[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0_ivo, updated. upstream/4.0.5+dfsg1-753-g5aab8a7

Sat May 11 14:16:38 UTC 2013

The following commit has been merged in the samba_4.0_ivo branch:
commit 1434a0913952ab8615f1e74e34c76910dc502e5d
Author: Christian Perrier <bubulle at debian.org>
Date:   Sat May 11 16:23:45 2013 +0200

    Regenerate all PO files

diff --git a/debian/po/ar.po b/debian/po/ar.po
index 728341d..468d18e 100644
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-06-21 05:10+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat at yahoo.com>\n"
 "Language-Team: Arabic <support at arabeyes.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "ØªØ±ÙŠØ¯ Ø§Ù„ØªØ±Ù‚ÙŠÙ…Ø© Ù…Ù† Ø³Ø§Ù…Ø¨Ø§3ØŸ"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -39,13 +39,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -54,7 +54,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -63,7 +63,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -71,7 +71,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -79,15 +79,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 #, fuzzy
-#| msgid "Realm:"
 msgid "Realm name:"
 msgstr "Realm:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -95,62 +94,189 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Ø¥Ù† Ù„Ù… ØªØ®ØªØ± Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø±ØŒ Ø³ÙŠØ¨Ù‚Ù‰ Ø³Ø§Ù…Ø¨Ø§ Ø¯ÙˆÙ† ØªÙ‡ÙŠØ¦Ø©ØŒ ÙˆØ³ÙŠØªÙˆØ¬Ø¨ Ø¹Ù„ÙŠÙƒ Ø¥Ø¹Ø¯Ø§Ø¯Ù‡ Ø¨Ù†ÙØ³Ùƒ."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Ø§Ø³Ù… Ø§Ù„Ù†Ø·Ø§Ù‚:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Ø¥Ø¹Ø¯Ø§Ø¯ Ø³Ø§Ù…Ø¨Ø§4 ÙƒÙ…ÙØªØÙƒÙ‘Ù… Ø£ÙˆÙ„ÙŠ Ø¨Ø§Ù„Ù†Ø·Ø§Ù‚ PDCØŸ"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Ø¥Ù† Ù„Ù… ØªØ®ØªØ± Ù‡Ø°Ø§ Ø§Ù„Ø®ÙŠØ§Ø±ØŒ Ø³ÙŠØ¨Ù‚Ù‰ Ø³Ø§Ù…Ø¨Ø§ Ø¯ÙˆÙ† ØªÙ‡ÙŠØ¦Ø©ØŒ ÙˆØ³ÙŠØªÙˆØ¬Ø¨ Ø¹Ù„ÙŠÙƒ Ø¥Ø¹Ø¯Ø§Ø¯Ù‡ Ø¨Ù†ÙØ³Ùƒ."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -166,10 +292,6 @@ msgstr ""
 #~ "Ø§Ù„Ø±Ø¬Ø§Ø¡ ØªØØ¯ÙŠØ¯ Kerberos realm Ø§Ù„Ø°ÙŠ Ø³ÙŠÙƒÙˆÙ† Ù‡Ø°Ø§ Ø§Ù„Ø®Ø§Ø¯Ù… ÙÙŠÙ‡. ÙÙŠ ÙƒØ«ÙŠØ± Ù…Ù† "
 #~ "Ø§Ù„ØØ§Ù„Ø§ØªØŒ ÙŠÙƒÙˆÙ† Ù‡Ø°Ø§ Ù‡Ùˆ Ù†ÙØ³Ù‡ Ø§Ø³Ù… Ø§Ù„Ù†Ø·Ø§Ù‚."
 
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Ø§Ø³Ù… Ø§Ù„Ù†Ø·Ø§Ù‚:"
-
 #~| msgid ""
 #~| "Please specify the workgroup you want this server to appear to be in "
 #~| "when queried by clients. Note that this parameter also controls the "
diff --git a/debian/po/ast.po b/debian/po/ast.po
index 79911f0..c98970e 100644
--- a/debian/po/ast.po
+++ b/debian/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: samba package\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-11 19:55+0200\n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2009-01-15 09:17+0100\n"
 "Last-Translator: astur <malditoastur at gmail.com>\n"
 "Language-Team: Asturian <softast-xeneral at lists.sourceforge.net>\n"
@@ -20,6 +20,123 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Country: SPAIN\n"
 
+#. Type: boolean
+#. Description
+#: ../samba-ad-dc.templates:1001
+msgid "Upgrade from Samba 3?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-ad-dc.templates:1001
+msgid ""
+"It is possible to migrate the existing configuration files from Samba 3 to "
+"Samba 4. This is likely to fail for complex setups, but should provide a "
+"good starting point for most existing installations."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid "Server role"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"Domain controllers manage NT4-style or Active Directory domains and provide "
+"services such as identity management and domain logons. Each domain needs to "
+"have a at least one domain controller."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"Member servers can be part of a NT4-style or Active Directory domain but do "
+"not provide any domain services. Workstations and file or print servers are "
+"usually regular domain members."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"A standalone server can not be used in a domain and only supports file "
+"sharing and Windows for Workgroups-style logins."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"If no server role is specified, the Samba server will not be provisioned, so "
+"this can be done manually by the user."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid "Realm name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid ""
+"Please specify the Kerberos realm for the domain that this domain controller "
+"controls."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid "Usually this is the a capitalized version of your DNS hostname."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "New password for the Samba \"administrator\" user:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "If this field is left blank, a random password will be generated."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "A password can be set later by running, as root:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid " $ samba-tool user setpassword administrator"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:5001
+msgid "Repeat password for the Samba \"administrator\" user:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../samba-ad-dc.templates:6001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../samba-ad-dc.templates:6001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
 #. Type: title
 #. Description
 #: ../samba-common.templates:1001
diff --git a/debian/po/be.po b/debian/po/be.po
index b9c470e..d1e8360 100644
--- a/debian/po/be.po
+++ b/debian/po/be.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: samba_2:3.3.0-3_be\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-11 19:55+0200\n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2009-02-19 04:33+0200\n"
 "Last-Translator: Pavel Piatruk <piatruk.p at gmail.com>\n"
 "Language-Team: Belarusian (Official spelling) <be at d-i.tanatos.org>\n"
@@ -18,6 +18,123 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#. Type: boolean
+#. Description
+#: ../samba-ad-dc.templates:1001
+msgid "Upgrade from Samba 3?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-ad-dc.templates:1001
+msgid ""
+"It is possible to migrate the existing configuration files from Samba 3 to "
+"Samba 4. This is likely to fail for complex setups, but should provide a "
+"good starting point for most existing installations."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid "Server role"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"Domain controllers manage NT4-style or Active Directory domains and provide "
+"services such as identity management and domain logons. Each domain needs to "
+"have a at least one domain controller."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"Member servers can be part of a NT4-style or Active Directory domain but do "
+"not provide any domain services. Workstations and file or print servers are "
+"usually regular domain members."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"A standalone server can not be used in a domain and only supports file "
+"sharing and Windows for Workgroups-style logins."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"If no server role is specified, the Samba server will not be provisioned, so "
+"this can be done manually by the user."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid "Realm name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid ""
+"Please specify the Kerberos realm for the domain that this domain controller "
+"controls."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid "Usually this is the a capitalized version of your DNS hostname."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "New password for the Samba \"administrator\" user:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "If this field is left blank, a random password will be generated."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "A password can be set later by running, as root:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid " $ samba-tool user setpassword administrator"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:5001
+msgid "Repeat password for the Samba \"administrator\" user:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../samba-ad-dc.templates:6001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../samba-ad-dc.templates:6001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
 #. Type: title
 #. Description
 #: ../samba-common.templates:1001
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 34248c3..3c1eb92 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_3.0.23c-1_bg\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-06-17 14:00+0300\n"
 "Last-Translator: Damyan Ivanov <dmn at debian.org>\n"
 "Language-Team: Bulgarian <dict at fsa-bg.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "ÐžÐ±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð¾Ñ‚ Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -36,13 +36,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -51,7 +51,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -60,7 +60,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -76,15 +76,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 #, fuzzy
-#| msgid "Realm:"
 msgid "Realm name:"
 msgstr "ÐžÐ±Ð»Ð°ÑÑ‚:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -92,61 +91,206 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Ð”Ð° ÑÐµ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸ Ð»Ð¸ smb.conf Ð´Ð° Ð²Ð·Ð¸Ð¼Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ Ð·Ð° WINS Ð¾Ñ‚ DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"ÐÐºÐ¾ ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€ÑŠÑ‚ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ð²Ð° Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ð¼Ñ€ÐµÐ¶Ð¾Ð²Ð¸Ñ‚Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¾Ñ‚ DHCP-ÑÑŠÑ€Ð²ÑŠÑ€, "
+"Ñ‚Ð¾Ð·Ð¸ Ð¼ÐµÑ‚Ð¾Ð´ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð¸ Ð·Ð° Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ð½Ð°Ð»Ð¸Ñ‡Ð½Ð¸Ñ‚Ðµ "
+"WINS-ÑÑŠÑ€Ð²ÑŠÑ€Ð¸ (ÑÑŠÑ€Ð²ÑŠÑ€Ð¸ Ð·Ð° Ð¸Ð¼ÐµÐ½Ð° NetBIOS). Ð—Ð° Ñ†ÐµÐ»Ñ‚Ð° Ðµ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð´Ð° ÑÐµ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸ "
+"Ñ„Ð°Ð¹Ð»ÑŠÑ‚ Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ smb.conf, Ñ‚Ð°ÐºÐ° Ñ‡Ðµ WINS-Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ Ð´Ð° ÑÐµ Ð²Ð·Ð¸Ð¼Ð°Ñ‚ Ð¾Ñ‚ /etc/"
+"samba.dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "Ð¢Ð°Ð·Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¸Ð·Ð¸ÑÐºÐ²Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° Ð¿Ð°ÐºÐµÑ‚Ð° dhcp3-client."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð½Ð° smb.conf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"ÐžÑÑ‚Ð°Ð½Ð°Ð»Ð°Ñ‚Ð° Ñ‡Ð°ÑÑ‚ Ð¾Ñ‚ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ°Ñ‚Ð° Ð½Ð° Samba Ð¸Ð·Ð¸ÑÐºÐ²Ð° Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸ Ð½Ð° Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ Ð² smb."
+"conf (Ñ„Ð°Ð¹Ð»ÑŠÑ‚ Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð·Ð° smbd Ð¸ nmbd). Ð’ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð° smb.conf ÑÑŠÐ´ÑŠÑ€Ð¶Ð° "
+"Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ð° â€žincludeâ€œ, ÐºÐ¾ÑÑ‚Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¾Ð±ÑŠÑ€ÐºÐ° Ð¿Ñ€Ð¾Ñ†ÐµÑÐ° Ð½Ð° Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ°. "
+"ÐÐºÐ¾ Ñ‚Ð¾Ð²Ð° ÑÐµ ÑÐ»ÑƒÑ‡Ð¸ Ñ‰Ðµ ÑÐµ Ð½Ð°Ð»Ð¾Ð¶Ð¸ Ñ€ÑŠÑ‡Ð½Ð¾ Ð´Ð° Ð¿Ð¾Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ðµ smb.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr "ÐÐºÐ¾ Ð½Ðµ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ‚Ð°Ð·Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ñ‰Ðµ Ñ‚Ñ€ÑÐ±Ð²Ð° ÑÐ°Ð¼Ð¸ Ð´Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚Ðµ Samba."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Ð”Ð¾Ð¼ÐµÐ¹Ð½:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Ð¨Ð¸Ñ„Ñ€Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð¸Ñ‚Ðµ?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Ð’ÑÐ¸Ñ‡ÐºÐ¸ ÑÑŠÐ²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¸ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð½Ð° Windows Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚ ÑˆÐ¸Ñ„Ñ€Ð¸Ñ€Ð°Ð½Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð¸ Ð·Ð° Ð²Ñ€ÑŠÐ·ÐºÐ° ÑÑŠÑ "
+"SMB-ÑÑŠÑ€Ð²ÑŠÑ€Ð¸. Ð˜Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð¸ Ð±ÐµÐ· ÑˆÐ¸Ñ„Ñ€Ð¸Ñ€Ð°Ð½Ðµ Ðµ Ð²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ°Ð¼Ð¾ ÑÐ»ÐµÐ´ "
+"Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸ Ð² Ñ€ÐµÐ³Ð¸ÑÑ‚ÑŠÑ€Ð°."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr "Ð˜Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° ÑˆÐ¸Ñ„Ñ€Ð¸Ñ€Ð°Ð½Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð¸ Ðµ ÑÐ¸Ð»Ð½Ð¾ Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑŠÑ‡Ð¸Ñ‚ÐµÐ»Ð½Ð¾."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "Ñ„Ð¾Ð½Ð¾Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑ"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "Ð¿Ñ€Ð¸ Ð½ÑƒÐ¶Ð´Ð°"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "ÐšÐ°Ðº Ð´Ð° ÑÐµ ÑÑ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð° Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"ÐžÑÐ½Ð¾Ð²Ð½Ð¸ÑÑ‚ Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° Samba, smbd, Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑŠÐ´Ðµ Ð¸Ð·Ð¿ÑŠÐ»Ð½ÑÐ²Ð°Ð½ Ð¿Ñ€Ð¸ Ð½ÑƒÐ¶Ð´Ð° Ð¸Ð»Ð¸ ÐºÐ°Ñ‚Ð¾ "
+"Ñ„Ð¾Ð½Ð¾Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑ (ÑÑŠÑ Ð·Ð°Ñ€ÐµÐ¶Ð´Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ‚Ð° ÑÐ¸ÑÑ‚ÐµÐ¼Ð°). ÐŸÑ€ÐµÐ¿Ð¾Ñ€ÑŠÑ‡Ð¸Ñ‚ÐµÐ»Ð½Ð¸ÑÑ‚ "
+"Ð½Ð°Ñ‡Ð¸Ð½ Ð·Ð° Ð¸Ð·Ð¿ÑŠÐ»Ð½ÐµÐ½Ð¸Ðµ Ðµ ÐºÐ°Ñ‚Ð¾ Ñ„Ð¾Ð½Ð¾Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑ."
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹Ð²Ð°Ð½Ðµ Ð½Ð° Samba 4 ÐºÐ°Ñ‚Ð¾ PDC?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr "ÐÐºÐ¾ Ð½Ðµ Ð¸Ð·Ð±ÐµÑ€ÐµÑ‚Ðµ Ñ‚Ð°Ð·Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ñ‰Ðµ Ñ‚Ñ€ÑÐ±Ð²Ð° ÑÐ°Ð¼Ð¸ Ð´Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚Ðµ Samba."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -162,10 +306,6 @@ msgstr ""
 #~ "Ð’ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ð¸Ð¼ÐµÑ‚Ð¾ Ð½Ð° Ð¾Ð±Ð»Ð°ÑÑ‚Ñ‚Ð° Ð½Ð° Kerberos, Ð² ÐºÐ¾ÑÑ‚Ð¾ Ñ‰Ðµ Ð±ÑŠÐ´Ðµ Ñ‚Ð¾Ð·Ð¸ ÑÑŠÑ€Ð²ÑŠÑ€. Ð’ "
 #~ "Ð¼Ð½Ð¾Ð³Ð¾ ÑÐ»ÑƒÑ‡Ð°Ð¸ Ð¾Ð±Ð»Ð°ÑÑ‚Ñ‚Ð° ÑÑŠÐ²Ð¿Ð°Ð´Ð° Ñ Ð¸Ð¼ÐµÑ‚Ð¾ Ð² DNS."
 
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Ð”Ð¾Ð¼ÐµÐ¹Ð½:"
-
 #~| msgid ""
 #~| "Please specify the workgroup you want this server to appear to be in "
 #~| "when queried by clients. Note that this parameter also controls the "
@@ -177,61 +317,6 @@ msgstr ""
 #~ "Ð’ÑŠÐ²ÐµÐ´ÐµÑ‚Ðµ Ð¸Ð¼ÐµÑ‚Ð¾ Ð½Ð° Ð´Ð¾Ð¼ÐµÐ¹Ð½Ð°, Ð² ÐºÐ¾Ð¹Ñ‚Ð¾ Ð´Ð° ÑÐµ Ð¿Ñ€ÐµÐ´ÑÑ‚Ð°Ð²Ñ ÑÑŠÑ€Ð²ÑŠÑ€ÑŠÑ‚ Ð¿Ñ€Ð¸ Ð·Ð°Ð¿Ð¸Ñ‚Ð²Ð°Ð½Ðµ "
 #~ "Ð¾Ñ‚ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¸Ñ‚Ðµ."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Ð”Ð° ÑÐµ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸ Ð»Ð¸ smb.conf Ð´Ð° Ð²Ð·Ð¸Ð¼Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ Ð·Ð° WINS Ð¾Ñ‚ DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "ÐÐºÐ¾ ÐºÐ¾Ð¼Ð¿ÑŽÑ‚ÑŠÑ€ÑŠÑ‚ Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ð²Ð° Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ð¼Ñ€ÐµÐ¶Ð¾Ð²Ð¸Ñ‚Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¾Ñ‚ DHCP-ÑÑŠÑ€Ð²ÑŠÑ€, "
-#~ "Ñ‚Ð¾Ð·Ð¸ Ð¼ÐµÑ‚Ð¾Ð´ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð¸ Ð·Ð° Ð¿Ð¾Ð»ÑƒÑ‡Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° Ð½Ð°Ð»Ð¸Ñ‡Ð½Ð¸Ñ‚Ðµ "
-#~ "WINS-ÑÑŠÑ€Ð²ÑŠÑ€Ð¸ (ÑÑŠÑ€Ð²ÑŠÑ€Ð¸ Ð·Ð° Ð¸Ð¼ÐµÐ½Ð° NetBIOS). Ð—Ð° Ñ†ÐµÐ»Ñ‚Ð° Ðµ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ Ð´Ð° ÑÐµ "
-#~ "Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸ Ñ„Ð°Ð¹Ð»ÑŠÑ‚ Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ smb.conf, Ñ‚Ð°ÐºÐ° Ñ‡Ðµ WINS-Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸Ñ‚Ðµ Ð´Ð° ÑÐµ "
-#~ "Ð²Ð·Ð¸Ð¼Ð°Ñ‚ Ð¾Ñ‚ /etc/samba.dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "Ð¢Ð°Ð·Ð¸ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð¸Ð·Ð¸ÑÐºÐ²Ð° Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° Ð¿Ð°ÐºÐµÑ‚Ð° dhcp3-client."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð° Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ð½Ð° smb.conf?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "ÐžÑÑ‚Ð°Ð½Ð°Ð»Ð°Ñ‚Ð° Ñ‡Ð°ÑÑ‚ Ð¾Ñ‚ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ°Ñ‚Ð° Ð½Ð° Samba Ð¸Ð·Ð¸ÑÐºÐ²Ð° Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸ Ð½Ð° Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸ Ð² "
-#~ "smb.conf (Ñ„Ð°Ð¹Ð»ÑŠÑ‚ Ñ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸ Ð·Ð° smbd Ð¸ nmbd). Ð’ Ð¼Ð¾Ð¼ÐµÐ½Ñ‚Ð° smb.conf ÑÑŠÐ´ÑŠÑ€Ð¶Ð° "
-#~ "Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ð° â€žincludeâ€œ, ÐºÐ¾ÑÑ‚Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¾Ð±ÑŠÑ€ÐºÐ° Ð¿Ñ€Ð¾Ñ†ÐµÑÐ° Ð½Ð° Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð° "
-#~ "Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ°. ÐÐºÐ¾ Ñ‚Ð¾Ð²Ð° ÑÐµ ÑÐ»ÑƒÑ‡Ð¸ Ñ‰Ðµ ÑÐµ Ð½Ð°Ð»Ð¾Ð¶Ð¸ Ñ€ÑŠÑ‡Ð½Ð¾ Ð´Ð° Ð¿Ð¾Ð¿Ñ€Ð°Ð²Ð¸Ñ‚Ðµ smb.conf."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Ð¨Ð¸Ñ„Ñ€Ð¸Ñ€Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð¸Ñ‚Ðµ?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Ð’ÑÐ¸Ñ‡ÐºÐ¸ ÑÑŠÐ²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð¸ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð½Ð° Windows Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ‚ ÑˆÐ¸Ñ„Ñ€Ð¸Ñ€Ð°Ð½Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð¸ Ð·Ð° Ð²Ñ€ÑŠÐ·ÐºÐ° "
-#~ "ÑÑŠÑ SMB-ÑÑŠÑ€Ð²ÑŠÑ€Ð¸. Ð˜Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° Ð¿Ð°Ñ€Ð¾Ð»Ð¸ Ð±ÐµÐ· ÑˆÐ¸Ñ„Ñ€Ð¸Ñ€Ð°Ð½Ðµ Ðµ Ð²ÑŠÐ·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ°Ð¼Ð¾ "
-#~ "ÑÐ»ÐµÐ´ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸ Ð² Ñ€ÐµÐ³Ð¸ÑÑ‚ÑŠÑ€Ð°."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr "Ð˜Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° ÑˆÐ¸Ñ„Ñ€Ð¸Ñ€Ð°Ð½Ð¸ Ð¿Ð°Ñ€Ð¾Ð»Ð¸ Ðµ ÑÐ¸Ð»Ð½Ð¾ Ð¿Ñ€ÐµÐ¿Ð¾Ñ€ÑŠÑ‡Ð¸Ñ‚ÐµÐ»Ð½Ð¾."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Ð¡ÑŠÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð±Ð°Ð·Ð°Ñ‚Ð° Ð´Ð°Ð½Ð½Ð¸ Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð¸, /var/lib/samba/passdb.tdb?"
 
@@ -262,23 +347,6 @@ msgstr ""
 #~ "Ð—Ð° Ð¿Ð¾Ð²ÐµÑ‡Ðµ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð²Ð¸Ð¶Ñ‚Ðµ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
 #~ "html."
 
-#~ msgid "daemons"
-#~ msgstr "Ñ„Ð¾Ð½Ð¾Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑ"
-
-#~ msgid "inetd"
-#~ msgstr "Ð¿Ñ€Ð¸ Ð½ÑƒÐ¶Ð´Ð°"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "ÐšÐ°Ðº Ð´Ð° ÑÐµ ÑÑ‚Ð°Ñ€Ñ‚Ð¸Ñ€Ð° Samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "ÐžÑÐ½Ð¾Ð²Ð½Ð¸ÑÑ‚ Ð¿Ñ€Ð¾Ñ†ÐµÑ Ð½Ð° Samba, smbd, Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑŠÐ´Ðµ Ð¸Ð·Ð¿ÑŠÐ»Ð½ÑÐ²Ð°Ð½ Ð¿Ñ€Ð¸ Ð½ÑƒÐ¶Ð´Ð° Ð¸Ð»Ð¸ "
-#~ "ÐºÐ°Ñ‚Ð¾ Ñ„Ð¾Ð½Ð¾Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑ (ÑÑŠÑ Ð·Ð°Ñ€ÐµÐ¶Ð´Ð°Ð½ÐµÑ‚Ð¾ Ð½Ð° Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ‚Ð° ÑÐ¸ÑÑ‚ÐµÐ¼Ð°). "
-#~ "ÐŸÑ€ÐµÐ¿Ð¾Ñ€ÑŠÑ‡Ð¸Ñ‚ÐµÐ»Ð½Ð¸ÑÑ‚ Ð½Ð°Ñ‡Ð¸Ð½ Ð·Ð° Ð¸Ð·Ð¿ÑŠÐ»Ð½ÐµÐ½Ð¸Ðµ Ðµ ÐºÐ°Ñ‚Ð¾ Ñ„Ð¾Ð½Ð¾Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑ."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr ""
 #~ "ÐÐ¾Ð²Ð°Ñ‚Ð° Ð²ÐµÑ€ÑÐ¸Ñ Ð½Ð° samba Ð½Ðµ Ð¿Ð¾Ð´Ð´ÑŠÑ€Ð¶Ð° Ñ€Ð°Ð±Ð¾Ñ‚Ð° Ñ Ð½ÑÐºÐ¾Ð»ÐºÐ¾ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð½Ð¸ Ñ Ð¿Ð°Ñ€Ð¾Ð»Ð¸"
diff --git a/debian/po/bn.po b/debian/po/bn.po
index db78938..a262a1f 100644
--- a/debian/po/bn.po
+++ b/debian/po/bn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Samba\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-11 19:55+0200\n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2009-04-16 12:12+0600\n"
 "Last-Translator: Md. Rezwan Shahid <rezwan at ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n at googlegroups.com>\n"
@@ -17,6 +17,123 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: WordForge 0.5-beta1\n"
 
+#. Type: boolean
+#. Description
+#: ../samba-ad-dc.templates:1001
+msgid "Upgrade from Samba 3?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-ad-dc.templates:1001
+msgid ""
+"It is possible to migrate the existing configuration files from Samba 3 to "
+"Samba 4. This is likely to fail for complex setups, but should provide a "
+"good starting point for most existing installations."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid "Server role"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"Domain controllers manage NT4-style or Active Directory domains and provide "
+"services such as identity management and domain logons. Each domain needs to "
+"have a at least one domain controller."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"Member servers can be part of a NT4-style or Active Directory domain but do "
+"not provide any domain services. Workstations and file or print servers are "
+"usually regular domain members."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"A standalone server can not be used in a domain and only supports file "
+"sharing and Windows for Workgroups-style logins."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"If no server role is specified, the Samba server will not be provisioned, so "
+"this can be done manually by the user."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid "Realm name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid ""
+"Please specify the Kerberos realm for the domain that this domain controller "
+"controls."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid "Usually this is the a capitalized version of your DNS hostname."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "New password for the Samba \"administrator\" user:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "If this field is left blank, a random password will be generated."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "A password can be set later by running, as root:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid " $ samba-tool user setpassword administrator"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:5001
+msgid "Repeat password for the Samba \"administrator\" user:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../samba-ad-dc.templates:6001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../samba-ad-dc.templates:6001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
 #. Type: title
 #. Description
 #: ../samba-common.templates:1001
diff --git a/debian/po/bs.po b/debian/po/bs.po
index 5203296..89a5897 100644
--- a/debian/po/bs.po
+++ b/debian/po/bs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2006-11-01 22:14+0100\n"
 "Last-Translator: Safir Secerovic <sapphire at linux.org.ba>\n"
 "Language-Team: Bosnian <lokal at linux.org.ba>\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -42,13 +42,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -96,68 +96,208 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Izmijeniti smb.conf za koriÅ¡tenje WINS postavki od DHCP-a?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Ako vaÅ¡ raÄunar dobiva informacije o IP adresama od DHCP servera na mreÅ¾i, "
+"DHCP server moÅ¾e takoÄ‘er pruÅ¾iti informacije o WINS serverima (\"NetBIOS "
+"name servers\") prisutnim na mreÅ¾i.  Ovo zahtijeva izmjenu u vaÅ¡oj smb.conf "
+"datoteci tako da WINS postavke dobivene od DHCP-a budu automatski proÄitane "
+"iz /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"dhcp3-client paket mora biti instaliran kako bi se iskoristila ova moguÄ‡nost."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Podesiti smb.conf automatski?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Ako ne odaberete ovu opciju, moraÄ‡ete sve izmjene konfiguracije sami "
-#~ "napraviti i neÄ‡ete moÄ‡i iskoristiti periodiÄna poboljÅ¡anja konfiguracije."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Ostatak konfiguracije Samba-e se bavi pitanjima koja utiÄu na parametre u /"
+"etc/samba/smb.conf, a to je datoteka koja se koristi za podeÅ¡avanje Samba "
+"programa (nmbd-a i smbd-a). VaÅ¡a trenutna smb.conf sadrÅ¾i 'include' liniju "
+"ili opciju koja obuhvata nekoliko linija, Å¡to bi moglo zbuniti "
+"automatizovani konfiguracioni proces i zahtijevati od vas da ruÄno uredite "
+"smb.conf kako bi proradili."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Workgroup/Domain Name:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Ako ne odaberete ovu opciju, moraÄ‡ete sve izmjene konfiguracije sami "
+"napraviti i neÄ‡ete moÄ‡i iskoristiti periodiÄna poboljÅ¡anja konfiguracije."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Workgroup/Domain Name:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Koristiti enkripciju Å¡ifre?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Svi noviji Windows klijenti komuniciraju sa SMB serverima koristeÄ‡i "
+"enkriptovane Å¡ifre. Ako Å¾elite koristiti Å¡ifre u vidu Äistog teksta, trebate "
+"promijeniti parametar u vaÅ¡em Windows registriju."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"UkljuÄivanje ove opcije je veoma preporuÄeno. Ako to uradite, pobrinite se "
+"da imate ispravnu /etc/samba/smbpasswd datoteku i da u njoj postavite Å¡ifre "
+"za svakog korisnika koristeÄ‡i smbpasswd naredbu."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "daemons"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Kako Å¾elite pokretati Samba-u?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba daemon smbd moÅ¾e biti pokrenut kao normalni daemon ili preko inetd-a. "
+"Pokretanje kao daemon je preporuÄeni pristup."
 
 #, fuzzy
 #~| msgid ""
@@ -172,68 +312,6 @@ msgstr ""
 #~ "upita od strane klijenata. Primijetite da ovaj parametar takoÄ‘e "
 #~ "kontroliÅ¡e domain name koriÅ¡ten u security=domain postavci."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Izmijeniti smb.conf za koriÅ¡tenje WINS postavki od DHCP-a?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Ako vaÅ¡ raÄunar dobiva informacije o IP adresama od DHCP servera na "
-#~ "mreÅ¾i, DHCP server moÅ¾e takoÄ‘er pruÅ¾iti informacije o WINS serverima "
-#~ "(\"NetBIOS name servers\") prisutnim na mreÅ¾i.  Ovo zahtijeva izmjenu u "
-#~ "vaÅ¡oj smb.conf datoteci tako da WINS postavke dobivene od DHCP-a budu "
-#~ "automatski proÄitane iz /etc/samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "dhcp3-client paket mora biti instaliran kako bi se iskoristila ova "
-#~ "moguÄ‡nost."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Podesiti smb.conf automatski?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Ostatak konfiguracije Samba-e se bavi pitanjima koja utiÄu na parametre "
-#~ "u /etc/samba/smb.conf, a to je datoteka koja se koristi za podeÅ¡avanje "
-#~ "Samba programa (nmbd-a i smbd-a). VaÅ¡a trenutna smb.conf sadrÅ¾i 'include' "
-#~ "liniju ili opciju koja obuhvata nekoliko linija, Å¡to bi moglo zbuniti "
-#~ "automatizovani konfiguracioni proces i zahtijevati od vas da ruÄno "
-#~ "uredite smb.conf kako bi proradili."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Koristiti enkripciju Å¡ifre?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Svi noviji Windows klijenti komuniciraju sa SMB serverima koristeÄ‡i "
-#~ "enkriptovane Å¡ifre. Ako Å¾elite koristiti Å¡ifre u vidu Äistog teksta, "
-#~ "trebate promijeniti parametar u vaÅ¡em Windows registriju."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "UkljuÄivanje ove opcije je veoma preporuÄeno. Ako to uradite, pobrinite "
-#~ "se da imate ispravnu /etc/samba/smbpasswd datoteku i da u njoj postavite "
-#~ "Å¡ifre za svakog korisnika koristeÄ‡i smbpasswd naredbu."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Kreirati samba bazu podataka sa Å¡iframa, /var/lib/samba/passdb.tdb?"
 
@@ -264,22 +342,6 @@ msgstr ""
 #~ "Vidjeti /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html iz samba-doc "
 #~ "paketa za viÅ¡e detalja."
 
-#~ msgid "daemons"
-#~ msgstr "daemons"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Kako Å¾elite pokretati Samba-u?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samba daemon smbd moÅ¾e biti pokrenut kao normalni daemon ili preko inetd-"
-#~ "a. Pokretanje kao daemon je preporuÄeni pristup."
-
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr "Premjestiti /etc/samba/smbpasswd u /var/lib/samba/passdb.tdb?"
 
diff --git a/debian/po/ca.po b/debian/po/ca.po
index 3422537..f2ee33f 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 4.0.0~alpha17.dfsg2-2\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-02-27 00:36+0100\n"
 "Last-Translator: Jordi Mallach <jordi at debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Voleu actualitzar des del Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -36,13 +36,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Rol del servidor"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -54,7 +54,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -84,13 +84,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Nom del reialme:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -100,116 +100,208 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Normalment aixÃ² Ã©s el nom en majÃºscules del vostre nom DNS."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "Voleu modificar el smb.conf perquÃ¨ utilitzi els parÃ metres de "
-#~ "configuraciÃ³ del WINS del DHCP?"
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
 
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Si el vostre ordinador obtÃ© la informaciÃ³ referent a la IP a travÃ©s d'un "
-#~ "servidor de DHCP, aquest tambÃ© li donarÃ  informaciÃ³ sobre els servidors "
-#~ "de WINS (\"servidors de nom de NetBIOS\") presents a la xarxa. Aquesta "
-#~ "opciÃ³ precisa d'una modificaciÃ³ del fitxer smb.conf per tal que els "
-#~ "parÃ metres de WINS obtinguts a travÃ©s del DHCP s'obtinguin a travÃ©s de la "
-#~ "lectura de /etc/samba/dhcp.conf."
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"Voleu modificar el smb.conf perquÃ¨ utilitzi els parÃ metres de configuraciÃ³ "
+"del WINS del DHCP?"
 
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Per beneficiar-vos d'aquesta caracterÃstica cal que sigui instalÂ·lat el "
-#~ "paquet dhcp3-client."
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Si el vostre ordinador obtÃ© la informaciÃ³ referent a la IP a travÃ©s d'un "
+"servidor de DHCP, aquest tambÃ© li donarÃ  informaciÃ³ sobre els servidors de "
+"WINS (\"servidors de nom de NetBIOS\") presents a la xarxa. Aquesta opciÃ³ "
+"precisa d'una modificaciÃ³ del fitxer smb.conf per tal que els parÃ metres de "
+"WINS obtinguts a travÃ©s del DHCP s'obtinguin a travÃ©s de la lectura de /etc/"
+"samba/dhcp.conf."
 
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Voleu configurar el smb.conf automÃ ticament?"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Per beneficiar-vos d'aquesta caracterÃstica cal que sigui instalÂ·lat el "
+"paquet dhcp3-client."
 
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "La resta de la configuraciÃ³ del Samba tracta amb qÃ¼estions que afecten "
-#~ "els parÃ metres del fitxer de configuraciÃ³ /etc/samba/smb.conf, que "
-#~ "utilitzen els programes de Samba. La versiÃ³ actual del smb.conf contÃ© una "
-#~ "lÃnia 'include' o una opciÃ³ que abarca mÃºltiples lÃnies que podria "
-#~ "confondre a la configuraciÃ³ automÃ tica i precisar de la seva ediciÃ³ "
-#~ "manual per poder-lo fer funcionar de nou."
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Voleu configurar el smb.conf automÃ ticament?"
 
-#~ msgid "Use password encryption?"
-#~ msgstr "Voleu utilitzar el xifrat de contrasenyes?"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"La resta de la configuraciÃ³ del Samba tracta amb qÃ¼estions que afecten els "
+"parÃ metres del fitxer de configuraciÃ³ /etc/samba/smb.conf, que utilitzen els "
+"programes de Samba. La versiÃ³ actual del smb.conf contÃ© una lÃnia 'include' "
+"o una opciÃ³ que abarca mÃºltiples lÃnies que podria confondre a la "
+"configuraciÃ³ automÃ tica i precisar de la seva ediciÃ³ manual per poder-lo fer "
+"funcionar de nou."
 
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Tots els clients de Windows recents es comuniquen amb els servidors de "
-#~ "Samba utilitzant contrasenyes xifrades. Si voleu utilitzar contrasenyes "
-#~ "amb text pla, haureu de modificar el vostre registre de Windows."
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
 
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Ã‰s recomanable habilitar aquesta opciÃ³. Si ho feu, assegureu-vos de tenir "
-#~ "un fitxer /etc/samba/smbpasswd vÃ lid i que hi especifiqueu la contrasenya "
-#~ "de cada usuari utilitzant l'ordre smbpasswd."
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Voleu utilitzar el xifrat de contrasenyes?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Tots els clients de Windows recents es comuniquen amb els servidors de Samba "
+"utilitzant contrasenyes xifrades. Si voleu utilitzar contrasenyes amb text "
+"pla, haureu de modificar el vostre registre de Windows."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Ã‰s recomanable habilitar aquesta opciÃ³. Si ho feu, assegureu-vos de tenir un "
+"fitxer /etc/samba/smbpasswd vÃ lid i que hi especifiqueu la contrasenya de "
+"cada usuari utilitzant l'ordre smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "dimonis"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Com voleu executar el Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"El dimoni de Samba pot executar-se com un dimoni normal o des de l'inetd. Ã‰s "
+"recomanable executar-lo com a dimoni."
 
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
@@ -245,22 +337,6 @@ msgstr ""
 #~ "Per mÃ©s informaciÃ³ feu una ullada a /usr/share/doc/samba-doc/htmldocs/"
 #~ "ENCRYPTION.html del paquet samba-doc."
 
-#~ msgid "daemons"
-#~ msgstr "dimonis"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Com voleu executar el Samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "El dimoni de Samba pot executar-se com un dimoni normal o des de l'inetd. "
-#~ "Ã‰s recomanable executar-lo com a dimoni."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "L'encadenament dels passdb no es permet"
 
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 985b5c3..b159cbf 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-02-12 09:21+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "PÅ™ejÃt ze Samby 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -44,13 +44,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Role serveru"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -62,7 +62,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -84,7 +84,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -92,13 +92,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "NÃ¡zev Å™ÃÅ¡e:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -108,63 +108,213 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Obvykle to bÃ½vÃ¡ DNS jmÃ©no poÄÃtaÄe napsanÃ© velkÃ½mi pÃsmeny."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Upravit smb.conf, aby pouÅ¾Ãval WINS nastavenÃ z DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Pokud vÃ¡Å¡ poÄÃtaÄ zÃskÃ¡vÃ¡ IP adresu z DHCP serveru, mÅ¯Å¾e vÃ¡m tento server "
+"nabÃzet takÃ© informace o WINS serverech (jmennÃ½ch serverech NetBIOSu), kterÃ© "
+"jsou dostupnÃ© ve vaÅ¡Ã sÃti. To vyÅ¾aduje zÃ¡sah do souboru smb.conf, kde se "
+"nastavÃ, aby se informace o WINS serverech naÄÃtaly ze souboru /etc/samba/"
+"dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Pro vyuÅ¾itÃ tÃ©to vlastnosti musÃte mÃt nainstalovanÃ½ balÃk dhcp3-client."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Konfigurovat smb.conf automaticky?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Zbytek konfigurace Samby se zabÃ½vÃ¡ otÃ¡zkami, kterÃ© mÄ›nÃ parametry v /etc/"
+"samba/smb.conf, coÅ¾ je soubor pouÅ¾ÃvanÃ½ pro nastavenÃ programÅ¯ nmbd a smbd "
+"(dohromady tvoÅ™Ã Sambu). VÃ¡Å¡ stÃ¡vajÃcÃ smb.conf obsahuje Å™Ã¡dek 'include' "
+"nebo volbu, kterÃ¡ se tÃ¡hne pÅ™es vÃce Å™Ã¡dkÅ¯, coÅ¾ mÅ¯Å¾e zmÃ¡st proces "
+"automatickÃ©ho nastavenÃ a mÅ¯Å¾e zpÅ¯sobit, Å¾e pro znovuzprovoznÄ›nÃ Samby "
+"budete muset upravit smb.conf ruÄnÄ›."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Pokud tuto moÅ¾nost nepovolÃte, zÅ¯stane Samba nenakonfigurovanÃ¡ a vÅ¡echna "
+"nastavenÃ budete muset zvlÃ¡dnout sami."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "DomÃ©na:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "PouÅ¾Ãt Å¡ifrovÃ¡nÃ hesel?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"VÅ¡ichni souÄasnÃ windowsovÃ klienti pouÅ¾ÃvajÃ pro komunikaci se SMB servery "
+"Å¡ifrovanÃ¡ hesla. Pokud chcete pouÅ¾Ãt hesla neÅ¡ifrovanÃ¡, musÃte zmÄ›nit jeden "
+"parametr v registrech systÃ©mu Windows."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"PovolenÃ tÃ©to volby je silnÄ› doporuÄeno. DÃ¡te-li na naÅ¡i radu, mÄ›li byste se "
+"ujistit, Å¾e mÃ¡te platnÃ½ soubor /etc/samba/smbpasswd a Å¾e v nÄ›m nastavÃte "
+"hesla vÅ¡ech uÅ¾ivatelÅ¯ pÅ™Ãkazem smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "dÃ©moni"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Jak chcete spouÅ¡tÄ›t Sambu?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Server Samby smbd mÅ¯Å¾e bÄ›Å¾et jako obyÄejnÃ½ daemon (doporuÄeno), nebo se mÅ¯Å¾e "
+"spouÅ¡tÄ›t z inetd."
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Nastavit Sambu 4 jako PDC?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Pokud tuto moÅ¾nost nepovolÃte, zÅ¯stane Samba nenakonfigurovanÃ¡ a vÅ¡echna "
-#~ "nastavenÃ budete muset zvlÃ¡dnout sami."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -180,10 +330,6 @@ msgstr ""
 #~ "Zadejte prosÃm kerberovu Å™ÃÅ¡i, do kterÃ© bude tento server patÅ™it. V mnoha "
 #~ "pÅ™Ãpadech je Å™ÃÅ¡e shodnÃ¡ s domÃ©novÃ½m DNS jmÃ©nem."
 
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "DomÃ©na:"
-
 #~| msgid ""
 #~| "Please specify the workgroup you want this server to appear to be in "
 #~| "when queried by clients. Note that this parameter also controls the "
@@ -195,67 +341,6 @@ msgstr ""
 #~ "Zadejte prosÃm jmÃ©no domÃ©ny, do kterÃ© mÃ¡ server patÅ™it (resp. se to tak "
 #~ "bude jevit klientÅ¯m)."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Upravit smb.conf, aby pouÅ¾Ãval WINS nastavenÃ z DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Pokud vÃ¡Å¡ poÄÃtaÄ zÃskÃ¡vÃ¡ IP adresu z DHCP serveru, mÅ¯Å¾e vÃ¡m tento server "
-#~ "nabÃzet takÃ© informace o WINS serverech (jmennÃ½ch serverech NetBIOSu), "
-#~ "kterÃ© jsou dostupnÃ© ve vaÅ¡Ã sÃti. To vyÅ¾aduje zÃ¡sah do souboru smb.conf, "
-#~ "kde se nastavÃ, aby se informace o WINS serverech naÄÃtaly ze souboru /"
-#~ "etc/samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Pro vyuÅ¾itÃ tÃ©to vlastnosti musÃte mÃt nainstalovanÃ½ balÃk dhcp3-client."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Konfigurovat smb.conf automaticky?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Zbytek konfigurace Samby se zabÃ½vÃ¡ otÃ¡zkami, kterÃ© mÄ›nÃ parametry v /etc/"
-#~ "samba/smb.conf, coÅ¾ je soubor pouÅ¾ÃvanÃ½ pro nastavenÃ programÅ¯ nmbd a "
-#~ "smbd (dohromady tvoÅ™Ã Sambu). VÃ¡Å¡ stÃ¡vajÃcÃ smb.conf obsahuje Å™Ã¡dek "
-#~ "'include' nebo volbu, kterÃ¡ se tÃ¡hne pÅ™es vÃce Å™Ã¡dkÅ¯, coÅ¾ mÅ¯Å¾e zmÃ¡st "
-#~ "proces automatickÃ©ho nastavenÃ a mÅ¯Å¾e zpÅ¯sobit, Å¾e pro znovuzprovoznÄ›nÃ "
-#~ "Samby budete muset upravit smb.conf ruÄnÄ›."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "PouÅ¾Ãt Å¡ifrovÃ¡nÃ hesel?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "VÅ¡ichni souÄasnÃ windowsovÃ klienti pouÅ¾ÃvajÃ pro komunikaci se SMB "
-#~ "servery Å¡ifrovanÃ¡ hesla. Pokud chcete pouÅ¾Ãt hesla neÅ¡ifrovanÃ¡, musÃte "
-#~ "zmÄ›nit jeden parametr v registrech systÃ©mu Windows."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "PovolenÃ tÃ©to volby je silnÄ› doporuÄeno. DÃ¡te-li na naÅ¡i radu, mÄ›li byste "
-#~ "se ujistit, Å¾e mÃ¡te platnÃ½ soubor /etc/samba/smbpasswd a Å¾e v nÄ›m "
-#~ "nastavÃte hesla vÅ¡ech uÅ¾ivatelÅ¯ pÅ™Ãkazem smbpasswd."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "VytvoÅ™it databÃ¡zi hesel /var/lib/samba/passdb.tdb?"
 
@@ -286,22 +371,6 @@ msgstr ""
 #~ "Podrobnosti naleznete v souboru /usr/share/doc/samba-doc/htmldocs/"
 #~ "ENCRYPTION.html z balÃku samba-doc."
 
-#~ msgid "daemons"
-#~ msgstr "dÃ©moni"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Jak chcete spouÅ¡tÄ›t Sambu?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Server Samby smbd mÅ¯Å¾e bÄ›Å¾et jako obyÄejnÃ½ daemon (doporuÄeno), nebo se "
-#~ "mÅ¯Å¾e spouÅ¡tÄ›t z inetd."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Å˜etÄ›zenÃ backendÅ¯ passdb nenÃ podporovÃ¡no"
 
diff --git a/debian/po/da.po b/debian/po/da.po
index 61d216b..47d2153 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-01-21 19:21+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Opgradere fra Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -39,13 +39,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Serverrolle"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -87,13 +87,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "OmrÃ¥denavn (realm):"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -103,49 +103,179 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 "Normalt er dette en version skrevet med stort bogstav for dit DNS-vÃ¦rtsnavn."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
diff --git a/debian/po/de.po b/debian/po/de.po
index 3b9b1fa..f79be8f 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4 4.0.0~alpha17.dfsg2-1\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2011-12-30 15:26+0100\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Upgrade von Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -45,13 +45,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Funktion des Servers"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -63,7 +63,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -95,13 +95,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Realm-Name:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -111,63 +111,190 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Ãœblicherweise ist dies Ihr DNS-Hostname in GroÃŸbuchstaben."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Wenn Sie diese Option nicht wÃ¤hlen, bleibt Samba unkonfiguriert, so dass Sie "
+"es selbst konfigurieren mÃ¼ssen."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Domain-Name:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Samba 4 als PDC einrichten?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Wenn Sie diese Option nicht wÃ¤hlen, bleibt Samba unkonfiguriert, so dass "
-#~ "Sie es selbst konfigurieren mÃ¼ssen."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -184,9 +311,6 @@ msgstr ""
 #~ "dieser Server befinden wird. In vielen FÃ¤llen wird dies identisch zum DNS-"
 #~ "Domain-Namen sein."
 
-#~ msgid "Domain Name:"
-#~ msgstr "Domain-Name:"
-
 #~ msgid ""
 #~ "Please specify the domain you want this server to appear to be in when "
 #~ "queried by clients."
diff --git a/debian/po/dz.po b/debian/po/dz.po
index 63d47d0..58ab36e 100644
--- a/debian/po/dz.po
+++ b/debian/po/dz.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po.pot\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-13 02:22+0530\n"
 "Last-Translator: translator <pemai_jurmey at hotmail.com>\n"
 "Language-Team: dzongkha <pgeyleg at dit.gov.bt>\n"
@@ -30,13 +30,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -45,13 +45,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -60,7 +60,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -77,7 +77,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -85,13 +85,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -99,68 +99,209 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½“à½„à¼‹à½£à½¦à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½¦à¾Ÿà½„à½¦à¼‹à½šà½´à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½‘à½–à¼‹à½“à½²à¼‹à½£à½´à¼‹ smb.conf à½£à½ºà½‚à½¦à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹"
+"à½¨à½²à½“à¼‹à½“à¼‹?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"à½‚à¼‹à½‘à½ºà½˜à¼‹à½…à½²à½‚à¼‹à½ à½–à½‘à¼‹ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à¼‹à½‚à¾³à½¼à½‚à¼‹à½¢à½²à½‚à¼‹à½‚à½²à½¦à¼‹à½¡à½¼à½„à½¦à¼‹à½ à½–à¾²à½ºà½£à¼‹à½‚à½´à½ à½²à¼‹à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½¦à½¢à¼‹à½–à½¢à¼‹à½“à½„à¼‹à½£à½¦à¼‹ à½¨à½ à½²à¼‹à½”à½²à¼‹à½à¼‹à½–à¾±à½„à¼‹à½–à½¢à¾¡à¼‹à½‘à½¼à½“à¼‹"
+"à½ à½à½¼à½–à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½¦à½¢à¼‹à½–à½¢à¼‹à½‚à½²à½¦à¼‹à½¡à½„à¼‹ à½¡à½¼à½„à½¦à¼‹à½ à½–à¾²à½ºà½£à¼‹à½‚à½´à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à½¢à¼‹à½–à½¢à½¦à½²à¼‹ "
+"(\"NetBIOS name servers\")à½‚à½²à¼‹à½¦à¾à½¼à½¢à¼‹à½£à½¦à¼‹à½–à½¢à¾¡à¼‹à½‘à½¼à½“à¼‹à½–à¾±à½²à½“à¼‹à½ à½¼à½„à¼‹à¼ à½ à½‘à½²à¼‹à½‚à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹ smb.conf "
+"à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½–à½¦à¾’à¾±à½´à½¢à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼‹ à½‘à½ºà¼‹à½ à½–à½‘à¼‹à½–à¼‹à½…à½²à½“à¼‹ à½–à¾±à½²à½“à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹"
+"à½¦à¾Ÿà½„à½¦à¼‹à½ à½‘à½²à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹ /etc/samba/dhcp.conf à½“à½„à¼‹à½£à½¦à¼‹à½£à¾·à½‚à¼‹à½ à½¼à½„à¼‹à¼"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à¼£-à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½à½´à½˜à¼‹à½¦à¾’à¾²à½²à½£à¼‹à½ à½‘à½²à¼‹ à½à¾±à½‘à¼‹à½¢à¾£à½˜à¼‹à½ à½‘à½²à¼‹à½‚à½²à¼‹à½•à½“à¼‹à½à½¼à½‚à½¦à¼‹à½£à½´à¼‹à½‚à½žà½²à¼‹à½–à½™à½´à½‚à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "smb.conf à½ à½‘à½²à¼‹à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹à½˜à¼‹à½‚à½‘à½˜à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‚à½²à¼‹à½ à½‚à¾±à½´à½¢à¼‹à½–à¼‹à½‚à½„à¼‹à½¢à½´à½„à¼‹à½…à½²à½‚à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½„à¼‹à½‚à½²à½¦à¼‹à½£à½ºà½‚à½¦à¼‹à½¦à¾à¾±à½¼à½„à¼‹à½ à½à½–à¼‹"
-#~ "à½‘à½‚à½¼à½”à¼‹à½‘à½„à¼‹ à½‘à½´à½¦à¼‹à½˜à½šà½˜à½¦à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‚à½¼à½„à¼‹à½¦à¾¤à½ºà½£à¼‹à½‚à¾±à½²à¼‹à½à½ºà¼‹à½•à½“à¼‹à½ à½à½¼à½–à¼‹à½˜à½²à¼‹à½šà½´à½‚à½¦à¼"
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"à½¦à½˜à¼‹à½–à¼‹à½‚à½²à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‚à½žà½“à¼‹à½˜à½²à¼‹à½šà½´à¼‹ à½ à½‘à¾²à½²à¼‹à½–à¼‹à½‘à½„à¼‹à½ à½–à¾²à½ºà½£à½à¼‹à½£à½¦à¼‹ /etc/samba/smb.conf à½“à½„à¼‹à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½£à½´à¼‹à½•à½“à¼‹"
+"à½‚à½“à½¼à½‘à¼‹à½ à½–à¾±à½´à½„à½˜à¼‹à½¨à½²à½“à¼‹ à½ à½‘à½²à¼‹à½¡à½„à¼‹à½¦à½˜à¼‹à½–à¼‹à½£à½¦à¼‹à½¢à½²à½˜à¼‹ (nmbd and smbd)à½šà½´à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½£à½´à¼‹à½‘à½‚à½¼à¼‹à½”à½ à½²à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹"
+"à½¨à½²à½“à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à¼‹à½‘à¼‹à½£à¾Ÿà½¼à½ à½²à¼‹ smb.conf à½“à½„à¼‹à½£à½´à¼‹ 'include'à½‚à¾²à½£à¼‹à½à½²à½‚à¼‹ à½¡à½„à½“à¼‹ à½ à½•à½¢à¼‹à½šà½‘à¼‹à½ à½‚à¾±à½¼à¼‹à½˜à½²à¼‹à½‚à¾²à½£à¼‹à½à½²à½‚à¼‹à½¦à¾£à¼‹à½˜à½„à¼‹à½‚à½²à¼‹"
+"à½‚à½‘à½˜à¼‹à½à¼‹à½šà½´à¼‹à½¡à½¼à½‘à½”à¼‹à½¨à½²à½“à¼‹ à½‘à½ºà¼‹à½‚à½²à½¦à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½…à½“à¼‹à½‚à¾±à½²à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½£à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½‘à½²à¼‹ à½˜à½‚à½´à¼‹à½ à½à½¼à½˜à¼‹à½–à½…à½´à½‚à½”à¼‹à½¨à½²à½“à½˜à¼‹à½‘à½„à¼‹ à½£à½¼à½‚à¼‹à½¦à¾Ÿà½ºà¼‹à½£à½±à¼‹"
+"à½ à½–à½‘à¼‹à½“à½²à½ à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½£à½‚à¼‹à½”à½ à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹smb.conf à½žà½´à½“à¼‹à½‘à½‚à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼ "
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½‚à½‘à½˜à¼‹à½à¼‹à½ à½‘à½²à¼‹à½˜à¼‹à½‚à½‘à½˜à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‚à½²à¼‹à½ à½‚à¾±à½´à½¢à¼‹à½–à¼‹à½‚à½„à¼‹à½¢à½´à½„à¼‹à½…à½²à½‚à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½„à¼‹à½‚à½²à½¦à¼‹à½£à½ºà½‚à½¦à¼‹à½¦à¾à¾±à½¼à½„à¼‹à½ à½à½–à¼‹à½‘à½‚à½¼à½”à¼‹"
+"à½‘à½„à¼‹ à½‘à½´à½¦à¼‹à½˜à½šà½˜à½¦à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‚à½¼à½„à¼‹à½¦à¾¤à½ºà½£à¼‹à½‚à¾±à½²à¼‹à½à½ºà¼‹à½•à½“à¼‹à½ à½à½¼à½–à¼‹à½˜à½²à¼‹à½šà½´à½‚à½¦à¼"
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "à½£à½±à¼‹à½‚à½²à¼‹à½¦à¾¡à½ºà¼‹à½šà½“à¼‹/à½Œà½¼à¼‹à½˜à½ºà½“à¼‹à½˜à½²à½„à¼‹:"
+msgid "Workgroup/Domain Name:"
+msgstr "à½£à½±à¼‹à½‚à½²à¼‹à½¦à¾¡à½ºà¼‹à½šà½“à¼‹/à½Œà½¼à¼‹à½˜à½ºà½“à¼‹à½˜à½²à½„à¼‹:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½¦à½„à¼‹à½–à½Ÿà½¼à¼‹à½£à½‚à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½˜à½„à¼‹à½¤à½¼à½¦à¼‹à½…à½²à½‚à¼‹à½‚à½²à½¦à¼‹ à½‚à½¦à½„à¼‹à½–à½Ÿà½¼à½¦à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½‚à¾±à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½¨à½ºà½¦à½²à¼‹à½¨à½ºà½˜à¼‹à½–à½²à¼‹à½¦à½¢à¼‹à½–à½¢à½¦à½²à¼‹"
+"à½‘à½„à¼‹à½‚à½…à½²à½‚à¼‹à½à½¢à¼‹à½–à½¢à¾’à¾±à½´à½‘à¼‹à½ à½–à¾²à½ºà½£à¼‹à½ à½à½–à¼‹à½¨à½²à½“à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½šà½²à½‚à¼‹à½¡à½²à½‚à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½¦à½£à¼‹à½à½¼à½‚à¼‹à½à½¼à¼‹à½…à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½‘à½‚à½¼à¼‹à½˜à½“à½¼à¼‹à½–à¼‹"
+"à½…à½²à½“à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½à½¼à¼‹à½–à½€à½¼à½‘à¼‹à½“à½„à¼‹à½£à½´à¼‹à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½…à½²à½‚à¼‹à½–à½¦à¾’à¾±à½´à½¢à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"à½‚à½‘à½˜à¼‹à½à¼‹à½£à¾•à½¼à½‚à½¦à¼‹à½…à½“à¼‹à½–à½Ÿà½¼à¼‹à½˜à½²à¼‹à½ à½‘à½²à¼‹à½‚à½²à½¦à¼‹ à½‚à½“à½˜à¼‹à½˜à½ºà½‘à¼‹à½¦à¼‹à½˜à½ºà½‘à¼‹à½ à½¼à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼ à½‘à½ºà¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½à¾±à½¼à½‘à¼‹à½£à½´à¼‹"
+"à½“à½´à½¦à¼‹à½£à¾¡à½“à¼‹à½‚à¾±à½²à¼‹/etc/samba/smbpasswd à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½…à½²à½‚à¼‹à½‘à½‚à½¼à½”à¼‹à½‘à½„à¼‹ à½ à¼‹à½“à½²à¼‹à½ à½‘à½²à¼‹à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ smbpasswd à½–à½¢à¾¡à¼‹à½–à½€à½¼à½‘à¼‹"
+"à½£à½‚à¼‹à½£à½ºà½“à¼‹à½‚à¾±à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½£à½‚à¼‹à½£à½ºà½“à¼‹à½”à¼‹à½¢à½ºà¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à¼‹à½‘à½¼à½“à¼‹à½£à½¦à¼‹ à½‘à½ºà¼‹à½“à½„à¼‹à½£à½´à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½žà½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼ "
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "à½Œà½ºà¼‹à½˜à½±à½¼à½“à½¦à½²à¼‹"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½¦à½˜à¼‹à½–à¼‹à½ à½‘à½²à¼‹à½‚à¼‹à½‘à½ºà¼‹à½¦à¾¦à½ºà¼‹à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½‘à½‚à½¼à¼‹à½˜à½“à½¼à½à¼‹à½¦à¾¨à½¼?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"à½¦à½˜à¼‹à½–à¼‹à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹smbdà½ à½‘à½²à¼‹ à½¦à¾¤à¾±à½²à½¢à¼‹à½–à½à½„à¼‹à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹à½¦à¾¦à½ºà¼‹ à½¡à½„à¼‹à½“à¼‹ inetdà½“à½„à¼‹à½£à½¦à¼‹ à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½šà½´à½‚à½¦à¼ à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹à½¦à¾¦à½ºà¼‹à½‚à½¡à½¼à½‚à¼‹"
+"à½–à½€à½¼à½£à¼‹à½˜à½²à¼‹à½ à½‘à½²à¼‹ à½ à½¼à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½–à½‘à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½¢à¾©à½¢à¼‹à½£à½ºà½“à¼‹à½¨à½²à½“à¼"
 
 #, fuzzy
 #~| msgid ""
@@ -175,68 +316,6 @@ msgstr ""
 #~ "à½–à½€à½¼à½‘à¼‹à½ à½–à½‘à¼‹à½‚à½“à½„à¼‹à¼ à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½ à½‘à½²à¼‹à½‚à½²à½¦à¼‹ à½¦à¾²à½´à½„à¼‹à½¦à¾à¾±à½¼à½–à¼‹=à½Œà½±à¼‹à½˜à½±à½ºà½“à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½¦à¾Ÿà½„à½¦à¼‹à½‘à½„à¼‹à½‚à½…à½²à½‚à¼‹à½à½¢à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹"
 #~ "à½Œà½±à¼‹à½˜à½±à½ºà½“à¼‹à½˜à½²à½„à¼‹à½¡à½„à¼‹ à½šà½‘à¼‹à½ à½›à½²à½“à¼‹à½ à½–à½‘à½à¼‹à½¨à½²à½“à½˜à¼‹à½‘à¾²à½“à¼‹à½‘à½‚à½¼"
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½“à½„à¼‹à½£à½¦à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½¦à¾Ÿà½„à½¦à¼‹à½šà½´à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½‘à½–à¼‹à½“à½²à¼‹à½£à½´à¼‹ smb.conf à½£à½ºà½‚à½¦à¼‹à½–à½…à½¼à½¦à¼‹"
-#~ "à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“à¼‹?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "à½‚à¼‹à½‘à½ºà½˜à¼‹à½…à½²à½‚à¼‹à½ à½–à½‘à¼‹ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à¼‹à½‚à¾³à½¼à½‚à¼‹à½¢à½²à½‚à¼‹à½‚à½²à½¦à¼‹à½¡à½¼à½„à½¦à¼‹à½ à½–à¾²à½ºà½£à¼‹à½‚à½´à½ à½²à¼‹à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½¦à½¢à¼‹à½–à½¢à¼‹à½“à½„à¼‹à½£à½¦à¼‹ à½¨à½ à½²à¼‹à½”à½²à¼‹à½à¼‹à½–à¾±à½„à¼‹à½–à½¢à¾¡à¼‹"
-#~ "à½‘à½¼à½“à¼‹à½ à½à½¼à½–à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à½¦à½¢à¼‹à½–à½¢à¼‹à½‚à½²à½¦à¼‹à½¡à½„à¼‹ à½¡à½¼à½„à½¦à¼‹à½ à½–à¾²à½ºà½£à¼‹à½‚à½´à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹à½¨à½ºà½¦à½²à¼‹à½¦à½¢à¼‹à½–à½¢à½¦à½²à¼‹ "
-#~ "(\"NetBIOS name servers\")à½‚à½²à¼‹à½¦à¾à½¼à½¢à¼‹à½£à½¦à¼‹à½–à½¢à¾¡à¼‹à½‘à½¼à½“à¼‹à½–à¾±à½²à½“à¼‹à½ à½¼à½„à¼‹à¼ à½ à½‘à½²à¼‹à½‚à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹ smb."
-#~ "conf à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½–à½¦à¾’à¾±à½´à½¢à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼‹ à½‘à½ºà¼‹à½ à½–à½‘à¼‹à½–à¼‹à½…à½²à½“à¼‹ à½–à¾±à½²à½“à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹ à½Œà½–à¼‹à½£à½´à¼‹à½¨à½ à½²à¼‹à½¨à½ºà½“à¼‹"
-#~ "à½¨à½ºà½¦à½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½¦à¾Ÿà½„à½¦à¼‹à½ à½‘à½²à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹ /etc/samba/dhcp.conf à½“à½„à¼‹à½£à½¦à¼‹à½£à¾·à½‚à¼‹à½ à½¼à½„à¼‹à¼"
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "à½Œà½²à¼‹à½¨à½ºà½…à¼‹à½¦à½²à¼‹à½”à½²à¼‹à¼£-à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½à½´à½˜à¼‹à½¦à¾’à¾²à½²à½£à¼‹à½ à½‘à½²à¼‹ à½à¾±à½‘à¼‹à½¢à¾£à½˜à¼‹à½ à½‘à½²à¼‹à½‚à½²à¼‹à½•à½“à¼‹à½à½¼à½‚à½¦à¼‹à½£à½´à¼‹à½‚à½žà½²à¼‹à½–à½™à½´à½‚à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼"
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "smb.conf à½ à½‘à½²à¼‹à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à½¦à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "à½¦à½˜à¼‹à½–à¼‹à½‚à½²à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½‚à½žà½“à¼‹à½˜à½²à¼‹à½šà½´à¼‹ à½ à½‘à¾²à½²à¼‹à½–à¼‹à½‘à½„à¼‹à½ à½–à¾²à½ºà½£à½à¼‹à½£à½¦à¼‹ /etc/samba/smb.conf à½“à½„à¼‹à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½£à½´à¼‹à½•à½“à¼‹"
-#~ "à½‚à½“à½¼à½‘à¼‹à½ à½–à¾±à½´à½„à½˜à¼‹à½¨à½²à½“à¼‹ à½ à½‘à½²à¼‹à½¡à½„à¼‹à½¦à½˜à¼‹à½–à¼‹à½£à½¦à¼‹à½¢à½²à½˜à¼‹ (nmbd and smbd)à½šà½´à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½£à½´à¼‹à½‘à½‚à½¼à¼‹à½”à½ à½²à¼‹à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹"
-#~ "à½¨à½²à½“à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à¼‹à½‘à¼‹à½£à¾Ÿà½¼à½ à½²à¼‹ smb.conf à½“à½„à¼‹à½£à½´à¼‹ 'include'à½‚à¾²à½£à¼‹à½à½²à½‚à¼‹ à½¡à½„à½“à¼‹ à½ à½•à½¢à¼‹à½šà½‘à¼‹à½ à½‚à¾±à½¼à¼‹à½˜à½²à¼‹à½‚à¾²à½£à¼‹à½à½²à½‚à¼‹à½¦à¾£à¼‹à½˜à½„à¼‹"
-#~ "à½‚à½²à¼‹à½‚à½‘à½˜à¼‹à½à¼‹à½šà½´à¼‹à½¡à½¼à½‘à½”à¼‹à½¨à½²à½“à¼‹ à½‘à½ºà¼‹à½‚à½²à½¦à¼‹ à½¢à½„à¼‹à½–à½žà½²à½“à¼‹à½…à½“à¼‹à½‚à¾±à½²à¼‹à½¢à½²à½˜à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½£à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½‘à½²à¼‹ à½˜à½‚à½´à¼‹à½ à½à½¼à½˜à¼‹à½–à½…à½´à½‚à½”à¼‹à½¨à½²à½“à½˜à¼‹à½‘à½„à¼‹ "
-#~ "à½£à½¼à½‚à¼‹à½¦à¾Ÿà½ºà¼‹à½£à½±à¼‹à½ à½–à½‘à¼‹à½“à½²à½ à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½£à½‚à¼‹à½”à½ à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹smb.conf à½žà½´à½“à¼‹à½‘à½‚à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼à½”à¼‹à½¨à½²à½“à¼ "
-
-#~ msgid "Use password encryption?"
-#~ msgstr "à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½¦à½„à¼‹à½–à½Ÿà½¼à¼‹à½£à½‚à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½žà½–à½¦à¼‹à½à½¼à½‚à¼‹à½¦à¾¤à¾±à½¼à½‘à¼‹à½˜à½²à¼‹à½˜à½„à¼‹à½¤à½¼à½¦à¼‹à½…à½²à½‚à¼‹à½‚à½²à½¦à¼‹ à½‚à½¦à½„à¼‹à½–à½Ÿà½¼à½¦à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½‚à¾±à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½¨à½ºà½¦à½²à¼‹à½¨à½ºà½˜à¼‹à½–à½²à¼‹à½¦à½¢à¼‹"
-#~ "à½–à½¢à½¦à½²à¼‹à½‘à½„à¼‹à½‚à½…à½²à½‚à¼‹à½à½¢à¼‹à½–à½¢à¾’à¾±à½´à½‘à¼‹à½ à½–à¾²à½ºà½£à¼‹à½ à½à½–à¼‹à½¨à½²à½“à¼ à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½šà½²à½‚à¼‹à½¡à½²à½‚à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½¦à½£à¼‹à½à½¼à½‚à¼‹à½à½¼à¼‹à½…à½²à½‚à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½ à½à½–à¼‹à½‘à½‚à½¼à¼‹"
-#~ "à½˜à½“à½¼à¼‹à½–à¼‹à½…à½²à½“à¼‹ à½à¾±à½¼à½‘à¼‹à½¢à½ à½²à¼‹à½à½²à½“à¼‹à½Œà½±à½¦à½²à¼‹à½à½¼à¼‹à½–à½€à½¼à½‘à¼‹à½“à½„à¼‹à½£à½´à¼‹à½šà½‘à¼‹à½–à½Ÿà½´à½„à¼‹à½…à½²à½‚à¼‹à½–à½¦à¾’à¾±à½´à½¢à¼‹à½–à½…à½¼à½¦à¼‹à½ à½–à½‘à¼‹à½‘à½‚à½¼"
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "à½‚à½‘à½˜à¼‹à½à¼‹à½£à¾•à½¼à½‚à½¦à¼‹à½…à½“à¼‹à½–à½Ÿà½¼à¼‹à½˜à½²à¼‹à½ à½‘à½²à¼‹à½‚à½²à½¦à¼‹ à½‚à½“à½˜à¼‹à½˜à½ºà½‘à¼‹à½¦à¼‹à½˜à½ºà½‘à¼‹à½ à½¼à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼ à½‘à½ºà¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½”à¼‹à½…à½²à½“à¼‹ à½à¾±à½¼à½‘à¼‹"
-#~ "à½£à½´à¼‹à½“à½´à½¦à¼‹à½£à¾¡à½“à¼‹à½‚à¾±à½²à¼‹/etc/samba/smbpasswd à½¡à½²à½‚à¼‹à½¦à¾£à½¼à½‘à¼‹à½…à½²à½‚à¼‹à½‘à½‚à½¼à½”à¼‹à½‘à½„à¼‹ à½ à¼‹à½“à½²à¼‹à½ à½‘à½²à¼‹à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ smbpasswd "
-#~ "à½–à½¢à¾¡à¼‹à½–à½€à½¼à½‘à¼‹à½£à½‚à¼‹à½£à½ºà½“à¼‹à½‚à¾±à½²à¼‹à½à½¼à½‚à¼‹à½£à½¦à¼‹ à½£à½‚à¼‹à½£à½ºà½“à¼‹à½”à¼‹à½¢à½ºà¼‹à½–à½žà½²à½“à¼‹à½‚à¾±à½²à¼‹à½‘à½¼à½“à¼‹à½£à½¦à¼‹ à½‘à½ºà¼‹à½“à½„à¼‹à½£à½´à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½žà½²à¼‹à½¦à¾’à¾²à½²à½‚à¼‹à½ à½–à½‘à¼ "
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
 #~ "à½¦à½˜à¼‹à½–à¼‹à½†à½¼à½‚à¼‹à½¡à½²à½‚à¼‹à½‚à½“à½‘à¼‹à½¦à¾¡à½´à½‘à¼‹à½‚à½žà½²à¼‹à½¢à¾Ÿà½ºà½“à¼‹ /var/lib/samba/passdb.tdb à½‚à½¦à½¢à¼‹à½–à½¦à¾à¾²à½´à½“à¼‹à½ à½–à½‘à¼‹à½“à½²à¼‹à½¨à½²à½“à¼‹à½“à¼‹?"
@@ -268,22 +347,6 @@ msgstr ""
 #~ "à½à¼‹à½‚à½¦à½£à¼‹à½˜à½à¾±à½ºà½“à¼‹à½“à½²à½ à½²à¼‹à½‘à½¼à½“à¼‹à½£à½´à¼‹ à½¦à½˜à¼‹à½–à¼‹-à½Œà½¼à½€à¼‹à½à½´à½˜à¼‹à½¦à¾’à¾²à½²à½£à¼‹à½“à½„à¼‹à½£à½¦à¼‹ /usr/share/doc/samba-doc/"
 #~ "htmldocs/ENCRYPTION.html à½£à½´à¼‹à½£à¾Ÿà¼"
 
-#~ msgid "daemons"
-#~ msgstr "à½Œà½ºà¼‹à½˜à½±à½¼à½“à½¦à½²à¼‹"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "à½à¾±à½¼à½‘à¼‹à½€à¾±à½²à½¦à¼‹ à½¦à½˜à¼‹à½–à¼‹à½ à½‘à½²à¼‹à½‚à¼‹à½‘à½ºà¼‹à½¦à¾¦à½ºà¼‹à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½‘à½‚à½¼à¼‹à½˜à½“à½¼à½à¼‹à½¦à¾¨à½¼?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "à½¦à½˜à¼‹à½–à¼‹à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹smbdà½ à½‘à½²à¼‹ à½¦à¾¤à¾±à½²à½¢à¼‹à½–à½à½„à¼‹à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹à½¦à¾¦à½ºà¼‹ à½¡à½„à¼‹à½“à¼‹ inetdà½“à½„à¼‹à½£à½¦à¼‹ à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½šà½´à½‚à½¦à¼ à½Œà½ºà¼‹à½˜à½±à½¼à½“à¼‹à½¦à¾¦à½ºà¼‹"
-#~ "à½‚à½¡à½¼à½‚à¼‹à½–à½€à½¼à½£à¼‹à½˜à½²à¼‹à½ à½‘à½²à¼‹ à½ à½¼à½¦à¼‹à½¦à¾¦à¾±à½¼à½¢à¼‹à½ à½–à½‘à¼‹à½¡à½¼à½‘à¼‹à½”à½ à½²à¼‹à½¢à¾©à½¢à¼‹à½£à½ºà½“à¼‹à½¨à½²à½“à¼"
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "à½¢à¾’à¾±à½´à½“à¼‹à½à½‚à¼‹ passdb à½¢à¾’à¾±à½–à¼‹à½˜à½à½ à¼‹à½ à½‘à½²à¼‹ à½¢à¾’à¾±à½–à¼‹à½¦à¾à¾±à½¼à½¢à¼‹à½˜à¼‹à½ à½–à½‘à¼‹à½–à½¦à¼‹"
 
diff --git a/debian/po/el.po b/debian/po/el.po
index 25b28c0..189a656 100644
--- a/debian/po/el.po
+++ b/debian/po/el.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_el\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-16 11:29+0200\n"
 "Last-Translator: galaxico\n"
 "Language-Team:  <en at li.org>\n"
@@ -28,13 +28,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -43,13 +43,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -58,7 +58,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -75,7 +75,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -83,13 +83,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -97,69 +97,217 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"Î¤ÏÎ¿Ï€Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï„Î¿Ï… smb.conf ÏŽÏƒÏ„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ WINS Î±Ï€ÏŒ Ï„Î¿Î½ "
+"server DHCP;"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Î‘Î½ Î¿ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®Ï‚ ÏƒÎ±Ï‚ Ï€Î±Î¯ÏÎ½ÎµÎ¹ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î³Î¹Î± Ï„Î·Î½ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP Î±Ï€ÏŒ ÎÎ½Î±Î½ "
+"server DHCP ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿, Î¿ server DHCP Î¼Ï€Î¿ÏÎµÎ¯ ÎµÏ€Î¯ÏƒÎ·Ï‚ Î½Î± Î´ÏŽÏƒÎµÎ¹ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ "
+"ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ server WINS (\"NetBIOS name servers\") Ï€Î¿Ï… Ï…Ï€Î¬ÏÏ‡Î¿Ï…Î½ ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿. "
+"Î‘Ï…Ï„ÏŒ Î±Ï€Î±Î¹Ï„ÎµÎ¯ Î¼Î¹Î± Î±Î»Î»Î±Î³Î® ÏƒÏ„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ ÏƒÎ±Ï‚ smb.conf ÏŽÏƒÏ„Îµ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î³Î¹Î± Ï„Î¿Î½ "
+"server WINS Ï€Î¿Ï… Ï€Î±ÏÎÏ‡Î¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ Ï„Î¿Î½ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î® DHCP Î½Î± Î´Î¹Î±Î²Î¬Î¶Î¿Î½Ï„Î±Î¹ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î± "
+"Î±Ï€ÏŒ Î±Ï€ÏŒ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Î“Î¹Î± Î½Î± ÎµÎºÎ¼ÎµÏ„Î±Î»Î»ÎµÏ…Ï„ÎµÎ¯Ï„Îµ Î±Ï…Ï„ÏŒ Ï„Î¿ Î³Î½ÏŽÏÎ¹ÏƒÎ¼Î± Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ Ï€Î±ÎºÎÏ„Î¿ "
+"dhcp3-client."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Î‘Ï…Ï„ÏŒÎ¼Î±Ï„Î· ÏÏÎ¸Î¼Î¹ÏƒÎ· Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… smb.conf;"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Î‘Î½ Î´ÎµÎ½ Î´Î¹Î±Î»ÎÎ¾ÎµÏ„Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î® , Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„ÎµÎ¯Ï„Îµ Ï„Î¹Ï‚ ÏŒÏ€Î¿Î¹ÎµÏ‚ "
-#~ "Î±Î»Î»Î±Î³ÎÏ‚ ÏƒÏ„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î¼ÏŒÎ½Î¿Î¹ ÏƒÎ±Ï‚ ÎºÎ±Î¹ Î´ÎµÎ½ Î¸Î± ÎµÎ¯ÏƒÏ„Îµ ÏƒÎµ Î¸ÎÏƒÎ· Î½Î± "
-#~ "ÎµÎºÎ¼ÎµÏ„Î±Î»Î»ÎµÏ…Ï„ÎµÎ¯Ï„Îµ Ï„Î¹Ï‚ Î²ÎµÎ»Ï„Î¹ÏŽÏƒÎµÎ¹Ï‚ Ï€Î¿Ï… ÎºÎ±Ï„Î¬ ÎºÎ±Î¹ÏÎ¿ÏÏ‚ Î³Î¯Î½Î¿Î½Ï„Î±Î¹ ÏƒÎµ Î±Ï…Ï„ÎÏ‚."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Î¤Î¿ Ï…Ï€ÏŒÎ»Î¿Î¹Ï€Î¿ Ï„Î·Ï‚ ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚ Ï„Î·Ï‚ Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ Samba ÎÏ‡ÎµÎ¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹ Î¼Îµ ÎµÏÏ‰Ï„Î®ÏƒÎµÎ¹Ï‚ Ï€Î¿Ï… "
+"ÎµÏ€Î·ÏÎµÎ¬Î¶Î¿Ï…Î½ Ï€Î±ÏÎ±Î¼ÎÏ„ÏÎ¿Ï…Ï‚ ÏƒÏ„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ etc/samba/smb.conf, Ï€Î¿Ï… ÎµÎ¯Î½Î±Î¹ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ "
+"Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î·Î½ ÏÏÎ¸Î¼Î¹ÏƒÎ· Ï„Ï‰Î½ Ï€ÏÎ¿Î³ÏÎ±Î¼Î¼Î¬Ï„Ï‰Î½ Ï„Î·Ï‚ Samba (nmbd ÎºÎ±Î¹ "
+"smbd). To Ï€Î±ÏÏŒÎ½ Î±ÏÏ‡ÎµÎ¯Î¿ ÏƒÎ±Ï‚ smb.conf Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î¼Î¹Î± Î³ÏÎ±Î¼Î¼Î® 'include' Î® Î¼Î¹Î± "
+"ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î¿Ï… ÎµÎºÏ„ÎµÎ¯Î½ÎµÏ„Î±Î¹ ÏƒÎµ Ï€Î¿Î»Î»Î±Ï€Î»ÎÏ‚ Î³ÏÎ±Î¼Î¼ÎÏ‚, Ï€Î¿Ï… Î¸Î± Î¼Ï€Î¿ÏÎ¿ÏÏƒÎ±Î½ Î½Î± Î¼Ï€ÎµÏÎ´ÎÏˆÎ¿Ï…Î½ "
+"Ï„Î·Î½ Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î± Ï„Î·Ï‚ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î·Ï‚ ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚ ÎºÎ±Î¹ Î±Ï€Î±Î¹Ï„Î¿ÏÎ½ Ï„Î·Î½ Î´Î¹ÏŒÏÎ¸Ï‰ÏƒÎ· Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… "
+"smb.conf Î±Ï€ÏŒ ÏƒÎ±Ï‚ Î¼Îµ Ï„Î¿ Ï‡ÎÏÎ¹ ÏŽÏƒÏ„Îµ Î½Î± Î¾Î±Î½Î±Î³Î¯Î½ÎµÎ¹ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¹ÎºÏŒ."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Î‘Î½ Î´ÎµÎ½ Î´Î¹Î±Î»ÎÎ¾ÎµÏ„Îµ Î±Ï…Ï„Î® Ï„Î·Î½ ÎµÏ€Î¹Î»Î¿Î³Î® , Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„ÎµÎ¯Ï„Îµ Ï„Î¹Ï‚ ÏŒÏ€Î¿Î¹ÎµÏ‚ "
+"Î±Î»Î»Î±Î³ÎÏ‚ ÏƒÏ„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ Î¼ÏŒÎ½Î¿Î¹ ÏƒÎ±Ï‚ ÎºÎ±Î¹ Î´ÎµÎ½ Î¸Î± ÎµÎ¯ÏƒÏ„Îµ ÏƒÎµ Î¸ÎÏƒÎ· Î½Î± ÎµÎºÎ¼ÎµÏ„Î±Î»Î»ÎµÏ…Ï„ÎµÎ¯Ï„Îµ "
+"Ï„Î¹Ï‚ Î²ÎµÎ»Ï„Î¹ÏŽÏƒÎµÎ¹Ï‚ Ï€Î¿Ï… ÎºÎ±Ï„Î¬ ÎºÎ±Î¹ÏÎ¿ÏÏ‚ Î³Î¯Î½Î¿Î½Ï„Î±Î¹ ÏƒÎµ Î±Ï…Ï„ÎÏ‚."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "ÎŒÎ½Î¿Î¼Î± ÎŸÎ¼Î¬Î´Î±Ï‚ Î•ÏÎ³Î±ÏƒÎ¯Î±Ï‚/Î¤Î¿Î¼ÎÎ±:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "ÎÎ± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ· Ï„Ï‰Î½ ÎºÏ‰Î´Î¹ÎºÏŽÎ½ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚;"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"ÎŒÎ»ÎµÏ‚ Î¿Î¹ Ï€ÏÏŒÏƒÏ†Î±Ï„ÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚ Ï„Ï‰Î½ Ï€ÎµÎ»Î±Ï„ÏŽÎ½ Windows ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î¿ÏÎ½ Î¼Îµ Ï„Î¿Ï…Ï‚ "
+"ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÎÏ‚ SMB Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÏŽÎ½Ï„Î±Ï‚ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚. Î‘Î½ "
+"Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î¼Î· ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± "
+"Î±Î»Î»Î¬Î¾ÎµÏ„Îµ Î¼Î¹Î± Ï€Î±ÏÎ¬Î¼ÎµÏ„ÏÎ¿ ÏƒÏ„Î¿ registry Ï„Ï‰Î½ Windows."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "ÎŒÎ½Î¿Î¼Î± ÎŸÎ¼Î¬Î´Î±Ï‚ Î•ÏÎ³Î±ÏƒÎ¯Î±Ï‚/Î¤Î¿Î¼ÎÎ±:"
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Î— ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ ÎµÏ€Î¹Î»Î¿Î³Î®Ï‚ ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹ ÎÎ½Ï„Î¿Î½Î±. Î‘Î½ Ï„Î·Î½ ÎºÎ¬Î½ÎµÏ„Îµ, "
+"Î²ÎµÎ²Î±Î¹Ï‰Î¸ÎµÎ¯Ï„Îµ ÏŒÏ„Î¹ ÎÏ‡ÎµÏ„Îµ ÎÎ½Î± ÎÎ³ÎºÏ…ÏÎ¿ Î±ÏÏ‡ÎµÎ¯Î¿ /etc/samba/smbpasswd ÎºÎ±Î¹ ÏŒÏ„Î¹ Î¿ÏÎ¯Î¶ÎµÏ„Îµ "
+"ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ Ïƒ' Î±Ï…Ï„ÏŒ Î³Î¹Î± ÎºÎ¬Î¸Îµ Ï‡ÏÎ®ÏƒÏ„Î· Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ Ï„Î·Î½ ÎµÎ½Ï„Î¿Î»Î® "
+"smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "Î´Î±Î¯Î¼Î¿Î½ÎµÏ‚"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Î ÏŽÏ‚ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± ÎµÎºÏ„ÎµÎ»ÎµÎ¯Ï„Î±Î¹ Î· Ï…Ï€Î·ÏÎµÏƒÎ¯Î± Samba;"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"ÎŸ Î´Î±Î¯Î¼Î¿Î½Î±Ï‚ Ï„Î·Ï‚ Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ Samba Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï„ÏÎÏ‡ÎµÎ¹ ÏƒÎ±Î½ ÎÎ½Î±Ï‚ ÏƒÏ…Î½Î·Î¸Î¹ÏƒÎ¼ÎÎ½Î¿Ï‚ "
+"Î´Î±Î¯Î¼Î¿Î½Î±Ï‚ Î® Î±Ï€ÏŒ Ï„Î¿Î½ inetd. Î— ÎµÎºÏ„ÎÎ»ÎµÏƒÎ® Ï„Î¿Ï… ÏƒÎ±Î½ ÏƒÏ…Î½Î·Î¸Î¹ÏƒÎ¼ÎÎ½Î¿Ï… Î´Î±Î¯Î¼Î¿Î½Î± ÎµÎ¯Î½Î±Î¹ Î· "
+"ÏƒÏ…Î½Î¹ÏƒÏ„ÏŽÎ¼ÎµÎ½Î· Ï€ÏÎ¿ÏƒÎÎ³Î³Î¹ÏƒÎ·."
 
 #, fuzzy
 #~| msgid ""
@@ -175,75 +323,6 @@ msgstr ""
 #~ "Ï„Î¿Ï…Ï‚ Ï€ÎµÎ»Î¬Ï„ÎµÏ‚. Î£Î·Î¼ÎµÎ¹ÏŽÏƒÏ„Îµ ÏŒÏ„Î¹ Î±Ï…Ï„Î® Î· Ï€Î±ÏÎ¬Î¼ÎµÏ„ÏÎ¿Ï‚ ÎµÎ»ÎÎ³Ï‡ÎµÎ¹ ÎµÏ€Î¯ÏƒÎ·Ï‚ Ï„Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î¿Ï… "
 #~ "Ï„Î¿Î¼ÎÎ± Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ ÏƒÏ„Î·Î½ ÏÏÎ¸Î¼Î¹ÏƒÎ· security=domain."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "Î¤ÏÎ¿Ï€Î¿Ï€Î¿Î¯Î·ÏƒÎ· Ï„Î¿Ï… smb.conf ÏŽÏƒÏ„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ Ï„Î¹Ï‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ WINS Î±Ï€ÏŒ Ï„Î¿Î½ "
-#~ "server DHCP;"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Î‘Î½ Î¿ Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®Ï‚ ÏƒÎ±Ï‚ Ï€Î±Î¯ÏÎ½ÎµÎ¹ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ Î³Î¹Î± Ï„Î·Î½ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ· IP Î±Ï€ÏŒ ÎÎ½Î±Î½ "
-#~ "server DHCP ÏƒÏ„Î¿ Î´Î¯ÎºÏ„Ï…Î¿, Î¿ server DHCP Î¼Ï€Î¿ÏÎµÎ¯ ÎµÏ€Î¯ÏƒÎ·Ï‚ Î½Î± Î´ÏŽÏƒÎµÎ¹ Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¯ÎµÏ‚ "
-#~ "ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ server WINS (\"NetBIOS name servers\") Ï€Î¿Ï… Ï…Ï€Î¬ÏÏ‡Î¿Ï…Î½ ÏƒÏ„Î¿ "
-#~ "Î´Î¯ÎºÏ„Ï…Î¿. Î‘Ï…Ï„ÏŒ Î±Ï€Î±Î¹Ï„ÎµÎ¯ Î¼Î¹Î± Î±Î»Î»Î±Î³Î® ÏƒÏ„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ ÏƒÎ±Ï‚ smb.conf ÏŽÏƒÏ„Îµ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚ "
-#~ "Î³Î¹Î± Ï„Î¿Î½ server WINS Ï€Î¿Ï… Ï€Î±ÏÎÏ‡Î¿Î½Ï„Î±Î¹ Î±Ï€ÏŒ Ï„Î¿Î½ ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„Î® DHCP Î½Î± "
-#~ "Î´Î¹Î±Î²Î¬Î¶Î¿Î½Ï„Î±Î¹ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î± Î±Ï€ÏŒ Î±Ï€ÏŒ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ /etc/samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Î“Î¹Î± Î½Î± ÎµÎºÎ¼ÎµÏ„Î±Î»Î»ÎµÏ…Ï„ÎµÎ¯Ï„Îµ Î±Ï…Ï„ÏŒ Ï„Î¿ Î³Î½ÏŽÏÎ¹ÏƒÎ¼Î± Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÏ„Îµ Ï„Î¿ "
-#~ "Ï€Î±ÎºÎÏ„Î¿ dhcp3-client."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Î‘Ï…Ï„ÏŒÎ¼Î±Ï„Î· ÏÏÎ¸Î¼Î¹ÏƒÎ· Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… smb.conf;"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Î¤Î¿ Ï…Ï€ÏŒÎ»Î¿Î¹Ï€Î¿ Ï„Î·Ï‚ ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚ Ï„Î·Ï‚ Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ Samba ÎÏ‡ÎµÎ¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹ Î¼Îµ ÎµÏÏ‰Ï„Î®ÏƒÎµÎ¹Ï‚ "
-#~ "Ï€Î¿Ï… ÎµÏ€Î·ÏÎµÎ¬Î¶Î¿Ï…Î½ Ï€Î±ÏÎ±Î¼ÎÏ„ÏÎ¿Ï…Ï‚ ÏƒÏ„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ etc/samba/smb.conf, Ï€Î¿Ï… ÎµÎ¯Î½Î±Î¹ Ï„Î¿ "
-#~ "Î±ÏÏ‡ÎµÎ¯Î¿ Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î³Î¹Î± Ï„Î·Î½ ÏÏÎ¸Î¼Î¹ÏƒÎ· Ï„Ï‰Î½ Ï€ÏÎ¿Î³ÏÎ±Î¼Î¼Î¬Ï„Ï‰Î½ Ï„Î·Ï‚ Samba "
-#~ "(nmbd ÎºÎ±Î¹ smbd). To Ï€Î±ÏÏŒÎ½ Î±ÏÏ‡ÎµÎ¯Î¿ ÏƒÎ±Ï‚ smb.conf Ï€ÎµÏÎ¹ÎÏ‡ÎµÎ¹ Î¼Î¹Î± Î³ÏÎ±Î¼Î¼Î® "
-#~ "'include' Î® Î¼Î¹Î± ÎµÏ€Î¹Î»Î¿Î³Î® Ï€Î¿Ï… ÎµÎºÏ„ÎµÎ¯Î½ÎµÏ„Î±Î¹ ÏƒÎµ Ï€Î¿Î»Î»Î±Ï€Î»ÎÏ‚ Î³ÏÎ±Î¼Î¼ÎÏ‚, Ï€Î¿Ï… Î¸Î± "
-#~ "Î¼Ï€Î¿ÏÎ¿ÏÏƒÎ±Î½ Î½Î± Î¼Ï€ÎµÏÎ´ÎÏˆÎ¿Ï…Î½ Ï„Î·Î½ Î´Î¹Î±Î´Î¹ÎºÎ±ÏƒÎ¯Î± Ï„Î·Ï‚ Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î·Ï‚ ÏÏÎ¸Î¼Î¹ÏƒÎ·Ï‚ ÎºÎ±Î¹ "
-#~ "Î±Ï€Î±Î¹Ï„Î¿ÏÎ½ Ï„Î·Î½ Î´Î¹ÏŒÏÎ¸Ï‰ÏƒÎ· Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… smb.conf Î±Ï€ÏŒ ÏƒÎ±Ï‚ Î¼Îµ Ï„Î¿ Ï‡ÎÏÎ¹ ÏŽÏƒÏ„Îµ Î½Î± "
-#~ "Î¾Î±Î½Î±Î³Î¯Î½ÎµÎ¹ Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î¹ÎºÏŒ."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "ÎÎ± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î·Î¸ÎµÎ¯ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ· Ï„Ï‰Î½ ÎºÏ‰Î´Î¹ÎºÏŽÎ½ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚;"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "ÎŒÎ»ÎµÏ‚ Î¿Î¹ Ï€ÏÏŒÏƒÏ†Î±Ï„ÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚ Ï„Ï‰Î½ Ï€ÎµÎ»Î±Ï„ÏŽÎ½ Windows ÎµÏ€Î¹ÎºÎ¿Î¹Î½Ï‰Î½Î¿ÏÎ½ Î¼Îµ Ï„Î¿Ï…Ï‚ "
-#~ "ÎµÎ¾Ï…Ï€Î·ÏÎµÏ„Î·Ï„ÎÏ‚ SMB Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÏŽÎ½Ï„Î±Ï‚ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚. Î‘Î½ "
-#~ "Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹Î®ÏƒÎµÏ„Îµ Î¼Î· ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ±Ï†Î·Î¼ÎÎ½Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Î¸Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± "
-#~ "Î±Î»Î»Î¬Î¾ÎµÏ„Îµ Î¼Î¹Î± Ï€Î±ÏÎ¬Î¼ÎµÏ„ÏÎ¿ ÏƒÏ„Î¿ registry Ï„Ï‰Î½ Windows."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Î— ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ ÎµÏ€Î¹Î»Î¿Î³Î®Ï‚ ÏƒÏ…Î½Î¹ÏƒÏ„Î¬Ï„Î±Î¹ ÎÎ½Ï„Î¿Î½Î±. Î‘Î½ Ï„Î·Î½ ÎºÎ¬Î½ÎµÏ„Îµ, "
-#~ "Î²ÎµÎ²Î±Î¹Ï‰Î¸ÎµÎ¯Ï„Îµ ÏŒÏ„Î¹ ÎÏ‡ÎµÏ„Îµ ÎÎ½Î± ÎÎ³ÎºÏ…ÏÎ¿ Î±ÏÏ‡ÎµÎ¯Î¿ /etc/samba/smbpasswd ÎºÎ±Î¹ ÏŒÏ„Î¹ "
-#~ "Î¿ÏÎ¯Î¶ÎµÏ„Îµ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ Ïƒ' Î±Ï…Ï„ÏŒ Î³Î¹Î± ÎºÎ¬Î¸Îµ Ï‡ÏÎ®ÏƒÏ„Î· Ï€Î¿Ï… Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯ Ï„Î·Î½ "
-#~ "ÎµÎ½Ï„Î¿Î»Î® smbpasswd."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
 #~ "ÎÎ± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸ÎµÎ¯ Î· Î²Î¬ÏƒÎ· Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½ Ï„Ï‰Î½ ÎºÏ‰Î´Î¹ÎºÏŽÎ½ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚ samba, /var/lib/"
@@ -279,23 +358,6 @@ msgstr ""
 #~ "Î”ÎµÎ¯Ï„Îµ Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html Î±Ï€ÏŒ Ï„Î¿ "
 #~ "Ï€Î±ÎºÎÏ„Î¿ samba-doc Î³Î¹Î± Ï€ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Î»ÎµÏ€Ï„Î¿Î¼ÎÏÎµÎ¹ÎµÏ‚."
 
-#~ msgid "daemons"
-#~ msgstr "Î´Î±Î¯Î¼Î¿Î½ÎµÏ‚"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Î ÏŽÏ‚ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± ÎµÎºÏ„ÎµÎ»ÎµÎ¯Ï„Î±Î¹ Î· Ï…Ï€Î·ÏÎµÏƒÎ¯Î± Samba;"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "ÎŸ Î´Î±Î¯Î¼Î¿Î½Î±Ï‚ Ï„Î·Ï‚ Ï…Ï€Î·ÏÎµÏƒÎ¯Î±Ï‚ Samba Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï„ÏÎÏ‡ÎµÎ¹ ÏƒÎ±Î½ ÎÎ½Î±Ï‚ ÏƒÏ…Î½Î·Î¸Î¹ÏƒÎ¼ÎÎ½Î¿Ï‚ "
-#~ "Î´Î±Î¯Î¼Î¿Î½Î±Ï‚ Î® Î±Ï€ÏŒ Ï„Î¿Î½ inetd. Î— ÎµÎºÏ„ÎÎ»ÎµÏƒÎ® Ï„Î¿Ï… ÏƒÎ±Î½ ÏƒÏ…Î½Î·Î¸Î¹ÏƒÎ¼ÎÎ½Î¿Ï… Î´Î±Î¯Î¼Î¿Î½Î± ÎµÎ¯Î½Î±Î¹ Î· "
-#~ "ÏƒÏ…Î½Î¹ÏƒÏ„ÏŽÎ¼ÎµÎ½Î· Ï€ÏÎ¿ÏƒÎÎ³Î³Î¹ÏƒÎ·."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Î— Î±Î»ÏÏƒÏ‰ÏƒÎ· Ï„Ï‰Î½ backend Ï„Ï‰Î½ passdb Î´ÎµÎ½ Ï…Ï€Î¿ÏƒÏ„Î·ÏÎ¯Î¶ÎµÏ„Î±Î¹"
 
diff --git a/debian/po/eo.po b/debian/po/eo.po
index cca5bba..4ebe7e2 100644
--- a/debian/po/eo.po
+++ b/debian/po/eo.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-02-13 21:43-0300\n"
 "Last-Translator: Felipe Castro <fefcas at gmail.com>\n"
 "Language-Team: Esperanto <debian-l10n-esperanto at lists.debian.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Äˆu Äisdatigi el Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -36,13 +36,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Servila rolo"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -54,7 +54,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -84,13 +84,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Area nomo (Realm):"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -100,48 +100,178 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Ordinare tio Ä‰i estas la majuskla versio de via DNS-gastigantnomo."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
diff --git a/debian/po/es.po b/debian/po/es.po
index 85d925f..2c97466 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -38,8 +38,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba for Debian 3.0.23c-1\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-01-03 01:59+0100\n"
 "Last-Translator: Javier FernÃ¡ndez-Sanguino <jfs at debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -51,13 +51,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Â¿Desea actualizar desde Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -70,13 +70,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Rol de servidor"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -88,7 +88,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -101,7 +101,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -112,7 +112,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -123,13 +123,13 @@ msgstr ""
 # al menos asÃ es consistente con la de otros programas. - JFS
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Nombre del reino:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -139,63 +139,215 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Generalmente este nombre es una capitalizaciÃ³n de su nombre DNS."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"Â¿Modificar smb.conf para usar la configuraciÃ³n WINS que proviene de DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Si su sistema recibe la direcciÃ³n IP desde un servidor DHCP en la red, el "
+"servidor DHCP tambiÃ©n puede proveerle informaciones sobre los servidores de "
+"WINS que haya en la red.  Esto requiere un cambio en el fichero smb.conf "
+"para que la configuraciÃ³n de WINS proveniente de DHCP se lea automaticamente "
+"de /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Hay que instalar el paquete dhcp3-client para aprovechar esta funcionalidad."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Â¿Configurar smb.conf automaticamente?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"El resto de la configuraciÃ³n de Samba trata sobre cuestiones que afectan al "
+"contenido de /etc/samba/smb.conf, que es el fichero utilizado para "
+"configurar los programas de Samba (nmbd y smbd). Su smb.conf actual contiene "
+"una lÃnea Â«includeÂ» o una opciÃ³n que atraviesa mÃ¡s de una lÃnea, asÃ que el "
+"proceso de configuraciÃ³n automÃ¡tica puede dejarlo con un smb.conf "
+"descompuesto, requiriendo que lo arregle a mano."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Si no escoge esta opciÃ³n, Samba se quedarÃ¡ sin configurar, ytendrÃ¡ que "
+"configurarlo a mano."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Nombre del dominio:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Â¿Utilizar contraseÃ±as cifradas?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Todos los clientes Windows actuales se comunican con los servidores SMB "
+"utilizando contraseÃ±as cifradas. Si quiere usar contraseÃ±as en claro, tendrÃ¡ "
+"que cambiar un parÃ¡metro en el registro de sus sistemas Windows."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Es muy recomendable habilitar esta opciÃ³n. Compruebe que tiene un fichero /"
+"etc/samba/smbpasswd vÃ¡lido y que configura las contraseÃ±as para cada usuario "
+"con el programa smbpasswd si elige hacerlo."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "demonios"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Â¿CÃ³mo quiere que se ejecute Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"El servicio Samba smbd puede ejecutarse como un demonio normal independiente "
+"o lanzarse desde el demonio inetd. Se recomienda que se ejecute como demonio "
+"independiente."
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Â¿Desea instalar Samba 4 como PDC?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Si no escoge esta opciÃ³n, Samba se quedarÃ¡ sin configurar, ytendrÃ¡ que "
-#~ "configurarlo a mano."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -204,9 +356,6 @@ msgstr ""
 #~ "deforma que proporcione los datos del archivo de zona que encontrarÃ¡ en "
 #~ "ese directorioantes de poder utilizar el dominio del Directorio Activo."
 
-#~ msgid "Domain Name:"
-#~ msgstr "Nombre del dominio:"
-
 #~ msgid ""
 #~ "Please specify the domain you want this server to appear to be in when "
 #~ "queried by clients."
@@ -214,69 +363,6 @@ msgstr ""
 #~ "Indique el dominio en el cual quiere que su servidor aparezca cuando se "
 #~ "lo pregunten los clientes de la red."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "Â¿Modificar smb.conf para usar la configuraciÃ³n WINS que proviene de DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Si su sistema recibe la direcciÃ³n IP desde un servidor DHCP en la red, el "
-#~ "servidor DHCP tambiÃ©n puede proveerle informaciones sobre los servidores "
-#~ "de WINS que haya en la red.  Esto requiere un cambio en el fichero smb."
-#~ "conf para que la configuraciÃ³n de WINS proveniente de DHCP se lea "
-#~ "automaticamente de /etc/samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Hay que instalar el paquete dhcp3-client para aprovechar esta "
-#~ "funcionalidad."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Â¿Configurar smb.conf automaticamente?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "El resto de la configuraciÃ³n de Samba trata sobre cuestiones que afectan "
-#~ "al contenido de /etc/samba/smb.conf, que es el fichero utilizado para "
-#~ "configurar los programas de Samba (nmbd y smbd). Su smb.conf actual "
-#~ "contiene una lÃnea Â«includeÂ» o una opciÃ³n que atraviesa mÃ¡s de una lÃnea, "
-#~ "asÃ que el proceso de configuraciÃ³n automÃ¡tica puede dejarlo con un smb."
-#~ "conf descompuesto, requiriendo que lo arregle a mano."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Â¿Utilizar contraseÃ±as cifradas?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Todos los clientes Windows actuales se comunican con los servidores SMB "
-#~ "utilizando contraseÃ±as cifradas. Si quiere usar contraseÃ±as en claro, "
-#~ "tendrÃ¡ que cambiar un parÃ¡metro en el registro de sus sistemas Windows."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Es muy recomendable habilitar esta opciÃ³n. Compruebe que tiene un "
-#~ "fichero /etc/samba/smbpasswd vÃ¡lido y que configura las contraseÃ±as para "
-#~ "cada usuario con el programa smbpasswd si elige hacerlo."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Â¿Crear la base de dados de contraseÃ±as /var/lib/samba/passdb.tdb?"
 
@@ -310,23 +396,6 @@ msgstr ""
 #~ "Si desea mÃ¡s informaciÃ³n consulte /usr/share/doc/samba-doc/htmldocs/"
 #~ "ENCRYPTION.html, disponible en el paquete samba-doc."
 
-#~ msgid "daemons"
-#~ msgstr "demonios"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Â¿CÃ³mo quiere que se ejecute Samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "El servicio Samba smbd puede ejecutarse como un demonio normal "
-#~ "independiente o lanzarse desde el demonio inetd. Se recomienda que se "
-#~ "ejecute como demonio independiente."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "El encadenamiento de motores Â«passdbÂ» ya no estÃ¡ soportado"
 
diff --git a/debian/po/et.po b/debian/po/et.po
index 2ce9cc1..ee9879e 100644
--- a/debian/po/et.po
+++ b/debian/po/et.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-13 10:26+0300\n"
 "Last-Translator: Siim PÃµder <siim at p6drad-teel.net>\n"
 "Language-Team: \n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -42,13 +42,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -96,142 +96,218 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Muuta smb.conf, et kasutataks DHCP WINS seadeid?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Kui su arvuti saab IP aadressi informatsiooni vÃµrgus asuvalt DHCP serverilt, "
+"vÃµib toosama DHCP server levitada infot ka vÃµrgus asuvate WINS serverite "
+"(\"NetBIOS nimeserverid\") kohta. Kui soovid, et seda informatsiooni "
+"kasutataks, on vaja smb.conf faili sisse viia muudatus, et DHCP poolt "
+"jagatud WINS seaded automaatselt /etc/samba/dhcp.conf failist loetaks."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "Et seda vÃµimalust kasutada, peab olema paigaldatud dhcp3-client pakk."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Seadistada smb.conf automaatselt?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Kui sa seda seadet ei vali, pead iga seadistuse muudatuse ise lÃ¤bi viima "
-#~ "ega saa tunda rÃµÃµmu autmaatsest perioodilisest seadistuse "
-#~ "tÃ¤iustustamisest."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"ÃœlejÃ¤Ã¤nud Samba seadistus tegeleb /etc/samba/smb.conf parameetreid "
+"mÃµjutavate kÃ¼simustega - see on fail mille abil seadistatakse Samba "
+"programmid (nmbd ja smbd). Sinu praegune smb.conf sisaldab 'include' rida "
+"vÃµi mitmerealist valikut, mis vÃµib automaatse seadistamise nurjata ning "
+"tekitada olukorra, kus pead smb.conf faili kÃ¤sitsi tÃ¶Ã¶korda seadma."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "TÃ¶Ã¶grupi/domeeni nimi:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Kui sa seda seadet ei vali, pead iga seadistuse muudatuse ise lÃ¤bi viima ega "
+"saa tunda rÃµÃµmu autmaatsest perioodilisest seadistuse tÃ¤iustustamisest."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
 #, fuzzy
-#~| msgid ""
-#~| "Please specify the workgroup you want this server to appear to be in "
-#~| "when queried by clients. Note that this parameter also controls the "
-#~| "domain name used with the security=domain setting."
-#~ msgid ""
-#~ "Please specify the domain you want this server to appear to be in when "
-#~ "queried by clients."
-#~ msgstr ""
-#~ "Palun vali tÃ¶Ã¶grupp, kuhu see server kuulub. Pane tÃ¤hele, et seesama "
-#~ "seade mÃ¤Ã¤rab ka domeeni, mida kasutatakse koos security=domain valikuga."
+msgid "Workgroup/Domain Name:"
+msgstr "TÃ¶Ã¶grupi/domeeni nimi:"
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Muuta smb.conf, et kasutataks DHCP WINS seadeid?"
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
 
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Kui su arvuti saab IP aadressi informatsiooni vÃµrgus asuvalt DHCP "
-#~ "serverilt, vÃµib toosama DHCP server levitada infot ka vÃµrgus asuvate WINS "
-#~ "serverite (\"NetBIOS nimeserverid\") kohta. Kui soovid, et seda "
-#~ "informatsiooni kasutataks, on vaja smb.conf faili sisse viia muudatus, et "
-#~ "DHCP poolt jagatud WINS seaded automaatselt /etc/samba/dhcp.conf failist "
-#~ "loetaks."
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Kasutada paroolide krÃ¼pteerimist?"
 
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Et seda vÃµimalust kasutada, peab olema paigaldatud dhcp3-client pakk."
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"KÃµik hiljutised Windows kliendid suhtlevad SMB serveritega kasutades "
+"krÃ¼pteeritud paroole. Kui soovid kasutada avatud paroole, pead Windows "
+"registris muutma Ã¼ht seadet."
 
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Seadistada smb.conf automaatselt?"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Selle seade valimine on Ã¼limalt soovitatav. Kui ta valid, palun veendu et "
+"sul oleks sobiv /etc/samba/smbpasswd fail ning sea igale seal olevale "
+"kasutajale smbpasswd kÃ¤su abil parool."
 
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "ÃœlejÃ¤Ã¤nud Samba seadistus tegeleb /etc/samba/smb.conf parameetreid "
-#~ "mÃµjutavate kÃ¼simustega - see on fail mille abil seadistatakse Samba "
-#~ "programmid (nmbd ja smbd). Sinu praegune smb.conf sisaldab 'include' rida "
-#~ "vÃµi mitmerealist valikut, mis vÃµib automaatse seadistamise nurjata ning "
-#~ "tekitada olukorra, kus pead smb.conf faili kÃ¤sitsi tÃ¶Ã¶korda seadma."
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
 
-#~ msgid "Use password encryption?"
-#~ msgstr "Kasutada paroolide krÃ¼pteerimist?"
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "deemonitena"
 
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "KÃµik hiljutised Windows kliendid suhtlevad SMB serveritega kasutades "
-#~ "krÃ¼pteeritud paroole. Kui soovid kasutada avatud paroole, pead Windows "
-#~ "registris muutma Ã¼ht seadet."
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd'ist"
 
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Kuidas soovid Samba kÃ¤ivitada?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba deemon vÃµib kÃ¤ivituda kui tavaline deemon vÃµi inetd'ist. Soovitatav "
+"lÃ¤henemine on kÃ¤ivitamine tavalise deemonina."
+
+#, fuzzy
+#~| msgid ""
+#~| "Please specify the workgroup you want this server to appear to be in "
+#~| "when queried by clients. Note that this parameter also controls the "
+#~| "domain name used with the security=domain setting."
 #~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
+#~ "Please specify the domain you want this server to appear to be in when "
+#~ "queried by clients."
 #~ msgstr ""
-#~ "Selle seade valimine on Ã¼limalt soovitatav. Kui ta valid, palun veendu et "
-#~ "sul oleks sobiv /etc/samba/smbpasswd fail ning sea igale seal olevale "
-#~ "kasutajale smbpasswd kÃ¤su abil parool."
+#~ "Palun vali tÃ¶Ã¶grupp, kuhu see server kuulub. Pane tÃ¤hele, et seesama "
+#~ "seade mÃ¤Ã¤rab ka domeeni, mida kasutatakse koos security=domain valikuga."
 
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Luua samba paroolide andmebaas, /var/lib/samba/passdb.tdb?"
@@ -262,22 +338,6 @@ msgstr ""
 #~ "End detailidega kurssi viimaks loe /usr/share/doc/samba-doc/htmldocs/"
 #~ "ENCRYPTION.html pakist samba-doc."
 
-#~ msgid "daemons"
-#~ msgstr "deemonitena"
-
-#~ msgid "inetd"
-#~ msgstr "inetd'ist"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Kuidas soovid Samba kÃ¤ivitada?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samba deemon vÃµib kÃ¤ivituda kui tavaline deemon vÃµi inetd'ist. Soovitatav "
-#~ "lÃ¤henemine on kÃ¤ivitamine tavalise deemonina."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr ""
 #~ "passdb backends mitme jÃ¤rjestikkuse variandi mÃ¤Ã¤ramine pole toetatud"
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 77804f9..f555750 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-04-07 23:18+0200\n"
 "Last-Translator: Piarres Beobide <pi at beobide.net>\n"
 "Language-Team: librezale <librezale at librezale.org>\n"
@@ -30,13 +30,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -45,13 +45,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -60,7 +60,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -77,7 +77,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -85,13 +85,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -99,68 +99,207 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "smb.conf WINS ezarpenak DHCP-tik jasotzeko eraldatu?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Zure sistemak IP helbidea sareko DHCP zerbitzari batetatik jaso ezkero, "
+"zerbitzari horrek sareko WINS (\"NetBIOS name servers\") zerbitzarien datuak "
+"eman ditzake.  Honek smb.conf fitxategian aldaketa bat behar du DHCP bidezko "
+"WINS ezarpenak /etc/samba/dhcp.conf-etik irakurtzeko."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Ezaugarri honetaz baliatzeko dhcp3-client bezeroa instalaturik izan behar "
+"duzu."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Smb.conf automatikoki konfiguratu?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Aukera hau ez erabili ezkero, konfigurazioko edozein aldaketa eskuz egin "
-#~ "beharko duzu eta ezingo duzu konfigurazio aldaketa automatikoez baliatu."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Konfigurazioaren hurrengo atalak /etc/samba/smb.conf fitxategiari dagozkion "
+"ezarpenenak dira, honek Samba programak (smbd eta nmbd) konfiguratzen ditu. "
+"Zure smb.conf fitxategiak 'include' lerro bat edo lerro bat baino luzeago "
+"den aukera bat badu, horregatik konfigurazio automatiko fitxategia honda "
+"daiteke, zuk eskuz konpondu beharko duzularik."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Lan Talde/Domeinu izena?"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Aukera hau ez erabili ezkero, konfigurazioko edozein aldaketa eskuz egin "
+"beharko duzu eta ezingo duzu konfigurazio aldaketa automatikoez baliatu."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Lan Talde/Domeinu izena?"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Zifraturiko pasahitzak erabili?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Windows bezero berrienek SMB zerbitzariekiko harremanak zifraturiko "
+"pasahitzak erabiliaz egiten dituzte. Testu laueko pasahitzak erabili nahi "
+"izan ezkero parametro bat aldatu behar duzu Windows erregistroan."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Aukera hau erabiltzea oso gomendagarri da. Erabiltzea hautatu ezkero "
+"ziurtatu baliozko /etc/samba/smbpasswd fitxategi bat duzula eta pasahitzak "
+"smbpasswd programaren bidez ezarri dituzula."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "deabruak"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Nola nahi duzu Samba abiaraztea?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba smbd zerbitzua deabru arrunt edo inted bidez abiarazi daiteke. Deabru "
+"bezala abiaraztea gomendatzen da."
 
 #, fuzzy
 #~| msgid ""
@@ -175,66 +314,6 @@ msgstr ""
 #~ "duen lan taldea. Kontutan izan parametro honek security=domain ezarpeneko "
 #~ "domeinu izena ere ezartzen duela."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "smb.conf WINS ezarpenak DHCP-tik jasotzeko eraldatu?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Zure sistemak IP helbidea sareko DHCP zerbitzari batetatik jaso ezkero, "
-#~ "zerbitzari horrek sareko WINS (\"NetBIOS name servers\") zerbitzarien "
-#~ "datuak eman ditzake.  Honek smb.conf fitxategian aldaketa bat behar du "
-#~ "DHCP bidezko WINS ezarpenak /etc/samba/dhcp.conf-etik irakurtzeko."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Ezaugarri honetaz baliatzeko dhcp3-client bezeroa instalaturik izan behar "
-#~ "duzu."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Smb.conf automatikoki konfiguratu?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Konfigurazioaren hurrengo atalak /etc/samba/smb.conf fitxategiari "
-#~ "dagozkion ezarpenenak dira, honek Samba programak (smbd eta nmbd) "
-#~ "konfiguratzen ditu. Zure smb.conf fitxategiak 'include' lerro bat edo "
-#~ "lerro bat baino luzeago den aukera bat badu, horregatik konfigurazio "
-#~ "automatiko fitxategia honda daiteke, zuk eskuz konpondu beharko duzularik."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Zifraturiko pasahitzak erabili?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Windows bezero berrienek SMB zerbitzariekiko harremanak zifraturiko "
-#~ "pasahitzak erabiliaz egiten dituzte. Testu laueko pasahitzak erabili nahi "
-#~ "izan ezkero parametro bat aldatu behar duzu Windows erregistroan."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Aukera hau erabiltzea oso gomendagarri da. Erabiltzea hautatu ezkero "
-#~ "ziurtatu baliozko /etc/samba/smbpasswd fitxategi bat duzula eta "
-#~ "pasahitzak smbpasswd programaren bidez ezarri dituzula."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "/var/lib/samba/passdb.tdb pasahitz datubase berria sortu?"
 
@@ -267,22 +346,6 @@ msgstr ""
 #~ "Samba-doc paketeko /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
 #~ "begiratu argibide gehiagorako"
 
-#~ msgid "daemons"
-#~ msgstr "deabruak"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Nola nahi duzu Samba abiaraztea?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samba smbd zerbitzua deabru arrunt edo inted bidez abiarazi daiteke. "
-#~ "Deabru bezala abiaraztea gomendatzen da."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "\"passbd\" motore kateatzea ez da onartzen"
 
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 48160a2..af4b85f 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba fi\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-13 18:35+0200\n"
 "Last-Translator: Tapio Lehtonen <tale at debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -32,13 +32,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -47,7 +47,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -56,7 +56,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -64,7 +64,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -72,13 +72,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -86,68 +86,207 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Muokataanko smb.conf käyttämään DHCP:ltä saatua WINS-asetusta?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Jos tietokone saa verkkoasetukset verkon DHCP-palvelimelta, saattaa DHCP-"
+"palvelin tarjota tietoa myös verkon WINS-palvelimista (\"NetBIOS-"
+"nimipalvelimista\"). Tällöin on tiedostoa smb.conf muutettava, jotta DHCP:n "
+"tarjoamat WINS-asetukset luetaan automaattisesti tiedostosta /etc/samba/dhcp."
+"conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Tätä ominaisuutta voi käyttää vain jos paketti dhcp3-client on asennettu."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Tehdäänkö asetukset tiedostoon smb.conf automaattisesti?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Jos et valitse tätä toimintoa, on kaikki asetusten muutokset tehtävä "
-#~ "itse, etkä pääse hyötymään julkaistavista asetusten parannuksista."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Loput Samban asetuksista ovat kysymyksiä jotka vaikuttavat parametreihin "
+"Samban ohjelmien (nmbd ja smbd) asetustiedostossa /etc/samba/smb.conf. Nyt "
+"tiedostossa smb.conf on \"include\"-rivi tai useita rivejä pitkä valitsin, "
+"mikä sotkee automatisoidun asetukset tekevän ohjelman ja pakottaa "
+"muokkaamaan tiedostoa smb.conf käsin, jotta se taas toimisi."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Työryhmän/Verkkoalueen nimi:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Jos et valitse tätä toimintoa, on kaikki asetusten muutokset tehtävä itse, "
+"etkä pääse hyötymään julkaistavista asetusten parannuksista."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Työryhmän/Verkkoalueen nimi:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Salataanko salasanat?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Kaikki viime aikoina julkistetut Windows-asiakkaat salaavat salasanat "
+"liikennöitäessä SMB-palvelimien kanssa. Jos halutaan käyttää selväkielisiä "
+"salasanoja, on Windows registryssä olevaa parametria muutettava."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Tämän valitsimen pitämistä päällä suositellaan suuresti. Jos se on päällä, "
+"on varmistuttava tiedoston /etc/samba/smbpasswd kelvollisuudesta ja että "
+"siellä on jokaiselle käyttäjälle tehty salasana komennolla smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "palvelinprosessit"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Kuinka Samba käynnistetään?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samban palvelinprosessi smbd voi toimia tavallisena prosessina tai inetd voi "
+"käynnistää sen. Tavallisen prosessin käyttämistä suositellaan."
 
 #, fuzzy
 #~| msgid ""
@@ -162,68 +301,6 @@ msgstr ""
 #~ "asiakaskoneiden kysyessä. Huomaa, että tämä parametri on myös asetuksen "
 #~ "security=domain kanssa käytettävä verkkoalueen nimi."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Muokataanko smb.conf käyttämään DHCP:ltä saatua WINS-asetusta?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Jos tietokone saa verkkoasetukset verkon DHCP-palvelimelta, saattaa DHCP-"
-#~ "palvelin tarjota tietoa myös verkon WINS-palvelimista (\"NetBIOS-"
-#~ "nimipalvelimista\"). Tällöin on tiedostoa smb.conf muutettava, jotta DHCP:"
-#~ "n tarjoamat WINS-asetukset luetaan automaattisesti tiedostosta /etc/samba/"
-#~ "dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Tätä ominaisuutta voi käyttää vain jos paketti dhcp3-client on asennettu."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Tehdäänkö asetukset tiedostoon smb.conf automaattisesti?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Loput Samban asetuksista ovat kysymyksiä jotka vaikuttavat parametreihin "
-#~ "Samban ohjelmien (nmbd ja smbd) asetustiedostossa /etc/samba/smb.conf. "
-#~ "Nyt tiedostossa smb.conf on \"include\"-rivi tai useita rivejä pitkä "
-#~ "valitsin, mikä sotkee automatisoidun asetukset tekevän ohjelman ja "
-#~ "pakottaa muokkaamaan tiedostoa smb.conf käsin, jotta se taas toimisi."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Salataanko salasanat?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Kaikki viime aikoina julkistetut Windows-asiakkaat salaavat salasanat "
-#~ "liikennöitäessä SMB-palvelimien kanssa. Jos halutaan käyttää "
-#~ "selväkielisiä salasanoja, on Windows registryssä olevaa parametria "
-#~ "muutettava."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Tämän valitsimen pitämistä päällä suositellaan suuresti. Jos se on "
-#~ "päällä, on varmistuttava tiedoston /etc/samba/smbpasswd kelvollisuudesta "
-#~ "ja että siellä on jokaiselle käyttäjälle tehty salasana komennolla "
-#~ "smbpasswd."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Luodaanko samban salasanatietokanta, /var/lib/samba/passdb.tdb?"
 
@@ -254,22 +331,6 @@ msgstr ""
 #~ "Katso lisätietoja paketin samba-doc tiedostosta /usr/share/doc/samba-doc/"
 #~ "htmldocs/ENCRYPTION.html."
 
-#~ msgid "daemons"
-#~ msgstr "palvelinprosessit"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Kuinka Samba käynnistetään?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samban palvelinprosessi smbd voi toimia tavallisena prosessina tai inetd "
-#~ "voi käynnistää sen. Tavallisen prosessin käyttämistä suositellaan."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "passdb:n taustaosien ketjuttamista ei tueta"
 
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 1175ee8..64ee81b 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2011-10-01 09:03+0200\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Faut-il mettre Samba Ã  niveau depuis Samba 3Â ?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -40,13 +40,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "RÃ´le du serveur"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -71,7 +71,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -82,7 +82,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -90,13 +90,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Royaume (Â«Â realmÂ Â») KerberosÂ :"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -106,63 +106,190 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "En gÃ©nÃ©ral, ce nom est le nom de domaine en majuscules."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Si vous ne choisissez pas cette option, Samba ne sera pas configurÃ© et vous "
+"devrez fournir et rÃ©gler les fichiers de configuration vous-mÃªme."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Nom de domaineÂ :"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Faut-il configurer Samba 4 comme contrÃ´leur principal de domaineÂ ?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Si vous ne choisissez pas cette option, Samba ne sera pas configurÃ© et "
-#~ "vous devrez fournir et rÃ©gler les fichiers de configuration vous-mÃªme."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -178,9 +305,6 @@ msgstr ""
 #~ "Veuillez indiquer le royaume (Â«Â realmÂ Â») Kerberos auquel appartiendra ce "
 #~ "serveur. Dans de nombreux cas, ce sera le nom de domaine DNS."
 
-#~ msgid "Domain Name:"
-#~ msgstr "Nom de domaineÂ :"
-
 #~ msgid ""
 #~ "Please specify the domain you want this server to appear to be in when "
 #~ "queried by clients."
diff --git a/debian/po/gl.po b/debian/po/gl.po
index e24bd2e..adbe887 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-06-17 20:09+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <trasno at ceu.fi.udc.es>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Â¿Actualizar de Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -44,13 +44,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -84,15 +84,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 #, fuzzy
-#| msgid "Realm:"
 msgid "Realm name:"
 msgstr "Reino:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -100,63 +99,214 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Â¿Modificar smb.conf para empregar a configuraciÃ³n WINS de DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Se o seu ordenador obtÃ©n o enderezo IP dun servidor DHCP da rede, o servidor "
+"DHCP tamÃ©n pode fornecer informaciÃ³n sobre os servidores WINS (servidores de "
+"nomes NetBIOS) que estean presentes na rede. Para facelo hai que modificar o "
+"ficheiro smb.conf para que a configuraciÃ³n WINS fornecida por DHCP se lea "
+"automaticamente de /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"O paquete dhcp3-client debe estar instalado para aproveitar esta "
+"caracterÃstica."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Â¿Configurar o ficheiro smb.conf automaticamente?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"O resto da configuraciÃ³n de Samba trata con cuestiÃ³ns que afectan aos "
+"parÃ¡metros de /etc/samba/smb.conf, que Ã© o ficheiro que se emprega para "
+"configurar os programas de Samba (nmbd e smbd). O seu ficheiro smb.conf "
+"actual contÃ©n unha liÃ±a \"include\" ou unha opciÃ³n que cubre varias liÃ±as, o "
+"que pode confundir ao proceso de configuraciÃ³n automÃ¡tico e facer que teÃ±a "
+"que editar o ficheiro smb.conf a man para poÃ±elo a funcionar outra vez."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Se non escolle esta opciÃ³n, Samba ha quedar sen configurar, e ha ter que "
+"configuralo manualmente."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Nome de dominio:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Â¿Empregar cifrado de contrasinais?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Todos os clientes Windows recentes comunÃcanse cos servidores SMB empregando "
+"contrasinais cifrados. Se quere empregar contrasinais de texto claro ha ter "
+"que cambiar un parÃ¡metro no rexistro de Windows."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"RecomÃ©ndase activar esta opciÃ³n. Se o fai, asegÃºrese de ter un ficheiro /etc/"
+"samba/smbpasswd vÃ¡lido e de establecer nel os contrasinais de cada usuario "
+"coa orde smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "servizos"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Â¿Como quere executar Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"O servizo de Samba smbd pode funcionar coma un servizo normal ou desde "
+"inetd. RecomÃ©ndase executalo coma un servizo."
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Â¿Configurar Samba 4 coma PDC?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Se non escolle esta opciÃ³n, Samba ha quedar sen configurar, e ha ter que "
-#~ "configuralo manualmente."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -172,9 +322,6 @@ msgstr ""
 #~ "Indique o reino Kerberos ao que ha pertencer este servidor. En moitos "
 #~ "casos ha ser o mesmo que o nome de dominio DNS."
 
-#~ msgid "Domain Name:"
-#~ msgstr "Nome de dominio:"
-
 #~ msgid ""
 #~ "Please specify the domain you want this server to appear to be in when "
 #~ "queried by clients."
@@ -182,69 +329,6 @@ msgstr ""
 #~ "Indique o dominio no que quere que apareza este servidor cando lle "
 #~ "pregunten os clientes."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Â¿Modificar smb.conf para empregar a configuraciÃ³n WINS de DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Se o seu ordenador obtÃ©n o enderezo IP dun servidor DHCP da rede, o "
-#~ "servidor DHCP tamÃ©n pode fornecer informaciÃ³n sobre os servidores WINS "
-#~ "(servidores de nomes NetBIOS) que estean presentes na rede. Para facelo "
-#~ "hai que modificar o ficheiro smb.conf para que a configuraciÃ³n WINS "
-#~ "fornecida por DHCP se lea automaticamente de /etc/samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "O paquete dhcp3-client debe estar instalado para aproveitar esta "
-#~ "caracterÃstica."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Â¿Configurar o ficheiro smb.conf automaticamente?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "O resto da configuraciÃ³n de Samba trata con cuestiÃ³ns que afectan aos "
-#~ "parÃ¡metros de /etc/samba/smb.conf, que Ã© o ficheiro que se emprega para "
-#~ "configurar os programas de Samba (nmbd e smbd). O seu ficheiro smb.conf "
-#~ "actual contÃ©n unha liÃ±a \"include\" ou unha opciÃ³n que cubre varias "
-#~ "liÃ±as, o que pode confundir ao proceso de configuraciÃ³n automÃ¡tico e "
-#~ "facer que teÃ±a que editar o ficheiro smb.conf a man para poÃ±elo a "
-#~ "funcionar outra vez."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Â¿Empregar cifrado de contrasinais?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Todos os clientes Windows recentes comunÃcanse cos servidores SMB "
-#~ "empregando contrasinais cifrados. Se quere empregar contrasinais de texto "
-#~ "claro ha ter que cambiar un parÃ¡metro no rexistro de Windows."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "RecomÃ©ndase activar esta opciÃ³n. Se o fai, asegÃºrese de ter un ficheiro /"
-#~ "etc/samba/smbpasswd vÃ¡lido e de establecer nel os contrasinais de cada "
-#~ "usuario coa orde smbpasswd."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
 #~ "Â¿Crear a base de datos de contrasinais de samba, /var/lib/samba/passdb."
@@ -278,22 +362,6 @@ msgstr ""
 #~ "Consulte o ficheiro /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html do "
 #~ "paquete samba-doc para ter mÃ¡is detalles."
 
-#~ msgid "daemons"
-#~ msgstr "servizos"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Â¿Como quere executar Samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "O servizo de Samba smbd pode funcionar coma un servizo normal ou desde "
-#~ "inetd. RecomÃ©ndase executalo coma un servizo."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Non estÃ¡ soportado o encadeamento de motores de passdb"
 
diff --git a/debian/po/gu.po b/debian/po/gu.po
index 0eb901f..f070c26 100644
--- a/debian/po/gu.po
+++ b/debian/po/gu.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_gu\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-06-08 20:22+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry at gmail.com>\n"
 "Language-Team: Gujarati <team at utkarsh.org>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -41,13 +41,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -56,7 +56,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -73,7 +73,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -81,13 +81,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -95,68 +95,205 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "DHCP àª®àª¾àª‚àª¥à«€ WINS àª—à«‹àª àªµàª£à«€àª“ àª‰àªªàª¯à«‹àª— àª•àª°àªµàª¾ àª®àª¾àªŸà«‡ smb.conf àª¬àª¦àª²àª¶à«‹?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"àªœà«‹ àª¤àª®àª¾àª°à«àª‚ àª•àª®à«àªªà«àª¯à«àªŸàª° àª¨à«‡àªŸàªµàª°à«àª•àª®àª¾àª‚ àª†àª‡àªªà«€ àª¸àª°àª¨àª¾àª®àª¾àª‚àª¨à«€ àª®àª¾àª¹àª¿àª¤à«€ DHCP àª¸àª°à«àªµàª°àª®àª¾àª‚àª¥à«€ àª²à«‡ àª›à«‡ àª¤à«‹,  DHCP àª¸àª°à«àªµàª° "
+"àª¨à«‡àªŸàªµàª°à«àª•àª®àª¾àª‚ àª¹àª¾àªœàª° àª°àª¹à«‡àª² WINS àª¸àª°à«àªµàª°à«‹ (\"NetBIOS àª¨àª¾àª® àª¸àª°à«àªµàª°à«‹\") àªµàª¿àª¶à«‡àª¨à«€ àª®àª¾àª¹àª¿àª¤à«€ àªªàª£ àªªà«‚àª°à«€ àªªàª¾àª¡à«€ "
+"àª¶àª•à«‡ àª›à«‡.  àª†àª¨à«‡ àª®àª¾àªŸà«‡ àª¤àª®àª¾àª°à«‡ smb.conf àª«àª¾àª‡àª²àª®àª¾àª‚ àª«à«‡àª°àª«àª¾àª° àª•àª°àªµà«‹ àªªàª¡àª¶à«‡ àªœà«‡àª¥à«€ DHCP àª àªªà«àª°à«€ àªªàª¾àª¡à«‡àª² WINS "
+"àª—à«‹àª àªµàª£à«€àª“ àª†àªªàª®à«‡àª³à«‡ /etc/samba/dhcp.conf àª®àª¾àª‚àª¥à«€ àªµàª¾àª‚àªšà«€ àª¶àª•àª¾àª¯."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "àª† àª²àª¾àª•à«àª·àª£àª¿àª•àª¤àª¾àª¨à«‹ àª²àª¾àª àª²à«‡àªµàª¾ àª®àª¾àªŸà«‡ dhcp3-àª•à«àª²àª¾àª¯àª¨à«àªŸ àªªà«‡àª•à«‡àªœ àª¸à«àª¥àª¾àªªàª¿àª¤ àª•àª°à«‡àª² àª¹à«‹àªµà«àª‚ àªœ àªœà«‹àª‡àª."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "smb.conf àª†àªªàª®à«‡àª³à«‡ àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¿àª¤ àª•àª°àª¶à«‹?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "àªœà«‹ àª¤àª®à«‡ àª† àªµàª¿àª•àª²à«àªª àªªàª¸àª‚àª¦ àª¨àª¹à«€ àª•àª°à«‹ àª¤à«‹, àª¤àª®àª¾àª°à«‡ àª¬àª§àª¾ àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¨à«‹ àª¤àª®àª¾àª°à«€ àªœàª¾àª¤à«‡ àª•àª°àªµàª¾ àªªàª¡àª¶à«‡, àª…àª¨à«‡ àª¤àª®à«‡ "
-#~ "àª†àªµà«ƒàª¤àª¿àª• àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¨ àª¸à«àª§àª¾àª°àª¾àª“àª¨à«‹ àª²àª¾àª àª²àª‡ àª¶àª•àª¶à«‹ àª¨àª¹à«€."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"àª¸àª¾àª®à«àª¬àª¾ àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¨àª¨àª¾àª‚ àª¬àª¾àª•à«€àª¨àª¾àª‚ àªªà«àª°àª¶à«àª¨à«‹ /etc/samba/smb.conf àª¨àª¾àª‚ àªµàª¿àª•àª²à«àªªà«‹ àª¸àª¾àª¥à«‡ àª•àª¾àª® àªªàª¾àª° àªªàª¾àª¡à«‡ "
+"àª›à«‡, àªœà«‡ àª¸àª¾àª®à«àª¬àª¾ àª•àª¾àª°à«àª¯àª•à«àª°àª®à«‹àª¨à«‡ (nmbd àª…àª¨à«‡ smbd) àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¨ àª•àª°àªµàª¾ àª®àª¾àªŸà«‡ àªµàªªàª°àª¾àª¯ àª›à«‡. àª¤àª®àª¾àª°à«€ àª¹àª¾àª²àª¨à«€ "
+"smb.conf àª«àª¾àª‡àª² 'include' àª²à«€àªŸà«€ àª§àª°àª¾àªµà«‡ àª›à«‡ àª…àª¥àªµàª¾ àªàª• àª¥à«€ àªµàª§à« àª²à«€àªŸà«€àª®àª¾àª‚ àªµàª¿àª¸à«àª¤àª¾àª°àªµàª¾àª¨à«‹ àªµàª¿àª•àª²à«àªª "
+"àª§àª°àª¾àªµà«‡ àª›à«‡, àªœà«‡ àª†àªªàª®à«‡àª³à«‡ àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¨ àª•à«àª°àª¿àª¯àª¾àª¨à«‡ àª®à«àª‚àªàªµàª£àª®àª¾àª‚ àª®à«‚àª•à«€ àª¶àª•à«‡ àª›à«‡ àª…àª¨à«‡ àª¤àª®àª¾àª°à«‡ smb.conf àª«àª°à«€ àª•àª¾àª® àª•àª°àª¤à«€ "
+"àª•àª°àªµàª¾ àª®àª¾àªŸà«‡ àªœàª¾àª¤à«‡ àª¸à«àª§àª¾àª°àªµà«€ àªªàª¡àª¶à«‡."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "àªµàª°à«àª•àª—à«àª°à«àªª/àª¡à«‹àª®à«‡àª‡àª¨ àª¨àª¾àª®:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"àªœà«‹ àª¤àª®à«‡ àª† àªµàª¿àª•àª²à«àªª àªªàª¸àª‚àª¦ àª¨àª¹à«€ àª•àª°à«‹ àª¤à«‹, àª¤àª®àª¾àª°à«‡ àª¬àª§àª¾ àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¨à«‹ àª¤àª®àª¾àª°à«€ àªœàª¾àª¤à«‡ àª•àª°àªµàª¾ àªªàª¡àª¶à«‡, àª…àª¨à«‡ àª¤àª®à«‡ "
+"àª†àªµà«ƒàª¤àª¿àª• àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¨ àª¸à«àª§àª¾àª°àª¾àª“àª¨à«‹ àª²àª¾àª àª²àª‡ àª¶àª•àª¶à«‹ àª¨àª¹à«€."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "àªµàª°à«àª•àª—à«àª°à«àªª/àª¡à«‹àª®à«‡àª‡àª¨ àª¨àª¾àª®:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "àªªàª¾àª¸àªµàª°à«àª¡ àªàª¨à«àª•à«àª°àª¿àªªà«àª¶àª¨ àªµàª¾àªªàª°àª¶à«‹?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"àª¹àª¾àª²àª¨àª¾àª‚ àª¬àª§àª¾ àªµàª¿àª¨à«àª¡à«‹àª àª•à«àª²àª¾àª¯àª¨à«àªŸà«‹ SMB àª¸àª°à«àªµàª°à«‹  àª¸àª¾àª¥à«‡ àªàª¨à«àª•à«àª°àª¿àªªà«àªŸà«‡àª¡ àªªàª¾àª¸àªµàª°à«àª¡à«‹àª¨à«‹ àª‰àªªàª¯à«‹àª— àª•àª°à«€àª¨à«‡ àª¸àª‚àª¦à«‡àª¶àª¾ "
+"àªµà«àª¯àªµàª¹àª¾àª° àª•àª°à«‡ àª›à«‡. àªœà«‹ àª¤àª®à«‡ àª¸àª¾àª¦à«‹ àª²àª–àª¾àª£ àªªàª¾àª¸àªµàª°à«àª¡ àªµàª¾àªªàª°àªµàª¾ àª®àª¾àª‚àª—àª¤àª¾ àª¹à«‹àªµ àª¤à«‹ àª¤àª®àª¾àª°à«‡, àªµàª¿àª¨à«àª¡à«‹àª "
+"àª°àªœà«€àª¸à«àªŸà«àª°à«€àª®àª¾àª‚ àªµàª¿àª•àª²à«àªª àª¬àª¦àª²àªµà«‹ àªªàª¡àª¶à«‡."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"àª† àªµàª¿àª•àª²à«àªª àª¸àª•à«àª°àª¿àª¯ àª•àª°àªµàª¾àª¨à«àª‚ àª–à«‚àª¬ àªœ àª¸àª²àª¾àª¹àªàª°à«àª¯à«àª‚ àª›à«‡. àªœà«‹ àª¤àª®à«‡ àª•àª°àª¶à«‹ àª¤à«‹, àª¤àª®à«‡ àª§à«àª¯àª¾àª¨àª®àª¾àª‚ àª°àª¾àª–àª¶à«‹ àª•à«‡ àª¤àª®àª¾àª°à«€ "
+"àªªàª¾àª¸à«‡ àª¯à«‹àª—à«àª¯ /etc/samba/smbpasswd àª«àª¾àª‡àª² àª¹à«‹àª¯ àª…àª¨à«‡ àª¦àª°à«‡àª• àªµàªªàª°àª¾àª¶àª•àª°à«àª¤àª¾ àª®àª¾àªŸà«‡ àª¤àª®à«‡ smbpasswd "
+"àª‰àªªàª¯à«‹àª— àª•àª°à«€àª¨à«‡ àªªàª¾àª¸àªµàª°à«àª¡ àª—à«‹àª àªµà«‡àª²à«‹ àª›à«‡."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "àª¡à«‡àª®à«‹àª¨à«àª¸"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "àª¤àª®à«‡ àª¸àª¾àª®à«àª¬àª¾ àª•àª‡ àª°à«€àª¤à«‡ àª‰àªªàª¯à«‹àª— àª•àª°àª¶à«‹?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"àª¸àª¾àª®à«àª¬àª¾ àª¡à«‡àª®à«‹àª¨ smbd àª¸àª¾àª®àª¾àª¨à«àª¯ àª¡à«‡àª®à«‹àª¨ àª…àª¥àªµàª¾ inetd àª¤àª°à«€àª•à«‡ àªšàª¾àª²à«€ àª¶àª•à«‡ àª›à«‡. àª¡à«‡àª®à«‹àª¨ àª¤àª°à«€àª•à«‡ àªšàª²àª¾àªµàªµàª¾àª¨à«àª‚ "
+"àª¸àª²àª¾àª¹àªàª°à«àª¯à«àª‚ àª›à«‡."
 
 #, fuzzy
 #~| msgid ""
@@ -171,64 +308,6 @@ msgstr ""
 #~ "àª•àª°à«€ àª¸à«àªªàª·à«àªŸ àª•àª°à«‹. àª§à«àª¯àª¾àª¨àª®àª¾àª‚ àª°àª¾àª–à«‹ àª•à«‡ àª† àªµàª¿àª•àª²à«àªª àª¡à«‹àª®à«‡àª‡àª¨ àª¨àª¾àª®àª¨à«‡ àªªàª£ àª¨àª¿àª¯àª‚àª¤à«àª°àª£ àª•àª°à«‡ àª›à«‡ àªœà«àª¯àª¾àª°à«‡ "
 #~ "àª¸àª²àª¾àª®àª¤à«€=àª¡à«‹àª®à«‡àª‡àª¨ àª—à«‹àª àªµàª£à«€ àª‰àªªàª¯à«‹àª— àª•àª°àªµàª¾àª®àª¾àª‚ àª†àªµà«‡ àª›à«‡."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "DHCP àª®àª¾àª‚àª¥à«€ WINS àª—à«‹àª àªµàª£à«€àª“ àª‰àªªàª¯à«‹àª— àª•àª°àªµàª¾ àª®àª¾àªŸà«‡ smb.conf àª¬àª¦àª²àª¶à«‹?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "àªœà«‹ àª¤àª®àª¾àª°à«àª‚ àª•àª®à«àªªà«àª¯à«àªŸàª° àª¨à«‡àªŸàªµàª°à«àª•àª®àª¾àª‚ àª†àª‡àªªà«€ àª¸àª°àª¨àª¾àª®àª¾àª‚àª¨à«€ àª®àª¾àª¹àª¿àª¤à«€ DHCP àª¸àª°à«àªµàª°àª®àª¾àª‚àª¥à«€ àª²à«‡ àª›à«‡ àª¤à«‹,  DHCP "
-#~ "àª¸àª°à«àªµàª° àª¨à«‡àªŸàªµàª°à«àª•àª®àª¾àª‚ àª¹àª¾àªœàª° àª°àª¹à«‡àª² WINS àª¸àª°à«àªµàª°à«‹ (\"NetBIOS àª¨àª¾àª® àª¸àª°à«àªµàª°à«‹\") àªµàª¿àª¶à«‡àª¨à«€ àª®àª¾àª¹àª¿àª¤à«€ àªªàª£ "
-#~ "àªªà«‚àª°à«€ àªªàª¾àª¡à«€ àª¶àª•à«‡ àª›à«‡.  àª†àª¨à«‡ àª®àª¾àªŸà«‡ àª¤àª®àª¾àª°à«‡ smb.conf àª«àª¾àª‡àª²àª®àª¾àª‚ àª«à«‡àª°àª«àª¾àª° àª•àª°àªµà«‹ àªªàª¡àª¶à«‡ àªœà«‡àª¥à«€ DHCP àª àªªà«àª°à«€ "
-#~ "àªªàª¾àª¡à«‡àª² WINS àª—à«‹àª àªµàª£à«€àª“ àª†àªªàª®à«‡àª³à«‡ /etc/samba/dhcp.conf àª®àª¾àª‚àª¥à«€ àªµàª¾àª‚àªšà«€ àª¶àª•àª¾àª¯."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "àª† àª²àª¾àª•à«àª·àª£àª¿àª•àª¤àª¾àª¨à«‹ àª²àª¾àª àª²à«‡àªµàª¾ àª®àª¾àªŸà«‡ dhcp3-àª•à«àª²àª¾àª¯àª¨à«àªŸ àªªà«‡àª•à«‡àªœ àª¸à«àª¥àª¾àªªàª¿àª¤ àª•àª°à«‡àª² àª¹à«‹àªµà«àª‚ àªœ àªœà«‹àª‡àª."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "smb.conf àª†àªªàª®à«‡àª³à«‡ àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¿àª¤ àª•àª°àª¶à«‹?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "àª¸àª¾àª®à«àª¬àª¾ àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¨àª¨àª¾àª‚ àª¬àª¾àª•à«€àª¨àª¾àª‚ àªªà«àª°àª¶à«àª¨à«‹ /etc/samba/smb.conf àª¨àª¾àª‚ àªµàª¿àª•àª²à«àªªà«‹ àª¸àª¾àª¥à«‡ àª•àª¾àª® àªªàª¾àª° "
-#~ "àªªàª¾àª¡à«‡ àª›à«‡, àªœà«‡ àª¸àª¾àª®à«àª¬àª¾ àª•àª¾àª°à«àª¯àª•à«àª°àª®à«‹àª¨à«‡ (nmbd àª…àª¨à«‡ smbd) àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¨ àª•àª°àªµàª¾ àª®àª¾àªŸà«‡ àªµàªªàª°àª¾àª¯ àª›à«‡. àª¤àª®àª¾àª°à«€ "
-#~ "àª¹àª¾àª²àª¨à«€ smb.conf àª«àª¾àª‡àª² 'include' àª²à«€àªŸà«€ àª§àª°àª¾àªµà«‡ àª›à«‡ àª…àª¥àªµàª¾ àªàª• àª¥à«€ àªµàª§à« àª²à«€àªŸà«€àª®àª¾àª‚ àªµàª¿àª¸à«àª¤àª¾àª°àªµàª¾àª¨à«‹ "
-#~ "àªµàª¿àª•àª²à«àªª àª§àª°àª¾àªµà«‡ àª›à«‡, àªœà«‡ àª†àªªàª®à«‡àª³à«‡ àª°à«àªªàª°à«‡àª–àª¾àª‚àª•àª¨ àª•à«àª°àª¿àª¯àª¾àª¨à«‡ àª®à«àª‚àªàªµàª£àª®àª¾àª‚ àª®à«‚àª•à«€ àª¶àª•à«‡ àª›à«‡ àª…àª¨à«‡ àª¤àª®àª¾àª°à«‡ smb.conf àª«àª°à«€ "
-#~ "àª•àª¾àª® àª•àª°àª¤à«€ àª•àª°àªµàª¾ àª®àª¾àªŸà«‡ àªœàª¾àª¤à«‡ àª¸à«àª§àª¾àª°àªµà«€ àªªàª¡àª¶à«‡."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "àªªàª¾àª¸àªµàª°à«àª¡ àªàª¨à«àª•à«àª°àª¿àªªà«àª¶àª¨ àªµàª¾àªªàª°àª¶à«‹?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "àª¹àª¾àª²àª¨àª¾àª‚ àª¬àª§àª¾ àªµàª¿àª¨à«àª¡à«‹àª àª•à«àª²àª¾àª¯àª¨à«àªŸà«‹ SMB àª¸àª°à«àªµàª°à«‹  àª¸àª¾àª¥à«‡ àªàª¨à«àª•à«àª°àª¿àªªà«àªŸà«‡àª¡ àªªàª¾àª¸àªµàª°à«àª¡à«‹àª¨à«‹ àª‰àªªàª¯à«‹àª— àª•àª°à«€àª¨à«‡ "
-#~ "àª¸àª‚àª¦à«‡àª¶àª¾ àªµà«àª¯àªµàª¹àª¾àª° àª•àª°à«‡ àª›à«‡. àªœà«‹ àª¤àª®à«‡ àª¸àª¾àª¦à«‹ àª²àª–àª¾àª£ àªªàª¾àª¸àªµàª°à«àª¡ àªµàª¾àªªàª°àªµàª¾ àª®àª¾àª‚àª—àª¤àª¾ àª¹à«‹àªµ àª¤à«‹ àª¤àª®àª¾àª°à«‡, àªµàª¿àª¨à«àª¡à«‹àª "
-#~ "àª°àªœà«€àª¸à«àªŸà«àª°à«€àª®àª¾àª‚ àªµàª¿àª•àª²à«àªª àª¬àª¦àª²àªµà«‹ àªªàª¡àª¶à«‡."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "àª† àªµàª¿àª•àª²à«àªª àª¸àª•à«àª°àª¿àª¯ àª•àª°àªµàª¾àª¨à«àª‚ àª–à«‚àª¬ àªœ àª¸àª²àª¾àª¹àªàª°à«àª¯à«àª‚ àª›à«‡. àªœà«‹ àª¤àª®à«‡ àª•àª°àª¶à«‹ àª¤à«‹, àª¤àª®à«‡ àª§à«àª¯àª¾àª¨àª®àª¾àª‚ àª°àª¾àª–àª¶à«‹ àª•à«‡ "
-#~ "àª¤àª®àª¾àª°à«€ àªªàª¾àª¸à«‡ àª¯à«‹àª—à«àª¯ /etc/samba/smbpasswd àª«àª¾àª‡àª² àª¹à«‹àª¯ àª…àª¨à«‡ àª¦àª°à«‡àª• àªµàªªàª°àª¾àª¶àª•àª°à«àª¤àª¾ àª®àª¾àªŸà«‡ àª¤àª®à«‡ "
-#~ "smbpasswd àª‰àªªàª¯à«‹àª— àª•àª°à«€àª¨à«‡ àªªàª¾àª¸àªµàª°à«àª¡ àª—à«‹àª àªµà«‡àª²à«‹ àª›à«‡."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "àª¸àª¾àª®à«àª¬àª¾ àªªàª¾àª¸àªµàª°à«àª¡ àª¡à«‡àªŸàª¾àª¬à«‡àª, /var/lib/samba/passdb.tdb àª¬àª¨àª¾àªµàª¶à«‹?"
 
@@ -258,22 +337,6 @@ msgstr ""
 #~ "samba-doc àªªà«‡àª•à«‡àªœàª®àª¾àª‚ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html àªµàª§à« "
 #~ "àª®àª¾àª¹àª¿àª¤à«€ àª®àª¾àªŸà«‡ àªœà«àª“."
 
-#~ msgid "daemons"
-#~ msgstr "àª¡à«‡àª®à«‹àª¨à«àª¸"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "àª¤àª®à«‡ àª¸àª¾àª®à«àª¬àª¾ àª•àª‡ àª°à«€àª¤à«‡ àª‰àªªàª¯à«‹àª— àª•àª°àª¶à«‹?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "àª¸àª¾àª®à«àª¬àª¾ àª¡à«‡àª®à«‹àª¨ smbd àª¸àª¾àª®àª¾àª¨à«àª¯ àª¡à«‡àª®à«‹àª¨ àª…àª¥àªµàª¾ inetd àª¤àª°à«€àª•à«‡ àªšàª¾àª²à«€ àª¶àª•à«‡ àª›à«‡. àª¡à«‡àª®à«‹àª¨ àª¤àª°à«€àª•à«‡ àªšàª²àª¾àªµàªµàª¾àª¨à«àª‚ "
-#~ "àª¸àª²àª¾àª¹àªàª°à«àª¯à«àª‚ àª›à«‡."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "passdb àª¬à«‡àª•àªàª¨à«àª¡ àª¬àª¦àª²àªµàª¾àª¨à«àª‚ àª†àª§àª¾àª° àª†àªªàªµàª¾àª®àª¾àª‚ àª†àªµàª¤à«àª‚ àª¨àª¥à«€"
 
diff --git a/debian/po/he.po b/debian/po/he.po
index ff7c03d..2c9914b 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4-4.0.0~alpha17-he\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-02-11 22:21+0200\n"
 "Last-Translator: Omer Zak <w1 at zak.co.il>\n"
 "Language-Team: Hebrew <debian-hebrew-common at lists.alioth.debian.org>\n"
@@ -22,13 +22,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "×œ×©×“×¨×’ ×ž-Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -40,13 +40,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "×¡×•×’ ×”×©×¨×ª"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -87,13 +87,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "×©× ×ž×ª×—×:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -101,48 +101,178 @@ msgstr "× × ×œ×¦×™×™×Ÿ ××ª ×ž×ª×—× Kerberos ×¢×‘×•×¨ ×”×ž×ª×—× ×©× ×©×œ×˜ ×¢
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "×‘×“×¨×š ×›×œ×œ ×–×• ×’×™×¨×¡× ×‘××•×ª×™×•×ª ×¨×™×©×™×•×ª ×©×œ ×©× ×ž×—×©×‘×š ×‘-DNS."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
diff --git a/debian/po/hu.po b/debian/po/hu.po
index 467b87a..d8b99ca 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-13 09:20+0100\n"
 "Last-Translator: SZERVÃC Attila <sas at 321.hu>\n"
 "Language-Team: Hungarian <hu at li.org>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -75,13 +75,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -89,68 +89,209 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"MÃ³dosÃtod az smb.conf-ot, hogy a WINS beÃ¡llÃtÃ¡sokat a DHCP-n keresztÃ¼l Ã©rje "
+"el?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Ha e gÃ©p az IP cÃmeket egy DHCP kiszolgÃ¡lÃ³tÃ³l kÃ©rdezi le a hÃ¡lÃ³zaton, lehet, "
+"hogy a WINS kiszolgÃ¡lÃ³k (\"NetBIOS nÃ©vkiszolgÃ¡lÃ³k\") listÃ¡jÃ¡t is le tudja "
+"kÃ©rdezni. Ehhez az smb.conf mÃ³dosÃtÃ¡sa szÃ¼ksÃ©ges, hogy a DHCP-n keresztÃ¼li "
+"WINS beÃ¡llÃtÃ¡sokat automatikusan kiolvassa a /etc/samba/dhcp.conf-bÃ³l."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"A dhcp3-client csomagnak telepÃtve kell lennie e kÃ©pessÃ©g kihasznÃ¡lÃ¡sÃ¡hoz."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Az smb.conf-ot automatikusan Ã¡llÃtod be?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Ha nem Ã©lsz e lehetÅ‘sÃ©ggel, minden beÃ¡llÃtÃ¡s vÃ¡ltozÃ¡sÃ¡t neked kell "
-#~ "felÃ¼gyelned, Ã©s nem Ã©lvezheted az idÅ‘szakos beÃ¡llÃtÃ¡shangolÃ¡s elÅ‘nyeit."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"A Samba tovÃ¡bbi beÃ¡llÃtÃ¡saihoz a /etc/samba/smb.conf paramÃ©tereit "
+"befolyÃ¡solÃ³ tovÃ¡bbi kÃ©rdÃ©seket kell megvÃ¡laszolni, ami a Samba programok "
+"(nmbd Ã©s smbd) beÃ¡llÃtÃ³fÃ¡jlja. A jelenlegi smb.conf tartalmaz egy 'include' "
+"sort, vagy egy tÃ¶bb sorra tÃ¶rt opciÃ³t, ami megzavarhatja az automata "
+"beÃ¡llÃtÃ³ folyamot, Ã©s szÃ¼ksÃ©gessÃ© teszi az smb.conf sajÃ¡t kezÅ± "
+"szerkesztÃ©sÃ©t, hogy az ismÃ©t mÅ±kÃ¶djÃ¶n."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Ha nem Ã©lsz e lehetÅ‘sÃ©ggel, minden beÃ¡llÃtÃ¡s vÃ¡ltozÃ¡sÃ¡t neked kell "
+"felÃ¼gyelned, Ã©s nem Ã©lvezheted az idÅ‘szakos beÃ¡llÃtÃ¡shangolÃ¡s elÅ‘nyeit."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Munkacsoport/TartomÃ¡ny neve:"
+msgid "Workgroup/Domain Name:"
+msgstr "Munkacsoport/TartomÃ¡ny neve:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "HasznÃ¡lsz kÃ³dolt jelszavakat?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Az Ãºjabb Windows kliensek kÃ³dolt jelszavakkal kommunikÃ¡lnak az SMB "
+"kiszolgÃ¡lÃ³kkal. Ha sima szÃ¶veges jelszavakat kÃvÃ¡nsz alkalmazni, meg kell "
+"vÃ¡ltoztatni egy beÃ¡llÃtÃ¡st a kliensek regisztrÃ¡ciÃ³jÃ¡ban."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"E lehetÅ‘sÃ©g bekapcsolÃ¡sa erÅ‘sen ajÃ¡nlott. Ha ezt teszed, gyÅ‘zÅ‘dj meg rÃ³la "
+"hogy Ã©rvÃ©nyes /etc/samba/smbpasswd fÃ¡jllal rendelkezel Ã©s hogy beÃ¡llÃtottad "
+"a jelszavakat minden felhasznÃ¡lÃ³hoz a smbpasswd paranccsal."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "dÃ©monok"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Hogyan induljon a Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Az smbd Samba dÃ©mon futhat normÃ¡l dÃ©monkÃ©nt vagy az inetd-n keresztÃ¼l. A "
+"dÃ©monkÃ©nt valÃ³ futtatÃ¡sa a javasolt beÃ¡llÃtÃ¡s."
 
 #, fuzzy
 #~| msgid ""
@@ -165,69 +306,6 @@ msgstr ""
 #~ "lekÃ©rdezik a kliensek. Vedd figyelembe, hogy e paramÃ©ter meghatÃ¡rozza a "
 #~ "tartomÃ¡ny nevÃ©t is, ha engedÃ©lyezve van a security=domain beÃ¡llÃtÃ¡s."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "MÃ³dosÃtod az smb.conf-ot, hogy a WINS beÃ¡llÃtÃ¡sokat a DHCP-n keresztÃ¼l "
-#~ "Ã©rje el?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Ha e gÃ©p az IP cÃmeket egy DHCP kiszolgÃ¡lÃ³tÃ³l kÃ©rdezi le a hÃ¡lÃ³zaton, "
-#~ "lehet, hogy a WINS kiszolgÃ¡lÃ³k (\"NetBIOS nÃ©vkiszolgÃ¡lÃ³k\") listÃ¡jÃ¡t is "
-#~ "le tudja kÃ©rdezni. Ehhez az smb.conf mÃ³dosÃtÃ¡sa szÃ¼ksÃ©ges, hogy a DHCP-n "
-#~ "keresztÃ¼li WINS beÃ¡llÃtÃ¡sokat automatikusan kiolvassa a /etc/samba/dhcp."
-#~ "conf-bÃ³l."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "A dhcp3-client csomagnak telepÃtve kell lennie e kÃ©pessÃ©g kihasznÃ¡lÃ¡sÃ¡hoz."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Az smb.conf-ot automatikusan Ã¡llÃtod be?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "A Samba tovÃ¡bbi beÃ¡llÃtÃ¡saihoz a /etc/samba/smb.conf paramÃ©tereit "
-#~ "befolyÃ¡solÃ³ tovÃ¡bbi kÃ©rdÃ©seket kell megvÃ¡laszolni, ami a Samba programok "
-#~ "(nmbd Ã©s smbd) beÃ¡llÃtÃ³fÃ¡jlja. A jelenlegi smb.conf tartalmaz egy "
-#~ "'include' sort, vagy egy tÃ¶bb sorra tÃ¶rt opciÃ³t, ami megzavarhatja az "
-#~ "automata beÃ¡llÃtÃ³ folyamot, Ã©s szÃ¼ksÃ©gessÃ© teszi az smb.conf sajÃ¡t kezÅ± "
-#~ "szerkesztÃ©sÃ©t, hogy az ismÃ©t mÅ±kÃ¶djÃ¶n."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "HasznÃ¡lsz kÃ³dolt jelszavakat?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Az Ãºjabb Windows kliensek kÃ³dolt jelszavakkal kommunikÃ¡lnak az SMB "
-#~ "kiszolgÃ¡lÃ³kkal. Ha sima szÃ¶veges jelszavakat kÃvÃ¡nsz alkalmazni, meg kell "
-#~ "vÃ¡ltoztatni egy beÃ¡llÃtÃ¡st a kliensek regisztrÃ¡ciÃ³jÃ¡ban."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "E lehetÅ‘sÃ©g bekapcsolÃ¡sa erÅ‘sen ajÃ¡nlott. Ha ezt teszed, gyÅ‘zÅ‘dj meg rÃ³la "
-#~ "hogy Ã©rvÃ©nyes /etc/samba/smbpasswd fÃ¡jllal rendelkezel Ã©s hogy "
-#~ "beÃ¡llÃtottad a jelszavakat minden felhasznÃ¡lÃ³hoz a smbpasswd paranccsal."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "LÃ©trehozod a samba jelszÃ³adatbÃ¡zist (/var/lib/samba/passdb.tdb)?"
 
@@ -258,22 +336,6 @@ msgstr ""
 #~ "LÃ¡sd a samba-doc csomag /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
 #~ "odalÃ¡t a rÃ©szletekÃ©rt."
 
-#~ msgid "daemons"
-#~ msgstr "dÃ©monok"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Hogyan induljon a Samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Az smbd Samba dÃ©mon futhat normÃ¡l dÃ©monkÃ©nt vagy az inetd-n keresztÃ¼l. A "
-#~ "dÃ©monkÃ©nt valÃ³ futtatÃ¡sa a javasolt beÃ¡llÃtÃ¡s."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "A passdb hÃ¡tterek lÃ¡ncolÃ¡sa nem tÃ¡mogatott"
 
diff --git a/debian/po/id.po b/debian/po/id.po
index 4a6b7b3..3a6a146 100644
--- a/debian/po/id.po
+++ b/debian/po/id.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_4.0.0~alpha17.dfsg2-2\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-02-16 04:48+0700\n"
 "Last-Translator: Mahyuddin Susanto <udienz at gmail.com>\n"
 "Language-Team: Debian Indonesia Translator <debian-l10n-indonesian at lists."
@@ -23,13 +23,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Upgrade dari Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -41,13 +41,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Aturan server"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -71,7 +71,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -81,7 +81,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -89,13 +89,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Nama Realm:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -105,66 +105,188 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Biasanya ini adalah versi huruf besar dari nama DNS host anda."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Jika Anda tidak mengambil pilihan ini,  Samba tidak akan diatur dan anda "
+"harus mengatur itu sendiri"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Set up Samba 4 sebagai PDC?"
 
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Jika Anda tidak mengambil pilihan ini,  Samba tidak akan diatur dan anda "
-#~ "harus mengatur itu sendiri"
-
 #~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
diff --git a/debian/po/it.po b/debian/po/it.po
index 7613c3d..412013e 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba 3.0.24-4 italian debconf templates\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-02-16 22:12+0100\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Aggiornare da Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -36,13 +36,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Ruolo del server"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -54,7 +54,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -84,13 +84,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Nome realm:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -100,48 +100,178 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Solitamente si usa il nome del DNS scritto in maiuscolo."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
diff --git a/debian/po/ja.po b/debian/po/ja.po
index b490403..51960ec 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-02-15 22:49+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Samba 3 ã‹ã‚‰ã‚¢ãƒƒãƒ—ã‚°ãƒ¬ãƒ¼ãƒ‰ã—ã¾ã™ã‹?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -44,13 +44,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "ã‚µãƒ¼ãƒãƒãƒ¼ãƒ«"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -62,7 +62,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -84,7 +84,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -92,13 +92,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "ãƒ¬ãƒ«ãƒ å:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -108,48 +108,178 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "é€šå¸¸ã“ã‚Œã¯ã€ã‚ãªãŸã® DNS ãƒ›ã‚¹ãƒˆåã®å¤§æ–‡å—ç‰ˆã§ã™ã€‚"
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
diff --git a/debian/po/ka.po b/debian/po/ka.po
index f5072c1..63e37e8 100644
--- a/debian/po/ka.po
+++ b/debian/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-11 19:55+0200\n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-09-10 01:45+0400\n"
 "Last-Translator: Aiet Kolkhi <aietkolkhi at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,6 +16,123 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: boolean
+#. Description
+#: ../samba-ad-dc.templates:1001
+msgid "Upgrade from Samba 3?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-ad-dc.templates:1001
+msgid ""
+"It is possible to migrate the existing configuration files from Samba 3 to "
+"Samba 4. This is likely to fail for complex setups, but should provide a "
+"good starting point for most existing installations."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid "Server role"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"Domain controllers manage NT4-style or Active Directory domains and provide "
+"services such as identity management and domain logons. Each domain needs to "
+"have a at least one domain controller."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"Member servers can be part of a NT4-style or Active Directory domain but do "
+"not provide any domain services. Workstations and file or print servers are "
+"usually regular domain members."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"A standalone server can not be used in a domain and only supports file "
+"sharing and Windows for Workgroups-style logins."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba-ad-dc.templates:2001
+msgid ""
+"If no server role is specified, the Samba server will not be provisioned, so "
+"this can be done manually by the user."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid "Realm name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid ""
+"Please specify the Kerberos realm for the domain that this domain controller "
+"controls."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-ad-dc.templates:3001
+msgid "Usually this is the a capitalized version of your DNS hostname."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "New password for the Samba \"administrator\" user:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "If this field is left blank, a random password will be generated."
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid "A password can be set later by running, as root:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:4001
+msgid " $ samba-tool user setpassword administrator"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../samba-ad-dc.templates:5001
+msgid "Repeat password for the Samba \"administrator\" user:"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../samba-ad-dc.templates:6001
+msgid "Password input error"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../samba-ad-dc.templates:6001
+msgid "The two passwords you entered were not the same. Please try again."
+msgstr ""
+
 #. Type: title
 #. Description
 #: ../samba-common.templates:1001
diff --git a/debian/po/km.po b/debian/po/km.po
index 3a0d70f..c1ef242 100644
--- a/debian/po/km.po
+++ b/debian/po/km.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po_km\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-13 08:39+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem at khmeros.info>\n"
 "Language-Team: Khmer <support at khmeros.info>\n"
@@ -29,13 +29,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -44,13 +44,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -84,13 +84,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -98,160 +98,240 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
 #  Type: boolean
 #  Description
-#, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž“áŸáŸ‡â€‹áž‘áŸ áž¢áŸ’áž“áž€â€‹áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž‚áŸ’ážšáž”áŸ‹áž‚áŸ’ážšáž„â€‹áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšâ€‹áž€áž¶ážšâ€‹â€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹ážŽáž¶áž˜áž½áž™â€‹ážŠáŸ„áž™â€‹"
-#~ "ážáŸ’áž›áž½áž“â€‹áž¢áŸ’áž“áž€â€‹áž•áŸ’áž‘áž¶áž›áŸ‹ áž“áž·áž„â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž¶áž“â€‹áž•áž›â€‹áž”áŸ’ážšáž™áŸ„áž‡áž“áŸâ€‹áž–áž¸â€‹áž€áž¶ážšâ€‹áž”áž„áŸ’áž€áž¾áž“â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹áž™áŸ‰áž¶áž„â€‹áž‘áŸ€ážâ€‹áž‘áž¶ážáŸ‹â€‹áž”áž¶áž“â€‹áž‘áŸÂ áŸ”"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "áž€áŸ‚áž”áŸ’ážšáŸ‚ smb.conf ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž”áŸ’ážšáž¾â€‹áž€áž¶ážšáž€áŸ†ážŽážáŸ‹â€‹ážšáž”ážŸáŸ‹ WINS áž–áž¸ DHCPÂ ?"
 
-#  Type: string
+#  Type: boolean
 #  Description
-#, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž€áŸ’ážšáž»áž˜áž€áž¶ážšáž„áž¶ážš/ážŠáŸ‚áž“Â áŸ–"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž€áž»áŸ†áž–áŸ’áž™áž¼áž‘áŸážšâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ IP áž–áž¸â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ DHCP áž“áŸ…â€‹áž›áž¾â€‹áž”ážŽáŸ’ážŠáž¶áž‰ áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ DHCP "
+"áž¢áž¶áž…â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž•áž„â€‹ážŠáŸ‚ážšâ€‹áž“áž¼ážœâ€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹áž¢áŸ†áž–áž¸â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ WINS (\"ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ NetBIOS\") ážŠáŸ‚áž›â€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž“áŸ…â€‹áž›áž¾â€‹"
+"áž”ážŽáŸ’ážŠáž¶áž‰Â áŸ” ážœáž¶â€‹ážáŸ’ážšáž¼ážœâ€‹áž€áž¶ážšâ€‹áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšâ€‹áž‘áŸ…â€‹áž“áž¹áž„â€‹áž¯áž€ážŸáž¶ážš smb.conf ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ ážŠáž¼áž…áŸ’áž“áŸáŸ‡áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹ážšáž”ážŸáŸ‹ WINS ážŠáŸ‚áž›â€‹"
+"áž”áž¶áž“áž•áŸ’ážŠáž›áŸ‹â€‹ážŠáŸ„áž™ DHCP áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž¶áž“â€‹ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž·â€‹áž–áž¸ /etc/samba/dhcp.conf."
 
-#  Type: string
+#  Type: boolean
 #  Description
-#, fuzzy
-#~| msgid ""
-#~| "Please specify the workgroup you want this server to appear to be in "
-#~| "when queried by clients. Note that this parameter also controls the "
-#~| "domain name used with the security=domain setting."
-#~ msgid ""
-#~ "Please specify the domain you want this server to appear to be in when "
-#~ "queried by clients."
-#~ msgstr ""
-#~ "ážŸáž¼áž˜â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹â€‹áž€áŸ’ážšáž»áž˜â€‹áž€áž¶ážšáž„áž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž²áŸ’áž™â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž“áŸáŸ‡â€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž“áŸ…â€‹áž–áŸáž›â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážŸáž½ážš ážŠáŸ„áž™â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœÂ áŸ” áž…áŸ†ážŽáž¶áŸ†â€‹"
-#~ "ážáž¶ áž”áŸ‰áž¶ážšáŸ‰áž¶áž˜áŸ‰áŸ‚ážáŸ’ážšâ€‹áž“áŸáŸ‡â€‹áž€áŸâ€‹ážáŸ’ážšáž½ážâ€‹áž–áž·áž“áž·ážáŸ’áž™â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážŠáŸ‚áž“ ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áŸ’ážšáž¾â€‹ážŠáŸ„áž™â€‹ážŸáž»ážœážáŸ’ážáž·áž—áž¶áž–=áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážŠáŸ‚áž“Â áŸ”"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "áž€áž‰áŸ’áž…áž”áŸ‹â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœ dhcp3 ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž”áž¶áž“â€‹ážŠáŸ†áž¡áž¾áž„â€‹ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž‘áž‘áž½áž›â€‹áž”áž¶áž“â€‹áž•áž›áž”áŸ’ážšáž™áŸ„áž‡áž“áŸážšáž”ážŸáŸ‹â€‹áž›áž€áŸ’ážážŽáŸˆâ€‹áž–áž·ážŸáŸážŸâ€‹áž“áŸáŸ‡Â áŸ”"
 
 #  Type: boolean
 #  Description
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "áž€áŸ‚áž”áŸ’ážšáŸ‚ smb.conf ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž”áŸ’ážšáž¾â€‹áž€áž¶ážšáž€áŸ†ážŽážáŸ‹â€‹ážšáž”ážŸáŸ‹ WINS áž–áž¸ DHCPÂ ?"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’ smb.conf ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž·Â ?"
 
 #  Type: boolean
 #  Description
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž€áž»áŸ†áž–áŸ’áž™áž¼áž‘áŸážšâ€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž‘áž‘áž½áž›â€‹â€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹áž¢áž¶ážŸáž™ážŠáŸ’áž‹áž¶áž“ IP áž–áž¸â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ DHCP áž“áŸ…â€‹áž›áž¾â€‹áž”ážŽáŸ’ážŠáž¶áž‰ áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹ "
-#~ "DHCP áž¢áž¶áž…â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž•áž„â€‹ážŠáŸ‚ážšâ€‹áž“áž¼ážœâ€‹áž–áŸážáŸŒáž˜áž¶áž“â€‹áž¢áŸ†áž–áž¸â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ WINS (\"ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ NetBIOS\") ážŠáŸ‚áž›â€‹áž”áž„áŸ’áž áž¶áž‰â€‹"
-#~ "áž“áŸ…â€‹áž›áž¾â€‹áž”ážŽáŸ’ážŠáž¶áž‰Â áŸ” ážœáž¶â€‹ážáŸ’ážšáž¼ážœâ€‹áž€áž¶ážšâ€‹áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšâ€‹áž‘áŸ…â€‹áž“áž¹áž„â€‹áž¯áž€ážŸáž¶ážš smb.conf ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€ ážŠáž¼áž…áŸ’áž“áŸáŸ‡áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹ážšáž”ážŸáŸ‹ "
-#~ "WINS ážŠáŸ‚áž›â€‹áž”áž¶áž“áž•áŸ’ážŠáž›áŸ‹â€‹ážŠáŸ„áž™ DHCP áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹áž”áž¶áž“â€‹áž¢áž¶áž“â€‹ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž·â€‹áž–áž¸ /etc/samba/dhcp.conf."
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶â€‹ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹ážšáž”ážŸáŸ‹ Samba áž‘áž¶áž€áŸ‹áž‘áž„â€‹áž‡áž¶â€‹áž˜áž½áž™â€‹áž“áž¹áž„â€‹ážŸáŸ†ážŽáž½ážšâ€‹ážŠáŸ‚áž›â€‹áž”áŸ‰áŸ‡áž–áž¶áž›áŸ‹â€‹áž”áŸ‰áž¶ážšáŸ‰áž¶áž˜áŸ‰áŸ‚ážáŸ’ážšâ€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ in /etc/samba/"
+"smb.conf ážŠáŸ‚áž›â€‹áž‡áž¶â€‹áž¯áž€ážŸáž¶ážšâ€‹áž”áž¶áž“â€‹áž”áŸ’ážšáž¾â€‹ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸ Samba (nmbd áž“áž·áž„ smbd)Â áŸ” smb."
+"conf áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹áž”áž“áŸ’áž‘áž¶ážáŸ‹ 'include' áž¬â€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážŠáŸ‚áž›â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹áž”áž“áŸ’áž‘áž¶ážáŸ‹â€‹áž‡áž¶â€‹áž…áŸ’ážšáž¾áž“â€‹áž…áž¼áž›â€‹áž‚áŸ’áž“áž¶ ážŠáŸ‚áž›â€‹áž¢áž¶áž…â€‹áž”áž“áŸ’áž›áŸ†â€‹"
+"ážŠáŸ†ážŽáž¾ážšâ€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’ ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™áž”áŸ’ážšážœážáŸ’ážáž· áž áž¾áž™â€‹ážáž˜áŸ’ážšáž¼ážœâ€‹áž²áŸ’áž™â€‹áž¢áŸ’áž“áž€â€‹áž€áŸ‚ážŸáž˜áŸ’ážšáž½áž› smb.conf ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ážŠáŸ„áž™â€‹ážŠáŸƒâ€‹ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž²áŸ’áž™â€‹"
+"ážœáž¶â€‹áž’áŸ’ážœáž¾áž€áž¶ážšâ€‹áž˜áŸ’ážŠáž„â€‹áž‘áŸ€ážÂ áŸ”"
 
 #  Type: boolean
 #  Description
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "áž€áž‰áŸ’áž…áž”áŸ‹â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœ dhcp3 ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž”áž¶áž“â€‹ážŠáŸ†áž¡áž¾áž„â€‹ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž‘áž‘áž½áž›â€‹áž”áž¶áž“â€‹áž•áž›áž”áŸ’ážšáž™áŸ„áž‡áž“áŸážšáž”ážŸáŸ‹â€‹áž›áž€áŸ’ážážŽáŸˆâ€‹áž–áž·ážŸáŸážŸâ€‹áž“áŸáŸ‡Â áŸ”"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž˜áž·áž“â€‹áž‡áŸ’ážšáž¾ážŸâ€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž“áŸáŸ‡â€‹áž‘áŸ áž¢áŸ’áž“áž€â€‹áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœâ€‹ážáŸ‚â€‹áž‚áŸ’ážšáž”áŸ‹áž‚áŸ’ážšáž„â€‹áž€áž¶ážšâ€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšâ€‹áž€áž¶ážšâ€‹â€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹ážŽáž¶áž˜áž½áž™â€‹ážŠáŸ„áž™â€‹ážáŸ’áž›áž½áž“â€‹"
+"áž¢áŸ’áž“áž€â€‹áž•áŸ’áž‘áž¶áž›áŸ‹ áž“áž·áž„â€‹áž˜áž·áž“â€‹áž¢áž¶áž…â€‹áž”áž¶áž“â€‹áž•áž›â€‹áž”áŸ’ážšáž™áŸ„áž‡áž“áŸâ€‹áž–áž¸â€‹áž€áž¶ážšâ€‹áž”áž„áŸ’áž€áž¾áž“â€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹áž™áŸ‰áž¶áž„â€‹áž‘áŸ€ážâ€‹áž‘áž¶ážáŸ‹â€‹áž”áž¶áž“â€‹áž‘áŸÂ áŸ”"
 
-#  Type: boolean
+#  Type: string
 #  Description
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’ smb.conf ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™â€‹áž”áŸ’ážšážœážáŸ’ážáž·Â ?"
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "ážˆáŸ’áž˜áŸ„áŸ‡â€‹áž€áŸ’ážšáž»áž˜áž€áž¶ážšáž„áž¶ážš/ážŠáŸ‚áž“Â áŸ–"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
 
 #  Type: boolean
 #  Description
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶â€‹ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹ážšáž”ážŸáŸ‹ Samba áž‘áž¶áž€áŸ‹áž‘áž„â€‹áž‡áž¶â€‹áž˜áž½áž™â€‹áž“áž¹áž„â€‹ážŸáŸ†ážŽáž½ážšâ€‹ážŠáŸ‚áž›â€‹áž”áŸ‰áŸ‡áž–áž¶áž›áŸ‹â€‹áž”áŸ‰áž¶ážšáŸ‰áž¶áž˜áŸ‰áŸ‚ážáŸ’ážšâ€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ in /etc/"
-#~ "samba/smb.conf ážŠáŸ‚áž›â€‹áž‡áž¶â€‹áž¯áž€ážŸáž¶ážšâ€‹áž”áž¶áž“â€‹áž”áŸ’ážšáž¾â€‹ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸ Samba (nmbd áž“áž·áž„ "
-#~ "smbd)Â áŸ” smb.conf áž”áž…áŸ’áž…áž»áž”áŸ’áž”áž“áŸ’áž“â€‹ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹áž”áž“áŸ’áž‘áž¶ážáŸ‹ 'include' áž¬â€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹ážŠáŸ‚áž›â€‹áž”áž‰áŸ’áž…áž¼áž›â€‹áž”áž“áŸ’áž‘áž¶ážáŸ‹â€‹áž‡áž¶â€‹áž…áŸ’ážšáž¾áž“â€‹"
-#~ "áž…áž¼áž›â€‹áž‚áŸ’áž“áž¶ ážŠáŸ‚áž›â€‹áž¢áž¶áž…â€‹áž”áž“áŸ’áž›áŸ†â€‹ážŠáŸ†ážŽáž¾ážšâ€‹áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážšáž…áž“áž¶ážŸáž˜áŸ’áž–áŸáž“áŸ’áž’ ážŠáŸ„áž™â€‹ážŸáŸ’ážœáŸáž™áž”áŸ’ážšážœážáŸ’ážáž· áž áž¾áž™â€‹ážáž˜áŸ’ážšáž¼ážœâ€‹áž²áŸ’áž™â€‹áž¢áŸ’áž“áž€â€‹áž€áŸ‚ážŸáž˜áŸ’ážšáž½áž› smb."
-#~ "conf ážšáž”ážŸáŸ‹â€‹áž¢áŸ’áž“áž€â€‹ážŠáŸ„áž™â€‹ážŠáŸƒâ€‹ážŠáž¾áž˜áŸ’áž”áž¸â€‹áž²áŸ’áž™â€‹ážœáž¶â€‹áž’áŸ’ážœáž¾áž€áž¶ážšâ€‹áž˜áŸ’ážŠáž„â€‹áž‘áŸ€ážÂ áŸ”"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "áž”áŸ’ážšáž¾â€‹áž€áž¶ážšâ€‹áž¢áŸŠáž·áž“áž‚áŸ’ážšáž¸áž”â€‹áž–áž¶áž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹Â ?"
 
 #  Type: boolean
 #  Description
-#~ msgid "Use password encryption?"
-#~ msgstr "áž”áŸ’ážšáž¾â€‹áž€áž¶ážšâ€‹áž¢áŸŠáž·áž“áž‚áŸ’ážšáž¸áž”â€‹áž–áž¶áž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹Â ?"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"áž‚áŸ’ážšáž”áŸ‹â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœâ€‹ážŠáŸ‚áž›â€‹áž”áŸ’ážšáž¾â€‹ážœáž¸áž“ážŠáž¼â€‹ážáŸ’áž˜áž¸áŸ—â€‹áž‘áž¶áŸ†áž„â€‹áž¢ážŸáŸ‹â€‹áž‘áž¶áž€áŸ‹áž‘áž„â€‹áž‡áž¶â€‹áž˜áž½áž™â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ SMB ážŠáŸ„áž™â€‹áž”áŸ’ážšáž¾â€‹áž–áž¶áž€áŸ’áž™ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹"
+"áž¢áŸŠáž·áž“áž‚áŸ’ážšáž¸áž”Â áŸ” áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž‡áž˜áŸ’ážšáŸ‡â€‹áž–áž¶áž€áŸ’áž™ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹áž¢ážáŸ’ážáž”áž‘ áž¢áŸ’áž“áž€â€‹áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœážáŸ‚â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšâ€‹áž”áŸ‰áž¶ážšáŸ‰áž¶áž˜áŸ‰áŸ‚ážáŸ’ážšâ€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ áž”áž‰áŸ’áž‡áž¸â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹"
+"ážšáž”ážŸáŸ‹â€‹ážœáž¸áž“ážŠáž¼Â áŸ”"
 
 #  Type: boolean
 #  Description
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "áž‚áŸ’ážšáž”áŸ‹â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœâ€‹ážŠáŸ‚áž›â€‹áž”áŸ’ážšáž¾â€‹ážœáž¸áž“ážŠáž¼â€‹ážáŸ’áž˜áž¸áŸ—â€‹áž‘áž¶áŸ†áž„â€‹áž¢ážŸáŸ‹â€‹áž‘áž¶áž€áŸ‹áž‘áž„â€‹áž‡áž¶â€‹áž˜áž½áž™â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾ SMB ážŠáŸ„áž™â€‹áž”áŸ’ážšáž¾â€‹áž–áž¶áž€áŸ’áž™ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹"
-#~ "áž¢áŸŠáž·áž“áž‚áŸ’ážšáž¸áž”Â áŸ” áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž‡áž˜áŸ’ážšáŸ‡â€‹áž–áž¶áž€áŸ’áž™ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹áž¢ážáŸ’ážáž”áž‘ áž¢áŸ’áž“áž€â€‹áž“áž¹áž„â€‹ážáŸ’ážšáž¼ážœážáŸ‚â€‹áž•áŸ’áž›áž¶ážŸáŸ‹áž”áŸ’ážŠáž¼ážšâ€‹áž”áŸ‰áž¶ážšáŸ‰áž¶áž˜áŸ‰áŸ‚ážáŸ’ážšâ€‹áž“áŸ…â€‹áž€áŸ’áž“áž»áž„ áž”áž‰áŸ’áž‡áž¸â€‹"
-#~ "ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážšáž”ážŸáŸ‹â€‹ážœáž¸áž“ážŠáž¼Â áŸ”"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸâ€‹áž™áŸ‰áž¶áž„â€‹ážáŸ’áž›áž¶áŸ†áž„â€‹áž²áŸ’áž™â€‹áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž“áŸáŸ‡Â áŸ” áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž’áŸ’ážœáž¾â€‹ážŠáž¼áž…áŸ’áž“áŸáŸ‡ ážŸáž¼áž˜â€‹áž”áŸ’ážšáž¶áž€ážŠâ€‹ážáž¶ áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹"
+"áž¯áž€ážŸáž¶ážš /etc/samba/smbpasswd ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœ áž áž¾áž™â€‹áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹áž€áŸ†ážŽážáŸ‹â€‹áž–áž¶áž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ ážŠáž¼áž…áŸ’áž“áŸáŸ‡â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾â€‹"
+"áž˜áŸ’áž“áž¶áž€áŸ‹áŸ— áž¢áž¶áž…â€‹áž”áŸ’ážšáž¾â€‹áž–áž¶áž€áŸ’áž™â€‹áž”áž‰áŸ’áž‡áž¶ smbpasswdÂ áŸ”"
 
-#  Type: boolean
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "ážŠáŸáž˜áž·áž“ "
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹ážšážáŸ‹ Samba ážáž¶áž˜â€‹ážœáž·áž’áž¸â€‹ážŽáž¶Â ?"
+
+#  Type: select
+#  Description
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"ážŠáŸáž˜áž·áž“ Samba smbd áž¢áž¶áž…ážšážáŸ‹áž‡áž¶ážŠáŸáž˜áž·áž“áž’áž˜áŸ’áž˜ážáž¶ áž¬áž–áž¸ inetdÂ áŸ” áž€áž¶ážšážšážáŸ‹áž‡áž¶ážŠáŸáž˜áž·áž“áž˜áž½áž™ážáŸ’ážšáž¼ážœáž”áž¶áž“áž•áŸ’ážŠáž›áŸ‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸÂ áŸ”"
+
+#  Type: string
 #  Description
+#, fuzzy
+#~| msgid ""
+#~| "Please specify the workgroup you want this server to appear to be in "
+#~| "when queried by clients. Note that this parameter also controls the "
+#~| "domain name used with the security=domain setting."
 #~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
+#~ "Please specify the domain you want this server to appear to be in when "
+#~ "queried by clients."
 #~ msgstr ""
-#~ "áž”áž¶áž“â€‹áž•áŸ’ážŠáž›áŸ‹â€‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸâ€‹áž™áŸ‰áž¶áž„â€‹ážáŸ’áž›áž¶áŸ†áž„â€‹áž²áŸ’áž™â€‹áž¢áž“áž»áž‰áŸ’áž‰áž¶ážâ€‹áž‡áž˜áŸ’ážšáž¾ážŸâ€‹áž“áŸáŸ‡Â áŸ” áž”áŸ’ážšážŸáž·áž“â€‹áž”áž¾â€‹áž¢áŸ’áž“áž€â€‹áž’áŸ’ážœáž¾â€‹ážŠáž¼áž…áŸ’áž“áŸáŸ‡ ážŸáž¼áž˜â€‹áž”áŸ’ážšáž¶áž€ážŠâ€‹ážáž¶ áž¢áŸ’áž“áž€â€‹áž˜áž¶áž“â€‹"
-#~ "áž¯áž€ážŸáž¶ážš /etc/samba/smbpasswd ážáŸ’ážšáž¹áž˜ážáŸ’ážšáž¼ážœ áž áž¾áž™â€‹áž¢áŸ’áž“áž€â€‹áž”áž¶áž“â€‹áž€áŸ†ážŽážáŸ‹â€‹áž–áž¶áž€áŸ’áž™â€‹ážŸáž˜áŸ’áž„áž¶ážáŸ‹â€‹ ážŠáž¼áž…áŸ’áž“áŸáŸ‡â€‹ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹áž¢áŸ’áž“áž€â€‹áž”áŸ’ážšáž¾â€‹"
-#~ "áž˜áŸ’áž“áž¶áž€áŸ‹áŸ— áž¢áž¶áž…â€‹áž”áŸ’ážšáž¾â€‹áž–áž¶áž€áŸ’áž™â€‹áž”áž‰áŸ’áž‡áž¶ smbpasswdÂ áŸ”"
+#~ "ážŸáž¼áž˜â€‹áž”áž‰áŸ’áž‡áž¶áž€áŸ‹â€‹áž€áŸ’ážšáž»áž˜â€‹áž€áž¶ážšáž„áž¶ážšâ€‹ážŠáŸ‚áž›â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹áž²áŸ’áž™â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž”áž˜áŸ’ážšáž¾â€‹áž“áŸáŸ‡â€‹áž”áž„áŸ’áž áž¶áž‰â€‹áž“áŸ…â€‹áž–áŸáž›â€‹ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹ážŸáž½ážš ážŠáŸ„áž™â€‹áž˜áŸ‰áž¶ážŸáŸŠáž¸áž“â€‹áž—áŸ’áž‰áŸ€ážœÂ áŸ” áž…áŸ†ážŽáž¶áŸ†â€‹"
+#~ "ážáž¶ áž”áŸ‰áž¶ážšáŸ‰áž¶áž˜áŸ‰áŸ‚ážáŸ’ážšâ€‹áž“áŸáŸ‡â€‹áž€áŸâ€‹ážáŸ’ážšáž½ážâ€‹áž–áž·áž“áž·ážáŸ’áž™â€‹ážˆáŸ’áž˜áŸ„áŸ‡â€‹ážŠáŸ‚áž“ ážŠáŸ‚áž›â€‹áž”áž¶áž“â€‹áž”áŸ’ážšáž¾â€‹ážŠáŸ„áž™â€‹ážŸáž»ážœážáŸ’ážáž·áž—áž¶áž–=áž€áž¶ážšâ€‹áž€áŸ†ážŽážáŸ‹â€‹ážŠáŸ‚áž“Â áŸ”"
 
 #  Type: boolean
 #  Description
@@ -290,23 +370,6 @@ msgstr ""
 #~ "ážŸáž˜áŸ’ážšáž¶áž”áŸ‹â€‹ážŸáŸáž…áž€áŸ’ážáž¸â€‹áž›áž˜áŸ’áž¢áž·ážâ€‹áž”áž“áŸ’ážáŸ‚áž˜â€‹ážŸáž¼áž˜â€‹áž˜áž¾áž›  /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
 #~ "html áž–áž¸â€‹áž€áž‰áŸ’áž…áž”áŸ‹ samba-docÂ áŸ”"
 
-#~ msgid "daemons"
-#~ msgstr "ážŠáŸáž˜áž·áž“ "
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "ážáž¾â€‹áž¢áŸ’áž“áž€â€‹áž…áž„áŸ‹â€‹ážšážáŸ‹ Samba ážáž¶áž˜â€‹ážœáž·áž’áž¸â€‹ážŽáž¶Â ?"
-
-#  Type: select
-#  Description
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "ážŠáŸáž˜áž·áž“ Samba smbd áž¢áž¶áž…ážšážáŸ‹áž‡áž¶ážŠáŸáž˜áž·áž“áž’áž˜áŸ’áž˜ážáž¶ áž¬áž–áž¸ inetdÂ áŸ” áž€áž¶ážšážšážáŸ‹áž‡áž¶ážŠáŸáž˜áž·áž“áž˜áž½áž™ážáŸ’ážšáž¼ážœáž”áž¶áž“áž•áŸ’ážŠáž›áŸ‹áž¢áž“áž»ážŸáž¶ážŸáž“áŸÂ áŸ”"
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "áž˜áž·áž“áž‚áž¶áŸ†áž‘áŸ’ážšâ€‹áž€áž¶ážšâ€‹ážŠáž¶áž€áŸ‹â€‹áž€áž˜áŸ’áž˜ážœáž·áž’áž¸â€‹ážáž¶áž„â€‹áž€áŸ’ážšáŸ„áž™ passdb áž‡áž¶â€‹áž›áŸ†ážŠáž¶áž”áŸ‹"
 
diff --git a/debian/po/ko.po b/debian/po/ko.po
index 5af2afa..34f4eab 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -3,8 +3,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-06-24 18:36-0400\n"
 "Last-Translator: Sunjae Park <darehanl at gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean at lists.debian.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "ì‚¼ë°”3ë¡œë¶€í„° ì—…ê·¸ë ˆì´ë“œí• ê¹Œìš”?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -34,13 +34,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -49,7 +49,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -58,7 +58,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -74,15 +74,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 #, fuzzy
-#| msgid "Realm:"
 msgid "Realm name:"
 msgstr "ì˜ì—:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -90,63 +89,190 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"ì´ ì˜µì…˜ì„ ì„ íƒí•˜ì§€ ì•Šì„ ê²½ìš° ì‚¼ë°”ëŠ” ì„¤ì • ì•ˆ ëœ ìƒíƒœ ê·¸ëŒ€ë¡œ ìžˆê²Œ ë˜ë©°, ì§ì ‘ ì„¤"
+"ì •í•˜ì…”ì•¼ í•©ë‹ˆë‹¤."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "ë„ë©”ì¸ ì´ë¦„:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "ì‚¼ë°”4ë¥¼ PDCë¡œ ì„¤ì •í• ê¹Œìš”?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "ì´ ì˜µì…˜ì„ ì„ íƒí•˜ì§€ ì•Šì„ ê²½ìš° ì‚¼ë°”ëŠ” ì„¤ì • ì•ˆ ëœ ìƒíƒœ ê·¸ëŒ€ë¡œ ìžˆê²Œ ë˜ë©°, ì§"
-#~ "ì ‘ ì„¤ì •í•˜ì…”ì•¼ í•©ë‹ˆë‹¤."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -161,9 +287,6 @@ msgstr ""
 #~ "ì´ ì„œë²„ê°€ ì†Œì†ë  Kerberos ì˜ì—ì„ ì§€ì •í•´ ì£¼ì‹ì‹œì˜¤. ë§Žì€ ê²½ìš° DNS ë„ë©”ì¸ ì´"
 #~ "ë¦„ê³¼ ê°™ì„ ê²ƒìž…ë‹ˆë‹¤."
 
-#~ msgid "Domain Name:"
-#~ msgstr "ë„ë©”ì¸ ì´ë¦„:"
-
 #~ msgid ""
 #~ "Please specify the domain you want this server to appear to be in when "
 #~ "queried by clients."
diff --git a/debian/po/ku.po b/debian/po/ku.po
index 2c1f981..5371246 100644
--- a/debian/po/ku.po
+++ b/debian/po/ku.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_ku\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-05-08 13:02+0200\n"
 "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n"
 "Language-Team: ku <ubuntu-l10n-kur at lists.ubuntu.com>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -75,13 +75,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -89,72 +89,183 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"Bila smb.conf were guherandin da ku mÃ®hengÃªn WINS ji DHCP werin bikaranÃ®n?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "Ji bo bikaranÃ®na vÃª fonksiyonÃª divÃª pakÃªta dhcp3-client were sazkirin."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Bila smb.conf were jixweber mÃ®hengkirin?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "NavÃª Koma Xebate/Domain:"
+msgid "Workgroup/Domain Name:"
+msgstr "NavÃª Koma Xebate/Domain:"
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "Bila smb.conf were guherandin da ku mÃ®hengÃªn WINS ji DHCP werin bikaranÃ®n?"
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
 
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Ji bo bikaranÃ®na vÃª fonksiyonÃª divÃª pakÃªta dhcp3-client were sazkirin."
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
 
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Bila smb.conf were jixweber mÃ®hengkirin?"
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "DixwazÃ® Samba Ã§awa bixebitÃ®nÃ®?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
 
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Danegeha ÅŸÃ®freyÃªn samba, /var/lib/samba/passdb.tdb, were afirandin?"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "DixwazÃ® Samba Ã§awa bixebitÃ®nÃ®?"
diff --git a/debian/po/lt.po b/debian/po/lt.po
index c322205..3f94e1b 100644
--- a/debian/po/lt.po
+++ b/debian/po/lt.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba-lt\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-06-24 23:47+0300\n"
 "Last-Translator: Gintautas Miliauskas <gintas at akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt at konferencijos.lt>\n"
@@ -29,13 +29,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Migruoti nuo Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -46,13 +46,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -61,7 +61,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -70,7 +70,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -78,7 +78,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -86,15 +86,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 #, fuzzy
-#| msgid "Realm:"
 msgid "Realm name:"
 msgstr "Sritis:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -102,63 +101,214 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Pakeisti smb.conf, kad bÅ«tÅ³ naudojami WINS nustatymai iÅ¡ DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Jei Å¡is kompiuteris gauna IP adresus iÅ¡ tinklo DHCP serverio, DHCP serveris "
+"taip pat gali teikti informacijÄ… apie tinklo WINS serverius (NetBIOS vardÅ³ "
+"serverius).  Kad WINS nustatymai, gauti per DHCP (saugomi rinkmenoje /etc/"
+"samba/dhcp.conf), bÅ«tÅ³ naudojami, reikia pakeisti rinkmenÄ… smb.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Kad bÅ«tÅ³ galima pasinaudoti Å¡ia galimybe, turi bÅ«ti Ä¯diegtas paketas dhcp3-"
+"client."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "AutomatiÅ¡kai konfigÅ«ruoti smb.conf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Likusi Samba konfigÅ«ravimo dalis susijusi su parametrais, nustatomais Samba "
+"konfigÅ«racijos rinkmenoje -- /etc/samba/smb.conf. Å i rinkmena konfigÅ«ruoja "
+"Samba programas (nmbd ir smbd). Esamame smb.conf yra â€žincludeâ€œ komanda arba "
+"nustatymas, uÅ¾raÅ¡ytas per kelias eilutes. Tai gali sutrikdyti automatinÄ¯ "
+"konfigÅ«ravimo procesÄ…, todÄ—l gali prireikti rankiniu bÅ«du paredaguoti smb."
+"conf, kad Samba vÄ—l pradÄ—tÅ³ veikti."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Jei nepasirinksite Å¡ios galimybÄ—s, Samba bus palikta nesukonfigÅ«ruota. "
+"TurÄ—site tai atlikti rankiniu bÅ«du."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Domeno vardas:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Naudoti slaptaÅ¾odÅ¾iÅ³ Å¡ifravimÄ…?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Visos nesenos Windows sistemos bendraudamos su SMB serveriu naudoja "
+"Å¡ifruotus slaptaÅ¾odÅ¾ius. Jei norite naudoti neÅ¡ifruotus slaptaÅ¾odÅ¾ius, "
+"reikia pakeisti reikÅ¡mÄ™ Windows registre."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Labai rekomenduojama pasirinkti Å¡iÄ… galimybÄ™. Jei pasirinksite Å¡ifruotus "
+"slaptaÅ¾odÅ¾ius, Ä¯sitikinkite, kad turite taisyklingÄ… /etc/samba/smbpasswd "
+"rinkmenÄ… ir kad ten nurodyti visÅ³ naudotojÅ³, naudojanÄiÅ³ smbpasswd, "
+"slaptaÅ¾odÅ¾iai."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "tarnybos"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Kokiu bÅ«du norite leisti Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba tarnyba smbd gali veikti kaip Ä¯prastinÄ— tarnyba arba ji gali bÅ«ti "
+"paleidÅ¾iama iÅ¡ inetd. Rekomenduojama Samba naudoti kaip Ä¯prastinÄ™ tarnybÄ…."
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Nustatyti Samba 4 kaip PDC (pagrindinÄ¯ domenÅ³ valdiklÄ¯)?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Jei nepasirinksite Å¡ios galimybÄ—s, Samba bus palikta nesukonfigÅ«ruota. "
-#~ "TurÄ—site tai atlikti rankiniu bÅ«du."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -174,10 +324,6 @@ msgstr ""
 #~ "Nurodykite Kerberos sritÄ¯, kuriai priklausys Å¡is serveris. Daugeliu "
 #~ "atvejÅ³ ji sutaps su DNS vardÅ³ sritimi."
 
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Domeno vardas:"
-
 #~| msgid ""
 #~| "Please specify the workgroup you want this server to appear to be in "
 #~| "when queried by clients. Note that this parameter also controls the "
@@ -189,69 +335,6 @@ msgstr ""
 #~ "Nurodykite domenÄ…, kuriam Å¡is serveris turÄ—tÅ³ priklausyti klientams, "
 #~ "siunÄiantiems uÅ¾klausas."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Pakeisti smb.conf, kad bÅ«tÅ³ naudojami WINS nustatymai iÅ¡ DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Jei Å¡is kompiuteris gauna IP adresus iÅ¡ tinklo DHCP serverio, DHCP "
-#~ "serveris taip pat gali teikti informacijÄ… apie tinklo WINS serverius "
-#~ "(NetBIOS vardÅ³ serverius).  Kad WINS nustatymai, gauti per DHCP (saugomi "
-#~ "rinkmenoje /etc/samba/dhcp.conf), bÅ«tÅ³ naudojami, reikia pakeisti "
-#~ "rinkmenÄ… smb.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Kad bÅ«tÅ³ galima pasinaudoti Å¡ia galimybe, turi bÅ«ti Ä¯diegtas paketas "
-#~ "dhcp3-client."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "AutomatiÅ¡kai konfigÅ«ruoti smb.conf?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Likusi Samba konfigÅ«ravimo dalis susijusi su parametrais, nustatomais "
-#~ "Samba konfigÅ«racijos rinkmenoje -- /etc/samba/smb.conf. Å i rinkmena "
-#~ "konfigÅ«ruoja Samba programas (nmbd ir smbd). Esamame smb.conf yra "
-#~ "â€žincludeâ€œ komanda arba nustatymas, uÅ¾raÅ¡ytas per kelias eilutes. Tai gali "
-#~ "sutrikdyti automatinÄ¯ konfigÅ«ravimo procesÄ…, todÄ—l gali prireikti "
-#~ "rankiniu bÅ«du paredaguoti smb.conf, kad Samba vÄ—l pradÄ—tÅ³ veikti."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Naudoti slaptaÅ¾odÅ¾iÅ³ Å¡ifravimÄ…?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Visos nesenos Windows sistemos bendraudamos su SMB serveriu naudoja "
-#~ "Å¡ifruotus slaptaÅ¾odÅ¾ius. Jei norite naudoti neÅ¡ifruotus slaptaÅ¾odÅ¾ius, "
-#~ "reikia pakeisti reikÅ¡mÄ™ Windows registre."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Labai rekomenduojama pasirinkti Å¡iÄ… galimybÄ™. Jei pasirinksite Å¡ifruotus "
-#~ "slaptaÅ¾odÅ¾ius, Ä¯sitikinkite, kad turite taisyklingÄ… /etc/samba/smbpasswd "
-#~ "rinkmenÄ… ir kad ten nurodyti visÅ³ naudotojÅ³, naudojanÄiÅ³ smbpasswd, "
-#~ "slaptaÅ¾odÅ¾iai."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Sukurti slaptaÅ¾odÅ¾iÅ³ duomenÅ³ bazÄ™, /var/lib/samba/passdb.tdb?"
 
@@ -284,22 +367,6 @@ msgstr ""
 #~ "Daugiau informacijos galite rasti rinkmenoje /usr/share/doc/samba-doc/"
 #~ "htmldocs/ENCRYPTION.html iÅ¡ paketo samba-doc."
 
-#~ msgid "daemons"
-#~ msgstr "tarnybos"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Kokiu bÅ«du norite leisti Samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samba tarnyba smbd gali veikti kaip Ä¯prastinÄ— tarnyba arba ji gali bÅ«ti "
-#~ "paleidÅ¾iama iÅ¡ inetd. Rekomenduojama Samba naudoti kaip Ä¯prastinÄ™ tarnybÄ…."
-
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr "Perkelti /etc/samba/smbpasswd Ä¯ /var/lib/samba/passdb.tdb?"
 
diff --git a/debian/po/ml.po b/debian/po/ml.po
index ecfcc68..fe0cb15 100644
--- a/debian/po/ml.po
+++ b/debian/po/ml.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2006-12-11 19:30+0530\n"
 "Last-Translator: Praveen A <pravi.a at gmail.com>\n"
 "Language-Team: Swathanthra Malayalam Computing <smc-discuss at googlegroups."
@@ -29,13 +29,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -44,13 +44,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -84,13 +84,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -98,69 +98,210 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "DHCP à´¯à´¿à´²àµâ€ à´¨à´¿à´¨àµà´¨àµà´³àµà´³ WINS à´¸àµ†à´±àµà´±à´¿à´™àµà´™àµà´•à´³àµâ€ à´‰à´ªà´¯àµ‹à´—à´¿à´•àµà´•à´¾à´¨àµâ€ smb.conf à´®à´¾à´±àµà´±à´£àµ‹?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´•à´®àµà´ªàµà´¯àµ‚à´Ÿàµà´Ÿà´±à´¿à´¨àµ à´à´ªà´¿ à´µà´¿à´²à´¾à´¸ à´µà´¿à´µà´°à´‚ à´¨àµ†à´±àµà´±àµà´µà´°àµâ€à´•àµà´•à´¿à´²àµ† à´’à´°àµ DHCP à´¸àµ‡à´µà´•à´¨à´¿à´²àµâ€ à´¨à´¿à´¨àµà´¨àµà´®à´¾à´£àµ "
+"à´²à´à´¿à´•àµà´•àµà´¨àµà´¨à´¤àµ†à´™àµà´•à´¿à´²àµâ€, DHCP à´¸àµ‡à´µà´•à´¨àµâ€ à´¨àµ†à´±àµà´±àµà´µà´°àµâ€à´•àµà´•à´¿à´²àµà´³àµà´³ WINS (\"NetBIOS à´¨à´¾à´® à´¸àµ‡à´µà´•à´°àµâ€\") "
+"à´¸àµ‡à´µà´•à´¨àµà´®à´¾à´°àµ†à´•àµà´•àµà´±à´¿à´šàµà´šàµà´³àµà´³ à´µà´¿à´µà´°à´™àµà´™à´³àµâ€ à´•àµ‚à´Ÿà´¿ à´¨à´²àµà´•à´¿à´¯àµ‡à´•àµà´•à´¾à´‚. DHCP-à´¨à´²àµà´•à´¿à´¯ WINS à´¸à´œàµà´œàµ€à´•à´°à´£à´™àµà´™à´³àµâ€  /etc/"
+"samba/dhcp.conf à´²àµâ€ à´¨à´¿à´¨àµà´¨àµà´‚ à´¸àµà´µà´¯à´®àµ‡ à´µà´¾à´¯à´¿à´•àµà´•àµà´¨àµà´¨à´¤à´¿à´¨àµ à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† smb.conf à´«à´¯à´²à´¿à´²àµâ€ à´’à´°àµ à´®à´¾à´±àµà´±à´‚ "
+"à´†à´µà´¶àµà´¯à´®à´¾à´£àµ."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "à´ˆ à´•à´´à´¿à´µàµà´ªà´¯àµ‹à´—à´¿à´•àµà´•à´¾à´¨àµâ€ dhcp3-client à´ªà´¾à´•àµà´•àµ‡à´œàµ à´‡à´¨àµâ€à´¸àµà´±àµà´±à´¾à´³àµâ€â€ à´šàµ†à´¯àµà´¤à´¿à´°à´¿à´•àµà´•àµ‡à´£àµà´Ÿà´¤àµà´£àµà´Ÿàµ."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "smb.conf à´¸àµà´µà´¯à´®àµ‡ à´•àµà´°à´®àµ€à´•à´°à´¿à´•àµà´•à´£àµ‹?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "à´ˆ à´¤à´¿à´°à´žàµà´žàµ†à´Ÿàµà´•àµà´•à´¾à´µàµà´¨àµà´¨ à´µà´¿à´² à´¨à´¿à´™àµà´™à´³àµâ€â€ à´¤à´¿à´°à´žàµà´žà´Ÿàµà´¤àµà´¤à´¿à´²àµà´²àµ†à´™àµà´•à´¿à´²àµâ€ à´Žà´¨àµà´¤àµ†à´™àµà´•à´¿à´²àµà´‚ à´•àµà´°à´®àµ€à´•à´°à´£ à´®à´¾à´±àµà´±à´™àµà´™à´³àµâ€ "
-#~ "à´¨à´¿à´™àµà´™à´³àµâ€à´•àµà´•àµ à´¸àµà´µà´¯à´‚ à´•àµˆà´•à´¾à´°àµà´¯à´‚ à´šàµ†à´¯àµà´¯àµ‡à´£àµà´Ÿà´¿ à´µà´°àµà´•à´¯àµà´‚ à´¸à´®à´¯à´¾à´¸à´®à´¯à´™àµà´™à´³à´¿à´²àµà´³àµà´³ à´•àµà´°à´®àµ€à´•à´°à´£ à´ªàµà´°àµ‹à´—à´¤à´¿à´•à´³àµà´Ÿàµ† "
-#~ "à´®àµà´¨àµâ€à´¤àµ‚à´•àµà´•à´‚ à´¨àµ‡à´Ÿà´¾à´¨àµâ€ à´¨à´¿à´™àµà´™à´³àµâ€à´•àµà´•àµ à´¸à´¾à´§à´¿à´•àµà´•à´¾à´¤àµ† à´µà´°àµà´•à´¯àµà´‚ à´šàµ†à´¯àµà´¯àµà´‚."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"à´¬à´¾à´•àµà´•à´¿à´¯àµà´³àµà´³ à´¸à´¾à´‚à´¬ à´•àµà´°à´®àµ€à´•à´°à´£à´‚ à´¸à´¾à´‚à´¬ à´ªàµà´°àµ‹à´—àµà´°à´¾à´®àµà´•à´³àµ† (nmbd à´¯àµà´‚ smbd) à´•àµà´°à´®àµ€à´•à´°à´¿à´•àµà´•à´¾à´¨àµà´ªà´¯àµ‹à´—à´¿à´•àµà´•àµà´¨àµà´¨ "
+"à´«à´¯à´²à´¾à´¯ /etc/samba/smb.conf à´²àµ† à´ªà´°à´¾à´®àµ€à´±àµà´±à´±àµà´•à´³àµ† à´¬à´¾à´§à´¿à´•àµà´•àµà´¨àµà´¨ à´šàµ‹à´¦àµà´¯à´™àµà´™à´³àµà´®à´¾à´¯à´¿ à´¬à´¨àµà´§à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´¤à´¾à´£àµ. "
+"à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´‡à´ªàµà´ªàµ‹à´´à´¤àµà´¤àµ† smb.conf à´’à´°àµ 'include' à´µà´°à´¿ à´…à´²àµà´²àµ†à´™àµà´•à´¿à´²àµâ€ à´’à´¨àµà´¨à´¿à´²à´§à´¿à´•à´‚ à´µà´°à´¿à´¯à´¿à´²àµâ€ "
+"à´µàµà´¯à´¾à´ªà´¿à´šàµà´šàµà´³àµà´³ à´’à´°àµ à´¤à´¿à´°à´žàµà´žàµ†à´Ÿàµà´•àµà´•à´¾à´µàµà´¨àµà´¨ à´µà´¿à´² à´‰à´³àµâ€â€Œà´•àµà´•àµŠà´³àµà´³àµà´¨àµà´¨à´¤à´¾à´£àµ, à´…à´¤àµ à´¸àµà´µà´¯à´®àµ‡à´¯àµà´³àµà´³ à´•àµà´°à´®àµ€à´•à´°à´£ à´ªàµà´°à´•àµà´°à´¿à´¯à´¯àµ† "
+"à´†à´¶à´¯à´•àµà´•àµà´´à´ªàµà´ªà´¤àµà´¤à´¿à´²à´¾à´•àµà´•àµà´•à´¯àµà´‚ à´µàµ€à´£àµà´Ÿàµà´‚ à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´•àµà´•àµà´¨àµà´¨ à´µà´¿à´§à´¤àµà´¤à´¿à´²à´¾à´•àµà´•à´¾à´¨àµâ€ smb.conf à´•àµˆà´•àµŠà´£àµà´Ÿàµ à´®à´¾à´±àµà´±àµà´¨àµà´¨à´¤àµ "
+"à´†à´µà´¶àµà´¯à´®à´¾à´•àµà´•àµà´•à´¯àµà´‚ à´šàµ†à´¯àµà´¯àµà´‚."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "à´µà´°àµâ€à´•àµà´•àµà´—àµà´°àµ‚à´ªàµà´ªàµ/à´¡àµŠà´®àµˆà´¨àµâ€ à´¨à´¾à´®à´‚:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"à´ˆ à´¤à´¿à´°à´žàµà´žàµ†à´Ÿàµà´•àµà´•à´¾à´µàµà´¨àµà´¨ à´µà´¿à´² à´¨à´¿à´™àµà´™à´³àµâ€â€ à´¤à´¿à´°à´žàµà´žà´Ÿàµà´¤àµà´¤à´¿à´²àµà´²àµ†à´™àµà´•à´¿à´²àµâ€ à´Žà´¨àµà´¤àµ†à´™àµà´•à´¿à´²àµà´‚ à´•àµà´°à´®àµ€à´•à´°à´£ à´®à´¾à´±àµà´±à´™àµà´™à´³àµâ€ à´¨à´¿à´™àµà´™à´³àµâ€à´•àµà´•àµ "
+"à´¸àµà´µà´¯à´‚ à´•àµˆà´•à´¾à´°àµà´¯à´‚ à´šàµ†à´¯àµà´¯àµ‡à´£àµà´Ÿà´¿ à´µà´°àµà´•à´¯àµà´‚ à´¸à´®à´¯à´¾à´¸à´®à´¯à´™àµà´™à´³à´¿à´²àµà´³àµà´³ à´•àµà´°à´®àµ€à´•à´°à´£ à´ªàµà´°àµ‹à´—à´¤à´¿à´•à´³àµà´Ÿàµ† à´®àµà´¨àµâ€à´¤àµ‚à´•àµà´•à´‚ à´¨àµ‡à´Ÿà´¾à´¨àµâ€ "
+"à´¨à´¿à´™àµà´™à´³àµâ€à´•àµà´•àµ à´¸à´¾à´§à´¿à´•àµà´•à´¾à´¤àµ† à´µà´°àµà´•à´¯àµà´‚ à´šàµ†à´¯àµà´¯àµà´‚."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "à´µà´°àµâ€à´•àµà´•àµà´—àµà´°àµ‚à´ªàµà´ªàµ/à´¡àµŠà´®àµˆà´¨àµâ€ à´¨à´¾à´®à´‚:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "à´…à´Ÿà´¯à´¾à´³à´µà´¾à´•àµà´•àµ à´Žà´¨àµâ€à´•àµà´°à´¿à´ªàµà´·à´¨àµâ€ à´‰à´ªà´¯àµ‹à´—à´¿à´•àµà´•à´£àµ‹?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"à´Žà´²àµà´²à´¾ à´ªàµà´¤à´¿à´¯ à´µà´¿à´¨àµâ€à´¡àµ‹à´¸àµ à´•àµà´²à´¯à´¨àµà´±àµà´•à´³àµà´‚ SMB à´¸àµ‡à´µà´•à´°àµà´®à´¾à´¯à´¿ à´†à´¶à´¯à´µà´¿à´¨àµà´®à´¯à´‚ à´¨à´Ÿà´¤àµà´¤àµà´¨àµà´¨à´¤àµ à´Žà´¨àµâ€à´•àµà´°à´¿à´ªàµà´±àµà´±àµ à´šàµ†à´¯àµà´¤ "
+"à´…à´Ÿà´¯à´¾à´³ à´µà´¾à´•àµà´•àµà´•à´³àµà´ªà´¯àµ‹à´—à´¿à´šàµà´šà´¾à´£àµ. à´¨à´¿à´™àµà´™à´³àµâ€ à´•àµà´²à´¿à´¯à´°àµâ€ à´Ÿàµ†à´•àµà´¸àµà´±àµà´±àµ à´…à´Ÿà´¯à´¾à´³ "
+"à´µà´¾à´•àµà´•àµà´•à´³àµà´ªà´¯àµ‹à´—à´¿à´•àµà´•à´¾à´¨à´¾à´—àµà´°à´¹à´¿à´•àµà´•àµà´¨àµà´¨àµ†à´™àµà´•à´¿à´²àµâ€ à´¨à´¿à´™àµà´™à´³àµâ€à´•àµà´•àµ à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´µà´¿à´¨àµâ€à´¡àµ‹à´¸àµ à´°à´œà´¿à´¸àµà´Ÿàµà´°à´¿à´¯à´¿à´²àµ† à´’à´°àµ à´ªà´°à´¾à´®àµ€à´±àµà´±à´°àµâ€ "
+"à´®à´¾à´±àµà´±àµ‡à´£àµà´Ÿà´¿ à´µà´°àµà´‚."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"à´ˆ à´¤à´¿à´°à´žàµà´žàµ†à´Ÿàµà´•àµà´•à´¾à´µàµà´¨àµà´¨ à´µà´¿à´² à´‡à´¨àµ‡à´¬à´¿à´³àµâ€ à´šàµ†à´¯àµà´¯àµà´¨àµà´¨à´¤à´¿à´¨àµ à´µà´³à´°àµ†à´¯à´§à´¿à´•à´‚ à´¶àµà´ªà´¾à´°àµâ€à´¶ à´šàµ†à´¯àµà´¤à´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨àµ. à´¨à´¿à´™àµà´™à´³àµâ€ "
+"à´…à´™àµà´™à´¨àµ† à´šàµ†à´¯àµà´¯àµà´•à´¯à´¾à´£àµ†à´™àµà´•à´¿à´²àµâ€ à´¨à´¿à´™àµà´™à´³àµâ€à´•àµà´•àµ à´’à´°àµ à´¯àµ‹à´—àµà´¯à´®à´¾à´¯ /etc/samba/smbpasswd à´«à´¯à´²àµà´£àµà´Ÿàµ†à´¨àµà´¨àµà´‚  "
+"smbpasswd à´Žà´¨àµà´¨ à´†à´œàµà´ž à´‰à´ªà´¯àµ‹à´—à´¿à´šàµà´šàµ à´“à´°àµ‹ à´‰à´ªà´¯àµ‹à´•àµà´¤à´¾à´•àµà´•à´³àµâ€à´•àµà´•àµà´‚ à´…à´µà´¿à´Ÿàµ† à´…à´Ÿà´¯à´¾à´³ à´µà´¾à´•àµà´•àµ à´¸àµ†à´±àµà´±àµ à´šàµ†à´¯àµà´¤àµ à´Žà´¨àµà´¨àµ "
+"à´‰à´±à´ªàµà´ªà´¾à´•àµà´•àµà´•à´¯àµà´‚ à´šàµ†à´¯àµà´¯àµà´•."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "à´¡àµ†à´®à´£àµà´•à´³àµâ€"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "à´¸à´¾à´‚à´¬ à´Žà´™àµà´™à´¨àµ† à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´ªàµà´ªà´¿à´•àµà´•à´¾à´¨à´¾à´£àµ à´¨à´¿à´™àµà´™à´³à´¾à´—àµà´°à´¹à´¿à´•àµà´•àµà´¨àµà´¨à´¤àµ?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"à´¸à´¾à´‚à´¬ à´¡àµ†à´®à´£àµâ€ smbd à´’à´°àµ à´¸à´¾à´§à´¾à´°à´£ à´¡àµ†à´®à´£à´¾à´¯àµ‹ à´…à´²àµà´²àµ†à´™àµà´•à´¿à´²àµâ€ inetd à´¯à´¿à´²àµâ€ à´¨à´¿à´¨àµà´¨àµ‹ "
+"à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´ªàµà´ªà´¿à´•àµà´•à´¾à´µàµà´¨àµà´¨à´¤à´¾à´£àµ. à´¡àµ†à´®à´£à´¾à´¯à´¿ à´“à´Ÿà´¿à´•àµà´•àµà´¨àµà´¨à´¤à´¾à´£àµ à´¶àµà´ªà´¾à´°àµâ€à´¶ à´šàµ†à´¯àµà´¤à´¿à´Ÿàµà´Ÿàµà´³àµà´³ à´µà´´à´¿."
 
 #, fuzzy
 #~| msgid ""
@@ -175,68 +316,6 @@ msgstr ""
 #~ "à´ªà´°à´¾à´®àµ€à´±àµà´±à´°àµâ€ security=domain à´Žà´¨àµà´¨ à´¸à´œàµà´œàµ€à´•à´°à´£à´¤àµà´¤à´¿à´²àµà´ªà´¯àµ‹à´—à´¿à´•àµà´•àµà´¨àµà´¨ à´¡àµŠà´®àµˆà´¨àµâ€ à´¨à´¾à´®à´¤àµà´¤àµ‡à´¯àµà´‚ "
 #~ "à´¨à´¿à´¯à´¨àµà´¤àµà´°à´¿à´•àµà´•àµà´¨àµà´¨àµ à´Žà´¨àµà´¨àµ‹à´°àµâ€à´•àµà´•àµà´•."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "DHCP à´¯à´¿à´²àµâ€ à´¨à´¿à´¨àµà´¨àµà´³àµà´³ WINS à´¸àµ†à´±àµà´±à´¿à´™àµà´™àµà´•à´³àµâ€ à´‰à´ªà´¯àµ‹à´—à´¿à´•àµà´•à´¾à´¨àµâ€ smb.conf à´®à´¾à´±àµà´±à´£àµ‹?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´•à´®àµà´ªàµà´¯àµ‚à´Ÿàµà´Ÿà´±à´¿à´¨àµ à´à´ªà´¿ à´µà´¿à´²à´¾à´¸ à´µà´¿à´µà´°à´‚ à´¨àµ†à´±àµà´±àµà´µà´°àµâ€à´•àµà´•à´¿à´²àµ† à´’à´°àµ DHCP à´¸àµ‡à´µà´•à´¨à´¿à´²àµâ€ à´¨à´¿à´¨àµà´¨àµà´®à´¾à´£àµ "
-#~ "à´²à´à´¿à´•àµà´•àµà´¨àµà´¨à´¤àµ†à´™àµà´•à´¿à´²àµâ€, DHCP à´¸àµ‡à´µà´•à´¨àµâ€ à´¨àµ†à´±àµà´±àµà´µà´°àµâ€à´•àµà´•à´¿à´²àµà´³àµà´³ WINS (\"NetBIOS à´¨à´¾à´® à´¸àµ‡à´µà´•à´°àµâ€\") "
-#~ "à´¸àµ‡à´µà´•à´¨àµà´®à´¾à´°àµ†à´•àµà´•àµà´±à´¿à´šàµà´šàµà´³àµà´³ à´µà´¿à´µà´°à´™àµà´™à´³àµâ€ à´•àµ‚à´Ÿà´¿ à´¨à´²àµà´•à´¿à´¯àµ‡à´•àµà´•à´¾à´‚. DHCP-à´¨à´²àµà´•à´¿à´¯ WINS à´¸à´œàµà´œàµ€à´•à´°à´£à´™àµà´™à´³àµâ€  /"
-#~ "etc/samba/dhcp.conf à´²àµâ€ à´¨à´¿à´¨àµà´¨àµà´‚ à´¸àµà´µà´¯à´®àµ‡ à´µà´¾à´¯à´¿à´•àµà´•àµà´¨àµà´¨à´¤à´¿à´¨àµ à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† smb.conf à´«à´¯à´²à´¿à´²àµâ€ à´’à´°àµ "
-#~ "à´®à´¾à´±àµà´±à´‚ à´†à´µà´¶àµà´¯à´®à´¾à´£àµ."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "à´ˆ à´•à´´à´¿à´µàµà´ªà´¯àµ‹à´—à´¿à´•àµà´•à´¾à´¨àµâ€ dhcp3-client à´ªà´¾à´•àµà´•àµ‡à´œàµ à´‡à´¨àµâ€à´¸àµà´±àµà´±à´¾à´³àµâ€â€ à´šàµ†à´¯àµà´¤à´¿à´°à´¿à´•àµà´•àµ‡à´£àµà´Ÿà´¤àµà´£àµà´Ÿàµ."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "smb.conf à´¸àµà´µà´¯à´®àµ‡ à´•àµà´°à´®àµ€à´•à´°à´¿à´•àµà´•à´£àµ‹?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "à´¬à´¾à´•àµà´•à´¿à´¯àµà´³àµà´³ à´¸à´¾à´‚à´¬ à´•àµà´°à´®àµ€à´•à´°à´£à´‚ à´¸à´¾à´‚à´¬ à´ªàµà´°àµ‹à´—àµà´°à´¾à´®àµà´•à´³àµ† (nmbd à´¯àµà´‚ smbd) "
-#~ "à´•àµà´°à´®àµ€à´•à´°à´¿à´•àµà´•à´¾à´¨àµà´ªà´¯àµ‹à´—à´¿à´•àµà´•àµà´¨àµà´¨ à´«à´¯à´²à´¾à´¯ /etc/samba/smb.conf à´²àµ† à´ªà´°à´¾à´®àµ€à´±àµà´±à´±àµà´•à´³àµ† à´¬à´¾à´§à´¿à´•àµà´•àµà´¨àµà´¨ "
-#~ "à´šàµ‹à´¦àµà´¯à´™àµà´™à´³àµà´®à´¾à´¯à´¿ à´¬à´¨àµà´§à´ªàµà´ªàµ†à´Ÿàµà´Ÿà´¤à´¾à´£àµ. à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´‡à´ªàµà´ªàµ‹à´´à´¤àµà´¤àµ† smb.conf à´’à´°àµ 'include' à´µà´°à´¿ "
-#~ "à´…à´²àµà´²àµ†à´™àµà´•à´¿à´²àµâ€ à´’à´¨àµà´¨à´¿à´²à´§à´¿à´•à´‚ à´µà´°à´¿à´¯à´¿à´²àµâ€ à´µàµà´¯à´¾à´ªà´¿à´šàµà´šàµà´³àµà´³ à´’à´°àµ à´¤à´¿à´°à´žàµà´žàµ†à´Ÿàµà´•àµà´•à´¾à´µàµà´¨àµà´¨ à´µà´¿à´² à´‰à´³àµâ€â€Œà´•àµà´•àµŠà´³àµà´³àµà´¨àµà´¨à´¤à´¾à´£àµ, à´…à´¤àµ "
-#~ "à´¸àµà´µà´¯à´®àµ‡à´¯àµà´³àµà´³ à´•àµà´°à´®àµ€à´•à´°à´£ à´ªàµà´°à´•àµà´°à´¿à´¯à´¯àµ† à´†à´¶à´¯à´•àµà´•àµà´´à´ªàµà´ªà´¤àµà´¤à´¿à´²à´¾à´•àµà´•àµà´•à´¯àµà´‚ à´µàµ€à´£àµà´Ÿàµà´‚ à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´•àµà´•àµà´¨àµà´¨ "
-#~ "à´µà´¿à´§à´¤àµà´¤à´¿à´²à´¾à´•àµà´•à´¾à´¨àµâ€ smb.conf à´•àµˆà´•àµŠà´£àµà´Ÿàµ à´®à´¾à´±àµà´±àµà´¨àµà´¨à´¤àµ à´†à´µà´¶àµà´¯à´®à´¾à´•àµà´•àµà´•à´¯àµà´‚ à´šàµ†à´¯àµà´¯àµà´‚."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "à´…à´Ÿà´¯à´¾à´³à´µà´¾à´•àµà´•àµ à´Žà´¨àµâ€à´•àµà´°à´¿à´ªàµà´·à´¨àµâ€ à´‰à´ªà´¯àµ‹à´—à´¿à´•àµà´•à´£àµ‹?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "à´Žà´²àµà´²à´¾ à´ªàµà´¤à´¿à´¯ à´µà´¿à´¨àµâ€à´¡àµ‹à´¸àµ à´•àµà´²à´¯à´¨àµà´±àµà´•à´³àµà´‚ SMB à´¸àµ‡à´µà´•à´°àµà´®à´¾à´¯à´¿ à´†à´¶à´¯à´µà´¿à´¨àµà´®à´¯à´‚ à´¨à´Ÿà´¤àµà´¤àµà´¨àµà´¨à´¤àµ à´Žà´¨àµâ€à´•àµà´°à´¿à´ªàµà´±àµà´±àµ à´šàµ†à´¯àµà´¤ "
-#~ "à´…à´Ÿà´¯à´¾à´³ à´µà´¾à´•àµà´•àµà´•à´³àµà´ªà´¯àµ‹à´—à´¿à´šàµà´šà´¾à´£àµ. à´¨à´¿à´™àµà´™à´³àµâ€ à´•àµà´²à´¿à´¯à´°àµâ€ à´Ÿàµ†à´•àµà´¸àµà´±àµà´±àµ à´…à´Ÿà´¯à´¾à´³ "
-#~ "à´µà´¾à´•àµà´•àµà´•à´³àµà´ªà´¯àµ‹à´—à´¿à´•àµà´•à´¾à´¨à´¾à´—àµà´°à´¹à´¿à´•àµà´•àµà´¨àµà´¨àµ†à´™àµà´•à´¿à´²àµâ€ à´¨à´¿à´™àµà´™à´³àµâ€à´•àµà´•àµ à´¨à´¿à´™àµà´™à´³àµà´Ÿàµ† à´µà´¿à´¨àµâ€à´¡àµ‹à´¸àµ à´°à´œà´¿à´¸àµà´Ÿàµà´°à´¿à´¯à´¿à´²àµ† à´’à´°àµ "
-#~ "à´ªà´°à´¾à´®àµ€à´±àµà´±à´°àµâ€ à´®à´¾à´±àµà´±àµ‡à´£àµà´Ÿà´¿ à´µà´°àµà´‚."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "à´ˆ à´¤à´¿à´°à´žàµà´žàµ†à´Ÿàµà´•àµà´•à´¾à´µàµà´¨àµà´¨ à´µà´¿à´² à´‡à´¨àµ‡à´¬à´¿à´³àµâ€ à´šàµ†à´¯àµà´¯àµà´¨àµà´¨à´¤à´¿à´¨àµ à´µà´³à´°àµ†à´¯à´§à´¿à´•à´‚ à´¶àµà´ªà´¾à´°àµâ€à´¶ à´šàµ†à´¯àµà´¤à´¿à´°à´¿à´•àµà´•àµà´¨àµà´¨àµ. à´¨à´¿à´™àµà´™à´³àµâ€ "
-#~ "à´…à´™àµà´™à´¨àµ† à´šàµ†à´¯àµà´¯àµà´•à´¯à´¾à´£àµ†à´™àµà´•à´¿à´²àµâ€ à´¨à´¿à´™àµà´™à´³àµâ€à´•àµà´•àµ à´’à´°àµ à´¯àµ‹à´—àµà´¯à´®à´¾à´¯ /etc/samba/smbpasswd à´«à´¯à´²àµà´£àµà´Ÿàµ†à´¨àµà´¨àµà´‚  "
-#~ "smbpasswd à´Žà´¨àµà´¨ à´†à´œàµà´ž à´‰à´ªà´¯àµ‹à´—à´¿à´šàµà´šàµ à´“à´°àµ‹ à´‰à´ªà´¯àµ‹à´•àµà´¤à´¾à´•àµà´•à´³àµâ€à´•àµà´•àµà´‚ à´…à´µà´¿à´Ÿàµ† à´…à´Ÿà´¯à´¾à´³ à´µà´¾à´•àµà´•àµ à´¸àµ†à´±àµà´±àµ à´šàµ†à´¯àµà´¤àµ "
-#~ "à´Žà´¨àµà´¨àµ à´‰à´±à´ªàµà´ªà´¾à´•àµà´•àµà´•à´¯àµà´‚ à´šàµ†à´¯àµà´¯àµà´•."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
 #~ "à´¸à´¾à´‚à´¬ à´…à´Ÿà´¯à´¾à´³ à´µà´¾à´•àµà´•àµà´•à´³àµà´Ÿàµ† à´¡à´¾à´±àµà´±à´¾à´¬àµ‡à´¸à´¾à´¯ /var/lib/samba/passdb.tdb à´¸àµƒà´·àµà´Ÿà´¿à´¯àµà´•àµà´•à´Ÿàµà´Ÿàµ‡?"
@@ -269,22 +348,6 @@ msgstr ""
 #~ "à´•àµ‚à´Ÿàµà´¤à´²àµâ€ à´µà´¿à´µà´°à´™àµà´™à´³àµâ€à´•àµà´•à´¾à´¯à´¿ samba-doc à´ªà´¾à´•àµà´•àµ‡à´œà´¿à´²àµ† /usr/share/doc/samba-doc/htmldocs/"
 #~ "ENCRYPTION.html à´•à´¾à´£àµà´•."
 
-#~ msgid "daemons"
-#~ msgstr "à´¡àµ†à´®à´£àµà´•à´³àµâ€"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "à´¸à´¾à´‚à´¬ à´Žà´™àµà´™à´¨àµ† à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´ªàµà´ªà´¿à´•àµà´•à´¾à´¨à´¾à´£àµ à´¨à´¿à´™àµà´™à´³à´¾à´—àµà´°à´¹à´¿à´•àµà´•àµà´¨àµà´¨à´¤àµ?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "à´¸à´¾à´‚à´¬ à´¡àµ†à´®à´£àµâ€ smbd à´’à´°àµ à´¸à´¾à´§à´¾à´°à´£ à´¡àµ†à´®à´£à´¾à´¯àµ‹ à´…à´²àµà´²àµ†à´™àµà´•à´¿à´²àµâ€ inetd à´¯à´¿à´²àµâ€ à´¨à´¿à´¨àµà´¨àµ‹ "
-#~ "à´ªàµà´°à´µà´°àµâ€à´¤àµà´¤à´¿à´ªàµà´ªà´¿à´•àµà´•à´¾à´µàµà´¨àµà´¨à´¤à´¾à´£àµ. à´¡àµ†à´®à´£à´¾à´¯à´¿ à´“à´Ÿà´¿à´•àµà´•àµà´¨àµà´¨à´¤à´¾à´£àµ à´¶àµà´ªà´¾à´°àµâ€à´¶ à´šàµ†à´¯àµà´¤à´¿à´Ÿàµà´Ÿàµà´³àµà´³ à´µà´´à´¿."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "passdb à´¬à´¾à´•àµà´•àµ†à´¨àµâ€à´¡àµà´•à´³àµâ€ à´šàµ†à´¯à´¿à´¨àµâ€ à´šàµ†à´¯àµà´¯àµà´¨àµà´¨à´¤à´¿à´¨àµ† à´ªà´¿à´¨àµâ€à´¤àµà´£à´¯àµà´•àµà´•àµà´¨àµà´¨à´¿à´²àµà´²"
 
diff --git a/debian/po/mr.po b/debian/po/mr.po
index a6ef140..b43c524 100644
--- a/debian/po/mr.po
+++ b/debian/po/mr.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2006-08-15 07:59-0500\n"
 "Last-Translator: Priti Patil <prithisd at gmail.com>\n"
 "Language-Team:  Marathi, janabhaaratii, C-DAC, Mumbai, India "
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -42,13 +42,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -96,68 +96,210 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€(à¤¡à¤¾à¤¯à¤¨à¤®à¤¿à¤• à¤¹à¥‹à¤¸à¥à¤Ÿ à¤•à¤¾à¤¨à¤«à¤¿à¤—à¥à¤°à¥‡à¤¶à¤¨ à¤ªà¥à¤°à¥‹à¤Ÿà¥‹à¤•à¥‰à¤²) à¤®à¤§à¥€à¤² à¤¡à¤¬à¥à¤²à¥à¤¯à¥à¤†à¤¯à¤à¤¨à¤à¤¸(à¤µà¤¿à¤¨à¥à¤¸) à¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤£à¤¾à¤‚à¤šà¤¾ "
+"à¤‰à¤ªà¤¯à¥‹à¤— à¤•à¤°à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ smb.conf à¤®à¤§à¥à¤¯à¥‡ à¤¬à¤¦à¤² à¤•à¤°à¤¾à¤¯à¤šà¤¾ à¤•à¤¾?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"à¤¸à¤‚à¤—à¤£à¤•à¤¾à¤šà¥à¤¯à¤¾ à¤œà¤¾à¤³à¥à¤¯à¤¾à¤µà¤°,à¤¤à¥à¤®à¤šà¥à¤¯à¤¾ à¤¸à¤‚à¤—à¤£à¤•à¤¾à¤²à¤¾,à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€ à¤ªà¤°à¤¿à¤¸à¥‡à¤µà¤•à¤¾à¤®à¤§à¥‚à¤¨ à¤†à¤¯à¤ªà¥€ à¤ªà¤¤à¥à¤¤à¤¾ à¤®à¤¿à¤³à¤¾à¤²à¤¾ à¤…à¤¸à¥‡à¤²,à¤¤à¤° "
+"à¤¤à¥‹ à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€ à¤ªà¤°à¤¿à¤¸à¥‡à¤µà¤•,à¤¸à¤‚à¤—à¤£à¤•à¤¾à¤šà¥à¤¯à¤¾ à¤œà¤¾à¤³à¥à¤¯à¤¾à¤µà¤° à¤…à¤¸à¤²à¥‡à¤²à¥à¤¯à¤¾ à¤¡à¤¬à¥à¤²à¥à¤¯à¥‚à¤†à¤¯à¤à¤¨à¤à¤¸ à¤ªà¤°à¤¿à¤¸à¥‡à¤µà¤•à¤¾à¤‚à¤¬à¤¦à¥à¤¦à¤²à¤¹à¥€ (\"à¤¨à¥‡à¤Ÿà¤¬à¥‰à¤¯à¤¸"
+"( à¤à¤¨à¤ˆà¤Ÿà¥€ à¤¬à¥€à¤†à¤¯à¤“à¤à¤¸) à¤¨à¤¾à¤‚à¤µà¤¾à¤šà¤¾ à¤ªà¤°à¤¿à¤¸à¥‡à¤µà¤•\") à¤®à¤¾à¤¹à¤¿à¤¤à¥€ à¤¦à¥‡à¤Š à¤¶à¤•à¥‡à¤². à¤¯à¤¾à¤¸à¤¾à¤ à¥€à¤š à¤¤à¥à¤®à¤šà¥à¤¯à¤¾ smb.conf "
+"à¤¸à¤‚à¤šà¤¿à¤•à¥‡à¤¤ à¤¬à¤¦à¤² à¤•à¤°à¤£à¥‡ à¤†à¤µà¤¶à¥à¤¯à¤• à¤†à¤¹à¥‡, à¤¤à¤¸à¥‡ à¤•à¥‡à¤²à¥à¤¯à¤¾à¤¨à¥‡ à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€à¤¨à¥‡ à¤ªà¥à¤°à¤µà¤¿à¤²à¥‡à¤²à¥€ à¤¡à¤¬à¥à¤²à¥à¤¯à¥‚à¤†à¤¯à¤à¤¨à¤à¤¸ à¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤£à¥‡ /à¤ˆà¤Ÿà¥€à¤¸à¥€/"
+"à¤¸à¤¾à¤‚à¤¬à¤¾/à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€ à¤¸à¥€à¤“à¤à¤¨à¤à¤« (/etc/samba/dhcp.conf./) à¤®à¤§à¥‚à¤¨ à¤†à¤ªà¥‹à¤†à¤ª à¤µà¤¾à¤šà¤²à¥€ à¤œà¤¾à¤Š à¤¶à¤•à¤¤à¤¾à¤¤."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"à¤¯à¤¾ à¤µà¤¿à¤¶à¥‡à¤· à¤²à¤•à¥à¤·à¤£à¤¾à¤šà¤¾ à¤«à¤¾à¤¯à¤¦à¤¾ à¤˜à¥‡à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€,à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€ à¥© à¤—à¥à¤°à¤¾à¤¹à¤• à¤ªà¥…à¤•à¥‡à¤œ à¤…à¤§à¤¿à¤·à¥à¤ à¤¾à¤ªà¤¿à¤¤ à¤•à¥‡à¤²à¥‡ à¤—à¥‡à¤²à¥‡à¤š à¤ªà¤¾à¤¹à¤¿à¤œà¥‡. "
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "à¤à¤¸à¤à¤®à¤¬à¥€à¥¤à¤¸à¥€à¤“à¤à¤¨à¤à¤« smb.conf à¤†à¤ªà¥‹à¤†à¤ª à¤¸à¤‚à¤°à¤šà¤¿à¤¤ à¤•à¤°à¤¾à¤¯à¤šà¥‡ à¤•à¤¾? "
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "à¤¤à¥à¤®à¥à¤¹à¥€ à¤¹à¤¾ à¤ªà¤°à¥à¤¯à¤¾à¤¯ à¤¨à¤¿à¤µà¤¡à¤²à¤¾ à¤¨à¤¾à¤¹à¥€à¤¤ à¤¤à¤° à¤¸à¤‚à¤°à¤šà¤¨à¥‡à¤¤à¤²à¥‡ à¤¬à¤¦à¤² à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾à¤š à¤¹à¤¾à¤¤à¤¾à¤³à¤¾à¤µà¥‡ à¤²à¤¾à¤—à¤¤à¥€à¤² à¤µ à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾ "
-#~ "à¤†à¤µà¤°à¥à¤¤à¥€ à¤¸à¤‚à¤°à¤šà¤¨à¤¾ à¤—à¥à¤£à¤¸à¤‚à¤µà¤°à¥à¤§à¤¨à¤¾à¤šà¤¾ à¤šà¤¾ à¤²à¤¾à¤ à¤˜à¥‡à¤¤à¤¾ à¤¯à¥‡à¤£à¤¾à¤° à¤¨à¤¾à¤¹à¥€."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"à¤¸à¤¾à¤‚à¤¬à¤¾à¤šà¥€ à¤¬à¤¾à¤•à¥€à¤šà¥€ à¤¸à¤‚à¤°à¤šà¤¨à¤¾,à¤¸à¤¾à¤‚à¤¬à¤¾ à¤†à¤œà¥à¤žà¤¾à¤µà¤²à¥€à¤šà¥€ (à¤à¤¨à¤à¤®à¤¬à¥€à¤¡à¥€ à¤µ à¤à¤¸à¤à¤®à¤¬à¥€à¤¡à¥€) à¤¸à¤‚à¤°à¤šà¤¨à¤¾ à¤•à¤°à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ "
+"à¤µà¤¾à¤ªà¤°à¤²à¥à¤¯à¤¾ à¤œà¤¾à¤£à¤¾à¤±à¥à¤¯à¤¾ etc/samba/smb.conf /à¤ˆà¤Ÿà¥€à¤¸à¥€/à¤¸à¤¾à¤‚à¤¬à¤¾/à¤à¤¸à¤à¤®à¤¬à¥€.à¤¸à¥€à¤“à¤à¤¨à¤à¤« à¤¯à¤¾ à¤¸à¤‚à¤šà¤¿à¤•à¥‡à¤®à¤§à¥€à¤² "
+"à¤šà¤²à¤¿à¤¤à¤®à¥‚à¤²à¥à¤¯à¤¾à¤‚à¤µà¤° à¤ªà¤°à¤¿à¤£à¤¾à¤® à¤•à¤°à¤£à¤¾à¤±à¥à¤¯à¤¾ à¤ªà¥à¤°à¤¶à¥à¤¨à¤¾à¤‚à¤¬à¤¾à¤¬à¤¤ à¤†à¤¹à¥‡. à¤¤à¥à¤®à¤šà¥à¤¯à¤¾ à¤¸à¤§à¥à¤¯à¤¾à¤šà¥à¤¯à¤¾ à¤à¤¸à¤à¤®à¤¬à¥€. à¤¸à¥€à¤“à¤à¤¨à¤à¤« smb."
+"conf à¤®à¤§à¥à¤¯à¥‡,'à¤…à¤‚à¤¤à¤°à¥à¤à¤¾à¤µ' à¤“à¤³ à¤•à¤¿à¤‚à¤µà¤¾ à¤…à¤¨à¥‡à¤• à¤“à¤³à¥€ à¤…à¤¸à¤²à¥‡à¤²à¤¾ à¤à¤• à¤ªà¤°à¥à¤¯à¤¾à¤¯ à¤†à¤¹à¥‡. à¤µ à¤¤à¥‹ à¤¸à¥à¤µà¤¯à¤‚à¤šà¤²à¤¿à¤¤ à¤¸à¤‚à¤°à¤šà¤¨à¤¾ "
+"à¤ªà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¥‡à¤¤ à¤—à¥‹à¤‚à¤§à¤³ à¤•à¤°à¥‚ à¤¶à¤•à¤¤à¥‹ à¤†à¤£à¤¿ à¤¤à¥à¤¯à¤¾à¤®à¥à¤³à¥‡ à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾ à¤¤à¥à¤®à¤šà¥€ à¤à¤¸à¤à¤®à¤¬à¥€.à¤¸à¥€à¤“à¤à¤¨à¤à¤«,smb.conf,à¤ªà¥à¤¨à¥à¤¹à¤¾ "
+"à¤•à¤¾à¤°à¥à¤¯à¤•à¤¾à¤°à¥€ à¤¹à¥‹à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ à¤¸à¥à¤µà¤¤à¤ƒà¤š à¤¸à¤‚à¤ªà¤¾à¤¦à¤¿à¤¤ à¤•à¤°à¤¾à¤µà¥€ à¤²à¤¾à¤—à¥‡à¤²."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"à¤¤à¥à¤®à¥à¤¹à¥€ à¤¹à¤¾ à¤ªà¤°à¥à¤¯à¤¾à¤¯ à¤¨à¤¿à¤µà¤¡à¤²à¤¾ à¤¨à¤¾à¤¹à¥€à¤¤ à¤¤à¤° à¤¸à¤‚à¤°à¤šà¤¨à¥‡à¤¤à¤²à¥‡ à¤¬à¤¦à¤² à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾à¤š à¤¹à¤¾à¤¤à¤¾à¤³à¤¾à¤µà¥‡ à¤²à¤¾à¤—à¤¤à¥€à¤² à¤µ à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾ "
+"à¤†à¤µà¤°à¥à¤¤à¥€ à¤¸à¤‚à¤°à¤šà¤¨à¤¾ à¤—à¥à¤£à¤¸à¤‚à¤µà¤°à¥à¤§à¤¨à¤¾à¤šà¤¾ à¤šà¤¾ à¤²à¤¾à¤ à¤˜à¥‡à¤¤à¤¾ à¤¯à¥‡à¤£à¤¾à¤° à¤¨à¤¾à¤¹à¥€."
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "à¤•à¤¾à¤°à¥à¤¯à¤—à¤Ÿ/à¤ªà¥à¤°à¤•à¥à¤·à¥‡à¤¤à¥à¤°à¤¾à¤šà¥‡ à¤¨à¤¾à¤µ:"
+msgid "Workgroup/Domain Name:"
+msgstr "à¤•à¤¾à¤°à¥à¤¯à¤—à¤Ÿ/à¤ªà¥à¤°à¤•à¥à¤·à¥‡à¤¤à¥à¤°à¤¾à¤šà¥‡ à¤¨à¤¾à¤µ:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "à¤•à¥‚à¤Ÿà¤²à¤¿à¤–à¤¿à¤¤ à¤ªà¤°à¤µà¤²à¥€à¤šà¤¾ à¤¶à¤¬à¥à¤¦ à¤µà¤¾à¤ªà¤°à¤¾à¤µà¤¾ à¤•à¤¾?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"à¤µà¤¿à¤‚à¤¡à¥‹à¤œà¤šà¥‡ à¤¸à¤°à¥à¤µ à¤—à¥à¤°à¤¾à¤¹à¤• à¤•à¥‚à¤Ÿà¤²à¤¿à¤–à¤¿à¤¤ à¤ªà¤°à¤µà¤²à¥€à¤šà¥‡ à¤¶à¤¬à¥à¤¦ à¤µà¤¾à¤ªà¤°à¥à¤¨ à¤à¤¸à¤à¤®à¤¬à¥€ à¤ªà¤°à¤¿à¤¸à¥‡à¤µà¤•à¤¾à¤‚à¤¶à¥€ à¤¸à¤‚à¤µà¤¾à¤¦ à¤¸à¤¾à¤§à¤¤à¤¾à¤¤. "
+"à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾ à¤¸à¥à¤ªà¤·à¥à¤Ÿ à¤ªà¤°à¤µà¤²à¥€à¤šà¥‡ à¤¶à¤¬à¥à¤¦ à¤µà¤¾à¤ªà¤°à¤¾à¤¯à¤šà¥‡ à¤…à¤¸à¤¤à¥€à¤² à¤¤à¤° à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾ à¤¤à¥à¤®à¤šà¥à¤¯à¤¾ à¤µà¤¿à¤‚à¤¡à¥‹à¤œà¤®à¤§à¥€à¤² à¤¨à¥‹à¤‚à¤¦à¥€à¤®à¤§à¥à¤¯à¥‡ à¤à¤–à¤¾à¤¦à¥‡ "
+"à¤šà¤²à¤¿à¤¤à¤®à¥‚à¤²à¥à¤¯ à¤¬à¤¦à¤²à¤¾à¤µà¥‡ à¤²à¤¾à¤—à¥‡à¤²."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"à¤¹à¤¾à¤š à¤ªà¤°à¥à¤¯à¤¾à¤¯ à¤•à¤¾à¤°à¥à¤¯à¤¾à¤¨à¥à¤µà¤¿à¤¤ à¤•à¤°à¤£à¥à¤¯à¤¾à¤šà¥€ à¤¶à¤¿à¤«à¤¾à¤°à¤¸ à¤•à¥‡à¤²à¥€ à¤œà¤¾à¤¤ à¤†à¤¹à¥‡. à¤¤à¥à¤®à¥à¤¹à¥€ à¤¤à¤¸à¥‡ à¤•à¥‡à¤²à¥à¤¯à¤¾à¤¸,à¤¤à¥à¤®à¤šà¥à¤¯à¤¾à¤œà¤µà¤³ à¤µà¥ˆà¤§ à¤…à¤¶à¥€ "
+"(/etc/samba/smbpasswd)à¤ˆà¤Ÿà¥€à¤¸à¥€/à¤¸à¤¾à¤‚à¤¬à¤¾/à¤à¤¸à¤à¤®à¤¬à¥€ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤¸à¤‚à¤šà¤¿à¤•à¤¾ à¤†à¤¹à¥‡, à¤¤à¤¸à¥‡à¤š ,à¤à¤¸à¤à¤®à¤¬à¥€ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ "
+"à¤†à¤œà¥à¤žà¤¾à¤µà¤²à¥€ à¤µà¤¾à¤ªà¤°à¥à¤¨, à¤ªà¥à¤°à¤¤à¥à¤¯à¥‡à¤• à¤‰à¤ªà¤¯à¥‹à¤œà¤•à¤¾à¤¸à¤¾à¤ à¥€ à¤ªà¤°à¤µà¤²à¥€à¤šà¥‡ à¤¶à¤¬à¥à¤¦ à¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ à¤•à¥‡à¤²à¥à¤¯à¤¾à¤šà¥€ à¤–à¤¾à¤¤à¥à¤°à¥€ à¤•à¤°à¤¾."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "à¤¡à¤¿à¤®à¤¨à¥à¤¸"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "à¤†à¤¯à¤à¤¨à¤‡à¤Ÿà¥€à¤¡à¥€"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾ à¤¸à¤¾à¤‚à¤¬à¤¾ à¤•à¤¶à¤¾ à¤ªà¥à¤°à¤•à¤¾à¤°à¥‡ à¤šà¤¾à¤²à¥‚ à¤•à¤°à¤¾à¤µà¤¯à¤¾à¤šà¤¾ à¤†à¤¹à¥‡?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"à¤¸à¤¾à¤‚à¤¬à¤¾ à¤¡à¤¿à¤®à¤¨ à¤à¤¸à¤à¤®à¤¬à¥€à¤¡à¥€ à¤¹à¤¾ à¤ªà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® à¤¸à¤°à¥à¤µà¤¸à¤¾à¤§à¤¾à¤°à¤£ à¤¡à¤¿à¤®à¤¨ à¤®à¥à¤¹à¤£à¥‚à¤¨ à¤•à¤¿à¤‚à¤µà¤¾ à¤†à¤¯à¤à¤¨à¤‡à¤Ÿà¥€à¤¡à¥€ à¤®à¤§à¥‚à¤¨ à¤šà¤¾à¤²à¤µà¤¿à¤¤à¤¾ "
+"à¤¯à¥‡à¤¤à¥‹. à¤¡à¤¿à¤®à¤¨ à¤®à¥à¤¹à¤£à¥‚à¤¨ à¤šà¤¾à¤²à¤µà¤¿à¤£à¥‡ à¤…à¤§à¤¿à¤• à¤¶à¥à¤°à¥‡à¤¯à¤¸à¥à¤•à¤°."
 
 #, fuzzy
 #~| msgid ""
@@ -172,72 +314,6 @@ msgstr ""
 #~ "à¤•à¤°à¤¾. à¤²à¤•à¥à¤·à¤¾à¤¤ à¤ à¥‡à¤µà¤¾ à¤•à¥€ à¤¹à¥‡à¤š à¤šà¤²à¤¿à¤¤à¤®à¥‚à¤²à¥à¤¯ à¤¸à¥à¤°à¤•à¥à¤·à¤¾-à¤ªà¥à¤°à¤•à¥à¤·à¥‡à¤¤à¥à¤° à¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤£ à¤¬à¤°à¥‹à¤¬à¤° à¤µà¤¾à¤ªà¤°à¤²à¥‡ à¤…à¤¸à¤¤à¤¾ "
 #~ "à¤ªà¥à¤°à¤•à¥à¤·à¥‡à¤¤à¥à¤°à¤¨à¤¾à¤®à¤¹à¥€ à¤¨à¤¿à¤¯à¤‚à¤¤à¥à¤°à¤¿à¤¤ à¤•à¤°à¤¤à¥‡."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€(à¤¡à¤¾à¤¯à¤¨à¤®à¤¿à¤• à¤¹à¥‹à¤¸à¥à¤Ÿ à¤•à¤¾à¤¨à¤«à¤¿à¤—à¥à¤°à¥‡à¤¶à¤¨ à¤ªà¥à¤°à¥‹à¤Ÿà¥‹à¤•à¥‰à¤²) à¤®à¤§à¥€à¤² à¤¡à¤¬à¥à¤²à¥à¤¯à¥à¤†à¤¯à¤à¤¨à¤à¤¸(à¤µà¤¿à¤¨à¥à¤¸) "
-#~ "à¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤£à¤¾à¤‚à¤šà¤¾ à¤‰à¤ªà¤¯à¥‹à¤— à¤•à¤°à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ smb.conf à¤®à¤§à¥à¤¯à¥‡ à¤¬à¤¦à¤² à¤•à¤°à¤¾à¤¯à¤šà¤¾ à¤•à¤¾?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "à¤¸à¤‚à¤—à¤£à¤•à¤¾à¤šà¥à¤¯à¤¾ à¤œà¤¾à¤³à¥à¤¯à¤¾à¤µà¤°,à¤¤à¥à¤®à¤šà¥à¤¯à¤¾ à¤¸à¤‚à¤—à¤£à¤•à¤¾à¤²à¤¾,à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€ à¤ªà¤°à¤¿à¤¸à¥‡à¤µà¤•à¤¾à¤®à¤§à¥‚à¤¨ à¤†à¤¯à¤ªà¥€ à¤ªà¤¤à¥à¤¤à¤¾ à¤®à¤¿à¤³à¤¾à¤²à¤¾ à¤…à¤¸à¥‡à¤²,"
-#~ "à¤¤à¤° à¤¤à¥‹ à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€ à¤ªà¤°à¤¿à¤¸à¥‡à¤µà¤•,à¤¸à¤‚à¤—à¤£à¤•à¤¾à¤šà¥à¤¯à¤¾ à¤œà¤¾à¤³à¥à¤¯à¤¾à¤µà¤° à¤…à¤¸à¤²à¥‡à¤²à¥à¤¯à¤¾ à¤¡à¤¬à¥à¤²à¥à¤¯à¥‚à¤†à¤¯à¤à¤¨à¤à¤¸ à¤ªà¤°à¤¿à¤¸à¥‡à¤µà¤•à¤¾à¤‚à¤¬à¤¦à¥à¤¦à¤²à¤¹à¥€ "
-#~ "(\"à¤¨à¥‡à¤Ÿà¤¬à¥‰à¤¯à¤¸( à¤à¤¨à¤ˆà¤Ÿà¥€ à¤¬à¥€à¤†à¤¯à¤“à¤à¤¸) à¤¨à¤¾à¤‚à¤µà¤¾à¤šà¤¾ à¤ªà¤°à¤¿à¤¸à¥‡à¤µà¤•\") à¤®à¤¾à¤¹à¤¿à¤¤à¥€ à¤¦à¥‡à¤Š à¤¶à¤•à¥‡à¤². à¤¯à¤¾à¤¸à¤¾à¤ à¥€à¤š à¤¤à¥à¤®à¤šà¥à¤¯à¤¾ "
-#~ "smb.conf à¤¸à¤‚à¤šà¤¿à¤•à¥‡à¤¤ à¤¬à¤¦à¤² à¤•à¤°à¤£à¥‡ à¤†à¤µà¤¶à¥à¤¯à¤• à¤†à¤¹à¥‡, à¤¤à¤¸à¥‡ à¤•à¥‡à¤²à¥à¤¯à¤¾à¤¨à¥‡ à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€à¤¨à¥‡ à¤ªà¥à¤°à¤µà¤¿à¤²à¥‡à¤²à¥€ à¤¡à¤¬à¥à¤²à¥à¤¯à¥‚à¤†à¤¯à¤à¤¨à¤à¤¸ "
-#~ "à¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤£à¥‡ /à¤ˆà¤Ÿà¥€à¤¸à¥€/à¤¸à¤¾à¤‚à¤¬à¤¾/à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€ à¤¸à¥€à¤“à¤à¤¨à¤à¤« (/etc/samba/dhcp.conf./) à¤®à¤§à¥‚à¤¨ à¤†à¤ªà¥‹à¤†à¤ª "
-#~ "à¤µà¤¾à¤šà¤²à¥€ à¤œà¤¾à¤Š à¤¶à¤•à¤¤à¤¾à¤¤."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "à¤¯à¤¾ à¤µà¤¿à¤¶à¥‡à¤· à¤²à¤•à¥à¤·à¤£à¤¾à¤šà¤¾ à¤«à¤¾à¤¯à¤¦à¤¾ à¤˜à¥‡à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€,à¤¡à¥€à¤à¤šà¤¸à¥€à¤ªà¥€ à¥© à¤—à¥à¤°à¤¾à¤¹à¤• à¤ªà¥…à¤•à¥‡à¤œ à¤…à¤§à¤¿à¤·à¥à¤ à¤¾à¤ªà¤¿à¤¤ à¤•à¥‡à¤²à¥‡ à¤—à¥‡à¤²à¥‡à¤š "
-#~ "à¤ªà¤¾à¤¹à¤¿à¤œà¥‡. "
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "à¤à¤¸à¤à¤®à¤¬à¥€à¥¤à¤¸à¥€à¤“à¤à¤¨à¤à¤« smb.conf à¤†à¤ªà¥‹à¤†à¤ª à¤¸à¤‚à¤°à¤šà¤¿à¤¤ à¤•à¤°à¤¾à¤¯à¤šà¥‡ à¤•à¤¾? "
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "à¤¸à¤¾à¤‚à¤¬à¤¾à¤šà¥€ à¤¬à¤¾à¤•à¥€à¤šà¥€ à¤¸à¤‚à¤°à¤šà¤¨à¤¾,à¤¸à¤¾à¤‚à¤¬à¤¾ à¤†à¤œà¥à¤žà¤¾à¤µà¤²à¥€à¤šà¥€ (à¤à¤¨à¤à¤®à¤¬à¥€à¤¡à¥€ à¤µ à¤à¤¸à¤à¤®à¤¬à¥€à¤¡à¥€) à¤¸à¤‚à¤°à¤šà¤¨à¤¾ à¤•à¤°à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ "
-#~ "à¤µà¤¾à¤ªà¤°à¤²à¥à¤¯à¤¾ à¤œà¤¾à¤£à¤¾à¤±à¥à¤¯à¤¾ etc/samba/smb.conf /à¤ˆà¤Ÿà¥€à¤¸à¥€/à¤¸à¤¾à¤‚à¤¬à¤¾/à¤à¤¸à¤à¤®à¤¬à¥€.à¤¸à¥€à¤“à¤à¤¨à¤à¤« à¤¯à¤¾ à¤¸à¤‚à¤šà¤¿à¤•à¥‡à¤®à¤§à¥€à¤² "
-#~ "à¤šà¤²à¤¿à¤¤à¤®à¥‚à¤²à¥à¤¯à¤¾à¤‚à¤µà¤° à¤ªà¤°à¤¿à¤£à¤¾à¤® à¤•à¤°à¤£à¤¾à¤±à¥à¤¯à¤¾ à¤ªà¥à¤°à¤¶à¥à¤¨à¤¾à¤‚à¤¬à¤¾à¤¬à¤¤ à¤†à¤¹à¥‡. à¤¤à¥à¤®à¤šà¥à¤¯à¤¾ à¤¸à¤§à¥à¤¯à¤¾à¤šà¥à¤¯à¤¾ à¤à¤¸à¤à¤®à¤¬à¥€. à¤¸à¥€à¤“à¤à¤¨à¤à¤« smb."
-#~ "conf à¤®à¤§à¥à¤¯à¥‡,'à¤…à¤‚à¤¤à¤°à¥à¤à¤¾à¤µ' à¤“à¤³ à¤•à¤¿à¤‚à¤µà¤¾ à¤…à¤¨à¥‡à¤• à¤“à¤³à¥€ à¤…à¤¸à¤²à¥‡à¤²à¤¾ à¤à¤• à¤ªà¤°à¥à¤¯à¤¾à¤¯ à¤†à¤¹à¥‡. à¤µ à¤¤à¥‹ à¤¸à¥à¤µà¤¯à¤‚à¤šà¤²à¤¿à¤¤ à¤¸à¤‚à¤°à¤šà¤¨à¤¾ "
-#~ "à¤ªà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¥‡à¤¤ à¤—à¥‹à¤‚à¤§à¤³ à¤•à¤°à¥‚ à¤¶à¤•à¤¤à¥‹ à¤†à¤£à¤¿ à¤¤à¥à¤¯à¤¾à¤®à¥à¤³à¥‡ à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾ à¤¤à¥à¤®à¤šà¥€ à¤à¤¸à¤à¤®à¤¬à¥€.à¤¸à¥€à¤“à¤à¤¨à¤à¤«,smb.conf,à¤ªà¥à¤¨à¥à¤¹à¤¾ "
-#~ "à¤•à¤¾à¤°à¥à¤¯à¤•à¤¾à¤°à¥€ à¤¹à¥‹à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ à¥€ à¤¸à¥à¤µà¤¤à¤ƒà¤š à¤¸à¤‚à¤ªà¤¾à¤¦à¤¿à¤¤ à¤•à¤°à¤¾à¤µà¥€ à¤²à¤¾à¤—à¥‡à¤²."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "à¤•à¥‚à¤Ÿà¤²à¤¿à¤–à¤¿à¤¤ à¤ªà¤°à¤µà¤²à¥€à¤šà¤¾ à¤¶à¤¬à¥à¤¦ à¤µà¤¾à¤ªà¤°à¤¾à¤µà¤¾ à¤•à¤¾?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "à¤µà¤¿à¤‚à¤¡à¥‹à¤œà¤šà¥‡ à¤¸à¤°à¥à¤µ à¤—à¥à¤°à¤¾à¤¹à¤• à¤•à¥‚à¤Ÿà¤²à¤¿à¤–à¤¿à¤¤ à¤ªà¤°à¤µà¤²à¥€à¤šà¥‡ à¤¶à¤¬à¥à¤¦ à¤µà¤¾à¤ªà¤°à¥à¤¨ à¤à¤¸à¤à¤®à¤¬à¥€ à¤ªà¤°à¤¿à¤¸à¥‡à¤µà¤•à¤¾à¤‚à¤¶à¥€ à¤¸à¤‚à¤µà¤¾à¤¦ à¤¸à¤¾à¤§à¤¤à¤¾à¤¤. "
-#~ "à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾ à¤¸à¥à¤ªà¤·à¥à¤Ÿ à¤ªà¤°à¤µà¤²à¥€à¤šà¥‡ à¤¶à¤¬à¥à¤¦ à¤µà¤¾à¤ªà¤°à¤¾à¤¯à¤šà¥‡ à¤…à¤¸à¤¤à¥€à¤² à¤¤à¤° à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾ à¤¤à¥à¤®à¤šà¥à¤¯à¤¾ à¤µà¤¿à¤‚à¤¡à¥‹à¤œà¤®à¤§à¥€à¤² à¤¨à¥‹à¤‚à¤¦à¥€à¤®à¤§à¥à¤¯à¥‡ "
-#~ "à¤à¤–à¤¾à¤¦à¥‡ à¤šà¤²à¤¿à¤¤à¤®à¥‚à¤²à¥à¤¯ à¤¬à¤¦à¤²à¤¾à¤µà¥‡ à¤²à¤¾à¤—à¥‡à¤²."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "à¤¹à¤¾à¤š à¤ªà¤°à¥à¤¯à¤¾à¤¯ à¤•à¤¾à¤°à¥à¤¯à¤¾à¤¨à¥à¤µà¤¿à¤¤ à¤•à¤°à¤£à¥à¤¯à¤¾à¤šà¥€ à¤¶à¤¿à¤«à¤¾à¤°à¤¸ à¤•à¥‡à¤²à¥€ à¤œà¤¾à¤¤ à¤†à¤¹à¥‡. à¤¤à¥à¤®à¥à¤¹à¥€ à¤¤à¤¸à¥‡ à¤•à¥‡à¤²à¥à¤¯à¤¾à¤¸,à¤¤à¥à¤®à¤šà¥à¤¯à¤¾à¤œà¤µà¤³ à¤µà¥ˆà¤§ "
-#~ "à¤…à¤¶à¥€ (/etc/samba/smbpasswd)à¤ˆà¤Ÿà¥€à¤¸à¥€/à¤¸à¤¾à¤‚à¤¬à¤¾/à¤à¤¸à¤à¤®à¤¬à¥€ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤¸à¤‚à¤šà¤¿à¤•à¤¾ à¤†à¤¹à¥‡, à¤¤à¤¸à¥‡à¤š ,à¤à¤¸à¤à¤®à¤¬à¥€ "
-#~ "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤†à¤œà¥à¤žà¤¾à¤µà¤²à¥€ à¤µà¤¾à¤ªà¤°à¥à¤¨, à¤ªà¥à¤°à¤¤à¥à¤¯à¥‡à¤• à¤‰à¤ªà¤¯à¥‹à¤œà¤•à¤¾à¤¸à¤¾à¤ à¥€ à¤ªà¤°à¤µà¤²à¥€à¤šà¥‡ à¤¶à¤¬à¥à¤¦ à¤¨à¤¿à¤°à¥à¤§à¤¾à¤°à¤¿à¤¤ à¤•à¥‡à¤²à¥à¤¯à¤¾à¤šà¥€ à¤–à¤¾à¤¤à¥à¤°à¥€ "
-#~ "à¤•à¤°à¤¾."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
 #~ "var/lib/samba/passdb.tdb /à¤µà¥à¤¹à¥€à¤à¤†à¤° /à¤à¤²à¤†à¤¯à¤¬à¥€/à¤¸à¤¾à¤‚à¤¬à¤¾ /à¤à¤¸à¤à¤®à¤¬à¥€ à¤ªà¤¾à¤¸à¤¡à¥€à¤¬à¥€.à¤Ÿà¥€à¤¡à¥€à¤¬à¥€? à¤¯à¤¾ "
@@ -270,22 +346,6 @@ msgstr ""
 #~ "ENCRYPTION.html (à¤¯à¥‚à¤à¤¸à¤†à¤°/à¤¶à¥‡à¤…à¤°/à¤¡à¥€à¤“à¤¸à¥€/à¤¸à¤¾à¤‚à¤¬à¤¾-à¤¡à¥€à¤“à¤¸à¥€/à¤à¤šà¤Ÿà¥€à¤à¤®à¤à¤²à¤¡à¥€à¤“à¤¸à¥€à¤à¤¸/à¤à¤¨à¤•à¥à¤°à¤¿à¤ªà¥à¤¶à¤¨."
 #~ "à¤à¤šà¤Ÿà¥€à¤à¤®à¤à¤²) à¤¹à¥‡ à¤ªà¥…à¤•à¥‡à¤œ à¤ªà¤¹à¤¾."
 
-#~ msgid "daemons"
-#~ msgstr "à¤¡à¤¿à¤®à¤¨à¥à¤¸"
-
-#~ msgid "inetd"
-#~ msgstr "à¤†à¤¯à¤à¤¨à¤‡à¤Ÿà¥€à¤¡à¥€"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "à¤¤à¥à¤®à¥à¤¹à¤¾à¤²à¤¾ à¤¸à¤¾à¤‚à¤¬à¤¾ à¤•à¤¶à¤¾ à¤ªà¥à¤°à¤•à¤¾à¤°à¥‡ à¤šà¤¾à¤²à¥‚ à¤•à¤°à¤¾à¤µà¤¯à¤¾à¤šà¤¾ à¤†à¤¹à¥‡?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "à¤¸à¤¾à¤‚à¤¬à¤¾ à¤¡à¤¿à¤®à¤¨ à¤à¤¸à¤à¤®à¤¬à¥€à¤¡à¥€ à¤¹à¤¾ à¤ªà¥à¤°à¥‹à¤—à¥à¤°à¤¾à¤® à¤¸à¤°à¥à¤µà¤¸à¤¾à¤§à¤¾à¤°à¤£ à¤¡à¤¿à¤®à¤¨ à¤®à¥à¤¹à¤£à¥‚à¤¨ à¤•à¤¿à¤‚à¤µà¤¾ à¤†à¤¯à¤à¤¨à¤‡à¤Ÿà¥€à¤¡à¥€ à¤®à¤§à¥‚à¤¨ "
-#~ "à¤šà¤¾à¤²à¤µà¤¿à¤¤à¤¾ à¤¯à¥‡à¤¤à¥‹. à¤¡à¤¿à¤®à¤¨ à¤®à¥à¤¹à¤£à¥‚à¤¨ à¤šà¤¾à¤²à¤µà¤¿à¤£à¥‡ à¤…à¤§à¤¿à¤• à¤¶à¥à¤°à¥‡à¤¯à¤¸à¥à¤•à¤°."
-
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
 #~ "/à¤ˆà¤Ÿà¥€à¤¸à¥€/à¤¸à¤¾à¤‚à¤¬à¤¾/à¤à¤¸à¤à¤®à¤¬à¥€ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡,/à¤µà¥à¤¹à¥€à¤à¤†à¤°/à¤à¤²à¤†à¤¯à¤¬à¥€/à¤¸à¤¾à¤‚à¤¬à¤¾/à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡à¥¤à¤Ÿà¥€à¤¡à¥€à¤¬à¥€ à¤•à¤¡à¥‡ à¤¹à¤²à¤µà¤¾à¤¯à¤šà¤¾ à¤•à¤¾?"
diff --git a/debian/po/nb.po b/debian/po/nb.po
index abe8e53..f4924bc 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_debian_po_nb\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-01-02 20:17+0100\n"
 "Last-Translator: BjÃ¸rn Steensrud <bjornst at skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian BokmÃ¥l <i18n-nb at lister.ping.uio.no>\n"
@@ -29,13 +29,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Skal det oppgraderes fra Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -47,13 +47,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Tjenerrolle"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -77,7 +77,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -87,7 +87,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -95,13 +95,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "OmrÃ¥denavn:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -109,68 +109,208 @@ msgstr "Oppgi Kerberos-omrÃ¥de for domenet som denne domenestyreren styrer."
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Dette er som regel ditt DNS vertsnavn, skrevet med store bokstaver."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Skal smb.conf endres til Ã¥ bruke WINS-innstillinger fra DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Hvis din datamaskin fÃ¥r informasjon om IP-adressen fra en DHCP-tjener pÃ¥ "
+"nettet, sÃ¥ kan DHCP-tjeneren ogsÃ¥ skaffe informasjon om WINS-tjenere "
+"(Â«NetBIOS navnetjenereÂ») pÃ¥ nettet. For Ã¥ bruke dette mÃ¥ smb.conf-fila "
+"endres slik at WINS-innstillinger fra DHCP automatisk leses fra /etc/samba/"
+"dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "For Ã¥ utnytte denne muligheten mÃ¥ pakka dhcp3-client vÃ¦re installert."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Sette opp smb.conf automatisk?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Hvis du ikke velger automatisk oppsett, mÃ¥ du hÃ¥ndtere oppsettsendringer "
-#~ "selv, og kan ikke dra nytte av periodiske forbedringer i oppsettet."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Resten av Samba-oppsettet dreier seg om spÃ¸rsmÃ¥l som pÃ¥virker parametre i /"
+"etc/samba/smb.conf, som er oppsettsfila for Samba-programmene (nmbd og "
+"smbd). smb.conf-fila inneholder nÃ¥ en  Â«includeÂ»-linje eller en parameter "
+"som gÃ¥r over flere linjer, som kanskje kan forvirre den automatiske "
+"oppsettsprosessen slik at du mÃ¥ endre smb.conf for hÃ¥nd for Ã¥ fÃ¥ den til Ã¥ "
+"virke igjen."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Hvis du ikke velger automatisk oppsett, mÃ¥ du hÃ¥ndtere oppsettsendringer "
+"selv, og kan ikke dra nytte av periodiske forbedringer i oppsettet."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Arbeidsgruppe/domenenavn:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Bruke passord-kryptering?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Alle nyere Windows-klienter bruker krypterte passord nÃ¥r de kommuniserer med "
+"SMB-tjenere. Hvis du vil bruke passord i klartekst mÃ¥ du endre en parameter "
+"i Windows registry pÃ¥ klientene."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Arbeidsgruppe/domenenavn:"
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Det anbefales sterkt Ã¥ bruke krypterte passord. GjÃ¸r du det, sÃ¥ se etter at "
+"du har en gyldig fil i /etc/samba/smbpasswd og at du lagrer passord der for "
+"hver bruker med kommandoen smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#  Using same translation as in debian.edu/Skolelinux. A bit controversial.
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "nisser"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Hvordan vil du at Samba skal kjÃ¸res?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba-prosessen smbd kan kjÃ¸res som en normal nisse eller fra inetd. Det "
+"anbefales Ã¥ kjÃ¸re som en nisse."
 
 #, fuzzy
 #~| msgid ""
@@ -185,67 +325,6 @@ msgstr ""
 #~ "den. Merk at denne parameteren ogsÃ¥ styrer domenenavnet som brukes med "
 #~ "innstillingen security=domain."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Skal smb.conf endres til Ã¥ bruke WINS-innstillinger fra DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Hvis din datamaskin fÃ¥r informasjon om IP-adressen fra en DHCP-tjener pÃ¥ "
-#~ "nettet, sÃ¥ kan DHCP-tjeneren ogsÃ¥ skaffe informasjon om WINS-tjenere "
-#~ "(Â«NetBIOS navnetjenereÂ») pÃ¥ nettet. For Ã¥ bruke dette mÃ¥ smb.conf-fila "
-#~ "endres slik at WINS-innstillinger fra DHCP automatisk leses fra /etc/"
-#~ "samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "For Ã¥ utnytte denne muligheten mÃ¥ pakka dhcp3-client vÃ¦re installert."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Sette opp smb.conf automatisk?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Resten av Samba-oppsettet dreier seg om spÃ¸rsmÃ¥l som pÃ¥virker parametre "
-#~ "i /etc/samba/smb.conf, som er oppsettsfila for Samba-programmene (nmbd og "
-#~ "smbd). smb.conf-fila inneholder nÃ¥ en  Â«includeÂ»-linje eller en parameter "
-#~ "som gÃ¥r over flere linjer, som kanskje kan forvirre den automatiske "
-#~ "oppsettsprosessen slik at du mÃ¥ endre smb.conf for hÃ¥nd for Ã¥ fÃ¥ den til "
-#~ "Ã¥ virke igjen."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Bruke passord-kryptering?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Alle nyere Windows-klienter bruker krypterte passord nÃ¥r de kommuniserer "
-#~ "med SMB-tjenere. Hvis du vil bruke passord i klartekst mÃ¥ du endre en "
-#~ "parameter i Windows registry pÃ¥ klientene."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Det anbefales sterkt Ã¥ bruke krypterte passord. GjÃ¸r du det, sÃ¥ se etter "
-#~ "at du har en gyldig fil i /etc/samba/smbpasswd og at du lagrer passord "
-#~ "der for hver bruker med kommandoen smbpasswd."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Opprette samba passord-database, /var/lib/samba/passdb.tdb?"
 
@@ -276,23 +355,6 @@ msgstr ""
 #~ "Mer detaljer finnes i fila /usr/share/doc/samba-doc/htmldocs/ENCRYPTION."
 #~ "html fra pakka samba-doc."
 
-#  Using same translation as in debian.edu/Skolelinux. A bit controversial.
-#~ msgid "daemons"
-#~ msgstr "nisser"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Hvordan vil du at Samba skal kjÃ¸res?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samba-prosessen smbd kan kjÃ¸res som en normal nisse eller fra inetd. Det "
-#~ "anbefales Ã¥ kjÃ¸re som en nisse."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Det er ikke stÃ¸tte for Ã¥ kjede sammen passdb-motorer"
 
diff --git a/debian/po/ne.po b/debian/po/ne.po
index 60c37b2..53e021a 100644
--- a/debian/po/ne.po
+++ b/debian/po/ne.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ne\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-14 05:36+0545\n"
 "Last-Translator: Shiva Pokharel <shiva at mpp.org.np>\n"
 "Language-Team: Nepali <info at mpp.org.np>\n"
@@ -30,13 +30,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -45,13 +45,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -60,7 +60,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -77,7 +77,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -85,13 +85,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -99,68 +99,206 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "DHCP à¤¬à¤¾à¤Ÿ WINS à¤¸à¥‡à¤Ÿà¤¿à¤™ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¥à¤¨ smb.conf à¤ªà¤°à¤¿à¤®à¤¾à¤°à¥à¤œà¤¨ à¤—à¤°à¥à¤¨à¥à¤¹à¥‹à¤¸à¥?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"à¤¯à¤¦à¤¿ à¤¤à¤ªà¤¾à¤ˆà¤à¤•à¥‹ à¤•à¤®à¥à¤ªà¥à¤¯à¥à¤Ÿà¤°à¤²à¥‡ à¤¸à¤žà¥à¤œà¤¾à¤²à¤®à¤¾ DHCP à¤¸à¤°à¥à¤à¤°à¤¬à¤¾à¤Ÿ IP à¤ à¥‡à¤—à¤¾à¤¨à¤¾ à¤œà¤¾à¤¨à¤•à¤¾à¤°à¥€ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤ à¤—à¤°à¥à¤› à¤à¤¨à¥‡, DHCP "
+"à¤¸à¤°à¥à¤à¤°à¤²à¥‡ à¤ªà¤¨à¤¿ à¤¸à¤žà¥à¤œà¤¾à¤²à¤®à¤¾ à¤µà¤°à¥à¤¤à¤®à¤¾à¤¨ WINS à¤¸à¤°à¥à¤à¤° (\"NetBIOS name servers\") à¤•à¤¾ à¤¬à¤¾à¤°à¥‡à¤®à¤¾ "
+"à¤œà¤¾à¤¨à¤•à¤¾à¤°à¥€ à¤‰à¤ªà¤²à¤¬à¥à¤§ à¤—à¤°à¤¾à¤‰à¤¨ à¤¸à¤•à¥à¤› à¥¤ à¤¯à¤¸à¤•à¤¾ à¤²à¤¾à¤—à¤¿ à¤¤à¤ªà¤¾à¤ˆà¤à¤•à¥‹ smb.conf à¤«à¤¾à¤‡à¤²à¤®à¤¾ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨ à¤†à¤µà¤¶à¥à¤¯à¤• à¤¹à¥à¤¨à¥à¤› "
+"à¤¤à¤¾à¤•à¥€ DHCP à¤²à¥‡ à¤‰à¤ªà¤²à¤¬à¥à¤§ à¤—à¤°à¤¾à¤à¤•à¤¾ WINS à¤¸à¥‡à¤Ÿà¤¿à¤™ /etc/samba/dhcp.conf. à¤¬à¤¾à¤Ÿ à¤¸à¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ à¤°à¥à¤ªà¤®à¤¾ "
+"à¤ªà¤¢à¥à¤¨ à¤¸à¤•à¤¿à¤¯à¥‹à¤¸à¥ à¥¤"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "à¤¯à¥‹ à¤µà¤¿à¤¶à¥‡à¤·à¤¤à¤¾à¤•à¥‹ à¤«à¤¾à¤‡à¤¦à¤¾ à¤²à¤¿à¤¨ dhcp3-à¤•à¥à¤²à¤¾à¤‡à¤¨à¥à¤Ÿ à¤ªà¥à¤¯à¤¾à¤•à¥‡à¤œ à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¤¾ à¤—à¤°à¤¿à¤à¤•à¥‹ à¤¹à¥à¤¨ à¤ªà¤°à¥à¤› à¥¤"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "à¤¸à¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ à¤°à¥à¤ªà¤®à¤¾ smb.conf à¤•à¤¨à¥à¤«à¤¿à¤—à¤° à¤—à¤°à¥à¤¨à¥à¤¹à¥à¤¨à¥à¤›?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "à¤¯à¤¦à¤¿ à¤¤à¤ªà¤¾à¤ˆà¤à¤²à¥‡ à¤¯à¥‹ à¤µà¤¿à¤•à¤²à¥à¤ª à¤›à¤¨à¥Œà¤Ÿ à¤¨à¤—à¤°à¥‡à¤®à¤¾, à¤•à¥à¤¨à¥ˆ à¤ªà¤¨à¤¿ à¤•à¤¨à¥à¤«à¤¿à¤—à¤°à¥‡à¤¸à¤¨ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨ à¤¤à¤ªà¤¾à¤ˆà¤ à¤†à¤«à¥ˆà¤²à¥‡ à¤¹à¥à¤¯à¤¾à¤¨à¥à¤¡à¤² "
-#~ "à¤—à¤°à¥à¤¨à¥ à¤ªà¤°à¥à¤›, à¤° à¤†à¤µà¤§à¤¿à¤• à¤•à¤¨à¥à¤«à¤¿à¤—à¤°à¥‡à¤¸à¤¨ à¤µà¥ƒà¤¦à¥à¤§à¥€à¤•à¥‹ à¤«à¤¾à¤‡à¤¦à¤¾ à¤²à¤¿à¤¨ à¤¸à¤•à¥à¤¨à¥ à¤¹à¥à¤¨à¥‡ à¤›à¥ˆà¤¨ à¥¤"
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"à¤¸à¤¾à¤®à¥à¤¬à¤¾à¤•à¥‹ à¤¬à¤¾à¤à¤•à¥€ à¤•à¤¨à¥à¤«à¤¿à¤—à¤°à¥‡à¤¸à¤¨ /etc/samba/smb.conf à¤ªà¤°à¤¾à¤®à¤¿à¤¤à¤¿à¤®à¤¾ à¤ªà¥à¤°à¤à¤¾à¤µ à¤ªà¤¾à¤°à¥à¤¨à¥‡ à¤ªà¥à¤°à¤¶à¥à¤¨à¤¸à¤à¤— à¤¡à¤¿à¤² "
+"à¤—à¤°à¥à¤›, à¤œà¥à¤¨ à¤¸à¤¾à¤®à¥à¤¬à¤¾ à¤•à¤¾à¤°à¥à¤¯à¤•à¥à¤°à¤® à¤•à¤¨à¥à¤«à¤¿à¤—à¤° à¤—à¤°à¥à¤¨ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤¹à¥à¤¨à¥‡ à¤«à¤¾à¤‡à¤² à¤¹à¥‹ (nmbd à¤° smbd) à¥¤ à¤¤à¤ªà¤¾à¤ˆà¤à¤•à¥‹ "
+"à¤¹à¤¾à¤²à¤•à¥‹ smb.conf à¤²à¥‡ à¤à¤‰à¤Ÿà¤¾ 'à¤¸à¤®à¥à¤®à¤¿à¤²à¤¿à¤¤' à¤²à¤¾à¤‡à¤¨ à¤µà¤¾ à¤¬à¤¹à¥à¤à¤¾à¤—à¤¿à¤¯ à¤²à¤¾à¤‡à¤¨ à¤¢à¤¾à¤•à¥à¤¨à¥‡ à¤µà¤¿à¤•à¤²à¥à¤ª à¤¸à¤®à¤¾à¤µà¥‡à¤¶ à¤—à¤°à¥à¤›, "
+"à¤œà¤¸à¤²à¥‡ à¤¸à¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ à¤•à¤¨à¥à¤«à¤¿à¤—à¤°à¥‡à¤¸à¤¨ à¤ªà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ à¤…à¤¸à¥à¤¤à¤µà¥à¤¯à¤¸à¥à¤¤ à¤ªà¤¾à¤°à¥à¤¨ à¤¸à¤•à¥à¤› à¤° à¤¤à¤ªà¤¾à¤ˆà¤à¤²à¥‡ à¤¯à¤¸à¤¬à¤¾à¤Ÿ à¤«à¥‡à¤°à¤¿ à¤•à¤¾à¤°à¥à¤¯ à¤—à¤°à¤¾à¤‰à¤¨ "
+"à¤¹à¤¾à¤¤à¥ˆà¤²à¥‡ smb.conf à¤¸à¤®à¥à¤ªà¤¾à¤¦à¤¨ à¤—à¤°à¥à¤¨à¥ à¤ªà¤°à¥à¤› à¥¤"
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "à¤•à¤¾à¤°à¥à¤¯ à¤¸à¤®à¥‚à¤¹/à¤¡à¥‹à¤®à¥‡à¤¨ à¤¨à¤¾à¤®:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"à¤¯à¤¦à¤¿ à¤¤à¤ªà¤¾à¤ˆà¤à¤²à¥‡ à¤¯à¥‹ à¤µà¤¿à¤•à¤²à¥à¤ª à¤›à¤¨à¥Œà¤Ÿ à¤¨à¤—à¤°à¥‡à¤®à¤¾, à¤•à¥à¤¨à¥ˆ à¤ªà¤¨à¤¿ à¤•à¤¨à¥à¤«à¤¿à¤—à¤°à¥‡à¤¸à¤¨ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨ à¤¤à¤ªà¤¾à¤ˆà¤ à¤†à¤«à¥ˆà¤²à¥‡ à¤¹à¥à¤¯à¤¾à¤¨à¥à¤¡à¤² à¤—à¤°à¥à¤¨à¥ "
+"à¤ªà¤°à¥à¤›, à¤° à¤†à¤µà¤§à¤¿à¤• à¤•à¤¨à¥à¤«à¤¿à¤—à¤°à¥‡à¤¸à¤¨ à¤µà¥ƒà¤¦à¥à¤§à¥€à¤•à¥‹ à¤«à¤¾à¤‡à¤¦à¤¾ à¤²à¤¿à¤¨ à¤¸à¤•à¥à¤¨à¥ à¤¹à¥à¤¨à¥‡ à¤›à¥ˆà¤¨ à¥¤"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "à¤•à¤¾à¤°à¥à¤¯ à¤¸à¤®à¥‚à¤¹/à¤¡à¥‹à¤®à¥‡à¤¨ à¤¨à¤¾à¤®:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤—à¥à¤ªà¥à¤¤à¤¿à¤•à¤°à¤£ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› ?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"à¤¹à¤¾à¤²à¤•à¤¾ à¤¸à¤¬à¥ˆ à¤¸à¤žà¥à¤à¥à¤¯à¤¾à¤² à¤—à¥à¤°à¤¾à¤¹à¤• à¤¸à¤®à¤•à¥à¤°à¤®à¤¿à¤¤ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¥‡à¤° SMB à¤¸à¤°à¥à¤à¤°à¤¸à¤à¤— à¤¸à¤žà¥à¤šà¤¾à¤° à¤—à¤°à¥à¤›à¤¨à¥ à¥¤ à¤¯à¤¦à¤¿ "
+"à¤¤à¤ªà¤¾à¤ˆà¤ à¤–à¤¾à¤²à¥€ à¤ªà¤¾à¤  à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¥à¤¨ à¤šà¤¾à¤¹à¤¨à¥à¤¹à¥à¤¨à¥à¤› à¤à¤¨à¥‡ à¤¤à¤ªà¤¾à¤ˆà¤à¤•à¥‹ à¤¸à¤žà¥à¤à¥à¤¯à¤¾à¤² à¤¦à¤°à¥à¤¤à¤¾à¤•à¥‹ à¤ªà¤°à¤¾à¤®à¤¿à¤¤à¤¿ "
+"à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨ à¤—à¤°à¥à¤¨à¥ à¤†à¤µà¤¶à¥à¤¯à¤• à¤¹à¥à¤¨à¥à¤› à¥¤"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"à¤¯à¥‹ à¤µà¤¿à¤•à¤²à¥à¤ª à¤¸à¤•à¥à¤·à¤® à¤ªà¤¾à¤°à¥à¤¨à¥‡ à¤‰à¤¤à¥à¤•à¥ƒà¤·à¥à¤Ÿ à¤¸à¥à¤µà¥€à¤•à¤¾à¤° à¤—à¤°à¤¿à¤à¤•à¥‹ à¤› à¥¤ à¤¯à¤¦à¤¿ à¤¤à¤ªà¤¾à¤ˆà¤ à¤—à¤°à¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› à¤à¤¨à¥‡, à¤¤à¤ªà¤¾à¤ˆà¤ à¤¸à¤à¤— /etc/"
+"samba/smbpasswd à¤«à¤¾à¤‡à¤² à¤° à¤¤à¥à¤¯à¤¹à¤¾à¤ à¤ªà¥à¤°à¤¤à¥à¤¯à¥‡à¤• à¤ªà¥à¤°à¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾à¤•à¤¾ à¤²à¤¾à¤—à¤¿ à¤¸à¥‡à¤Ÿ à¤—à¤°à¤¿à¤à¤•à¤¾ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ "
+"smbpasswd à¤†à¤¦à¥‡à¤¶ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¥‡à¤° à¤µà¥ˆà¤¦à¥à¤¯ à¤à¤à¤•à¥‹ à¤¨à¤¿à¤¶à¥à¤šà¤¿à¤¨à¥à¤¤ à¤¹à¥à¤¨à¥à¤¹à¥‹à¤¸à¥ à¥¤"
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "à¤¡à¥‡à¤‡à¤®à¥‹à¤¨"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "à¤¤à¤ªà¤¾à¤ˆà¤ à¤¸à¤¾à¤®à¥à¤¬à¤¾ à¤•à¤¸à¤°à¥€ à¤šà¤²à¤¾à¤‰à¤¨ à¤šà¤¾à¤¹à¤¨à¥à¤¹à¥à¤¨à¥à¤›?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"à¤¸à¤¾à¤®à¥à¤¬à¤¾ à¤¡à¥‡à¤‡à¤®à¥‹à¤¨ à¤¸à¤®à¤¾à¤¨à¥à¤¯ à¤¡à¥‡à¤‡à¤®à¥‹à¤¨à¤•à¥‹ à¤°à¥à¤ªà¤®à¤¾ à¤µà¤¾ inetd à¤¬à¤¾à¤Ÿ à¤šà¤²à¤¾à¤‰à¤¨ à¤¸à¤•à¤¿à¤¨à¥à¤› à¥¤ à¤¡à¥‡à¤‡à¤®à¥‹à¤¨à¤•à¥‹ à¤°à¥‚à¤ªà¤®à¤¾ à¤šà¤²à¤¾à¤‰à¤¨à¥ "
+"à¤¸à¤¿à¤«à¤¾à¤°à¤¿à¤¸ à¤—à¤°à¤¿à¤à¤•à¥‹ à¤¤à¤°à¤¿à¤•à¤¾ à¤¹à¥‹ à¥¤"
 
 #, fuzzy
 #~| msgid ""
@@ -175,65 +313,6 @@ msgstr ""
 #~ "à¤¯à¤¾à¤¦ à¤—à¤°à¥à¤¨à¥à¤¹à¥‹à¤¸à¥ à¤¯à¥‹ à¤ªà¤°à¤¾à¤®à¤¿à¤¤à¤¿à¤²à¥‡ à¤ªà¤¨à¤¿ à¤¸à¥à¤°à¤•à¥à¤·à¤¾=à¤¡à¥‹à¤®à¥‡à¤¨ à¤¸à¥‡à¤Ÿà¤¿à¤™à¤®à¤¾ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¤¿à¤à¤•à¤¾ à¤¡à¥‹à¤®à¥‡à¤¨ à¤¨à¤¾à¤® "
 #~ "à¤¨à¤¿à¤¯à¤¨à¥à¤¤à¥à¤°à¤£ à¤—à¤°à¥à¤› à¥¤"
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "DHCP à¤¬à¤¾à¤Ÿ WINS à¤¸à¥‡à¤Ÿà¤¿à¤™ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¥à¤¨ smb.conf à¤ªà¤°à¤¿à¤®à¤¾à¤°à¥à¤œà¤¨ à¤—à¤°à¥à¤¨à¥à¤¹à¥‹à¤¸à¥?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "à¤¯à¤¦à¤¿ à¤¤à¤ªà¤¾à¤ˆà¤à¤•à¥‹ à¤•à¤®à¥à¤ªà¥à¤¯à¥à¤Ÿà¤°à¤²à¥‡ à¤¸à¤žà¥à¤œà¤¾à¤²à¤®à¤¾ DHCP à¤¸à¤°à¥à¤à¤°à¤¬à¤¾à¤Ÿ IP à¤ à¥‡à¤—à¤¾à¤¨à¤¾ à¤œà¤¾à¤¨à¤•à¤¾à¤°à¥€ à¤ªà¥à¤°à¤¾à¤ªà¥à¤¤ à¤—à¤°à¥à¤› à¤à¤¨à¥‡, "
-#~ "DHCP à¤¸à¤°à¥à¤à¤°à¤²à¥‡ à¤ªà¤¨à¤¿ à¤¸à¤žà¥à¤œà¤¾à¤²à¤®à¤¾ à¤µà¤°à¥à¤¤à¤®à¤¾à¤¨ WINS à¤¸à¤°à¥à¤à¤° (\"NetBIOS name servers\") à¤•à¤¾ "
-#~ "à¤¬à¤¾à¤°à¥‡à¤®à¤¾ à¤œà¤¾à¤¨à¤•à¤¾à¤°à¥€ à¤‰à¤ªà¤²à¤¬à¥à¤§ à¤—à¤°à¤¾à¤‰à¤¨ à¤¸à¤•à¥à¤› à¥¤ à¤¯à¤¸à¤•à¤¾ à¤²à¤¾à¤—à¤¿ à¤¤à¤ªà¤¾à¤ˆà¤à¤•à¥‹ smb.conf à¤«à¤¾à¤‡à¤²à¤®à¤¾ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨ "
-#~ "à¤†à¤µà¤¶à¥à¤¯à¤• à¤¹à¥à¤¨à¥à¤› à¤¤à¤¾à¤•à¥€ DHCP à¤²à¥‡ à¤‰à¤ªà¤²à¤¬à¥à¤§ à¤—à¤°à¤¾à¤à¤•à¤¾ WINS à¤¸à¥‡à¤Ÿà¤¿à¤™ /etc/samba/dhcp.conf. à¤¬à¤¾à¤Ÿ "
-#~ "à¤¸à¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ à¤°à¥à¤ªà¤®à¤¾ à¤ªà¤¢à¥à¤¨ à¤¸à¤•à¤¿à¤¯à¥‹à¤¸à¥ à¥¤"
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "à¤¯à¥‹ à¤µà¤¿à¤¶à¥‡à¤·à¤¤à¤¾à¤•à¥‹ à¤«à¤¾à¤‡à¤¦à¤¾ à¤²à¤¿à¤¨ dhcp3-à¤•à¥à¤²à¤¾à¤‡à¤¨à¥à¤Ÿ à¤ªà¥à¤¯à¤¾à¤•à¥‡à¤œ à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¤¾ à¤—à¤°à¤¿à¤à¤•à¥‹ à¤¹à¥à¤¨ à¤ªà¤°à¥à¤› à¥¤"
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "à¤¸à¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ à¤°à¥à¤ªà¤®à¤¾ smb.conf à¤•à¤¨à¥à¤«à¤¿à¤—à¤° à¤—à¤°à¥à¤¨à¥à¤¹à¥à¤¨à¥à¤›?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "à¤¸à¤¾à¤®à¥à¤¬à¤¾à¤•à¥‹ à¤¬à¤¾à¤à¤•à¥€ à¤•à¤¨à¥à¤«à¤¿à¤—à¤°à¥‡à¤¸à¤¨ /etc/samba/smb.conf à¤ªà¤°à¤¾à¤®à¤¿à¤¤à¤¿à¤®à¤¾ à¤ªà¥à¤°à¤à¤¾à¤µ à¤ªà¤¾à¤°à¥à¤¨à¥‡ à¤ªà¥à¤°à¤¶à¥à¤¨à¤¸à¤à¤— à¤¡à¤¿à¤² "
-#~ "à¤—à¤°à¥à¤›, à¤œà¥à¤¨ à¤¸à¤¾à¤®à¥à¤¬à¤¾ à¤•à¤¾à¤°à¥à¤¯à¤•à¥à¤°à¤® à¤•à¤¨à¥à¤«à¤¿à¤—à¤° à¤—à¤°à¥à¤¨ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤¹à¥à¤¨à¥‡ à¤«à¤¾à¤‡à¤² à¤¹à¥‹ (nmbd à¤° smbd) à¥¤ à¤¤à¤ªà¤¾à¤ˆà¤à¤•à¥‹ "
-#~ "à¤¹à¤¾à¤²à¤•à¥‹ smb.conf à¤²à¥‡ à¤à¤‰à¤Ÿà¤¾ 'à¤¸à¤®à¥à¤®à¤¿à¤²à¤¿à¤¤' à¤²à¤¾à¤‡à¤¨ à¤µà¤¾ à¤¬à¤¹à¥à¤à¤¾à¤—à¤¿à¤¯ à¤²à¤¾à¤‡à¤¨ à¤¢à¤¾à¤•à¥à¤¨à¥‡ à¤µà¤¿à¤•à¤²à¥à¤ª à¤¸à¤®à¤¾à¤µà¥‡à¤¶ "
-#~ "à¤—à¤°à¥à¤›, à¤œà¤¸à¤²à¥‡ à¤¸à¥à¤µà¤šà¤¾à¤²à¤¿à¤¤ à¤•à¤¨à¥à¤«à¤¿à¤—à¤°à¥‡à¤¸à¤¨ à¤ªà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ à¤…à¤¸à¥à¤¤à¤µà¥à¤¯à¤¸à¥à¤¤ à¤ªà¤¾à¤°à¥à¤¨ à¤¸à¤•à¥à¤› à¤° à¤¤à¤ªà¤¾à¤ˆà¤à¤²à¥‡ à¤¯à¤¸à¤¬à¤¾à¤Ÿ à¤«à¥‡à¤°à¤¿ à¤•à¤¾à¤°à¥à¤¯ "
-#~ "à¤—à¤°à¤¾à¤‰à¤¨ à¤¹à¤¾à¤¤à¥ˆà¤²à¥‡ smb.conf à¤¸à¤®à¥à¤ªà¤¾à¤¦à¤¨ à¤—à¤°à¥à¤¨à¥ à¤ªà¤°à¥à¤› à¥¤"
-
-#~ msgid "Use password encryption?"
-#~ msgstr "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤—à¥à¤ªà¥à¤¤à¤¿à¤•à¤°à¤£ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› ?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "à¤¹à¤¾à¤²à¤•à¤¾ à¤¸à¤¬à¥ˆ à¤¸à¤žà¥à¤à¥à¤¯à¤¾à¤² à¤—à¥à¤°à¤¾à¤¹à¤• à¤¸à¤®à¤•à¥à¤°à¤®à¤¿à¤¤ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¥‡à¤° SMB à¤¸à¤°à¥à¤à¤°à¤¸à¤à¤— à¤¸à¤žà¥à¤šà¤¾à¤° à¤—à¤°à¥à¤›à¤¨à¥ à¥¤ "
-#~ "à¤¯à¤¦à¤¿ à¤¤à¤ªà¤¾à¤ˆà¤ à¤–à¤¾à¤²à¥€ à¤ªà¤¾à¤  à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¥à¤¨ à¤šà¤¾à¤¹à¤¨à¥à¤¹à¥à¤¨à¥à¤› à¤à¤¨à¥‡ à¤¤à¤ªà¤¾à¤ˆà¤à¤•à¥‹ à¤¸à¤žà¥à¤à¥à¤¯à¤¾à¤² à¤¦à¤°à¥à¤¤à¤¾à¤•à¥‹ "
-#~ "à¤ªà¤°à¤¾à¤®à¤¿à¤¤à¤¿ à¤ªà¤°à¤¿à¤µà¤°à¥à¤¤à¤¨ à¤—à¤°à¥à¤¨à¥ à¤†à¤µà¤¶à¥à¤¯à¤• à¤¹à¥à¤¨à¥à¤› à¥¤"
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "à¤¯à¥‹ à¤µà¤¿à¤•à¤²à¥à¤ª à¤¸à¤•à¥à¤·à¤® à¤ªà¤¾à¤°à¥à¤¨à¥‡ à¤‰à¤¤à¥à¤•à¥ƒà¤·à¥à¤Ÿ à¤¸à¥à¤µà¥€à¤•à¤¾à¤° à¤—à¤°à¤¿à¤à¤•à¥‹ à¤› à¥¤ à¤¯à¤¦à¤¿ à¤¤à¤ªà¤¾à¤ˆà¤ à¤—à¤°à¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› à¤à¤¨à¥‡, à¤¤à¤ªà¤¾à¤ˆà¤ à¤¸à¤à¤— /"
-#~ "etc/samba/smbpasswd à¤«à¤¾à¤‡à¤² à¤° à¤¤à¥à¤¯à¤¹à¤¾à¤ à¤ªà¥à¤°à¤¤à¥à¤¯à¥‡à¤• à¤ªà¥à¤°à¤¯à¥‹à¤—à¤•à¤°à¥à¤¤à¤¾à¤•à¤¾ à¤²à¤¾à¤—à¤¿ à¤¸à¥‡à¤Ÿ à¤—à¤°à¤¿à¤à¤•à¤¾ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ "
-#~ "smbpasswd à¤†à¤¦à¥‡à¤¶ à¤ªà¥à¤°à¤¯à¥‹à¤— à¤—à¤°à¥‡à¤° à¤µà¥ˆà¤¦à¥à¤¯ à¤à¤à¤•à¥‹ à¤¨à¤¿à¤¶à¥à¤šà¤¿à¤¨à¥à¤¤ à¤¹à¥à¤¨à¥à¤¹à¥‹à¤¸à¥ à¥¤"
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "à¤¸à¤¾à¤®à¥à¤¬à¤¾ à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡ à¤¡à¤¾à¤Ÿà¤¾à¤¬à¥‡à¤¸ /var/lib/samba/passdb.tdb à¤¸à¤¿à¤°à¥à¤œà¤¨à¤¾ à¤—à¤°à¥à¤¨à¥à¤¹à¥à¤¨à¥à¤› ?"
 
@@ -263,22 +342,6 @@ msgstr ""
 #~ "à¤…à¤§à¤¿à¤• à¤œà¤¾à¤¨à¤•à¤¾à¤°à¥€à¤•à¤¾ à¤²à¤¾à¤—à¤¿ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html  "
 #~ "à¤¬à¤¾à¤Ÿ samba-doc à¤ªà¥à¤¯à¤¾à¤•à¥‡à¤œ à¤¹à¥‡à¤°à¥à¤¨à¥à¤¹à¥‹à¤¸à¥ à¥¤"
 
-#~ msgid "daemons"
-#~ msgstr "à¤¡à¥‡à¤‡à¤®à¥‹à¤¨"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "à¤¤à¤ªà¤¾à¤ˆà¤ à¤¸à¤¾à¤®à¥à¤¬à¤¾ à¤•à¤¸à¤°à¥€ à¤šà¤²à¤¾à¤‰à¤¨ à¤šà¤¾à¤¹à¤¨à¥à¤¹à¥à¤¨à¥à¤›?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "à¤¸à¤¾à¤®à¥à¤¬à¤¾ à¤¡à¥‡à¤‡à¤®à¥‹à¤¨ à¤¸à¤®à¤¾à¤¨à¥à¤¯ à¤¡à¥‡à¤‡à¤®à¥‹à¤¨à¤•à¥‹ à¤°à¥à¤ªà¤®à¤¾ à¤µà¤¾ inetd à¤¬à¤¾à¤Ÿ à¤šà¤²à¤¾à¤‰à¤¨ à¤¸à¤•à¤¿à¤¨à¥à¤› à¥¤ à¤¡à¥‡à¤‡à¤®à¥‹à¤¨à¤•à¥‹ à¤°à¥‚à¤ªà¤®à¤¾ "
-#~ "à¤šà¤²à¤¾à¤‰à¤¨à¥ à¤¸à¤¿à¤«à¤¾à¤°à¤¿à¤¸ à¤—à¤°à¤¿à¤à¤•à¥‹ à¤¤à¤°à¤¿à¤•à¤¾ à¤¹à¥‹ à¥¤"
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "passdb à¤¬à¥à¤¯à¤¾à¤•à¥‡à¤¨à¥à¤¡ à¤šà¥‡à¤¨ à¤—à¤°à¥à¤¨à¥‡à¤•à¤¾ à¤²à¤¾à¤—à¤¿ à¤¸à¤®à¤°à¥à¤¥à¤¨ à¤›à¥ˆà¤¨ "
 
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 02e7b00..a6649cd 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4 4.0.0~alpha17.dfsg2-1\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-01-25 09:57+0100\n"
 "Last-Translator: Jeroen Schot <schot at a-eskwadraat.nl>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Opwaarderen vanaf Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -38,13 +38,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Server-rol"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -56,7 +56,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -87,13 +87,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Realm-naam:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -103,48 +103,178 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Meestal is dit uw domeinnaam in hoofdletters."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
diff --git a/debian/po/nn.po b/debian/po/nn.po
index 3d6e74e..bc7cf0b 100644
--- a/debian/po/nn.po
+++ b/debian/po/nn.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_nn\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-17 18:35+0100\n"
 "Last-Translator: HÃ¥vard Korsvoll <korsvoll at gmail.com>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn at lister.ping.uio.no>\n"
@@ -20,13 +20,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -75,13 +75,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -89,69 +89,208 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Vil du endre smd.conf til Ã¥ bruke WINS-innstillingar frÃ¥ DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Viss maskina di fÃ¥r IP-adresseinformasjon frÃ¥ ein DHCP-tenar pÃ¥ nettverket, "
+"kan DHCP-tenaren ogsÃ¥ gje informasjon om WINS-tenarar (Â«NetBIOS "
+"namnetenararÂ») som er tilstade pÃ¥ nettverket. Dette krev ei endring i smb."
+"conf-fila slik at WINS-innstillingar som DHCP-tenaren oppgjev automatisk "
+"vert lest frÃ¥ /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "Pakka dhcp3-client mÃ¥ vere installert for Ã¥ ta i bruk dette."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Setje opp smb.conf automatisk?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Viss du ikkje vel dette, sÃ¥ vil du mÃ¥tte handtere endringar i oppsettet "
-#~ "sjÃ¸lv, og du vil ikkje vere i stand til Ã¥ ta imot periodiske forbetringar "
-#~ "i oppsettet."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Resten av oppsettet av Samba er spÃ¸rsmÃ¥l som handlar om parametrar i /etc/"
+"samba/smb.conf, som er fila som blir brukt til Ã¥ setje opp Sambaprogram "
+"(nmbd og smbd). Den noverande smb.conf-fila inneheld ei Â«includeÂ»-linje "
+"eller ein opsjon som gÃ¥r over fleire linjer, noko som kan forvirre den "
+"automatiske oppsettsprosessen og gjer at du mÃ¥ redigere smb.conf-fila "
+"manuelt for Ã¥ fÃ¥ det til Ã¥ fungere igjen."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Arbeidsgruppe/Domenenamn:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Viss du ikkje vel dette, sÃ¥ vil du mÃ¥tte handtere endringar i oppsettet "
+"sjÃ¸lv, og du vil ikkje vere i stand til Ã¥ ta imot periodiske forbetringar i "
+"oppsettet."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Arbeidsgruppe/Domenenamn:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Bruke krypterte passord?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Alle nyare Windows-klientar kommuniserer med SMB-tenarar ved hjelp av "
+"krypterte passord. Viss du vil bruke klartekstpassord, mÃ¥ du endre ein "
+"parameter i Windows-registeret."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Det er sterkt tilrÃ¥dd at du slÃ¥r pÃ¥ dette valet. Viss du gjer det, mÃ¥ du sjÃ¥ "
+"etter at du har ei gyldig /etc/samba/smbpasswd-fil, og du set inn passord "
+"der for kvar brukar ved hjelp av kommandoen Â«smbpasswdÂ»."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "tenester"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Korleis vil du kÃ¸yre Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba-tenesta smbd kan kÃ¸yrast som ei normal teneste frÃ¥ inetd. Ã… kÃ¸yre som "
+"ei teneste er den tilrÃ¥dde mÃ¥ten."
 
 #, fuzzy
 #~| msgid ""
@@ -166,66 +305,6 @@ msgstr ""
 #~ "vere i nÃ¥r han blir spurd av klientar. Merk at denne parameteren ogsÃ¥ "
 #~ "kontrollerer domenenamnet som er brukt med instillinga security=domain."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Vil du endre smd.conf til Ã¥ bruke WINS-innstillingar frÃ¥ DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Viss maskina di fÃ¥r IP-adresseinformasjon frÃ¥ ein DHCP-tenar pÃ¥ "
-#~ "nettverket, kan DHCP-tenaren ogsÃ¥ gje informasjon om WINS-tenarar "
-#~ "(Â«NetBIOS namnetenararÂ») som er tilstade pÃ¥ nettverket. Dette krev ei "
-#~ "endring i smb.conf-fila slik at WINS-innstillingar som DHCP-tenaren "
-#~ "oppgjev automatisk vert lest frÃ¥ /etc/samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "Pakka dhcp3-client mÃ¥ vere installert for Ã¥ ta i bruk dette."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Setje opp smb.conf automatisk?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Resten av oppsettet av Samba er spÃ¸rsmÃ¥l som handlar om parametrar i /etc/"
-#~ "samba/smb.conf, som er fila som blir brukt til Ã¥ setje opp Sambaprogram "
-#~ "(nmbd og smbd). Den noverande smb.conf-fila inneheld ei Â«includeÂ»-linje "
-#~ "eller ein opsjon som gÃ¥r over fleire linjer, noko som kan forvirre den "
-#~ "automatiske oppsettsprosessen og gjer at du mÃ¥ redigere smb.conf-fila "
-#~ "manuelt for Ã¥ fÃ¥ det til Ã¥ fungere igjen."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Bruke krypterte passord?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Alle nyare Windows-klientar kommuniserer med SMB-tenarar ved hjelp av "
-#~ "krypterte passord. Viss du vil bruke klartekstpassord, mÃ¥ du endre ein "
-#~ "parameter i Windows-registeret."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Det er sterkt tilrÃ¥dd at du slÃ¥r pÃ¥ dette valet. Viss du gjer det, mÃ¥ du "
-#~ "sjÃ¥ etter at du har ei gyldig /etc/samba/smbpasswd-fil, og du set inn "
-#~ "passord der for kvar brukar ved hjelp av kommandoen Â«smbpasswdÂ»."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Opprette samba passorddatabase, /var/lib/samba/passdb.tdb?"
 
@@ -256,22 +335,6 @@ msgstr ""
 #~ "SjÃ¥ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html frÃ¥ pakken samba-"
 #~ "doc for fleire detaljar."
 
-#~ msgid "daemons"
-#~ msgstr "tenester"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Korleis vil du kÃ¸yre Samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samba-tenesta smbd kan kÃ¸yrast som ei normal teneste frÃ¥ inetd. Ã… kÃ¸yre "
-#~ "som ei teneste er den tilrÃ¥dde mÃ¥ten."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Lenkjing av passdb-motorar er ikkje stÃ¸tta"
 
diff --git a/debian/po/pl.po b/debian/po/pl.po
index 290abd1..749782d 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-02-11 19:28+0100\n"
 "Last-Translator: MichaÅ‚ KuÅ‚ach <michal.kulach at gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish at lists.debian.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "ZaktualizowaÄ‡ z Samby 3? "
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -40,13 +40,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Rola serwera"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -58,7 +58,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -70,7 +70,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -80,7 +80,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -88,13 +88,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Nazwa dziedziny:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -104,48 +104,178 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Z reguÅ‚y jest to pisana duÅ¼ymi literami nazwa DNS komputera."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 26e2207..0f23cb6 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4 4.0.0~alpha4~20080617-1\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2011-12-29 10:02+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig at debian.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Actualizar a partir do Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -36,13 +36,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Papel do servidor"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -54,7 +54,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -77,7 +77,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -85,13 +85,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Nome do reino:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -101,64 +101,217 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 "Normalmente isto Ã© a versÃ£o em maiÃºsculas do seu nome de mÃ¡quina de DNS."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"Modificar o smb.conf para utilizar definiÃ§Ãµes de WINS a partir de DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Se o seu computador obtÃ©m a informaÃ§Ã£o do endereÃ§o IP a partir de um "
+"servidor de DHCP na rede, o servidor de DHCP pode tambÃ©m fornecer informaÃ§Ã£o "
+"acerca de servidores de WINS (\"servidor de nomes NetBIOS\") presentes na "
+"rede.  Isto requer uma alteraÃ§Ã£o no seu ficheiro smb.conf de modo que as "
+"definiÃ§Ãµes de WINS fornecidas por DHCP sejam automaticamente lidas a partir "
+"de /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Para tirar partido desta funcionalidade tem de ter instalado o pacote dhcp3-"
+"client."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Configurar automaticamente o smb.conf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"O resto da configuraÃ§Ã£o do Samba trata de questÃµes que afectam parÃ¢metros "
+"em /etc/samba/smb.conf, que Ã© o ficheiro utilizado para configurar os "
+"programas do Samba (nmbd e smbd). O seu actual smb.conf contÃ©m uma linha "
+"'include' ou uma opÃ§Ã£o que se espalha por vÃ¡rias linhas, a qual pode "
+"confundir o processo de configuraÃ§Ã£o automÃ¡tica e necessitar que vocÃª edite "
+"Ã  mÃ£o o smb.conf par o ter novamente operacional."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Se nÃ£o escolher esta opÃ§Ã£o, o Samba ficarÃ¡ por configurar, e terÃ¡ de fazÃª-lo "
+"vocÃª mesmo."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Nome de DomÃnio:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Utilizar encriptaÃ§Ã£o de passwords?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Todos os clientes Windows recentes comunicam com servidores SMB utilizando "
+"passwords encriptadas. Se deseja utilizar passwords de texto puro vocÃª vai "
+"ter de alterar um parÃ¢metro no registo do seu Windows."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Ã‰ altamente recomendado que escolha esta opÃ§Ã£o. Se o fizer, assegure-se que "
+"tem um ficheiro /etc/samba/smbpasswd vÃ¡lido e que define as passwords para "
+"cada utilizador utilizando o comando smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "daemons"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Como deseja correr o Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"O daemon de Samba smbd pode correr como um daemon normal ou a partir de "
+"inetd. ExecutÃ¡-lo como um daemon Ã© a aproximaÃ§Ã£o recomendada."
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Configurar o Samba 4 como um PDC?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Se nÃ£o escolher esta opÃ§Ã£o, o Samba ficarÃ¡ por configurar, e terÃ¡ de fazÃª-"
-#~ "lo vocÃª mesmo."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -174,9 +327,6 @@ msgstr ""
 #~ "Por favor especifique o reino Kerberos onde este servidor irÃ¡ estar. Em "
 #~ "muitos casos, este serÃ¡ o mesmo do que o nome de domÃnio DNS."
 
-#~ msgid "Domain Name:"
-#~ msgstr "Nome de DomÃnio:"
-
 #~ msgid ""
 #~ "Please specify the domain you want this server to appear to be in when "
 #~ "queried by clients."
@@ -184,70 +334,6 @@ msgstr ""
 #~ "Por favor especifique o domÃnio em que quer que este servidor apareÃ§a "
 #~ "quando for questionado pelos clientes."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "Modificar o smb.conf para utilizar definiÃ§Ãµes de WINS a partir de DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Se o seu computador obtÃ©m a informaÃ§Ã£o do endereÃ§o IP a partir de um "
-#~ "servidor de DHCP na rede, o servidor de DHCP pode tambÃ©m fornecer "
-#~ "informaÃ§Ã£o acerca de servidores de WINS (\"servidor de nomes NetBIOS\") "
-#~ "presentes na rede.  Isto requer uma alteraÃ§Ã£o no seu ficheiro smb.conf de "
-#~ "modo que as definiÃ§Ãµes de WINS fornecidas por DHCP sejam automaticamente "
-#~ "lidas a partir de /etc/samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Para tirar partido desta funcionalidade tem de ter instalado o pacote "
-#~ "dhcp3-client."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Configurar automaticamente o smb.conf?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "O resto da configuraÃ§Ã£o do Samba trata de questÃµes que afectam parÃ¢metros "
-#~ "em /etc/samba/smb.conf, que Ã© o ficheiro utilizado para configurar os "
-#~ "programas do Samba (nmbd e smbd). O seu actual smb.conf contÃ©m uma linha "
-#~ "'include' ou uma opÃ§Ã£o que se espalha por vÃ¡rias linhas, a qual pode "
-#~ "confundir o processo de configuraÃ§Ã£o automÃ¡tica e necessitar que vocÃª "
-#~ "edite Ã  mÃ£o o smb.conf par o ter novamente operacional."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Utilizar encriptaÃ§Ã£o de passwords?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Todos os clientes Windows recentes comunicam com servidores SMB "
-#~ "utilizando passwords encriptadas. Se deseja utilizar passwords de texto "
-#~ "puro vocÃª vai ter de alterar um parÃ¢metro no registo do seu Windows."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Ã‰ altamente recomendado que escolha esta opÃ§Ã£o. Se o fizer, assegure-se "
-#~ "que tem um ficheiro /etc/samba/smbpasswd vÃ¡lido e que define as passwords "
-#~ "para cada utilizador utilizando o comando smbpasswd."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Criar base de dados de passwords samba, /var/lib/samba/passdb.tdb?"
 
@@ -279,22 +365,6 @@ msgstr ""
 #~ "Para mais detalhes veja /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
 #~ "do pacote samba-doc."
 
-#~ msgid "daemons"
-#~ msgstr "daemons"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Como deseja correr o Samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "O daemon de Samba smbd pode correr como um daemon normal ou a partir de "
-#~ "inetd. ExecutÃ¡-lo como um daemon Ã© a aproximaÃ§Ã£o recomendada."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "NÃ£o Ã© suportado carregar backends passdb"
 
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 460fd36..23029f8 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-12 16:16-0200\n"
 "Last-Translator: AndrÃ© LuÃs Lopes <andrelop at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -41,13 +41,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -56,7 +56,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -73,7 +73,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -81,13 +81,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -95,69 +95,211 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Modificar smb.conf para usar configuraÃ§Ãµes WINS fornecidas via DHCP ?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Caso seu computador obtenha as informaÃ§Ãµes de endereÃ§amento IP de um "
+"servidor DHCP na rede, o servidor DHCP poderÃ¡ tambÃ©m fornecer informaÃ§Ãµes "
+"sobre servidor WINS (\"Servidor de Nomes NetBIOS\") presentes na rede. Para "
+"que o Samba leia as configuraÃ§Ãµes WINS fornecidas pelo servidor DHCP "
+"automaticamente do arquivo /etc/samba/dhcp.conf, Ã© preciso modificar seu "
+"arquivo smb.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"O pacote dhcp3-client deve estar instalado para que esse recurso possa ser "
+"utilizado."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Configurar smb.conf automaticamente ?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Caso vocÃª opte por essa opÃ§Ã£o, vocÃª precisarÃ¡ lidar com quaisquer "
-#~ "mudanÃ§as de configuraÃ§Ã£o manualmente e vocÃª nÃ£o poderÃ¡ aproveitar os "
-#~ "melhoramentos periÃ³dicos de configuraÃ§Ã£o."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"O restante da configuraÃ§Ã£o do Samba lida com questÃµes que afetam parÃ¢metros "
+"no arquivo /etc/samba/smb.conf, que Ã© o arquivo usado para configurar os "
+"programas Samba (nmbd e smbd). Seu arquivo smb.conf atual contÃ©m uma linha "
+"'include' ou uma opÃ§Ã£o que ocupa diversas linhas, o que pode confundir o "
+"processo de configuraÃ§Ã£o automatizado e requerer que vocÃª edite seu arquivo "
+"smb.conf manualmente para tornÃ¡-lo funcional novamente."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Caso vocÃª opte por essa opÃ§Ã£o, vocÃª precisarÃ¡ lidar com quaisquer mudanÃ§as "
+"de configuraÃ§Ã£o manualmente e vocÃª nÃ£o poderÃ¡ aproveitar os melhoramentos "
+"periÃ³dicos de configuraÃ§Ã£o."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Nome de DomÃnio/Grupo de Trabalho :"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Usar senhas criptografadas ?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Todos os clientes Windows atuais comunicam-se com servidores SMB usando "
+"senhas encriptadas. Caso vocÃª queira usar senhas em texto puro vocÃª "
+"precisarÃ¡ modificar um parÃ¢metro no registro de seu Windows."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Nome de DomÃnio/Grupo de Trabalho :"
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Habilitar esta opÃ§Ã£o Ã© altamente recomendado. Caso vocÃª o faÃ§a, certifique-"
+"se de possuir um arquivo /etc/samba/smbpasswd e que vocÃª tenha senhas "
+"definidas no mesmo para cada usuÃ¡rio usando o comando smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "daemons"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Como vocÃª deseja que o Samba seja executado ?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"O serviÃ§o Samba smbd pode ser executado como daemon normal ou a partir do "
+"inetd. ExecutÃ¡-lo como daemon Ã© o mÃ©todo recomendado."
 
 #, fuzzy
 #~| msgid ""
@@ -173,71 +315,6 @@ msgstr ""
 #~ "tambÃ©m controla o nome de DomÃnio usado com a configuraÃ§Ã£o "
 #~ "security=domain."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "Modificar smb.conf para usar configuraÃ§Ãµes WINS fornecidas via DHCP ?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Caso seu computador obtenha as informaÃ§Ãµes de endereÃ§amento IP de um "
-#~ "servidor DHCP na rede, o servidor DHCP poderÃ¡ tambÃ©m fornecer informaÃ§Ãµes "
-#~ "sobre servidor WINS (\"Servidor de Nomes NetBIOS\") presentes na rede. "
-#~ "Para que o Samba leia as configuraÃ§Ãµes WINS fornecidas pelo servidor DHCP "
-#~ "automaticamente do arquivo /etc/samba/dhcp.conf, Ã© preciso modificar seu "
-#~ "arquivo smb.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "O pacote dhcp3-client deve estar instalado para que esse recurso possa "
-#~ "ser utilizado."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Configurar smb.conf automaticamente ?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "O restante da configuraÃ§Ã£o do Samba lida com questÃµes que afetam "
-#~ "parÃ¢metros no arquivo /etc/samba/smb.conf, que Ã© o arquivo usado para "
-#~ "configurar os programas Samba (nmbd e smbd). Seu arquivo smb.conf atual "
-#~ "contÃ©m uma linha 'include' ou uma opÃ§Ã£o que ocupa diversas linhas, o que "
-#~ "pode confundir o processo de configuraÃ§Ã£o automatizado e requerer que "
-#~ "vocÃª edite seu arquivo smb.conf manualmente para tornÃ¡-lo funcional "
-#~ "novamente."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Usar senhas criptografadas ?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Todos os clientes Windows atuais comunicam-se com servidores SMB usando "
-#~ "senhas encriptadas. Caso vocÃª queira usar senhas em texto puro vocÃª "
-#~ "precisarÃ¡ modificar um parÃ¢metro no registro de seu Windows."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Habilitar esta opÃ§Ã£o Ã© altamente recomendado. Caso vocÃª o faÃ§a, "
-#~ "certifique-se de possuir um arquivo /etc/samba/smbpasswd e que vocÃª tenha "
-#~ "senhas definidas no mesmo para cada usuÃ¡rio usando o comando smbpasswd."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Gerar a base de dados para senhas /var/lib/samba/passdb.tdb ?"
 
@@ -269,22 +346,6 @@ msgstr ""
 #~ "Consulte o arquivo /usr/share/doc/samba-doc/htmldos/ENCRYPTION.html, "
 #~ "fornecido pelo pacote samba-doc, para conhecer maiores detalhes."
 
-#~ msgid "daemons"
-#~ msgstr "daemons"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Como vocÃª deseja que o Samba seja executado ?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "O serviÃ§o Samba smbd pode ser executado como daemon normal ou a partir do "
-#~ "inetd. ExecutÃ¡-lo como daemon Ã© o mÃ©todo recomendado."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "MÃºltiplos backends passdb nÃ£o sÃ£o suportados"
 
diff --git a/debian/po/ro.po b/debian/po/ro.po
index 936da93..ad73d77 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ro\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-06-18 14:30+0300\n"
 "Last-Translator: Igor Stirbu <igor.stirbu at gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian at lists.debian.org>\n"
@@ -31,13 +31,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Actualizare de la Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -50,13 +50,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -82,7 +82,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -90,15 +90,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 #, fuzzy
-#| msgid "Realm:"
 msgid "Realm name:"
 msgstr "Domeniu:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -106,63 +105,190 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"DacÄƒ nu selectaÈ›i aceastÄƒ opÈ›iune, serviciul Samba va rÄƒmÃ¢ne neconfigurat È™i "
+"va trebui sÄƒ-l configuraÈ›i manual."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Numele de domeniu:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Se configureazÄƒ Samba 4 ca PDC?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "DacÄƒ nu selectaÈ›i aceastÄƒ opÈ›iune, serviciul Samba va rÄƒmÃ¢ne neconfigurat "
-#~ "È™i va trebui sÄƒ-l configuraÈ›i manual."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -178,10 +304,6 @@ msgstr ""
 #~ "PrecizaÈ›i domeniul Kerberos de care va aparÈ›ine acest server. ÃŽn multe "
 #~ "cazuri acesta va fi la fel cu domeniul DNS."
 
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Numele de domeniu:"
-
 #~| msgid ""
 #~| "Please specify the workgroup you want this server to appear to be in "
 #~| "when queried by clients. Note that this parameter also controls the "
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 458c89d..a5d267e 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4 4.0.0~alpha17.dfsg2-1\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2011-12-10 11:45+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
 "Language-Team: Russian <man-pages-ru-talks at lists.sourceforge.net>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Ð’Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ñ Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -39,13 +39,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Ð Ð¾Ð»ÑŒ ÑÐµÑ€Ð²ÐµÑ€Ð°"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -87,13 +87,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Ð˜Ð¼Ñ Ð¾Ð±Ð»Ð°ÑÑ‚Ð¸:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -103,63 +103,189 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "ÐžÐ±Ñ‹Ñ‡Ð½Ð¾, ÑÑ‚Ð¾ Ð¸Ð¼Ñ DNS Ð²Ð°ÑˆÐµÐ³Ð¾ ÑƒÐ·Ð»Ð°, Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ð½Ð¾Ðµ Ð·Ð°Ð³Ð»Ð°Ð²Ð½Ñ‹Ð¼Ð¸ Ð±ÑƒÐºÐ²Ð°Ð¼Ð¸."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"ÐŸÑ€Ð¸ Ð¾Ñ‚ÐºÐ°Ð·Ðµ Ð¾Ñ‚ ÑÑ‚Ð¾Ð¹ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ Samba Ð¾ÑÑ‚Ð°Ð½ÐµÑ‚ÑÑ Ð½ÐµÐ½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ð¾Ð¹, Ð¸ Ð²Ð°Ð¼ Ð¿Ñ€Ð¸Ð´Ñ‘Ñ‚ÑÑ "
+"Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ ÐµÑ‘ ÑÐ°Ð¼Ð¾ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ð¾."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ Samba 4 Ð² ÐºÐ°Ñ‡ÐµÑÑ‚Ð²Ðµ PDC?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "ÐŸÑ€Ð¸ Ð¾Ñ‚ÐºÐ°Ð·Ðµ Ð¾Ñ‚ ÑÑ‚Ð¾Ð¹ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚Ð¸ Samba Ð¾ÑÑ‚Ð°Ð½ÐµÑ‚ÑÑ Ð½ÐµÐ½Ð°ÑÑ‚Ñ€Ð¾ÐµÐ½Ð½Ð¾Ð¹, Ð¸ Ð²Ð°Ð¼ "
-#~ "Ð¿Ñ€Ð¸Ð´Ñ‘Ñ‚ÑÑ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¸Ñ‚ÑŒ ÐµÑ‘ ÑÐ°Ð¼Ð¾ÑÑ‚Ð¾ÑÑ‚ÐµÐ»ÑŒÐ½Ð¾."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 1adac98..11f59f5 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2012-06-17 19:40+0100\n"
 "Last-Translator: Ivan MasÃ¡r <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <debian-l10n-slovak at lists.debian.org>\n"
@@ -30,13 +30,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "AktualizovaÅ¥ zo Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -49,13 +49,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Ãšloha servera"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -89,7 +89,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -97,13 +97,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "NÃ¡zov oblasti (realm):"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -112,64 +112,190 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 "Toto je zvyÄajne vÃ¡Å¡ nÃ¡zov poÄÃtaÄa podÄ¾a DNS napÃsanÃ½ veÄ¾kÃ½mi pÃsmenami."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Ak nezvolÃte tÃºto moÅ¾nosÅ¥, Samba zostane nenakonfigurovanÃ¡ a budete ju "
+"musieÅ¥ nastaviÅ¥ ruÄne."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "NastaviÅ¥ Samba 4 ako PDC?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Ak nezvolÃte tÃºto moÅ¾nosÅ¥, Samba zostane nenakonfigurovanÃ¡ a budete ju "
-#~ "musieÅ¥ nastaviÅ¥ ruÄne."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
diff --git a/debian/po/sl.po b/debian/po/sl.po
index cd54d07..47fb218 100644
--- a/debian/po/sl.po
+++ b/debian/po/sl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-13 08:06+0100\n"
 "Last-Translator: Matej KovaÄiÄ <matej.kovacic at owca.info>\n"
 "Language-Team: Sl <skrat at owca.info>\n"
@@ -29,13 +29,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -44,13 +44,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -68,7 +68,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -76,7 +76,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -84,13 +84,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -98,69 +98,210 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"Spremeni smb.conf za uporabo WINS nastavitev pridobljenih s strani DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"ÄŒe vaÅ¡ raÄunalnik pridobiva informacije o IP naslovu prek DHCP streÅ¾nika, "
+"lahko ta streÅ¾nik ponuja tudi informacije o WINS streÅ¾nikih (\"NetBIOS "
+"imenski streÅ¾niki\"), ki so prisotni v omreÅ¾ju. To zahteva spremembo v "
+"datoteki smb.conf ki bo omogoÄila samodejno branje nastavitev WINS iz /etc/"
+"samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "Za uporabo teh moÅ¾nosti mora biti nameÅ¡Äen paket dhcp3-client."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Samodejna nastavitev smb.conf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "ÄŒe ne izberete te moÅ¾nosti, boste morali vse spremembe nastavitev "
-#~ "opraviti sami in ne boste mogli uporabljati periodiÄnih samodejnih "
-#~ "izboljÅ¡av nastavitev."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Ostanek nastavitev Sambe se nanaÅ¡a na vpraÅ¡anja, ki vplivajo na parametre v /"
+"etc/samba/smb.conf. Ta datoteka se uporablja za konfiguracijo Samba "
+"programov (nmbd in smbd). VaÅ¡ trenutni smb.conf vkljuÄuje vrstico 'include'  "
+"ali moÅ¾nost, ki se razteza Äez veÄ vrstic konfiguracijske datoteke in lahko "
+"povzroÄi zmedo v procesu avtomatskih nastavitev. Za ponovno vzpostavitev "
+"delovanja bo potrebno roÄno urejanje konfiguracijske datoteke z nastavitvami "
+"smb.conf."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Ime delovne skupine/domene:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"ÄŒe ne izberete te moÅ¾nosti, boste morali vse spremembe nastavitev opraviti "
+"sami in ne boste mogli uporabljati periodiÄnih samodejnih izboljÅ¡av "
+"nastavitev."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Ime delovne skupine/domene:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Uporaba Å¡ifriranja gesel?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Vsi novejÅ¡i Windows odjemalci komunicirajo s SMB streÅ¾niki z uporabo "
+"Å¡ifriranih gesel. ÄŒe Å¾elite uporabiti neÅ¡ifrirana gesla boste morali "
+"spremeniti ustrezen parameter v Windows registru."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"MoÄno priporoÄamo vklop te moÅ¾nosti. ÄŒe jo boste vkljuÄili, preverite da "
+"imate veljavno datoteko /etc/samba/smbpasswd in da ste tam nastavili gesla "
+"za vsakega uporabnika s pomoÄjo ukaza smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "daemoni"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Kako Å¾elite poganjati Sambo?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba demon smbd lahko teÄe kot obiÄajen demon ali iz inetd. PriporoÄljivo "
+"je poganjanje sambe kot demon."
 
 #, fuzzy
 #~| msgid ""
@@ -175,68 +316,6 @@ msgstr ""
 #~ "streÅ¾nik ko ga bodo klienti iskali. Ta parameter doloÄa tudi ime domene, "
 #~ "ki je uporabljeno v nastavitvah security=domain."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "Spremeni smb.conf za uporabo WINS nastavitev pridobljenih s strani DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "ÄŒe vaÅ¡ raÄunalnik pridobiva informacije o IP naslovu prek DHCP streÅ¾nika, "
-#~ "lahko ta streÅ¾nik ponuja tudi informacije o WINS streÅ¾nikih (\"NetBIOS "
-#~ "imenski streÅ¾niki\"), ki so prisotni v omreÅ¾ju. To zahteva spremembo v "
-#~ "datoteki smb.conf ki bo omogoÄila samodejno branje nastavitev WINS iz /"
-#~ "etc/samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "Za uporabo teh moÅ¾nosti mora biti nameÅ¡Äen paket dhcp3-client."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Samodejna nastavitev smb.conf?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Ostanek nastavitev Sambe se nanaÅ¡a na vpraÅ¡anja, ki vplivajo na parametre "
-#~ "v /etc/samba/smb.conf. Ta datoteka se uporablja za konfiguracijo Samba "
-#~ "programov (nmbd in smbd). VaÅ¡ trenutni smb.conf vkljuÄuje vrstico "
-#~ "'include'  ali moÅ¾nost, ki se razteza Äez veÄ vrstic konfiguracijske "
-#~ "datoteke in lahko povzroÄi zmedo v procesu avtomatskih nastavitev. Za "
-#~ "ponovno vzpostavitev delovanja bo potrebno roÄno urejanje konfiguracijske "
-#~ "datoteke z nastavitvami smb.conf."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Uporaba Å¡ifriranja gesel?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Vsi novejÅ¡i Windows odjemalci komunicirajo s SMB streÅ¾niki z uporabo "
-#~ "Å¡ifriranih gesel. ÄŒe Å¾elite uporabiti neÅ¡ifrirana gesla boste morali "
-#~ "spremeniti ustrezen parameter v Windows registru."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "MoÄno priporoÄamo vklop te moÅ¾nosti. ÄŒe jo boste vkljuÄili, preverite da "
-#~ "imate veljavno datoteko /etc/samba/smbpasswd in da ste tam nastavili "
-#~ "gesla za vsakega uporabnika s pomoÄjo ukaza smbpasswd."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Ali naj ustvarim bazo samba gesel, /var/lib/samba/passdb.tdb?"
 
@@ -268,22 +347,6 @@ msgstr ""
 #~ "Za podrobnejÅ¡e informacije si oglejte /usr/share/doc/samba-doc/htmldocs/"
 #~ "ENCRYPTION.html iz paketa samba-doc."
 
-#~ msgid "daemons"
-#~ msgstr "daemoni"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Kako Å¾elite poganjati Sambo?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samba demon smbd lahko teÄe kot obiÄajen demon ali iz inetd. "
-#~ "PriporoÄljivo je poganjanje sambe kot demon."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "VeriÅ¾enje (chaining) passdb hrbtenic ni podprto."
 
diff --git a/debian/po/sq.po b/debian/po/sq.po
index 1899eab..5ef5ae8 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-13 21:25+0100\n"
 "Last-Translator: Elian Myftiu <elian.myftiu at gmail.com>\n"
 "Language-Team: Debian L10n Albanian <debian-l10n-albanian at lists.debian.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -40,13 +40,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -55,7 +55,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -64,7 +64,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -72,7 +72,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -80,13 +80,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -94,69 +94,209 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Ta ndryshoj smb.conf pÃ«r tÃ« pÃ«rdorur rregullimet WINS nga DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"NÃ«se kompjuteri yt pajiset me adrese IP nga njÃ« shÃ«rbyes DHCP nÃ« rrjet, "
+"shÃ«rbyesi DHCP mundet gjithashtu tÃ« japÃ« tÃ« dhÃ«na rreth shÃ«rbyesve WINS "
+"(\"shÃ«rbyesa emri NetBIOS\") qÃ« ndodhen nÃ« rrjet.  Kjo ka nevojÃ« pÃ«r njÃ« "
+"ndryshim nÃ« skedÃ«n tÃ«nde smb.conf nÃ« mÃ«nyrÃ« tÃ« tillÃ« qÃ« rregullimet WINS qÃ« "
+"vijnÃ« me DHCP tÃ« lexohen automatikisht nga /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Duhet instaluar paketa dhcp3-client pÃ«r tÃ« patur pÃ«rparÃ«si mbi kÃ«tÃ« veti."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Ta konfiguroj smb.conf automatikisht?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "NÃ«se nuk zgjedh kÃ«tÃ« mundÃ«si, do tÃ« duhet tÃ« kryesh Ã§do ndryshim "
-#~ "konfigurimi vetÃ«, dhe nuk do kesh rastin tÃ« pÃ«rfitosh nga pÃ«rmirÃ«sime "
-#~ "periodike konfigurimi."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Pjesa e mbetur e konfigurimit Samba ka tÃ« bÃ«jÃ« me pyetje qÃ« prekin parametra "
+"nÃ« /etc/samba/smb.conf, e cili Ã«shtÃ« skeda qÃ« pÃ«rdoret pÃ«r tÃ« konfiguruar "
+"programet Samba (nmbd dhe smbd). smb.conf yt i tanishÃ«m pÃ«rmban njÃ« rresht "
+"'include' ose njÃ« mundÃ«si qÃ« tendos rreshta tÃ« shumÃ«fishtÃ«, tÃ« cilÃ«t mund tÃ« "
+"hutojnÃ« proÃ§esin automatik tÃ« konfigurimit dhe tÃ« tÃ« kÃ«rkojÃ« ta ndryshosh "
+"skedarin tÃ«nd smb.conf dorazi dhe ta vesh nÃ« punÃ« sÃ«rish."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Grup Pune/EmÃ«r Zone:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"NÃ«se nuk zgjedh kÃ«tÃ« mundÃ«si, do tÃ« duhet tÃ« kryesh Ã§do ndryshim konfigurimi "
+"vetÃ«, dhe nuk do kesh rastin tÃ« pÃ«rfitosh nga pÃ«rmirÃ«sime periodike "
+"konfigurimi."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Grup Pune/EmÃ«r Zone:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "TÃ« pÃ«rdor kriptim fjalÃ«kalimi?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"TÃ« tÃ«rÃ« klientÃ«t e fundit Windows komunikojnÃ« me shÃ«rbyes SMB duke pÃ«rdorur "
+"fjalÃ«kalime tÃ« kriptuar. NÃ«se dÃ«shiron tÃ« pÃ«rdorÃ«sh fjalÃ«kalime tÃ« qarta "
+"tekstualÃ« do tÃ« duhet tÃ« ndryshosh njÃ« parametÃ«r nÃ« regjistrin tÃ«nd Windows."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Aktivizimi i kÃ«saj mundÃ«sie kÃ«shillohet fuqimisht. NÃ«se e bÃ«n, sigurohu qÃ« "
+"ke njÃ« skedar tÃ« vlefshÃ«m /etc/samba/smbpasswd dhe qÃ« i cakton fjalÃ«kalimet "
+"atje pÃ«r secilin pÃ«rdorues duke pÃ«rdorur komandÃ«n smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "daemons"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Si dÃ«shiron tÃ« xhirojÃ« Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Daemon Samba smbd mund tÃ« xhirojÃ« si njÃ« daemon normal ose nga inetd. "
+"Rekomandohet puna si daemon."
 
 #, fuzzy
 #~| msgid ""
@@ -171,69 +311,6 @@ msgstr ""
 #~ "tÃ« pyetet nga klientÃ«. VÃ«r re qÃ« ky parametÃ«r kontrollon gjithashtu emrin "
 #~ "e zonÃ«s sÃ« pÃ«rdorur me rregullimet security=domain."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Ta ndryshoj smb.conf pÃ«r tÃ« pÃ«rdorur rregullimet WINS nga DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "NÃ«se kompjuteri yt pajiset me adrese IP nga njÃ« shÃ«rbyes DHCP nÃ« rrjet, "
-#~ "shÃ«rbyesi DHCP mundet gjithashtu tÃ« japÃ« tÃ« dhÃ«na rreth shÃ«rbyesve WINS "
-#~ "(\"shÃ«rbyesa emri NetBIOS\") qÃ« ndodhen nÃ« rrjet.  Kjo ka nevojÃ« pÃ«r njÃ« "
-#~ "ndryshim nÃ« skedÃ«n tÃ«nde smb.conf nÃ« mÃ«nyrÃ« tÃ« tillÃ« qÃ« rregullimet WINS "
-#~ "qÃ« vijnÃ« me DHCP tÃ« lexohen automatikisht nga /etc/samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Duhet instaluar paketa dhcp3-client pÃ«r tÃ« patur pÃ«rparÃ«si mbi kÃ«tÃ« veti."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Ta konfiguroj smb.conf automatikisht?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Pjesa e mbetur e konfigurimit Samba ka tÃ« bÃ«jÃ« me pyetje qÃ« prekin "
-#~ "parametra nÃ« /etc/samba/smb.conf, e cili Ã«shtÃ« skeda qÃ« pÃ«rdoret pÃ«r tÃ« "
-#~ "konfiguruar programet Samba (nmbd dhe smbd). smb.conf yt i tanishÃ«m "
-#~ "pÃ«rmban njÃ« rresht 'include' ose njÃ« mundÃ«si qÃ« tendos rreshta tÃ« "
-#~ "shumÃ«fishtÃ«, tÃ« cilÃ«t mund tÃ« hutojnÃ« proÃ§esin automatik tÃ« konfigurimit "
-#~ "dhe tÃ« tÃ« kÃ«rkojÃ« ta ndryshosh skedarin tÃ«nd smb.conf dorazi dhe ta vesh "
-#~ "nÃ« punÃ« sÃ«rish."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "TÃ« pÃ«rdor kriptim fjalÃ«kalimi?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "TÃ« tÃ«rÃ« klientÃ«t e fundit Windows komunikojnÃ« me shÃ«rbyes SMB duke "
-#~ "pÃ«rdorur fjalÃ«kalime tÃ« kriptuar. NÃ«se dÃ«shiron tÃ« pÃ«rdorÃ«sh fjalÃ«kalime "
-#~ "tÃ« qarta tekstualÃ« do tÃ« duhet tÃ« ndryshosh njÃ« parametÃ«r nÃ« regjistrin "
-#~ "tÃ«nd Windows."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Aktivizimi i kÃ«saj mundÃ«sie kÃ«shillohet fuqimisht. NÃ«se e bÃ«n, sigurohu "
-#~ "qÃ« ke njÃ« skedar tÃ« vlefshÃ«m /etc/samba/smbpasswd dhe qÃ« i cakton "
-#~ "fjalÃ«kalimet atje pÃ«r secilin pÃ«rdorues duke pÃ«rdorur komandÃ«n smbpasswd."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "TÃ« krijoj bazÃ« tÃ« dhÃ«nash fjalÃ«kalimi, /var/lib/samba/passdb.tdb?"
 
@@ -265,22 +342,6 @@ msgstr ""
 #~ "Shih /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html nga paketa samba-"
 #~ "doc pÃ«r hollÃ«si tÃ« mÃ«tejshme."
 
-#~ msgid "daemons"
-#~ msgstr "daemons"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Si dÃ«shiron tÃ« xhirojÃ« Samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Daemon Samba smbd mund tÃ« xhirojÃ« si njÃ« daemon normal ose nga inetd. "
-#~ "Rekomandohet puna si daemon."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "VargÃ«zimi i passdb nuk suportohet"
 
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 8ca9b25..3309851 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2011-10-11 01:13+0100\n"
 "Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -21,13 +21,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Uppgradera frÃ¥n Samba 3?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -39,13 +39,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Serverroll"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -79,7 +79,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -87,13 +87,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Namn fÃ¶r realm:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -102,51 +102,181 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Vanligen Ã¤r detta DNS-vÃ¤rdnamnet i stora bokstÃ¤ver."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Installera Samba 4 som en PDC?"
diff --git a/debian/po/ta.po b/debian/po/ta.po
index 5e8b98a..2b70851 100644
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba_po\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2006-12-16 20:10+0530\n"
 "Last-Translator: drtvasudevan <agnihot3 at gmail.com>\n"
 "Language-Team: TAMIL <Ubuntu-tam at lists.ubuntu.com>\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -42,13 +42,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -96,68 +96,208 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "smb.conf à® à®Ÿà®¿à®¹à¯†à®šà¯à®šà®¿à®ªà®¿ à®¯à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ WINS à®…à®®à¯ˆà®ªà¯à®ªà¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤ à®®à®¾à®±à¯à®±à®¿à®¯à®®à¯ˆà®•à¯à®•à®µà®¾ ?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"à®‰à®™à¯à®•à®³à¯ à®•à®£à®¿à®©à®¿ IP à®®à¯à®•à®µà®°à®¿à®¯à¯ˆ à®µà®²à¯ˆà®ªà¯ à®ªà®¿à®©à¯à®©à®²à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®Ÿà®¿à®¹à¯†à®šà¯à®šà®¿à®ªà®¿ à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®©à¯ à®®à¯‚à®²à®®à¯ "
+"à®ªà¯†à®±à¯à®®à®¾à®©à®¾à®²à¯ à®…à®¨à¯à®¤ à®Ÿà®¿à®¹à¯†à®šà¯à®šà®¿à®ªà®¿ à®šà¯‡à®µà¯ˆà®¯à®•à®®à¯ à®µà®²à¯ˆà®ªà¯ à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ à®‰à®³à¯à®³ WINS servers (à®µà®¿à®£à¯à®¸à¯ "
+"à®šà¯‡à®µà¯ˆà®¯à®•à®™à¯à®•à®³à¯) (\"NetBIOS name servers\") à®¨à¯†à®Ÿà¯à®ªà®¯à®¾à®¸à¯ à®ªà¯†à®¯à®°à¯ à®šà¯‡à®µà¯ˆà®¯à®•à®™à¯à®•à®³à¯ à®•à¯à®±à®¿à®¤à¯à®¤ à®¤à®•à®µà®²à¯à®•à®³à¯ˆ "
+"à®¤à®° à®‡à®¯à®²à¯à®®à¯. à®‡à®¤à®±à¯à®•à¯ smb.conf à®•à¯‹à®ªà¯à®ªà¯ˆ à®Ÿà®¿à®¹à¯†à®šà¯à®šà®¿à®ªà®¿  à®¤à®°à¯à®®à¯ WINS à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà¯ˆ /etc/samba/"
+"dhcp.conf à®•à¯‹à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®¤à®¾à®©à®¿à®¯à®™à¯à®•à®¿à®¯à®¾à®• à®ªà®Ÿà®¿à®•à¯à®•à¯à®®à¯ à®ªà®Ÿà®¿ à®…à®®à¯ˆà®•à¯à®• à®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "à®‡à®¨à¯à®¤ à®µà®šà®¤à®¿à®¯à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®¿à®•à¯ à®•à¯Šà®³à¯à®³ à®Ÿà®¿à®¹à¯†à®šà¯à®šà®¿à®ªà®¿3 à®šà®¾à®°à¯à®¨à¯à®¤à¯‹à®©à¯ à®ªà¯Šà®¤à®¿à®¯à¯ˆ à®¨à®¿à®±à¯à®µ à®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "smb.conf à® à®¤à®¾à®©à®¿à®¯à®™à¯à®•à®¿à®¯à®¾à®• à®µà®Ÿà®¿à®µà®®à¯ˆà®•à¯à®•à®²à®¾à®®à®¾?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "à®¨à¯€à®™à¯à®•à®³à¯ à®‡à®¤à¯ˆ à®¤à¯‡à®°à¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•à®¾à®µà®¿à®Ÿà¯à®Ÿà®¾à®²à¯ à®Žà®¨à¯à®¤ à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà¯ˆà®¯à¯à®®à¯ à®¨à¯€à®™à¯à®•à®³à¯‡à®¤à®¾à®©à¯ à®šà¯†à®¯à¯à®¯ à®µà¯‡à®£à¯à®Ÿà¯à®®à¯. à®®à¯‡à®²à¯à®®à¯ "
-#~ "à®…à®µà¯à®µà®ªà¯à®ªà¯‹à®¤à¯ à®¨à®¿à®•à®´à¯à®®à¯ à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà¯ à®®à¯‡à®®à¯à®ªà®¾à®Ÿà¯à®Ÿà¯ à®µà®šà®¤à®¿à®¯à¯ˆ à®‡à®´à®•à¯à®• à®¨à¯‡à®°à¯à®®à¯."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"à®®à®±à¯à®± à®šà®¾à®®à¯à®ªà®¾ à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà¯ /etc/samba/smb.conf à®•à¯‹à®ªà¯à®ªà®¿à®²à¯ à®‰à®³à¯à®³ à®Žà®²à¯à®²à¯ˆ à®šà¯†à®¯à®²à¯ à®…à®²à®•à¯à®•à®³à¯ˆ "
+"(parameters) à®ªà®¾à®¤à®¿à®•à¯à®•à¯à®®à¯ à®•à¯‡à®³à¯à®µà®¿à®•à®³à¯ˆà®ªà¯ à®ªà®±à¯à®±à®¿à®¯à®¤à¯. à®‡à®¨à¯à®¤ à®•à¯‹à®ªà¯à®ªà¯ à®šà®¾à®®à¯à®ªà®¾ à®¨à®¿à®°à®²à¯à®•à®³à¯ˆ(nmbd and "
+"smbd) (à®Žà®©à¯à®Žà®®à¯à®ªà®¿à®Ÿà®¿ à®®à®±à¯à®±à¯à®®à¯ à®Žà®¸à¯à®Žà®®à¯à®ªà®¿à®Ÿà®¿) à®µà®Ÿà®¿à®µà®®à¯ˆà®•à¯à®• à®ªà®¯à®©à¯à®ªà®Ÿà¯à®µà®¤à¯. à®‰à®™à¯à®•à®³à®¤à¯ à®¤à®±à¯à®ªà¯‹à®¤à¯ˆà®¯ smb.conf "
+"à®•à¯‹à®ªà¯à®ªà¯ 'à®‡à®©à¯à®•à¯à®²à¯‚à®Ÿà¯' ('include') à®µà®°à®¿ à®…à®²à¯à®²à®¤à¯ à®ªà®² à®µà®°à®¿à®•à®³à¯ˆ à®†à®•à¯à®•à®¿à®°à®®à®¿à®•à¯à®•à¯à®®à¯ à®¤à¯‡à®°à¯à®µà¯ˆ à®‰à®³à¯à®³à®Ÿà®•à¯à®•à®¿à®¯à®¤à¯. "
+"à®‡à®¤à¯ à®¤à®¾à®©à®¿à®¯à®™à¯à®•à®¿ à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà¯ à®šà¯†à®¯à®²à¯ˆ à®•à¯à®´à®ªà¯à®ªà®²à®¾à®®à¯. à®…à®¤à®©à®¾à®²à¯ à®…à®¤à¯ à®®à¯€à®£à¯à®Ÿà¯à®®à¯ à®µà¯‡à®²à¯ˆ à®šà¯†à®¯à¯à®µà®¤à®±à¯à®•à¯ à®‰à®™à¯à®•à®³à¯ˆ "
+"à®•à¯ˆà®®à¯à®±à¯ˆà®¯à®¾à®• à®‰à®™à¯à®•à®³à¯ smb.conf à®•à¯‹à®ªà¯à®ªà¯ˆ à®¤à®¿à®°à¯à®¤à¯à®¤à®•à¯ à®•à¯‹à®°à®²à®¾à®®à¯."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "à®µà¯‡à®²à¯ˆà®•à¯à®•à¯à®´à¯/à®•à®³à®ªà¯ à®ªà¯†à®¯à®°à¯:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"à®¨à¯€à®™à¯à®•à®³à¯ à®‡à®¤à¯ˆ à®¤à¯‡à®°à¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•à®¾à®µà®¿à®Ÿà¯à®Ÿà®¾à®²à¯ à®Žà®¨à¯à®¤ à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà¯ˆà®¯à¯à®®à¯ à®¨à¯€à®™à¯à®•à®³à¯‡à®¤à®¾à®©à¯ à®šà¯†à®¯à¯à®¯ à®µà¯‡à®£à¯à®Ÿà¯à®®à¯. à®®à¯‡à®²à¯à®®à¯ "
+"à®…à®µà¯à®µà®ªà¯à®ªà¯‹à®¤à¯ à®¨à®¿à®•à®´à¯à®®à¯ à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà¯ à®®à¯‡à®®à¯à®ªà®¾à®Ÿà¯à®Ÿà¯ à®µà®šà®¤à®¿à®¯à¯ˆ à®‡à®´à®•à¯à®• à®¨à¯‡à®°à¯à®®à¯."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "à®µà¯‡à®²à¯ˆà®•à¯à®•à¯à®´à¯/à®•à®³à®ªà¯ à®ªà¯†à®¯à®°à¯:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "à®•à®Ÿà®µà¯à®šà¯ à®šà¯Šà®²à¯ à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯à®Ÿà®¾à®•à¯à®•à®¤à¯à®¤à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà®¾?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"à®…à®©à¯ˆà®¤à¯à®¤à¯ à®µà®¿à®£à¯à®Ÿà¯‹à®¸à¯ à®šà®¾à®°à¯à®¨à¯à®¤à¯‹à®©à¯à®•à®³à¯à®®à¯ SMB à®šà¯‡à®µà¯ˆà®¯à®•à®™à¯à®•à®³à¯à®Ÿà®©à¯ à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯à®Ÿà®¾à®•à¯à®•à®¿à®¯ à®•à®Ÿà®µà¯à®šà¯ à®šà¯Šà®±à¯à®•à®³à¯ˆ à®ªà®¯à®©à¯ "
+"à®ªà®Ÿà¯à®¤à¯à®¤à®¿ à®¤à¯Šà®Ÿà®°à¯à®ªà¯ à®•à¯Šà®³à¯à®•à®¿à®©à¯à®±à®©. à®¨à¯€à®™à¯à®•à®³à¯ à®¤à¯†à®³à®¿à®µà®¾à®© à®‰à®°à¯ˆ à®•à®Ÿà®µà¯à®šà¯ à®šà¯Šà®²à¯à®²à¯ˆ à®ªà®¯à®©à¯ à®ªà®Ÿà¯à®¤à¯à®¤ à®µà®¿à®°à¯à®®à¯à®ªà®¿à®©à®¾à®²à¯ "
+"à®µà®¿à®£à¯à®Ÿà¯‹à®¸à¯ à®ªà®¤à®¿à®µà®•à®¤à¯à®¤à®¿à®²à¯ à®®à®¾à®±à¯à®±à®™à¯à®•à®³à¯ à®šà¯†à®¯à¯à®¯ à®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"à®‡à®¨à¯à®¤ à®¤à¯‡à®°à¯à®µà¯ˆ à®šà¯†à®¯à®²à¯ à®ªà®Ÿà¯à®¤à¯à®¤ à®ªà®²à®®à®¾à®•à®ªà¯ à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯ˆà®•à¯à®•à®ªà¯ à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯. à®…à®ªà¯à®ªà®Ÿà®¿à®šà¯ à®šà¯†à®¯à¯à®¤à®¾à®²à¯ "
+"à®šà¯†à®²à¯à®²à¯à®ªà®Ÿà®¿à®¯à®¾à®•à¯à®®à¯ /etc/samba/smbpasswd à®•à¯‹à®ªà¯à®ªà¯ à®‰à®™à¯à®•à®³à®¿à®Ÿà®®à¯ à®‡à®°à¯à®ªà¯à®ªà®¤à¯ˆà®¯à¯à®®à¯ à®¨à¯€à®™à¯à®•à®³à¯ à®’à®µà¯à®µà¯Šà®°à¯ "
+"à®ªà®¯à®©à®°à¯à®•à¯à®•à¯à®®à¯ smbpasswd à®•à®Ÿà¯à®Ÿà®³à¯ˆ à®®à¯‚à®²à®®à¯ à®¤à®©à®¿à®¤à¯à®¤à®©à®¿ à®•à®Ÿà®µà¯à®šà¯ à®šà¯Šà®²à¯ à®…à®®à¯ˆà®ªà¯à®ªà®¤à¯ˆà®¯à¯à®®à¯ à®‰à®±à¯à®¤à®¿ à®šà¯†à®¯à¯à®¤à¯ "
+"à®•à¯Šà®³à¯à®³à®µà¯à®®à¯. "
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "à®•à®¿à®™à¯à®•à®°à®©à¯à®•à®³à¯ (à®Ÿà¯€à®®à®©à¯à®•à®³à¯)"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "à®šà®¾à®®à¯à®ªà®¾à®µà¯ˆ à®Žà®ªà¯à®ªà®Ÿà®¿ à®‡à®¯à®•à¯à®• à®µà®¿à®°à¯à®®à¯à®ªà¯à®•à®¿à®±à¯€à®°à¯à®•à®³à¯?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"à®šà®¾à®®à¯à®ªà®¾ à®•à®¿à®™à¯à®•à®°à®©à®¾à®© à®Žà®¸à¯à®Žà®®à¯à®ªà®¿à®Ÿà®¿ à®‡à®¯à®²à¯à®ªà®¾à®© à®•à®¿à®™à¯à®•à®°à®©à®¾à®• à®‡à®¯à®™à¯à®•à®²à®¾à®®à¯ à®…à®²à¯à®²à®¤à¯ inetd à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®‡à®¯à®™à¯à®•à®²à®¾à®®à¯. "
+"à®•à®¿à®™à¯à®•à®°à®©à®¾à®• à®‡à®¯à®™à¯à®•à¯à®µà®¤à¯‡ à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯ˆà®•à¯à®•à®ªà¯ à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯."
 
 #, fuzzy
 #~| msgid ""
@@ -172,67 +312,6 @@ msgstr ""
 #~ "à®µà¯‡à®£à¯à®Ÿà¯à®®à¯ à®Žà®© à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®•. à®‡à®¨à¯à®¤ à®Žà®²à¯à®²à¯ˆ à®šà¯†à®¯à®²à¯ à®…à®²à®•à¯ security=domain à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà®¿à®²à¯ à®‰à®³à¯à®³ "
 #~ "à®•à®³à®ªà¯ à®ªà¯†à®¯à®°à¯ˆà®¯à¯à®®à¯ à®•à®Ÿà¯à®Ÿà¯à®ªà¯ à®ªà®Ÿà¯à®¤à¯à®¤à¯à®®à¯."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "smb.conf à® à®Ÿà®¿à®¹à¯†à®šà¯à®šà®¿à®ªà®¿ à®¯à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ WINS à®…à®®à¯ˆà®ªà¯à®ªà¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤ à®®à®¾à®±à¯à®±à®¿à®¯à®®à¯ˆà®•à¯à®•à®µà®¾ ?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "à®‰à®™à¯à®•à®³à¯ à®•à®£à®¿à®©à®¿ IP à®®à¯à®•à®µà®°à®¿à®¯à¯ˆ à®µà®²à¯ˆà®ªà¯ à®ªà®¿à®©à¯à®©à®²à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®Ÿà®¿à®¹à¯†à®šà¯à®šà®¿à®ªà®¿ à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®©à¯ à®®à¯‚à®²à®®à¯ "
-#~ "à®ªà¯†à®±à¯à®®à®¾à®©à®¾à®²à¯ à®…à®¨à¯à®¤ à®Ÿà®¿à®¹à¯†à®šà¯à®šà®¿à®ªà®¿ à®šà¯‡à®µà¯ˆà®¯à®•à®®à¯ à®µà®²à¯ˆà®ªà¯ à®ªà®¿à®©à¯à®©à®²à®¿à®²à¯ à®‰à®³à¯à®³ WINS servers (à®µà®¿à®£à¯à®¸à¯ "
-#~ "à®šà¯‡à®µà¯ˆà®¯à®•à®™à¯à®•à®³à¯) (\"NetBIOS name servers\") à®¨à¯†à®Ÿà¯à®ªà®¯à®¾à®¸à¯ à®ªà¯†à®¯à®°à¯ à®šà¯‡à®µà¯ˆà®¯à®•à®™à¯à®•à®³à¯ à®•à¯à®±à®¿à®¤à¯à®¤ "
-#~ "à®¤à®•à®µà®²à¯à®•à®³à¯ˆ à®¤à®° à®‡à®¯à®²à¯à®®à¯. à®‡à®¤à®±à¯à®•à¯ smb.conf à®•à¯‹à®ªà¯à®ªà¯ˆ à®Ÿà®¿à®¹à¯†à®šà¯à®šà®¿à®ªà®¿  à®¤à®°à¯à®®à¯ WINS à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà¯ˆ /"
-#~ "etc/samba/dhcp.conf à®•à¯‹à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®¤à®¾à®©à®¿à®¯à®™à¯à®•à®¿à®¯à®¾à®• à®ªà®Ÿà®¿à®•à¯à®•à¯à®®à¯ à®ªà®Ÿà®¿ à®…à®®à¯ˆà®•à¯à®• à®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "à®‡à®¨à¯à®¤ à®µà®šà®¤à®¿à®¯à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®¿à®•à¯ à®•à¯Šà®³à¯à®³ à®Ÿà®¿à®¹à¯†à®šà¯à®šà®¿à®ªà®¿3 à®šà®¾à®°à¯à®¨à¯à®¤à¯‹à®©à¯ à®ªà¯Šà®¤à®¿à®¯à¯ˆ à®¨à®¿à®±à¯à®µ à®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "smb.conf à® à®¤à®¾à®©à®¿à®¯à®™à¯à®•à®¿à®¯à®¾à®• à®µà®Ÿà®¿à®µà®®à¯ˆà®•à¯à®•à®²à®¾à®®à®¾?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "à®®à®±à¯à®± à®šà®¾à®®à¯à®ªà®¾ à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà¯ /etc/samba/smb.conf à®•à¯‹à®ªà¯à®ªà®¿à®²à¯ à®‰à®³à¯à®³ à®Žà®²à¯à®²à¯ˆ à®šà¯†à®¯à®²à¯ à®…à®²à®•à¯à®•à®³à¯ˆ "
-#~ "(parameters) à®ªà®¾à®¤à®¿à®•à¯à®•à¯à®®à¯ à®•à¯‡à®³à¯à®µà®¿à®•à®³à¯ˆà®ªà¯ à®ªà®±à¯à®±à®¿à®¯à®¤à¯. à®‡à®¨à¯à®¤ à®•à¯‹à®ªà¯à®ªà¯ à®šà®¾à®®à¯à®ªà®¾ à®¨à®¿à®°à®²à¯à®•à®³à¯ˆ(nmbd and "
-#~ "smbd) (à®Žà®©à¯à®Žà®®à¯à®ªà®¿à®Ÿà®¿ à®®à®±à¯à®±à¯à®®à¯ à®Žà®¸à¯à®Žà®®à¯à®ªà®¿à®Ÿà®¿) à®µà®Ÿà®¿à®µà®®à¯ˆà®•à¯à®• à®ªà®¯à®©à¯à®ªà®Ÿà¯à®µà®¤à¯. à®‰à®™à¯à®•à®³à®¤à¯ à®¤à®±à¯à®ªà¯‹à®¤à¯ˆà®¯ smb."
-#~ "conf à®•à¯‹à®ªà¯à®ªà¯ 'à®‡à®©à¯à®•à¯à®²à¯‚à®Ÿà¯' ('include') à®µà®°à®¿ à®…à®²à¯à®²à®¤à¯ à®ªà®² à®µà®°à®¿à®•à®³à¯ˆ à®†à®•à¯à®•à®¿à®°à®®à®¿à®•à¯à®•à¯à®®à¯ à®¤à¯‡à®°à¯à®µà¯ˆ "
-#~ "à®‰à®³à¯à®³à®Ÿà®•à¯à®•à®¿à®¯à®¤à¯. à®‡à®¤à¯ à®¤à®¾à®©à®¿à®¯à®™à¯à®•à®¿ à®µà®Ÿà®¿à®µà®®à¯ˆà®ªà¯à®ªà¯ à®šà¯†à®¯à®²à¯ˆ à®•à¯à®´à®ªà¯à®ªà®²à®¾à®®à¯. à®…à®¤à®©à®¾à®²à¯ à®…à®¤à¯ à®®à¯€à®£à¯à®Ÿà¯à®®à¯ à®µà¯‡à®²à¯ˆ "
-#~ "à®šà¯†à®¯à¯à®µà®¤à®±à¯à®•à¯ à®‰à®™à¯à®•à®³à¯ˆ à®•à¯ˆà®®à¯à®±à¯ˆà®¯à®¾à®• à®‰à®™à¯à®•à®³à¯ smb.conf à®•à¯‹à®ªà¯à®ªà¯ˆ à®¤à®¿à®°à¯à®¤à¯à®¤à®•à¯ à®•à¯‹à®°à®²à®¾à®®à¯."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "à®•à®Ÿà®µà¯à®šà¯ à®šà¯Šà®²à¯ à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯à®Ÿà®¾à®•à¯à®•à®¤à¯à®¤à¯ˆ à®ªà®¯à®©à¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà®¾?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "à®…à®©à¯ˆà®¤à¯à®¤à¯ à®µà®¿à®£à¯à®Ÿà¯‹à®¸à¯ à®šà®¾à®°à¯à®¨à¯à®¤à¯‹à®©à¯à®•à®³à¯à®®à¯ SMB à®šà¯‡à®µà¯ˆà®¯à®•à®™à¯à®•à®³à¯à®Ÿà®©à¯ à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯à®Ÿà®¾à®•à¯à®•à®¿à®¯ à®•à®Ÿà®µà¯à®šà¯ à®šà¯Šà®±à¯à®•à®³à¯ˆ à®ªà®¯à®©à¯ "
-#~ "à®ªà®Ÿà¯à®¤à¯à®¤à®¿ à®¤à¯Šà®Ÿà®°à¯à®ªà¯ à®•à¯Šà®³à¯à®•à®¿à®©à¯à®±à®©. à®¨à¯€à®™à¯à®•à®³à¯ à®¤à¯†à®³à®¿à®µà®¾à®© à®‰à®°à¯ˆ à®•à®Ÿà®µà¯à®šà¯ à®šà¯Šà®²à¯à®²à¯ˆ à®ªà®¯à®©à¯ à®ªà®Ÿà¯à®¤à¯à®¤ à®µà®¿à®°à¯à®®à¯à®ªà®¿à®©à®¾à®²à¯ "
-#~ "à®µà®¿à®£à¯à®Ÿà¯‹à®¸à¯ à®ªà®¤à®¿à®µà®•à®¤à¯à®¤à®¿à®²à¯ à®®à®¾à®±à¯à®±à®™à¯à®•à®³à¯ à®šà¯†à®¯à¯à®¯ à®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "à®‡à®¨à¯à®¤ à®¤à¯‡à®°à¯à®µà¯ˆ à®šà¯†à®¯à®²à¯ à®ªà®Ÿà¯à®¤à¯à®¤ à®ªà®²à®®à®¾à®•à®ªà¯ à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯ˆà®•à¯à®•à®ªà¯ à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯. à®…à®ªà¯à®ªà®Ÿà®¿à®šà¯ à®šà¯†à®¯à¯à®¤à®¾à®²à¯ "
-#~ "à®šà¯†à®²à¯à®²à¯à®ªà®Ÿà®¿à®¯à®¾à®•à¯à®®à¯ /etc/samba/smbpasswd à®•à¯‹à®ªà¯à®ªà¯ à®‰à®™à¯à®•à®³à®¿à®Ÿà®®à¯ à®‡à®°à¯à®ªà¯à®ªà®¤à¯ˆà®¯à¯à®®à¯ à®¨à¯€à®™à¯à®•à®³à¯ à®’à®µà¯à®µà¯Šà®°à¯ "
-#~ "à®ªà®¯à®©à®°à¯à®•à¯à®•à¯à®®à¯ smbpasswd à®•à®Ÿà¯à®Ÿà®³à¯ˆ à®®à¯‚à®²à®®à¯ à®¤à®©à®¿à®¤à¯à®¤à®©à®¿ à®•à®Ÿà®µà¯à®šà¯ à®šà¯Šà®²à¯ à®…à®®à¯ˆà®ªà¯à®ªà®¤à¯ˆà®¯à¯à®®à¯ à®‰à®±à¯à®¤à®¿ à®šà¯†à®¯à¯à®¤à¯ "
-#~ "à®•à¯Šà®³à¯à®³à®µà¯à®®à¯. "
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
 #~ " /var/lib/samba/passdb.tdb à®Žà®©à¯à®± à®šà®¾à®®à¯à®ªà®¾ à®•à®Ÿà®µà¯à®šà¯ à®šà¯Šà®²à¯ à®¤à®°à®µà¯à®¤à¯ à®¤à®³à®¤à¯à®¤à¯ˆ à®‰à®°à¯à®µà®¾à®•à¯à®•à®µà®¾?"
@@ -264,22 +343,6 @@ msgstr ""
 #~ "à®šà®¾à®®à¯à®ªà®¾ à®†à®µà®£à®™à¯à®•à®³à¯ (samba-doc) à®ªà¯Šà®¤à®¿à®•à®³à®¿à®²à¯ à®‡à®°à¯à®¨à¯à®¤à¯ /usr/share/doc/samba-doc/"
 #~ "htmldocs/ENCRYPTION.html à® à®®à¯‡à®²à®¤à®¿à®• à®µà®¿à®µà®°à®™à¯à®•à®³à¯à®•à¯à®•à¯à®ªà¯ à®ªà®¾à®°à¯à®•à¯à®•à®µà¯à®®à¯."
 
-#~ msgid "daemons"
-#~ msgstr "à®•à®¿à®™à¯à®•à®°à®©à¯à®•à®³à¯ (à®Ÿà¯€à®®à®©à¯à®•à®³à¯)"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "à®šà®¾à®®à¯à®ªà®¾à®µà¯ˆ à®Žà®ªà¯à®ªà®Ÿà®¿ à®‡à®¯à®•à¯à®• à®µà®¿à®°à¯à®®à¯à®ªà¯à®•à®¿à®±à¯€à®°à¯à®•à®³à¯?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "à®šà®¾à®®à¯à®ªà®¾ à®•à®¿à®™à¯à®•à®°à®©à®¾à®© à®Žà®¸à¯à®Žà®®à¯à®ªà®¿à®Ÿà®¿ à®‡à®¯à®²à¯à®ªà®¾à®© à®•à®¿à®™à¯à®•à®°à®©à®¾à®• à®‡à®¯à®™à¯à®•à®²à®¾à®®à¯ à®…à®²à¯à®²à®¤à¯ inetd à®²à®¿à®°à¯à®¨à¯à®¤à¯ "
-#~ "à®‡à®¯à®™à¯à®•à®²à®¾à®®à¯. à®•à®¿à®™à¯à®•à®°à®©à®¾à®• à®‡à®¯à®™à¯à®•à¯à®µà®¤à¯‡ à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯ˆà®•à¯à®•à®ªà¯ à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯."
-
 #~ msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
 #~ msgstr "/etc/samba/smbpasswd à® /var/lib/samba/passdb.tdb à®•à¯à®•à¯ à®¨à®•à®°à¯à®¤à¯à®¤à®µà®¾?"
 
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index be012f1..6048666 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,14 +1,22 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#    Translators, if you are not familiar with the PO format, gettext
+#    documentation is worth reading, especially sections dedicated to
+#    this format, e.g. by running:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+#    Some information specific to po-debconf are available at
+#            /usr/share/doc/po-debconf/README-trans
+#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+#    Developers do not need to manually edit POT or PO files.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: samba4\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -19,13 +27,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -34,13 +42,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -49,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -58,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -66,7 +74,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -74,13 +82,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -88,48 +96,178 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid "Workgroup/Domain Name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
diff --git a/debian/po/th.po b/debian/po/th.po
index 8c62ce4..84e8fa3 100644
--- a/debian/po/th.po
+++ b/debian/po/th.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-06-17 15:40+0700\n"
 "Last-Translator:  Theppitak Karoonboonyanan <thep at linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n at googlegroups.com>\n"
@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "à¸ˆà¸°à¸›à¸£à¸±à¸šà¸£à¸¸à¹ˆà¸™à¸‚à¸¶à¹‰à¸™à¸ˆà¸²à¸ Samba 3 à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -50,7 +50,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -59,7 +59,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -67,7 +67,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -75,15 +75,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 #, fuzzy
-#| msgid "Realm:"
 msgid "Realm name:"
 msgstr "Realm:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -91,63 +90,207 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "à¸ˆà¸°à¹à¸à¹‰à¹„à¸‚ smb.conf à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸„à¹ˆà¸²à¸•à¸±à¹‰à¸‡ WINS à¸ˆà¸²à¸ DHCP à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"à¸–à¹‰à¸²à¸„à¸à¸¡à¸žà¸´à¸§à¹€à¸•à¸à¸£à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¹ƒà¸Šà¹‰à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸«à¸¡à¸²à¸¢à¹€à¸¥à¸‚ IP à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ DHCP à¹ƒà¸™à¹€à¸„à¸£à¸·à¸à¸‚à¹ˆà¸²à¸¢ à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ DHCP "
+"à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸à¸²à¸ˆà¹ƒà¸«à¹‰à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ WINS (\"name server à¸‚à¸à¸‡ NetBIOS\") "
+"à¸—à¸µà¹ˆà¸¡à¸µà¹ƒà¸™à¹€à¸„à¸£à¸·à¸à¸‚à¹ˆà¸²à¸¢à¸¡à¸²à¸”à¹‰à¸§à¸¢ à¸à¸²à¸£à¸ˆà¸°à¹ƒà¸Šà¹‰à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹„à¸”à¹‰ à¸ˆà¸³à¹€à¸›à¹‡à¸™à¸•à¹‰à¸à¸‡à¹à¸à¹‰à¹„à¸‚à¹à¸Ÿà¹‰à¸¡ smb.conf à¸‚à¸à¸‡à¸„à¸¸à¸“ "
+"à¹€à¸žà¸·à¹ˆà¸à¹ƒà¸«à¹‰à¸¡à¸µà¸à¸²à¸£à¸à¹ˆà¸²à¸™à¸„à¹ˆà¸²à¸•à¸±à¹‰à¸‡ WINS à¸—à¸µà¹ˆà¹„à¸”à¹‰à¸ˆà¸²à¸ DHCP à¹ƒà¸™à¹à¸Ÿà¹‰à¸¡ /etc/samba/dhcp.conf à¹‚à¸”à¸¢à¸à¸±à¸•à¹‚à¸™à¸¡à¸±à¸•à¸´"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "à¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹à¸žà¸à¹€à¸à¸ˆ dhcp3-client à¸”à¹‰à¸§à¸¢ à¹€à¸žà¸·à¹ˆà¸à¸ˆà¸°à¹ƒà¸Šà¹‰à¸„à¸§à¸²à¸¡à¸ªà¸²à¸¡à¸²à¸£à¸–à¸™à¸µà¹‰"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "à¸ˆà¸°à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸² smb.conf à¹à¸šà¸šà¸à¸±à¸•à¹‚à¸™à¸¡à¸±à¸•à¸´à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸² Samba à¹ƒà¸™à¸ªà¹ˆà¸§à¸™à¸—à¸µà¹ˆà¹€à¸«à¸¥à¸·à¸ à¸ˆà¸°à¹€à¸›à¹‡à¸™à¸„à¸³à¸–à¸²à¸¡à¸—à¸µà¹ˆà¸ˆà¸°à¸¡à¸µà¸œà¸¥à¸•à¹ˆà¸à¸„à¹ˆà¸²à¸•à¹ˆà¸²à¸‡à¹† à¹ƒà¸™ /etc/samba/smb.conf "
+"à¸‹à¸¶à¹ˆà¸‡à¹€à¸›à¹‡à¸™à¹à¸Ÿà¹‰à¸¡à¸—à¸µà¹ˆà¹ƒà¸Šà¹‰à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¸‚à¸à¸‡ Samba (nmbd à¹à¸¥à¸° smbd)  à¹à¸Ÿà¹‰à¸¡ smb.conf à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“ "
+"à¸¡à¸µà¸šà¸£à¸£à¸—à¸±à¸” 'include' à¸«à¸£à¸·à¸à¸¡à¸µà¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸—à¸µà¹ˆà¸¢à¸²à¸§à¸«à¸¥à¸²à¸¢à¸šà¸£à¸£à¸—à¸±à¸” à¸‹à¸¶à¹ˆà¸‡à¸ˆà¸°à¹€à¸›à¹‡à¸™à¸›à¸±à¸à¸«à¸²à¸•à¹ˆà¸à¸à¸£à¸°à¸šà¸§à¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¹à¸šà¸šà¸à¸±à¸•à¹‚à¸™à¸¡à¸±à¸•à¸´ "
+"à¹à¸¥à¸°à¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¹à¸à¹‰à¹„à¸‚à¹à¸Ÿà¹‰à¸¡ smb.conf à¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸à¸‡à¸à¹ˆà¸à¸™ à¹€à¸žà¸·à¹ˆà¸à¹ƒà¸«à¹‰à¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"à¸–à¹‰à¸²à¸„à¸¸à¸“à¹„à¸¡à¹ˆà¹€à¸¥à¸·à¸à¸à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸™à¸µà¹‰ Samba à¸ˆà¸°à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸ªà¸–à¸²à¸™à¸°à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸¡à¸µà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸² à¹à¸¥à¸°à¸„à¸¸à¸“à¸ˆà¸°à¸•à¹‰à¸à¸‡à¸ˆà¸±à¸”à¸à¸²à¸£à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸•à¹ˆà¸²à¸‡à¹† à¹€à¸à¸‡"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "à¸Šà¸·à¹ˆà¸à¹‚à¸”à¹€à¸¡à¸™:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "à¹ƒà¸Šà¹‰à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¸¥à¸±à¸šà¸à¸±à¸šà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸¥à¸¹à¸à¸‚à¹ˆà¸²à¸¢à¸§à¸´à¸™à¹‚à¸”à¸§à¸ªà¹Œà¸£à¸¸à¹ˆà¸™à¹ƒà¸«à¸¡à¹ˆà¹† à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸” à¸ˆà¸°à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ SMB à¹‚à¸”à¸¢à¹ƒà¸Šà¹‰à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸—à¸µà¹ˆà¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¸¥à¸±à¸š "
+"à¸–à¹‰à¸²à¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸ˆà¸°à¹ƒà¸Šà¹‰à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹à¸šà¸šà¸‚à¹‰à¸à¸„à¸§à¸²à¸¡à¸˜à¸£à¸£à¸¡à¸”à¸² à¸„à¸¸à¸“à¸ˆà¸°à¸•à¹‰à¸à¸‡à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸„à¹ˆà¸²à¸„à¹ˆà¸²à¸«à¸™à¸¶à¹ˆà¸‡à¹ƒà¸™à¹€à¸£à¸ˆà¸´à¸ªà¸•à¸£à¸µà¸‚à¸à¸‡à¸§à¸´à¸™à¹‚à¸”à¸§à¸ªà¹Œ"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"à¸‚à¸à¹à¸™à¸°à¸™à¸³à¸à¸¢à¹ˆà¸²à¸‡à¸¢à¸´à¹ˆà¸‡à¹ƒà¸«à¹‰à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸™à¸µà¹‰ à¹à¸¥à¸°à¸–à¹‰à¸²à¸„à¸¸à¸“à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰ à¸à¸£à¸¸à¸“à¸²à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¹ƒà¸«à¹‰à¹à¸™à¹ˆà¹ƒà¸ˆà¸§à¹ˆà¸²à¸„à¸¸à¸“à¸¡à¸µà¹à¸Ÿà¹‰à¸¡ /etc/"
+"samba/smbpasswd à¸—à¸µà¹ˆà¹ƒà¸Šà¹‰à¸à¸²à¸£à¹„à¸”à¹‰ à¹à¸¥à¸°à¸„à¸¸à¸“à¹„à¸”à¹‰à¸•à¸±à¹‰à¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸™à¸™à¸±à¹‰à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹à¸•à¹ˆà¸¥à¸°à¸„à¸™ à¹‚à¸”à¸¢à¹ƒà¸Šà¹‰à¸„à¸³à¸ªà¸±à¹ˆà¸‡ "
+"smbpasswd"
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "à¸”à¸µà¸¡à¸à¸™"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "à¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸à¹ƒà¸Šà¹‰ Samba à¹à¸šà¸šà¹„à¸«à¸™?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"à¸”à¸µà¸¡à¸à¸™ smbd à¸‚à¸à¸‡ Samba à¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¸‡à¸²à¸™à¹à¸šà¸šà¸”à¸µà¸¡à¸à¸™à¸˜à¸£à¸£à¸¡à¸”à¸² à¸«à¸£à¸·à¸à¹€à¸£à¸µà¸¢à¸à¸ˆà¸²à¸ inetd à¸à¹‡à¹„à¸”à¹‰ "
+"à¸—à¸²à¸‡à¸—à¸µà¹ˆà¸‚à¸à¹à¸™à¸°à¸™à¸³à¸„à¸·à¸à¹€à¸£à¸µà¸¢à¸à¹à¸šà¸šà¸”à¸µà¸¡à¸à¸™"
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "à¸ˆà¸°à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸² Samba 4 à¹ƒà¸«à¹‰à¹€à¸›à¹‡à¸™ PDC à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "à¸–à¹‰à¸²à¸„à¸¸à¸“à¹„à¸¡à¹ˆà¹€à¸¥à¸·à¸à¸à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸™à¸µà¹‰ Samba à¸ˆà¸°à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸ªà¸–à¸²à¸™à¸°à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸¡à¸µà¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸² à¹à¸¥à¸°à¸„à¸¸à¸“à¸ˆà¸°à¸•à¹‰à¸à¸‡à¸ˆà¸±à¸”à¸à¸²à¸£à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸•à¹ˆà¸²à¸‡à¹† "
-#~ "à¹€à¸à¸‡"
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -162,71 +305,11 @@ msgstr ""
 #~ "à¸à¸£à¸¸à¸“à¸²à¸£à¸°à¸šà¸¸ realm à¸‚à¸à¸‡ Kerberos à¸—à¸µà¹ˆà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸™à¸µà¹‰à¹€à¸›à¹‡à¸™à¸ªà¸¡à¸²à¸Šà¸´à¸à¸à¸¢à¸¹à¹ˆ à¹‚à¸”à¸¢à¸—à¸±à¹ˆà¸§à¹„à¸› "
 #~ "à¸„à¹ˆà¸²à¸™à¸µà¹‰à¸¡à¸±à¸à¹€à¸›à¹‡à¸™à¸„à¹ˆà¸²à¹€à¸”à¸µà¸¢à¸§à¸à¸±à¸šà¸Šà¸·à¹ˆà¸à¹‚à¸”à¹€à¸¡à¸™à¸‚à¸à¸‡ DNS"
 
-#~ msgid "Domain Name:"
-#~ msgstr "à¸Šà¸·à¹ˆà¸à¹‚à¸”à¹€à¸¡à¸™:"
-
 #~ msgid ""
 #~ "Please specify the domain you want this server to appear to be in when "
 #~ "queried by clients."
 #~ msgstr "à¸à¸£à¸¸à¸“à¸²à¸£à¸°à¸šà¸¸à¹‚à¸”à¹€à¸¡à¸™à¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸«à¹‰à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸™à¸µà¹‰à¸›à¸£à¸°à¸à¸²à¸¨à¹€à¸›à¹‡à¸™à¸ªà¸¡à¸²à¸Šà¸´à¸à¹€à¸¡à¸·à¹ˆà¸à¸–à¸¹à¸à¸–à¸²à¸¡à¹‚à¸”à¸¢à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸¥à¸¹à¸à¸‚à¹ˆà¸²à¸¢"
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "à¸ˆà¸°à¹à¸à¹‰à¹„à¸‚ smb.conf à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸„à¹ˆà¸²à¸•à¸±à¹‰à¸‡ WINS à¸ˆà¸²à¸ DHCP à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "à¸–à¹‰à¸²à¸„à¸à¸¡à¸žà¸´à¸§à¹€à¸•à¸à¸£à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¹ƒà¸Šà¹‰à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸«à¸¡à¸²à¸¢à¹€à¸¥à¸‚ IP à¸ˆà¸²à¸à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ DHCP à¹ƒà¸™à¹€à¸„à¸£à¸·à¸à¸‚à¹ˆà¸²à¸¢ à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ DHCP "
-#~ "à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸à¸²à¸ˆà¹ƒà¸«à¹‰à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ WINS (\"name server à¸‚à¸à¸‡ NetBIOS\") "
-#~ "à¸—à¸µà¹ˆà¸¡à¸µà¹ƒà¸™à¹€à¸„à¸£à¸·à¸à¸‚à¹ˆà¸²à¸¢à¸¡à¸²à¸”à¹‰à¸§à¸¢ à¸à¸²à¸£à¸ˆà¸°à¹ƒà¸Šà¹‰à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹„à¸”à¹‰ à¸ˆà¸³à¹€à¸›à¹‡à¸™à¸•à¹‰à¸à¸‡à¹à¸à¹‰à¹„à¸‚à¹à¸Ÿà¹‰à¸¡ smb.conf à¸‚à¸à¸‡à¸„à¸¸à¸“ "
-#~ "à¹€à¸žà¸·à¹ˆà¸à¹ƒà¸«à¹‰à¸¡à¸µà¸à¸²à¸£à¸à¹ˆà¸²à¸™à¸„à¹ˆà¸²à¸•à¸±à¹‰à¸‡ WINS à¸—à¸µà¹ˆà¹„à¸”à¹‰à¸ˆà¸²à¸ DHCP à¹ƒà¸™à¹à¸Ÿà¹‰à¸¡ /etc/samba/dhcp.conf à¹‚à¸”à¸¢à¸à¸±à¸•à¹‚à¸™à¸¡à¸±à¸•à¸´"
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "à¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹à¸žà¸à¹€à¸à¸ˆ dhcp3-client à¸”à¹‰à¸§à¸¢ à¹€à¸žà¸·à¹ˆà¸à¸ˆà¸°à¹ƒà¸Šà¹‰à¸„à¸§à¸²à¸¡à¸ªà¸²à¸¡à¸²à¸£à¸–à¸™à¸µà¹‰"
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "à¸ˆà¸°à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸² smb.conf à¹à¸šà¸šà¸à¸±à¸•à¹‚à¸™à¸¡à¸±à¸•à¸´à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸² Samba à¹ƒà¸™à¸ªà¹ˆà¸§à¸™à¸—à¸µà¹ˆà¹€à¸«à¸¥à¸·à¸ à¸ˆà¸°à¹€à¸›à¹‡à¸™à¸„à¸³à¸–à¸²à¸¡à¸—à¸µà¹ˆà¸ˆà¸°à¸¡à¸µà¸œà¸¥à¸•à¹ˆà¸à¸„à¹ˆà¸²à¸•à¹ˆà¸²à¸‡à¹† à¹ƒà¸™ /etc/samba/smb.conf "
-#~ "à¸‹à¸¶à¹ˆà¸‡à¹€à¸›à¹‡à¸™à¹à¸Ÿà¹‰à¸¡à¸—à¸µà¹ˆà¹ƒà¸Šà¹‰à¸à¸³à¸«à¸™à¸”à¸„à¹ˆà¸²à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¸‚à¸à¸‡ Samba (nmbd à¹à¸¥à¸° smbd)  à¹à¸Ÿà¹‰à¸¡ smb.conf "
-#~ "à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“ à¸¡à¸µà¸šà¸£à¸£à¸—à¸±à¸” 'include' à¸«à¸£à¸·à¸à¸¡à¸µà¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸—à¸µà¹ˆà¸¢à¸²à¸§à¸«à¸¥à¸²à¸¢à¸šà¸£à¸£à¸—à¸±à¸” "
-#~ "à¸‹à¸¶à¹ˆà¸‡à¸ˆà¸°à¹€à¸›à¹‡à¸™à¸›à¸±à¸à¸«à¸²à¸•à¹ˆà¸à¸à¸£à¸°à¸šà¸§à¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¹à¸šà¸šà¸à¸±à¸•à¹‚à¸™à¸¡à¸±à¸•à¸´ à¹à¸¥à¸°à¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¹à¸à¹‰à¹„à¸‚à¹à¸Ÿà¹‰à¸¡ smb.conf à¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸à¸‡à¸à¹ˆà¸à¸™ "
-#~ "à¹€à¸žà¸·à¹ˆà¸à¹ƒà¸«à¹‰à¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰"
-
-#~ msgid "Use password encryption?"
-#~ msgstr "à¹ƒà¸Šà¹‰à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¸¥à¸±à¸šà¸à¸±à¸šà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¸¥à¸¹à¸à¸‚à¹ˆà¸²à¸¢à¸§à¸´à¸™à¹‚à¸”à¸§à¸ªà¹Œà¸£à¸¸à¹ˆà¸™à¹ƒà¸«à¸¡à¹ˆà¹† à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸” à¸ˆà¸°à¸•à¸´à¸”à¸•à¹ˆà¸à¸à¸±à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ SMB à¹‚à¸”à¸¢à¹ƒà¸Šà¹‰à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸—à¸µà¹ˆà¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¸¥à¸±à¸š "
-#~ "à¸–à¹‰à¸²à¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸ˆà¸°à¹ƒà¸Šà¹‰à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹à¸šà¸šà¸‚à¹‰à¸à¸„à¸§à¸²à¸¡à¸˜à¸£à¸£à¸¡à¸”à¸² à¸„à¸¸à¸“à¸ˆà¸°à¸•à¹‰à¸à¸‡à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸„à¹ˆà¸²à¸„à¹ˆà¸²à¸«à¸™à¸¶à¹ˆà¸‡à¹ƒà¸™à¹€à¸£à¸ˆà¸´à¸ªà¸•à¸£à¸µà¸‚à¸à¸‡à¸§à¸´à¸™à¹‚à¸”à¸§à¸ªà¹Œ"
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "à¸‚à¸à¹à¸™à¸°à¸™à¸³à¸à¸¢à¹ˆà¸²à¸‡à¸¢à¸´à¹ˆà¸‡à¹ƒà¸«à¹‰à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸™à¸µà¹‰ à¹à¸¥à¸°à¸–à¹‰à¸²à¸„à¸¸à¸“à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰ à¸à¸£à¸¸à¸“à¸²à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¹ƒà¸«à¹‰à¹à¸™à¹ˆà¹ƒà¸ˆà¸§à¹ˆà¸²à¸„à¸¸à¸“à¸¡à¸µà¹à¸Ÿà¹‰à¸¡ /etc/"
-#~ "samba/smbpasswd à¸—à¸µà¹ˆà¹ƒà¸Šà¹‰à¸à¸²à¸£à¹„à¸”à¹‰ à¹à¸¥à¸°à¸„à¸¸à¸“à¹„à¸”à¹‰à¸•à¸±à¹‰à¸‡à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸™à¸™à¸±à¹‰à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¹à¸•à¹ˆà¸¥à¸°à¸„à¸™ à¹‚à¸”à¸¢à¹ƒà¸Šà¹‰à¸„à¸³à¸ªà¸±à¹ˆà¸‡ "
-#~ "smbpasswd"
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "à¸ˆà¸°à¸ªà¸£à¹‰à¸²à¸‡à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™ samba /var/lib/samba/passdb.tdb à¸«à¸£à¸·à¸à¹„à¸¡à¹ˆ?"
 
@@ -256,22 +339,6 @@ msgstr ""
 #~ "à¸”à¸¹à¸£à¸²à¸¢à¸¥à¸°à¹€à¸à¸µà¸¢à¸”à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¹„à¸”à¹‰à¸—à¸µà¹ˆ /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html "
 #~ "à¸ˆà¸²à¸à¹à¸žà¸à¹€à¸à¸ˆ samba-doc "
 
-#~ msgid "daemons"
-#~ msgstr "à¸”à¸µà¸¡à¸à¸™"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "à¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸à¹ƒà¸Šà¹‰ Samba à¹à¸šà¸šà¹„à¸«à¸™?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "à¸”à¸µà¸¡à¸à¸™ smbd à¸‚à¸à¸‡ Samba à¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¸‡à¸²à¸™à¹à¸šà¸šà¸”à¸µà¸¡à¸à¸™à¸˜à¸£à¸£à¸¡à¸”à¸² à¸«à¸£à¸·à¸à¹€à¸£à¸µà¸¢à¸à¸ˆà¸²à¸ inetd à¸à¹‡à¹„à¸”à¹‰ "
-#~ "à¸—à¸²à¸‡à¸—à¸µà¹ˆà¸‚à¸à¹à¸™à¸°à¸™à¸³à¸„à¸·à¸à¹€à¸£à¸µà¸¢à¸à¹à¸šà¸šà¸”à¸µà¸¡à¸à¸™"
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "à¹„à¸¡à¹ˆà¸ªà¸™à¸±à¸šà¸ªà¸™à¸¸à¸™à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸¥à¸¹à¸à¹‚à¸‹à¹ˆà¹à¸šà¹‡à¸à¹€à¸à¸™à¸”à¹Œà¸‚à¸à¸‡ passdb"
 
diff --git a/debian/po/tl.po b/debian/po/tl.po
index a39c31a..ad36c28 100644
--- a/debian/po/tl.po
+++ b/debian/po/tl.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-13 06:13+0800\n"
 "Last-Translator: eric pareja <xenos at upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl at banwa.upm.edu.ph>\n"
@@ -26,13 +26,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -41,13 +41,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -56,7 +56,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -73,7 +73,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -81,13 +81,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -95,69 +95,212 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Baguhin ang smb.conf upang gumamit ng WINS setting mula sa DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Kung ang computer ninyo ay kumukuha ng IP address mula sa DHCP server sa "
+"network, ang DHCP server ay maaaring magbigay ng impormasyon tungkol sa mga "
+"WINS server (\"NetBIOS name server\") na nasa network. Kinakailangan nito ng "
+"pagbabago sa inyong talaksang smb.conf upang ang bigay-ng-DHCP na WINS "
+"setting ay awtomatikong babasahin mula sa /etc/samba/dhcp.conf."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Ang paketeng dhcp3-client ay dapat nakaluklok upang mapakinabangan ang "
+"feature na ito."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Awtomatikong isaayos ang smb.conf?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Kung hindi ninyo pinili ang opsiyon na ito, kakailanganin ninyong ayusin "
-#~ "ang anumang pagbabagong pagsasaayos, at hindi ninyo mapapakinabangan ang "
-#~ "mga paminsanang pagpapahusay ng pagsasaayos."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Ang natitirang pagsasaayos ng Samba ay may mga katanungan tungkol sa mga "
+"parameter sa /etc/samba/smb.conf, na siyang talaksan na ginagamit sa "
+"pagsaayos ng mga programang Samba (nmbd at smbd). Ang kasalukuyang smb.conf "
+"ninyo ay naglalaman ng 'include' na linya o opsiyon na labis sa isang linya, "
+"na maaaring makalito  sa prosesong pagsaayos na awtomatiko at kakailanganin "
+"ninyong i-edit ang inyong smb.conf ng de kamay upang ito'y umandar muli. "
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Pangalan ng Workgroup/Domain:"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Kung hindi ninyo pinili ang opsiyon na ito, kakailanganin ninyong ayusin ang "
+"anumang pagbabagong pagsasaayos, at hindi ninyo mapapakinabangan ang mga "
+"paminsanang pagpapahusay ng pagsasaayos."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Pangalan ng Workgroup/Domain:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Gumamit ng encryption sa kontrasenyas?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Lahat ng mga bagong mga Windows client ay nakikipag-usap sa mga SMB server "
+"na naka-encrypt ang mga kontrasenyas. Kung nais niyong gumamit ng \"clear "
+"text\" na kontrasenyas, kailangan ninyong baguhin ang isang parameter sa "
+"inyong Windows registry."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Ang pag-enable ng opsiyon na ito ay rekomendado. Kung gawin niyo ito, "
+"tiyakin na ang inyong talaksang /etc/samba/smbpasswd ay valid at may "
+"nakatakda kayong kontrasenyas para sa bawat gumagamit na ginamitan ng "
+"smbpasswd na utos."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "mga daemon"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Paano ninyo gustong patakbuhin ang Samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Ang daemon na smbd ng Samba ay maaaring patakbuhin bilang normal na daemon o "
+"mula sa inetd. Pagpapatakbo nito bilang daemon ang rekomendado."
 
 #, fuzzy
 #~| msgid ""
@@ -172,71 +315,6 @@ msgstr ""
 #~ "client. Ang parameter na ito ang siyang nag-co-control ng Domain name na "
 #~ "ginagamit sa security=domain na setting."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Baguhin ang smb.conf upang gumamit ng WINS setting mula sa DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Kung ang computer ninyo ay kumukuha ng IP address mula sa DHCP server sa "
-#~ "network, ang DHCP server ay maaaring magbigay ng impormasyon tungkol sa "
-#~ "mga WINS server (\"NetBIOS name server\") na nasa network. Kinakailangan "
-#~ "nito ng pagbabago sa inyong talaksang smb.conf upang ang bigay-ng-DHCP na "
-#~ "WINS setting ay awtomatikong babasahin mula sa /etc/samba/dhcp.conf."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Ang paketeng dhcp3-client ay dapat nakaluklok upang mapakinabangan ang "
-#~ "feature na ito."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Awtomatikong isaayos ang smb.conf?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Ang natitirang pagsasaayos ng Samba ay may mga katanungan tungkol sa mga "
-#~ "parameter sa /etc/samba/smb.conf, na siyang talaksan na ginagamit sa "
-#~ "pagsaayos ng mga programang Samba (nmbd at smbd). Ang kasalukuyang smb."
-#~ "conf ninyo ay naglalaman ng 'include' na linya o opsiyon na labis sa "
-#~ "isang linya, na maaaring makalito  sa prosesong pagsaayos na awtomatiko "
-#~ "at kakailanganin ninyong i-edit ang inyong smb.conf ng de kamay upang "
-#~ "ito'y umandar muli. "
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Gumamit ng encryption sa kontrasenyas?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Lahat ng mga bagong mga Windows client ay nakikipag-usap sa mga SMB "
-#~ "server na naka-encrypt ang mga kontrasenyas. Kung nais niyong gumamit ng "
-#~ "\"clear text\" na kontrasenyas, kailangan ninyong baguhin ang isang "
-#~ "parameter sa inyong Windows registry."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Ang pag-enable ng opsiyon na ito ay rekomendado. Kung gawin niyo ito, "
-#~ "tiyakin na ang inyong talaksang /etc/samba/smbpasswd ay valid at may "
-#~ "nakatakda kayong kontrasenyas para sa bawat gumagamit na ginamitan ng "
-#~ "smbpasswd na utos."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
 #~ "Likhain ang talaan ng kontrasenyas ng samba, /var/lib/samba/passdb.tdb?"
@@ -271,22 +349,6 @@ msgstr ""
 #~ "Basahin ang /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html mula sa "
 #~ "paketeng samba-doc para sa karagdagang detalye."
 
-#~ msgid "daemons"
-#~ msgstr "mga daemon"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Paano ninyo gustong patakbuhin ang Samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Ang daemon na smbd ng Samba ay maaaring patakbuhin bilang normal na "
-#~ "daemon o mula sa inetd. Pagpapatakbo nito bilang daemon ang rekomendado."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Ang pagdudugtong ng mga backend ng passdb ay hindi suportado"
 
diff --git a/debian/po/tr.po b/debian/po/tr.po
index 80e24ce..56712da 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-06-20 17:28+0200\n"
 "Last-Translator: Ä°smail BAYDAN <ibaydan at gmail.com>\n"
 "Language-Team: Turkish <debian-l10n-turkish at lists.debian.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "Samba 3'ten gÃ¼ncelleÅŸtir?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -35,13 +35,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr "Sunucu rolÃ¼"
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -53,7 +53,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -65,7 +65,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -75,7 +75,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -83,13 +83,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr "Realm adÄ±:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -99,63 +99,217 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr "Genellikle bu bÃ¼yÃ¼k harfle yazÄ±lmÄ±ÅŸ sizin DNS konak adÄ±dÄ±r."
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+"WINS ayarlarÄ±nÄ± DHCP'den kullanmak iÃ§in smb.conf dosyasÄ±nda deÄŸiÅŸiklik "
+"yapÄ±lsÄ±n mÄ±?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"EÄŸer bilgisayarÄ±nÄ±z IP adresini aÄŸÄ±nÄ±zdaki bir DHCP sunucusundan alÄ±yorsa, "
+"DHCP sunucusu ayrÄ±ca aÄŸÄ±nÄ±zda bulunan WINS sunucularÄ± (\"NetBIOS alanadÄ± "
+"sunucularÄ±\") hakkÄ±nda da bilgi verebilir.  Bu, smb.conf dosyanÄ±zda DHCP "
+"tarafÄ±ndan sunulan WINS ayarlarÄ±nÄ±n otomatik olarak /etc/samba/dhcp.conf "
+"dosyasÄ±ndan okunmasÄ±nÄ± saÄŸlayan bir deÄŸiÅŸikliÄŸi gerektirir."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+"Bu Ã¶zellikten yararlanabilmek iÃ§in dhcp3-client paketinin kurulmuÅŸ olmasÄ± "
+"gerekir."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "smb.conf dosyasÄ± otomatik olarak yapÄ±landÄ±rÄ±lsÄ±n mÄ±?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Geri kalan Samba yapÄ±landÄ±rmasÄ±, Samba uygulamalarÄ±nÄ± (nmbd ve smbd) "
+"yapÄ±landÄ±rmak iÃ§in kullanÄ±lan /etc/samba/smb.conf dosyasÄ±ndaki parametreleri "
+"etkileyen sorularla devam edecektir. Mevcut smb.conf dosyasÄ±, debconf'u "
+"ÅŸaÅŸÄ±rtabilecek ve smb.conf dosyanÄ±zÄ± elle deÄŸiÅŸtirilmesi zorunda kÄ±lacak bir "
+"'include' satÄ±rÄ± veya birden fazla satÄ±r boyunca devam eden bir seÃ§enek "
+"iÃ§eriyor ve tekrar Ã§alÄ±ÅŸabilmesi iÃ§in smb.conf dosyanÄ±zÄ±n sizin tarafÄ±nÄ±zdan "
+"deÄŸiÅŸtirilmesi gerekiyor."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"EÄŸer bu seÃ§eneÄŸi seÃ§mezseniz, Sabma yapÄ±landÄ±rÄ±lmamÄ±ÅŸ olarak kalacak ve "
+"bÃ¼tÃ¼n yapÄ±landÄ±rma deÄŸiÅŸikliklerini kendiniz yapmak zorunda kalacaksÄ±nÄ±z."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Etki AlanÄ± Ä°smi:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Parola ÅŸifrelenmesi kullanÄ±lsÄ±n mÄ±?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Yeni Windows istemcileri SBM sunucularÄ±yla ÅŸifrelenmiÅŸ parolalar kullanarak "
+"iletiÅŸim kurarlar. EÄŸer dÃ¼z metin parolalarÄ± kullanmak istiyorsanÄ±z Windows "
+"registry iÃ§inde bir parametreyi deÄŸiÅŸtirmelisiniz."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Bu iÅŸlemi yapmanÄ±z ÅŸiddetle Ã¶nerilir. EÄŸer yapacaksanÄ±z, geÃ§erli bir /etc/"
+"samba/smbpasswd dosyanÄ±z olduÄŸundan emin olun ve smbpasswd komutunu "
+"kullanarak bÃ¼tÃ¼n kullanÄ±cÄ±lar iÃ§in parola belirleyin."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "artalan sÃ¼reÃ§leri"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Samba'nÄ±n nasÄ±l Ã§alÄ±ÅŸmasÄ±nÄ± istersiniz?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba artalan sÃ¼reci smbd, normal bir artalan sÃ¼reci olarak veya inetd'den "
+"Ã§alÄ±ÅŸabilir. Tavsiye edilen yaklaÅŸÄ±m artalan sÃ¼reci olarak Ã§alÄ±ÅŸtÄ±rmaktÄ±r."
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Samba 4'Ã¼ PDC olarak ayarla?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "EÄŸer bu seÃ§eneÄŸi seÃ§mezseniz, Sabma yapÄ±landÄ±rÄ±lmamÄ±ÅŸ olarak kalacak ve "
-#~ "bÃ¼tÃ¼n yapÄ±landÄ±rma deÄŸiÅŸikliklerini kendiniz yapmak zorunda kalacaksÄ±nÄ±z."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -171,10 +325,6 @@ msgstr ""
 #~ "LÃ¼tfen bu sunucunun iÃ§inde yer alacaÄŸÄ± Kerberos realm'Ä± belirtin. Ã‡oÄŸu "
 #~ "durumda, bu isim DNS etki alanÄ± ile aynÄ±dÄ±r."
 
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Etki AlanÄ± Ä°smi:"
-
 #~| msgid ""
 #~| "Please specify the workgroup you want this server to appear to be in "
 #~| "when queried by clients. Note that this parameter also controls the "
@@ -186,72 +336,6 @@ msgstr ""
 #~ "LÃ¼tfen sunucunuzun istemciler tarafÄ±ndan sorgulandÄ±ÄŸÄ±nda iÃ§erisinde "
 #~ "gÃ¶zÃ¼kmesini istediÄŸiniz etki alanÄ±nÄ± belirtiniz."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr ""
-#~ "WINS ayarlarÄ±nÄ± DHCP'den kullanmak iÃ§in smb.conf dosyasÄ±nda deÄŸiÅŸiklik "
-#~ "yapÄ±lsÄ±n mÄ±?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "EÄŸer bilgisayarÄ±nÄ±z IP adresini aÄŸÄ±nÄ±zdaki bir DHCP sunucusundan "
-#~ "alÄ±yorsa, DHCP sunucusu ayrÄ±ca aÄŸÄ±nÄ±zda bulunan WINS sunucularÄ± "
-#~ "(\"NetBIOS alanadÄ± sunucularÄ±\") hakkÄ±nda da bilgi verebilir.  Bu, smb."
-#~ "conf dosyanÄ±zda DHCP tarafÄ±ndan sunulan WINS ayarlarÄ±nÄ±n otomatik olarak /"
-#~ "etc/samba/dhcp.conf dosyasÄ±ndan okunmasÄ±nÄ± saÄŸlayan bir deÄŸiÅŸikliÄŸi "
-#~ "gerektirir."
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Bu Ã¶zellikten yararlanabilmek iÃ§in dhcp3-client paketinin kurulmuÅŸ olmasÄ± "
-#~ "gerekir."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "smb.conf dosyasÄ± otomatik olarak yapÄ±landÄ±rÄ±lsÄ±n mÄ±?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Geri kalan Samba yapÄ±landÄ±rmasÄ±, Samba uygulamalarÄ±nÄ± (nmbd ve smbd) "
-#~ "yapÄ±landÄ±rmak iÃ§in kullanÄ±lan /etc/samba/smb.conf dosyasÄ±ndaki "
-#~ "parametreleri etkileyen sorularla devam edecektir. Mevcut smb.conf "
-#~ "dosyasÄ±, debconf'u ÅŸaÅŸÄ±rtabilecek ve smb.conf dosyanÄ±zÄ± elle "
-#~ "deÄŸiÅŸtirilmesi zorunda kÄ±lacak bir 'include' satÄ±rÄ± veya birden fazla "
-#~ "satÄ±r boyunca devam eden bir seÃ§enek iÃ§eriyor ve tekrar Ã§alÄ±ÅŸabilmesi "
-#~ "iÃ§in smb.conf dosyanÄ±zÄ±n sizin tarafÄ±nÄ±zdan deÄŸiÅŸtirilmesi gerekiyor."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Parola ÅŸifrelenmesi kullanÄ±lsÄ±n mÄ±?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Yeni Windows istemcileri SBM sunucularÄ±yla ÅŸifrelenmiÅŸ parolalar "
-#~ "kullanarak iletiÅŸim kurarlar. EÄŸer dÃ¼z metin parolalarÄ± kullanmak "
-#~ "istiyorsanÄ±z Windows registry iÃ§inde bir parametreyi deÄŸiÅŸtirmelisiniz."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Bu iÅŸlemi yapmanÄ±z ÅŸiddetle Ã¶nerilir. EÄŸer yapacaksanÄ±z, geÃ§erli bir /etc/"
-#~ "samba/smbpasswd dosyanÄ±z olduÄŸundan emin olun ve smbpasswd komutunu "
-#~ "kullanarak bÃ¼tÃ¼n kullanÄ±cÄ±lar iÃ§in parola belirleyin."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "Samba parola veritabanÄ± /var/lib/samba/passwd.tdb yaratÄ±lsÄ±n mÄ±?"
 
@@ -284,23 +368,6 @@ msgstr ""
 #~ "Daha detaylÄ±Ä± bilgi iÃ§in samba-doc paketinden /usr/share/doc/samba-doc/"
 #~ "htmldocs/ENCRYPTION.html dosyasÄ±na gÃ¶zatÄ±n."
 
-#~ msgid "daemons"
-#~ msgstr "artalan sÃ¼reÃ§leri"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Samba'nÄ±n nasÄ±l Ã§alÄ±ÅŸmasÄ±nÄ± istersiniz?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samba artalan sÃ¼reci smbd, normal bir artalan sÃ¼reci olarak veya "
-#~ "inetd'den Ã§alÄ±ÅŸabilir. Tavsiye edilen yaklaÅŸÄ±m artalan sÃ¼reci olarak "
-#~ "Ã§alÄ±ÅŸtÄ±rmaktÄ±r."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr ""
 #~ "Parola veritabanÄ± iÃ§in Ã§oklu arkayÃ¼z kullanÄ±labilmesi Ã¶zelliÄŸi  "
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 2750ba8..b0b102c 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba4 4.0.0~alpha4~20080617-1\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2008-06-17 18:40+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -19,13 +19,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr "NÃ¢ng cáº¥p tá»« Samba 3 khÃ´ng?"
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -37,13 +37,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -52,7 +52,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -61,7 +61,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -77,15 +77,14 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 #, fuzzy
-#| msgid "Realm:"
 msgid "Realm name:"
 msgstr "Äá»‹a háº¡t:"
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -93,63 +92,190 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"KhÃ´ng báºt tÃ¹y chá»n nÃ y thÃ¬ Samba cÃ²n láº¡i khÃ´ng cÃ³ cáº¥u hÃ¬nh: báº¡n sáº½ cáº§n pháº£i "
+"tá»± cáº¥u hÃ¬nh nÃ³."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "TÃªn miá»n:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+
 #~ msgid "Set up Samba 4 as a PDC?"
 #~ msgstr "Thiáº¿t láºp Samba 4 nhÆ° lÃ  má»™t PDC khÃ´ng?"
 
 #~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "KhÃ´ng báºt tÃ¹y chá»n nÃ y thÃ¬ Samba cÃ²n láº¡i khÃ´ng cÃ³ cáº¥u hÃ¬nh: báº¡n sáº½ cáº§n "
-#~ "pháº£i tá»± cáº¥u hÃ¬nh nÃ³."
-
-#~ msgid ""
 #~ "Even when using this option, you will need to set up DNS such that it "
 #~ "serves the data from the zone file in that directory before you can use "
 #~ "the Active Directory domain."
@@ -165,10 +291,6 @@ msgstr ""
 #~ "HÃ£y xÃ¡c Ä‘á»‹nh Ä‘á»‹a háº¡t Kerberos sáº½ chá»©a mÃ¡y phá»¥c vá»¥ nÃ y. Trong nhiá»u trÆ°á»ng "
 #~ "há»£p Ä‘á»u, Ä‘á»‹a háº¡t trÃ¹ng vá»›i tÃªn miá»n DNS."
 
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "TÃªn miá»n:"
-
 #~| msgid ""
 #~| "Please specify the workgroup you want this server to appear to be in "
 #~| "when queried by clients. Note that this parameter also controls the "
diff --git a/debian/po/wo.po b/debian/po/wo.po
index 7fcb4d1..fc519d6 100644
--- a/debian/po/wo.po
+++ b/debian/po/wo.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wo\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-04-30 18:13+0000\n"
 "Last-Translator: Mouhamadou Mamoune Mbacke <mouhamadoumamoune at gmail.com>\n"
 "Language-Team: Wolof\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -42,13 +42,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -96,69 +96,208 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "Ndax nu soppi smb.con ba muy jÃ«fandikoo komfiguraasioÅ‹ bu DHCP?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"Bu fekkee sa kompiyutar mi ngi ame adrees IP ci ab serwÃ³or DHCP bu ne ci "
+"resÃ³o bi, kon serwÃ³or DHCP bi man na yitam di joxe ay xamle yu aju ci "
+"serwÃ³or WINS yi (\"NetBIOS name servers\") yi nekk ci resÃ³o bi. Loolu nak "
+"dana laaj ak coppat ci sa fiise smb.conf, ngir ba komfiguraasioÅ‹ yi DHCP bi "
+"di joxe Ã±ukoy jaÅ‹gale sune boppu ci fiise /etc/samba/dhcp.conf"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "Paket bu dhcp3-client nak wareesna koo istale ngir jariÃ±oo defiin wii."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "Ndax Ã±u komfigureel smb.conf sunu boppu?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "Bu fekkee tannoo lii, kon bÃ©pp coppat booy def ci komfiguraasioÅ‹ bi danga "
-#~ "koy defal sa boppu, ta kon doo mana jariÃ±u ci rafetal ak jekkal yiÃ±uy "
-#~ "farala def ci komfiguraasioÅ‹ bi."
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"Li des ci komfiguraasioÅ‹ bu samba ay laaj la yu aju ci parameetar yu /etc/"
+"samba/smb.conf, nga xam ne mooy fiise biÃ±uy jÃ«fandikoo ngir komfigure "
+"prograam yu samba (nmbd ak smbd). Sa fiise smb.conf bii nga yore fii mune, "
+"amna aw bind wu 'include' walla ab tann bu tallalu ci ay bind yu bare, ta "
+"loolu man naa jaxase komfiguraasioÅ‹ otomatik bi, ba taxna danga koy wara "
+"soppi ak sa loxo, ngir lÃ©ppu awaat yoon."
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+#, fuzzy
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"Bu fekkee tannoo lii, kon bÃ©pp coppat booy def ci komfiguraasioÅ‹ bi danga "
+"koy defal sa boppu, ta kon doo mana jariÃ±u ci rafetal ak jekkal yiÃ±uy farala "
+"def ci komfiguraasioÅ‹ bi."
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+#, fuzzy
+msgid "Workgroup/Domain Name:"
+msgstr "Grup bu liggÃ©ey/Turu domen:"
+
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "Ndax Ã±u kiripte baatujall yi?"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"Mbooleem kiliyaÅ‹ yu Windows yu yees yi buÃ±uy jokkoo ak SMB daÃ±uy jÃ«fandikoo "
+"baatijall yuÃ±u kiripte. Boo bÃ«ggÃ©e jÃ«fandikoo baatijall yu tekst yu leer, "
+"kon dangay wara soppi ab parameetar ci register bu Windows."
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "Grup bu liggÃ©ey/Turu domen:"
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"Ã‘oongi deÅ‹kaane bubaax nga tann lii. Boo ko defee, na nga wÃ³orlu ne amnga ab "
+"fiise /etc/samba/smbpasswd bu baax, ta nga def foofa baatujall bu "
+"jÃ«fandikukat yÃ©ppu. Dangay jÃ«fandikoo komaand bu smbpasswd."
+
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "daemon yi"
+
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "Nan nga bÃ«gga doxale samba?"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Daemon bu Samba smbd maneesna koo doxal ne ab deamon normaal, maneesna koo "
+"doxale yit ak inetd. LiÃ±uy deÅ‹kaane nak mooy doxalko muy ab daemon."
 
 #, fuzzy
 #~| msgid ""
@@ -173,67 +312,6 @@ msgstr ""
 #~ "kiliyaÅ‹ di laaj. Nga bayyi xel ne parameetar bii mooy konturle yitam turu "
 #~ "domen biÃ±uy jÃ«fandikoo ci komfiguraasioÅ‹ bu security=domain."
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "Ndax nu soppi smb.con ba muy jÃ«fandikoo komfiguraasioÅ‹ bu DHCP?"
-
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "Bu fekkee sa kompiyutar mi ngi ame adrees IP ci ab serwÃ³or DHCP bu ne ci "
-#~ "resÃ³o bi, kon serwÃ³or DHCP bi man na yitam di joxe ay xamle yu aju ci "
-#~ "serwÃ³or WINS yi (\"NetBIOS name servers\") yi nekk ci resÃ³o bi. Loolu nak "
-#~ "dana laaj ak coppat ci sa fiise smb.conf, ngir ba komfiguraasioÅ‹ yi DHCP "
-#~ "bi di joxe Ã±ukoy jaÅ‹gale sune boppu ci fiise /etc/samba/dhcp.conf"
-
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr ""
-#~ "Paket bu dhcp3-client nak wareesna koo istale ngir jariÃ±oo defiin wii."
-
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "Ndax Ã±u komfigureel smb.conf sunu boppu?"
-
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "Li des ci komfiguraasioÅ‹ bu samba ay laaj la yu aju ci parameetar yu /etc/"
-#~ "samba/smb.conf, nga xam ne mooy fiise biÃ±uy jÃ«fandikoo ngir komfigure "
-#~ "prograam yu samba (nmbd ak smbd). Sa fiise smb.conf bii nga yore fii "
-#~ "mune, amna aw bind wu 'include' walla ab tann bu tallalu ci ay bind yu "
-#~ "bare, ta loolu man naa jaxase komfiguraasioÅ‹ otomatik bi, ba taxna danga "
-#~ "koy wara soppi ak sa loxo, ngir lÃ©ppu awaat yoon."
-
-#~ msgid "Use password encryption?"
-#~ msgstr "Ndax Ã±u kiripte baatujall yi?"
-
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "Mbooleem kiliyaÅ‹ yu Windows yu yees yi buÃ±uy jokkoo ak SMB daÃ±uy "
-#~ "jÃ«fandikoo baatijall yuÃ±u kiripte. Boo bÃ«ggÃ©e jÃ«fandikoo baatijall yu "
-#~ "tekst yu leer, kon dangay wara soppi ab parameetar ci register bu Windows."
-
-#~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
-#~ msgstr ""
-#~ "Ã‘oongi deÅ‹kaane bubaax nga tann lii. Boo ko defee, na nga wÃ³orlu ne amnga "
-#~ "ab fiise /etc/samba/smbpasswd bu baax, ta nga def foofa baatujall bu "
-#~ "jÃ«fandikukat yÃ©ppu. Dangay jÃ«fandikoo komaand bu smbpasswd."
-
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr ""
 #~ "Ndax Ã±u sos baasu done bu baatujall yu samba, /var/lib/samba/passdb.tdb?"
@@ -267,22 +345,6 @@ msgstr ""
 #~ "Xoolal /usr/share/doc/samba-doc/htmldocs/ENCRYPTION.html bi nekk ci paket "
 #~ "bu samba-doc, ngir am yaneen leeral."
 
-#~ msgid "daemons"
-#~ msgstr "daemon yi"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "Nan nga bÃ«gga doxale samba?"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Daemon bu Samba smbd maneesna koo doxal ne ab deamon normaal, maneesna "
-#~ "koo doxale yit ak inetd. LiÃ±uy deÅ‹kaane nak mooy doxalko muy ab daemon."
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Ceene passdb backends manula nekk"
 
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 941787e..a77095d 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 3.0.22-1\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2006-10-03 19:36-0500\n"
 "Last-Translator: Carlos Z.F. Liu <carlosliu at users.sourceforge.ent>\n"
 "Language-Team: Debian Chinese [GB] <debian-chinese-gb at lists.debian.org>\n"
@@ -30,13 +30,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -45,13 +45,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -60,7 +60,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -69,7 +69,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -77,7 +77,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -85,13 +85,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -99,135 +99,213 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "è¦ä¿®æ”¹ smb.conf ä»¥ä½¿ç”¨ä»Ž DHCP èŽ·å¾—çš„ WINS è®¾å®šå—ï¼Ÿ"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"å¦‚æžœæ‚¨çš„è®¡ç®—æœºæ˜¯ä»Žç½‘ç»œä¸Šçš„ DHCP æœåŠ¡å™¨èŽ·å– IP åœ°å€ä¿¡æ¯ï¼Œè¯¥ DHCP æœåŠ¡ä¹Ÿå¯èƒ½ä¼š"
+"æä¾›ç½‘ç»œä¸Šçš„ WINS æœåŠ¡å™¨ (â€œNetBIOS åŸŸåæœåŠ¡â€) ä¿¡æ¯ã€‚è¿™éœ€è¦å¯¹æ‚¨çš„ smb.conf è¿›"
+"è¡Œä¿®æ”¹ï¼Œä»¥è‡ªåŠ¨ä»Ž /etc/samba/dhcp.conf è¯»å– DHCP æ‰€æä¾›çš„ WINS è®¾ç½®ã€‚"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "å¿…é¡»å®‰è£… dhcp3-client è½¯ä»¶åŒ…ï¼Œæ‰èƒ½ä½¿ç”¨æ¤é¡¹ç‰¹æ€§ã€‚"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "è‡ªåŠ¨é…ç½® smb.conf å—ï¼Ÿ"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "å¦‚æžœæ‚¨ä¸é€‰ä¸æ¤é¡¹ï¼Œæ‚¨å°±å¿…é¡»è‡ªå·±å¤„ç†æ‰€æœ‰çš„é…ç½®æ”¹å˜ï¼Œä¹Ÿæ— æ³•äº«å—åˆ°å®šæœŸçš„é…ç½®æ”¹"
-#~ "è¿›ç‰¹æ€§ã€‚"
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"ä½™ä¸‹çš„ Samba é…ç½®æ¶‰åŠé‚£äº›å½±å“ /etc/samba/smb.conf ä¸å‚æ•°çš„é—®é¢˜ã€‚æ¤æ–‡ä»¶æ˜¯ç”¨æ¥"
+"é…ç½® Samba ç¨‹åº (nmbd å’Œ smbd)ã€‚æ‚¨ç›®å‰çš„ smb.conf åŒ…æ‹¬ä¸€ä¸ªâ€œincludeâ€è¡Œæˆ–è€…ä¸€ä¸ª"
+"è·¨è¶Šå¤šè¡Œçš„é€‰é¡¹ï¼Œè¿™å°†æ…ä¹±è‡ªåŠ¨é…ç½®ç¨‹åºå¹¶éœ€è¦æ‚¨æ‰‹åŠ¨ä¿®æ”¹ smb.conf ä»¥ä½¿å…¶æ£å¸¸å·¥"
+"ä½œã€‚"
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "å·¥ä½œç»„/åŸŸåï¼š"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"å¦‚æžœæ‚¨ä¸é€‰ä¸æ¤é¡¹ï¼Œæ‚¨å°±å¿…é¡»è‡ªå·±å¤„ç†æ‰€æœ‰çš„é…ç½®æ”¹å˜ï¼Œä¹Ÿæ— æ³•äº«å—åˆ°å®šæœŸçš„é…ç½®æ”¹è¿›"
+"ç‰¹æ€§ã€‚"
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
 #, fuzzy
-#~| msgid ""
-#~| "Please specify the workgroup you want this server to appear to be in "
-#~| "when queried by clients. Note that this parameter also controls the "
-#~| "domain name used with the security=domain setting."
-#~ msgid ""
-#~ "Please specify the domain you want this server to appear to be in when "
-#~ "queried by clients."
-#~ msgstr ""
-#~ "è¯·æŒ‡å®šæœ¬æœåŠ¡å™¨åœ¨æ”¶åˆ°å®¢æˆ·ç«¯æŸ¥è¯¢æ—¶å°†è¦æ˜¾ç¤ºçš„å·¥ä½œç»„ã€‚è¯·æ³¨æ„ï¼Œæ¤å‚æ•°åŒæ ·ä¹ŸæŽ§åˆ¶"
-#~ "äº† security=demain è®¾ç½®æ‰€ç”¨çš„åŸŸåã€‚"
+msgid "Workgroup/Domain Name:"
+msgstr "å·¥ä½œç»„/åŸŸåï¼š"
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "è¦ä¿®æ”¹ smb.conf ä»¥ä½¿ç”¨ä»Ž DHCP èŽ·å¾—çš„ WINS è®¾å®šå—ï¼Ÿ"
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
 
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "å¦‚æžœæ‚¨çš„è®¡ç®—æœºæ˜¯ä»Žç½‘ç»œä¸Šçš„ DHCP æœåŠ¡å™¨èŽ·å– IP åœ°å€ä¿¡æ¯ï¼Œè¯¥ DHCP æœåŠ¡ä¹Ÿå¯èƒ½"
-#~ "ä¼šæä¾›ç½‘ç»œä¸Šçš„ WINS æœåŠ¡å™¨ (â€œNetBIOS åŸŸåæœåŠ¡â€) ä¿¡æ¯ã€‚è¿™éœ€è¦å¯¹æ‚¨çš„ smb."
-#~ "conf è¿›è¡Œä¿®æ”¹ï¼Œä»¥è‡ªåŠ¨ä»Ž /etc/samba/dhcp.conf è¯»å– DHCP æ‰€æä¾›çš„ WINS è®¾"
-#~ "ç½®ã€‚"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "ä½¿ç”¨å£ä»¤åŠ å¯†å—ï¼Ÿ"
 
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "å¿…é¡»å®‰è£… dhcp3-client è½¯ä»¶åŒ…ï¼Œæ‰èƒ½ä½¿ç”¨æ¤é¡¹ç‰¹æ€§ã€‚"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"è¾ƒæ–°çš„ Windows å®¢æˆ·ç«¯éƒ½ä½¿ç”¨åŠ å¯†çš„å£ä»¤ä¸Ž SMB æœåŠ¡å™¨é€šè®¯ã€‚å¦‚æžœæ‚¨æƒ³ä½¿ç”¨æ˜Žæ–‡å¯†"
+"ç ï¼Œæ‚¨å°†éœ€è¦ä¿®æ”¹æ‚¨çš„ Windows æ³¨å†Œè¡¨ä¸çš„ä¸€ä¸ªå‚æ•°ã€‚"
 
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "è‡ªåŠ¨é…ç½® smb.conf å—ï¼Ÿ"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"å¼ºçƒˆæŽ¨èå¼€å¯æ¤é€‰é¡¹ã€‚å¦‚æžœé€‰ä¸ï¼Œè¯·ç¡®ä¿æ‚¨æ‹¥æœ‰ä¸€ä¸ªæœ‰æ•ˆçš„ /etc/samba/smbpasswd æ–‡"
+"ä»¶ï¼Œå¹¶ä¸”æ¤æ–‡ä»¶åŒ…å«ç”¨ smbpasswd å‘½ä»¤ä¸ºæ¯ä¸ªç”¨æˆ·è®¾å®šçš„å¯†ç ã€‚"
 
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "ä½™ä¸‹çš„ Samba é…ç½®æ¶‰åŠé‚£äº›å½±å“ /etc/samba/smb.conf ä¸å‚æ•°çš„é—®é¢˜ã€‚æ¤æ–‡ä»¶æ˜¯ç”¨"
-#~ "æ¥é…ç½® Samba ç¨‹åº (nmbd å’Œ smbd)ã€‚æ‚¨ç›®å‰çš„ smb.conf åŒ…æ‹¬ä¸€ä¸ªâ€œincludeâ€è¡Œæˆ–"
-#~ "è€…ä¸€ä¸ªè·¨è¶Šå¤šè¡Œçš„é€‰é¡¹ï¼Œè¿™å°†æ…ä¹±è‡ªåŠ¨é…ç½®ç¨‹åºå¹¶éœ€è¦æ‚¨æ‰‹åŠ¨ä¿®æ”¹ smb.conf ä»¥ä½¿å…¶"
-#~ "æ£å¸¸å·¥ä½œã€‚"
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
 
-#~ msgid "Use password encryption?"
-#~ msgstr "ä½¿ç”¨å£ä»¤åŠ å¯†å—ï¼Ÿ"
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "å®ˆæŠ¤è¿›ç¨‹"
 
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "è¾ƒæ–°çš„ Windows å®¢æˆ·ç«¯éƒ½ä½¿ç”¨åŠ å¯†çš„å£ä»¤ä¸Ž SMB æœåŠ¡å™¨é€šè®¯ã€‚å¦‚æžœæ‚¨æƒ³ä½¿ç”¨æ˜Žæ–‡å¯†"
-#~ "ç ï¼Œæ‚¨å°†éœ€è¦ä¿®æ”¹æ‚¨çš„ Windows æ³¨å†Œè¡¨ä¸çš„ä¸€ä¸ªå‚æ•°ã€‚"
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
 
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "æ‚¨æƒ³å¦‚ä½•è¿è¡Œ Sambaï¼Ÿ"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba å®ˆæŠ¤è¿›ç¨‹ smbd å¯ä»¥ä½œä¸ºæ™®é€šå®ˆæŠ¤è¿›ç¨‹æˆ–è€…ä»Ž inetd å¯åŠ¨ã€‚ä»¥å®ˆæŠ¤è¿›ç¨‹çš„æ–¹å¼è¿"
+"è¡Œæ˜¯æŽ¨èçš„æ–¹å¼ã€‚"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please specify the workgroup you want this server to appear to be in "
+#~| "when queried by clients. Note that this parameter also controls the "
+#~| "domain name used with the security=domain setting."
 #~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
+#~ "Please specify the domain you want this server to appear to be in when "
+#~ "queried by clients."
 #~ msgstr ""
-#~ "å¼ºçƒˆæŽ¨èå¼€å¯æ¤é€‰é¡¹ã€‚å¦‚æžœé€‰ä¸ï¼Œè¯·ç¡®ä¿æ‚¨æ‹¥æœ‰ä¸€ä¸ªæœ‰æ•ˆçš„ /etc/samba/smbpasswd "
-#~ "æ–‡ä»¶ï¼Œå¹¶ä¸”æ¤æ–‡ä»¶åŒ…å«ç”¨ smbpasswd å‘½ä»¤ä¸ºæ¯ä¸ªç”¨æˆ·è®¾å®šçš„å¯†ç ã€‚"
+#~ "è¯·æŒ‡å®šæœ¬æœåŠ¡å™¨åœ¨æ”¶åˆ°å®¢æˆ·ç«¯æŸ¥è¯¢æ—¶å°†è¦æ˜¾ç¤ºçš„å·¥ä½œç»„ã€‚è¯·æ³¨æ„ï¼Œæ¤å‚æ•°åŒæ ·ä¹ŸæŽ§åˆ¶"
+#~ "äº† security=demain è®¾ç½®æ‰€ç”¨çš„åŸŸåã€‚"
 
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "è¦åˆ›å»º samba å¯†ç æ•°æ®åº“ /var/lib/samba/passdb.tdb å—ï¼Ÿ"
@@ -257,22 +335,6 @@ msgstr ""
 #~ "æ›´å¤šè¯¦æƒ…ï¼Œè¯·å‚é˜… smaba-doc è½¯ä»¶åŒ…ä¸çš„ /usr/share/doc/samba-doc/htmldocs/"
 #~ "ENCRYPTION.htmlã€‚"
 
-#~ msgid "daemons"
-#~ msgstr "å®ˆæŠ¤è¿›ç¨‹"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "æ‚¨æƒ³å¦‚ä½•è¿è¡Œ Sambaï¼Ÿ"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samba å®ˆæŠ¤è¿›ç¨‹ smbd å¯ä»¥ä½œä¸ºæ™®é€šå®ˆæŠ¤è¿›ç¨‹æˆ–è€…ä»Ž inetd å¯åŠ¨ã€‚ä»¥å®ˆæŠ¤è¿›ç¨‹çš„æ–¹"
-#~ "å¼è¿è¡Œæ˜¯æŽ¨èçš„æ–¹å¼ã€‚"
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "ä¸æ”¯æŒä¸²è” passdb åŽç«¯"
 
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index 864a80b..10ca89c 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: samba\n"
-"Report-Msgid-Bugs-To: samba4 at packages.debian.org\n"
-"POT-Creation-Date: 2012-11-06 21:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-05-11 16:23+0200\n"
 "PO-Revision-Date: 2007-03-13 23:18+0800\n"
 "Last-Translator: Asho Yeh <asho at debian.org.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid "Upgrade from Samba 3?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4.templates:1001
+#: ../samba-ad-dc.templates:1001
 msgid ""
 "It is possible to migrate the existing configuration files from Samba 3 to "
 "Samba 4. This is likely to fail for complex setups, but should provide a "
@@ -42,13 +42,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid "Server role"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Domain controllers manage NT4-style or Active Directory domains and provide "
 "services such as identity management and domain logons. Each domain needs to "
@@ -57,7 +57,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "Member servers can be part of a NT4-style or Active Directory domain but do "
 "not provide any domain services. Workstations and file or print servers are "
@@ -66,7 +66,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "A standalone server can not be used in a domain and only supports file "
 "sharing and Windows for Workgroups-style logins."
@@ -74,7 +74,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../samba4.templates:2001
+#: ../samba-ad-dc.templates:2001
 msgid ""
 "If no server role is specified, the Samba server will not be provisioned, so "
 "this can be done manually by the user."
@@ -82,13 +82,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Realm name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid ""
 "Please specify the Kerberos realm for the domain that this domain controller "
 "controls."
@@ -96,134 +96,213 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4.templates:3001
+#: ../samba-ad-dc.templates:3001
 msgid "Usually this is the a capitalized version of your DNS hostname."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "New password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "If this field is left blank, a random password will be generated."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid "A password can be set later by running, as root:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:4001
+#: ../samba-ad-dc.templates:4001
 msgid " $ samba-tool user setpassword administrator"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../samba4.templates:5001
+#: ../samba-ad-dc.templates:5001
 msgid "Repeat password for the Samba \"administrator\" user:"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "Password input error"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../samba4.templates:6001
+#: ../samba-ad-dc.templates:6001
 msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
+#. Type: title
+#. Description
+#: ../samba-common.templates:1001
+msgid "Samba server and utilities"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid "Modify smb.conf to use WINS settings from DHCP?"
+msgstr "è¦ä¿®æ”¹ smb.conf ä»¥ä½¿ç”¨ DHCP å–å¾— WINS è¨å®šå—Žï¼Ÿ"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"If your computer gets IP address information from a DHCP server on the "
+"network, the DHCP server may also provide information about WINS servers "
+"(\"NetBIOS name servers\") present on the network.  This requires a change "
+"to your smb.conf file so that DHCP-provided WINS settings will automatically "
+"be read from /etc/samba/dhcp.conf."
+msgstr ""
+"å¦‚æžœæ‚¨çš„é›»è…¦æ˜¯å¾žç¶²çµ¡ä¸Šçš„ DHCP ä¼ºæœå™¨å–å¾— IP åœ°å€è³‡è¨Šï¼Œè©² DHCP æœå‹™ä¹Ÿå¯èƒ½æœƒæ"
+"ä¾›ç¶²è·¯ä¸Šçš„ WINS ä¼ºæœå™¨ (â€œNetBIOS åç¨±æœå‹™â€) è³‡è¨Šã€‚é€™éœ€è¦å°æ‚¨çš„ smb.conf é€²è¡Œ"
+"ä¿®æ”¹ï¼Œä»¥è‡ªå‹•å¾ž /etc/samba/dhcp.conf è®€å– DHCP æ‰€æä¾›çš„ WINS è¨å®šã€‚"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:2001
+msgid ""
+"The dhcp3-client package must be installed to take advantage of this feature."
+msgstr "å¿…é ˆå®‰è£ dhcp3-client å¥—ä»¶ï¼Œæ‰èƒ½ä½¿ç”¨æ¤é …ç‰¹æ€§ã€‚"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
+msgid "Configure smb.conf automatically?"
+msgstr "è‡ªå‹•è¨å®š smb.conf å—Žï¼Ÿ"
+
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid ""
-#~| "If you do not choose this option, you will have to handle any "
-#~| "configuration changes yourself, and will not be able to take advantage "
-#~| "of periodic configuration enhancements."
-#~ msgid ""
-#~ "If you do not choose this option, Samba will be left unconfigured, and "
-#~ "you will have to configure it yourself."
-#~ msgstr ""
-#~ "å¦‚æžœæ‚¨ä¸é¸æ¤é …ï¼Œæ‚¨å°±å¿…é ˆè‡ªå·±è™•ç†æ‰€æœ‰çš„è¨å®šæ”¹è®Šï¼Œä¹Ÿç„¡æ³•äº«å—åˆ°å®šæœŸçš„è¨å®šæ”¹é€²"
-#~ "ç‰¹æ€§ã€‚"
+msgid ""
+"The rest of the configuration of Samba deals with questions that affect "
+"parameters in /etc/samba/smb.conf, which is the file used to configure the "
+"Samba programs (nmbd and smbd). Your current smb.conf contains an \"include"
+"\" line or an option that spans multiple lines, which could confuse the "
+"automated configuration process and require you to edit your smb.conf by "
+"hand to get it working again."
+msgstr ""
+"å‰©ä¸‹çš„ Samba è¨å®šæ¶‰åŠé‚£äº›å½±éŸ¿ /etc/samba/smb.conf ä¸åƒæ•¸çš„å•é¡Œã€‚æ¤æ–‡ä»¶æ˜¯ç”¨ä¾†"
+"è¨å®š Samba ç¨‹åº (nmbd å’Œ smbd)ã€‚æ‚¨ç›®å‰çš„ smb.conf åŒ…æ‹¬ä¸€å€‹â€œincludeâ€è¡Œæˆ–è€…ä¸€å€‹"
+"è·¨è¶Šå¤šè¡Œçš„é¸é …ï¼Œé€™å°‡æ”ªäº‚è‡ªå‹•è¨å®šç¨‹åºä¸¦éœ€è¦æ‚¨æ‰‹å‹•ä¿®æ”¹ smb.conf ä»¥ä½¿å…¶æ£å¸¸å·¥"
+"ä½œã€‚"
 
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:3001
 #, fuzzy
-#~| msgid "Workgroup/Domain Name:"
-#~ msgid "Domain Name:"
-#~ msgstr "ç¾¤çµ„/ç¶²åŸŸï¼š"
+msgid ""
+"If you do not choose this option, you will have to handle any configuration "
+"changes yourself, and will not be able to take advantage of periodic "
+"configuration enhancements."
+msgstr ""
+"å¦‚æžœæ‚¨ä¸é¸æ¤é …ï¼Œæ‚¨å°±å¿…é ˆè‡ªå·±è™•ç†æ‰€æœ‰çš„è¨å®šæ”¹è®Šï¼Œä¹Ÿç„¡æ³•äº«å—åˆ°å®šæœŸçš„è¨å®šæ”¹é€²ç‰¹"
+"æ€§ã€‚"
 
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
 #, fuzzy
-#~| msgid ""
-#~| "Please specify the workgroup you want this server to appear to be in "
-#~| "when queried by clients. Note that this parameter also controls the "
-#~| "domain name used with the security=domain setting."
-#~ msgid ""
-#~ "Please specify the domain you want this server to appear to be in when "
-#~ "queried by clients."
-#~ msgstr ""
-#~ "è«‹æŒ‡å®šæœ¬ä¼ºæœå™¨åœ¨æ”¶åˆ°å®¢æˆ¶ç«¯æŸ¥è©¢æ™‚å°‡è¦é¡¯ç¤ºçš„ç¾¤çµ„ã€‚è«‹æ³¨æ„ï¼Œæ¤åƒæ•¸åŒæ¨£ä¹ŸæŽ§åˆ¶"
-#~ "äº† security=demain è¨ç½®æ‰€ç”¨çš„ç¶²åŸŸåã€‚"
+msgid "Workgroup/Domain Name:"
+msgstr "ç¾¤çµ„/ç¶²åŸŸï¼š"
 
-#~ msgid "Modify smb.conf to use WINS settings from DHCP?"
-#~ msgstr "è¦ä¿®æ”¹ smb.conf ä»¥ä½¿ç”¨ DHCP å–å¾— WINS è¨å®šå—Žï¼Ÿ"
+#. Type: string
+#. Description
+#: ../samba-common.templates:4001
+msgid ""
+"Please specify the workgroup for this system.  This setting controls which "
+"workgroup the system will appear in when used as a server, the default "
+"workgroup to be used when browsing with various frontends, and the domain "
+"name used with the \"security=domain\" setting."
+msgstr ""
 
-#~ msgid ""
-#~ "If your computer gets IP address information from a DHCP server on the "
-#~ "network, the DHCP server may also provide information about WINS servers "
-#~ "(\"NetBIOS name servers\") present on the network.  This requires a "
-#~ "change to your smb.conf file so that DHCP-provided WINS settings will "
-#~ "automatically be read from /etc/samba/dhcp.conf."
-#~ msgstr ""
-#~ "å¦‚æžœæ‚¨çš„é›»è…¦æ˜¯å¾žç¶²çµ¡ä¸Šçš„ DHCP ä¼ºæœå™¨å–å¾— IP åœ°å€è³‡è¨Šï¼Œè©² DHCP æœå‹™ä¹Ÿå¯èƒ½æœƒ"
-#~ "æä¾›ç¶²è·¯ä¸Šçš„ WINS ä¼ºæœå™¨ (â€œNetBIOS åç¨±æœå‹™â€) è³‡è¨Šã€‚é€™éœ€è¦å°æ‚¨çš„ smb.conf "
-#~ "é€²è¡Œä¿®æ”¹ï¼Œä»¥è‡ªå‹•å¾ž /etc/samba/dhcp.conf è®€å– DHCP æ‰€æä¾›çš„ WINS è¨å®šã€‚"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+msgid "Use password encryption?"
+msgstr "ä½¿ç”¨å¯†ç¢¼åŠ å¯†å—Žï¼Ÿ"
 
-#~ msgid ""
-#~ "The dhcp3-client package must be installed to take advantage of this "
-#~ "feature."
-#~ msgstr "å¿…é ˆå®‰è£ dhcp3-client å¥—ä»¶ï¼Œæ‰èƒ½ä½¿ç”¨æ¤é …ç‰¹æ€§ã€‚"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"All recent Windows clients communicate with SMB/CIFS servers using encrypted "
+"passwords. If you want to use clear text passwords you will need to change a "
+"parameter in your Windows registry."
+msgstr ""
+"è¼ƒæ–°çš„ Windows å®¢æˆ¶ç«¯éƒ½ä½¿ç”¨åŠ å¯†çš„å¯†ç¢¼èˆ‡ SMB æœå‹™å™¨é€šè¨Šã€‚å¦‚æžœæ‚¨æƒ³ä½¿ç”¨æ˜Žæ–‡å¯†"
+"ç¢¼ï¼Œæ‚¨å°‡éœ€è¦ä¿®æ”¹æ‚¨çš„ Windows ç™»éŒ„è¡¨ä¸çš„ä¸€å€‹åƒæ•¸ã€‚"
 
-#~ msgid "Configure smb.conf automatically?"
-#~ msgstr "è‡ªå‹•è¨å®š smb.conf å—Žï¼Ÿ"
+#. Type: boolean
+#. Description
+#: ../samba-common.templates:5001
+#, fuzzy
+msgid ""
+"Enabling this option is highly recommended as support for plain text "
+"passwords is no longer maintained in Microsoft Windows products. If you do, "
+"make sure you have a valid /etc/samba/smbpasswd file and that you set "
+"passwords in there for each user using the smbpasswd command."
+msgstr ""
+"å¼·çƒˆæŽ¨è–¦é–‹å•Ÿæ¤é¸é …ã€‚å¦‚æžœé¸å–ï¼Œè«‹ç¢ºä¿æ‚¨æ“æœ‰ä¸€å€‹æœ‰æ•ˆçš„ /etc/samba/smbpasswd æª”"
+"æ¡ˆï¼Œä¸¦ä¸”æ¤æª”æ¡ˆåŒ…å«ç”¨ smbpasswd å‘½ä»¤ç‚ºæ¯å€‹ç”¨æˆ¶è¨å®šçš„å¯†ç¢¼ã€‚"
 
-#~ msgid ""
-#~ "The rest of the configuration of Samba deals with questions that affect "
-#~ "parameters in /etc/samba/smb.conf, which is the file used to configure "
-#~ "the Samba programs (nmbd and smbd). Your current smb.conf contains an "
-#~ "'include' line or an option that spans multiple lines, which could "
-#~ "confuse the automated configuration process and require you to edit your "
-#~ "smb.conf by hand to get it working again."
-#~ msgstr ""
-#~ "å‰©ä¸‹çš„ Samba è¨å®šæ¶‰åŠé‚£äº›å½±éŸ¿ /etc/samba/smb.conf ä¸åƒæ•¸çš„å•é¡Œã€‚æ¤æ–‡ä»¶æ˜¯ç”¨"
-#~ "ä¾†è¨å®š Samba ç¨‹åº (nmbd å’Œ smbd)ã€‚æ‚¨ç›®å‰çš„ smb.conf åŒ…æ‹¬ä¸€å€‹â€œincludeâ€è¡Œæˆ–"
-#~ "è€…ä¸€å€‹è·¨è¶Šå¤šè¡Œçš„é¸é …ï¼Œé€™å°‡æ”ªäº‚è‡ªå‹•è¨å®šç¨‹åºä¸¦éœ€è¦æ‚¨æ‰‹å‹•ä¿®æ”¹ smb.conf ä»¥ä½¿å…¶"
-#~ "æ£å¸¸å·¥ä½œã€‚"
+#. Type: title
+#. Description
+#: ../samba.templates:1001
+msgid "Samba server"
+msgstr ""
 
-#~ msgid "Use password encryption?"
-#~ msgstr "ä½¿ç”¨å¯†ç¢¼åŠ å¯†å—Žï¼Ÿ"
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "daemons"
+msgstr "èƒŒæ™¯æœå‹™"
 
-#~ msgid ""
-#~ "All recent Windows clients communicate with SMB servers using encrypted "
-#~ "passwords. If you want to use clear text passwords you will need to "
-#~ "change a parameter in your Windows registry."
-#~ msgstr ""
-#~ "è¼ƒæ–°çš„ Windows å®¢æˆ¶ç«¯éƒ½ä½¿ç”¨åŠ å¯†çš„å¯†ç¢¼èˆ‡ SMB æœå‹™å™¨é€šè¨Šã€‚å¦‚æžœæ‚¨æƒ³ä½¿ç”¨æ˜Žæ–‡å¯†"
-#~ "ç¢¼ï¼Œæ‚¨å°‡éœ€è¦ä¿®æ”¹æ‚¨çš„ Windows ç™»éŒ„è¡¨ä¸çš„ä¸€å€‹åƒæ•¸ã€‚"
+#. Type: select
+#. Choices
+#: ../samba.templates:2001
+msgid "inetd"
+msgstr "inetd"
 
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid "How do you want to run Samba?"
+msgstr "æ‚¨æƒ³å¦‚ä½•åŸ·è¡Œ Sambaï¼Ÿ"
+
+#. Type: select
+#. Description
+#: ../samba.templates:2002
+msgid ""
+"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
+"daemon is the recommended approach."
+msgstr ""
+"Samba èƒŒæ™¯æœå‹™ç¨‹å¼ smbd å¯ä»¥ä½œç‚ºæ™®é€šçš„èƒŒæ™¯æœå‹™æˆ–è€…å¾ž inetd å•Ÿå‹•ã€‚ä»¥èƒŒæ™¯æœå‹™çš„"
+"æ–¹å¼åŸ·è¡Œæ˜¯æŽ¨è–¦çš„æ–¹å¼ã€‚"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please specify the workgroup you want this server to appear to be in "
+#~| "when queried by clients. Note that this parameter also controls the "
+#~| "domain name used with the security=domain setting."
 #~ msgid ""
-#~ "Enabling this option is highly recommended. If you do, make sure you have "
-#~ "a valid /etc/samba/smbpasswd file and that you set passwords in there for "
-#~ "each user using the smbpasswd command."
+#~ "Please specify the domain you want this server to appear to be in when "
+#~ "queried by clients."
 #~ msgstr ""
-#~ "å¼·çƒˆæŽ¨è–¦é–‹å•Ÿæ¤é¸é …ã€‚å¦‚æžœé¸å–ï¼Œè«‹ç¢ºä¿æ‚¨æ“æœ‰ä¸€å€‹æœ‰æ•ˆçš„ /etc/samba/smbpasswd "
-#~ "æª”æ¡ˆï¼Œä¸¦ä¸”æ¤æª”æ¡ˆåŒ…å«ç”¨ smbpasswd å‘½ä»¤ç‚ºæ¯å€‹ç”¨æˆ¶è¨å®šçš„å¯†ç¢¼ã€‚"
+#~ "è«‹æŒ‡å®šæœ¬ä¼ºæœå™¨åœ¨æ”¶åˆ°å®¢æˆ¶ç«¯æŸ¥è©¢æ™‚å°‡è¦é¡¯ç¤ºçš„ç¾¤çµ„ã€‚è«‹æ³¨æ„ï¼Œæ¤åƒæ•¸åŒæ¨£ä¹ŸæŽ§åˆ¶"
+#~ "äº† security=demain è¨ç½®æ‰€ç”¨çš„ç¶²åŸŸåã€‚"
 
 #~ msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
 #~ msgstr "è¦å»ºç«‹ samba å¯†ç¢¼è³‡æ–™åº« /var/lib/samba/passdb.tdb å—Žï¼Ÿ"
@@ -253,22 +332,6 @@ msgstr ""
 #~ "æ›´å¤šè©³æƒ…ï¼Œè«‹åƒé–± smaba-doc å¥—ä»¶ä¸çš„ /usr/share/doc/samba-doc/htmldocs/"
 #~ "ENCRYPTION.htmlã€‚"
 
-#~ msgid "daemons"
-#~ msgstr "èƒŒæ™¯æœå‹™"
-
-#~ msgid "inetd"
-#~ msgstr "inetd"
-
-#~ msgid "How do you want to run Samba?"
-#~ msgstr "æ‚¨æƒ³å¦‚ä½•åŸ·è¡Œ Sambaï¼Ÿ"
-
-#~ msgid ""
-#~ "The Samba daemon smbd can run as a normal daemon or from inetd. Running "
-#~ "as a daemon is the recommended approach."
-#~ msgstr ""
-#~ "Samba èƒŒæ™¯æœå‹™ç¨‹å¼ smbd å¯ä»¥ä½œç‚ºæ™®é€šçš„èƒŒæ™¯æœå‹™æˆ–è€…å¾ž inetd å•Ÿå‹•ã€‚ä»¥èƒŒæ™¯æœ"
-#~ "å‹™çš„æ–¹å¼åŸ·è¡Œæ˜¯æŽ¨è–¦çš„æ–¹å¼ã€‚"
-
 #~ msgid "Chaining passdb backends is not supported"
 #~ msgstr "Chaining passdb backendså°‡ä¸å†æ”¯æ´ã€‚"
 

-- 
Debian packaging for Samba


