[Pkg-samba-maint] r886 - in branches/samba4: . po

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-05 17:08:00 +0000 (Thu, 05 Jan 2006)
New Revision: 886

Modified:
   branches/samba4/changelog
   branches/samba4/po/POTFILES.in
   branches/samba4/po/templates.pot
Log:
Update po/POTFILES.in to reflect name change (from samba4-server ->
samba-server -> samba).

Rerun debconf-updatepo; it was out of date with all the changes and
the missing POTFILES.in file.


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-05 17:05:39 UTC (rev 885)
+++ branches/samba4/changelog	2006-01-05 17:08:00 UTC (rev 886)
@@ -60,8 +60,10 @@
   * Updated README.debian somewhat, and renamed to use a capital D.
   * Rewritten README.building, to reflect the magic that has to be done
     with the package in another repository.
+  * Update po/POTFILES.in to reflect name change (from samba4-server -> 
+    samba-server -> samba).
 
- -- Steinar H. Gunderson <sesse at debian.org>  Thu,  5 Jan 2006 18:05:14 +0100
+ -- Steinar H. Gunderson <sesse at debian.org>  Thu,  5 Jan 2006 18:06:08 +0100
 
 samba (3.9.0+SVN12395-1) unstable; urgency=low
 

Modified: branches/samba4/po/POTFILES.in
===================================================================
--- branches/samba4/po/POTFILES.in	2006-01-05 17:05:39 UTC (rev 885)
+++ branches/samba4/po/POTFILES.in	2006-01-05 17:08:00 UTC (rev 886)
@@ -1 +1 @@
-[type: gettext/rfc822deb] samba4-server.templates
+[type: gettext/rfc822deb] samba.templates

Modified: branches/samba4/po/templates.pot
===================================================================
--- branches/samba4/po/templates.pot	2006-01-05 17:05:39 UTC (rev 885)
+++ branches/samba4/po/templates.pot	2006-01-05 17:08:00 UTC (rev 886)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jelmer at samba.org\n"
-"POT-Creation-Date: 2005-12-13 16:10+0100\n"
+"POT-Creation-Date: 2006-01-05 18:06+0100\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"
@@ -17,13 +17,28 @@
 
 #. Type: boolean
 #. Description
-#: ../samba4-server.templates:4
+#: ../samba.templates:4
+msgid "Upgrade from Samba 3?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../samba.templates:4
+msgid ""
+"Do you want to migrate your 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: boolean
+#. Description
+#: ../samba.templates:12
 msgid "Set up Samba 4 as a PDC?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../samba4-server.templates:4
+#: ../samba.templates:12
 msgid ""
 "Do you want to set up Samba 4 as an Active Directory PDC? If you answer \"no"
 "\", Samba will be left unconfigured, and you will have to provision and make "
@@ -32,7 +47,7 @@
 
 #. Type: boolean
 #. Description
-#: ../samba4-server.templates:4
+#: ../samba.templates:12
 msgid ""
 "Note that even if you answer \"yes\", you will need to set up DNS such that "
 "it serves the data from the zone file in that directory before you can use "
@@ -41,13 +56,13 @@
 
 #. Type: string
 #. Description
-#: ../samba4-server.templates:15
+#: ../samba.templates:23
 msgid "Realm"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4-server.templates:15
+#: ../samba.templates:23
 msgid ""
 "What Kerberos realm will your server be in? In many cases, this will be the "
 "same as your DNS domain name (ie. YOUR.REALM)."
@@ -55,31 +70,15 @@
 
 #. Type: string
 #. Description
-#: ../samba4-server.templates:21
+#: ../samba.templates:29
 msgid "Domain"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../samba4-server.templates:21
+#: ../samba.templates:29
 msgid ""
 "What will be the domain of your server? This is also known as the \"workgroup"
 "\" of your server, and is typically a short name without any dots (ie. "
 "DOMAIN)."
 msgstr ""
-
-#. Type: password
-#. Description
-#: ../samba4-server.templates:28
-msgid "Administrator password"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../samba4-server.templates:28
-msgid ""
-"You will need a password for the \"Administrator\" account. Note that in the "
-"current version of the packaging, this will be visible in \"ps\" for a short "
-"time for everybody on the system, so you might not want to use a very "
-"sensitive password here."
-msgstr ""