Update the debconf templates:

- change shared/mailname to dma/mailname, since it mentions dma
- reword the templates a lot according to suggestions from debian-l10-en
- translate the reworded templates into Bulgarian

diff --git a/config b/config
index 8b6a35a3ed56c4641f478c74400d4b117f940c8a..dea8989a363c215ccd4bc37dcb88e92647059088 100755 (executable)
--- a/config
+++ b/config
@@ -7,11 +7,11 @@ db_version 2.0
 db_capb backup
 
 if [ -e /etc/mailname ]; then
-       db_set shared/mailname "`cat /etc/mailname`" || true
+       db_set dma/mailname "`cat /etc/mailname`" || true
 else
-       db_get shared/mailname || true
+       db_get dma/mailname || true
        if [ -z "$RET" ]; then
-               db_set shared/mailname "`hostname --fqdn`" || true
+               db_set dma/mailname "`hostname --fqdn`" || true
        fi
 fi
 
@@ -34,7 +34,7 @@ fi
 state=1
 while [ "$state" -ge 1 -a "$state" -le 3 ]; do
        case "$state" in
-       1)      db_input high shared/mailname || true
+       1)      db_input high dma/mailname || true
                ;;
        2)      db_input high dma/relayhost || true
                ;;

diff --git a/po/bg.po b/po/bg.po
index 9ee60db36d3a551d7ae40f3afdc0d7969dae4966..1f3c2b7580de8c4fd36daae2786a030ebcc19bcf 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dma-dfly 2009-02-11\n"
 "Report-Msgid-Bugs-To: dma@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-30 16:27+0300\n"
+"POT-Creation-Date: 2009-06-17 14:29+0300\n"
 "PO-Revision-Date: 2009-03-30 16:51+0300\n"
 "Last-Translator: Peter Pentchev <roam@ringlet.net>\n"
 "Language-Team: Bulgaria <dict@fsa-bg.org>n\n"
@@ -18,18 +18,37 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../templates:1001
-msgid "Mailname of your system:"
+msgid "System mail name:"
 msgstr "Пощенско име на системата:"
 
 #. Type: string
 #. Description
 #: ../templates:1001
 msgid ""
-"This is the fully-qualified host name of the computer running dma. It "
-"defaults to the output of \"hostname --fqdn\"."
+"The 'mail name' is the domain name used to 'qualify' mail addresses without "
+"a domain name."
 msgstr ""
-"Това е пълното име на сървъра, върху който работи dma.  По подразбиране "
-"се използва резултатът от командата \"hostname --fqdn\"."
+"Пощенското име се използва за допълване на пощенски адреси без домейн."
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"This name will also be used by other programs. It should be the single, "
+"fully qualified domain name (FQDN)."
+msgstr ""
+"Това име ще бъде използвано и от други програми и трябва да бъде пълно име "
+"на домейн (FQDN - Fully Qualified Domain Name)."
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Thus, if a mail address on the local host is foo@example.org, the correct "
+"value for this option would be example.org."
+msgstr ""
+"Например, ако даден пощенски адрес на този компютър е foo@example.org, то "
+"правилното пощенско име е example.org."
 
 #. Type: string
 #. Description
@@ -40,17 +59,21 @@ msgstr "Smarthost:"
 #. Type: string
 #. Description
 #: ../templates:2001
+#| msgid ""
+#| "This is the name of a remote server to which to send each message. If it "
+#| "is left blank, dma will try to deliver all messages by itself; however, "
+#| "for the present it cannot really handle MX record lookups. The default is "
+#| "a host named \"mail\" in the same domain as your computer."
 msgid ""
-"This is the name of a remote server to which to send each message. If it is "
-"left blank, dma will try to deliver all messages by itself; however, for the "
-"present it cannot really handle MX record lookups. The default is a host "
-"named \"mail\" in the same domain as your computer."
+"Please enter the IP address or the host name of a mail server that this "
+"system should use as outgoing smarthost.  If no smarthost is specified, dma "
+"will try to deliver all messages by itself; however, for the present it "
+"cannot handle MX record lookups."
 msgstr ""
-"Това е името на отдалечен сървър, към който ще бъдат изпращани всички "
-"съобщения.  Ако това поле е празно, dma ще се опита да достави съобщенията "
-"направо до получателите им; за момента обаче dma всъщност не се справя "
-"с DNS MX заявки.  Името на smarthost по подразбиране е хост, наречен "
-"\"mail\", в същия домейн като Вашия сървър."
+"Въведете IP адрес или име на пощенски сървър (smarthost), който да се "
+"използва за изпращане на изходящата поща.  Ако това поле е празно, dma ще "
+"се опита да достави съобщенията направо до получателите им; за момента "
+"обаче dma не може да прави DNS MX заявки."
 
 #. Type: string
 #. Description
@@ -61,12 +84,19 @@ msgstr "Програма, която да обработва недоставе
 #. Type: string
 #. Description
 #: ../templates:3001
+#| msgid ""
+#| "This is the name of a program that dma will invoke when a bounced message "
+#| "bounces in its own right.  Leave this blank if you like dma's default "
+#| "behavior of simply aborting the delivery, or specify the name or full "
+#| "path to a program that will process the double-bounce message."
 msgid ""
-"This is the name of a program that dma will invoke when a bounced message "
-"bounces in its own right.  Leave this blank if you like dma's default "
+"Please enter the name of a program that dma will invoke when a bounced "
+"message bounces in its own right.  Leave this blank to keep dma's default "
 "behavior of simply aborting the delivery, or specify the name or full path "
 "to a program that will process the double-bounce message."
 msgstr ""
-"Това е името или пълният път към програма, която dma ще изпълни всеки път, "
-"когато съобщение за грешка при доставка също не може да бъде доставено.  "
-"Ако това поле е празно, dma просто ще се откаже от доставката."
+"Въведете името или пълния път към програма, която dma ще изпълни всеки път, "
+"когато съобщение за грешка при доставка също не може да бъде доставено. "
+"Оставете това поле празно, ако искате dma да се откаже от доставката, или "
+"въведете името или пълния път към програмата, която да обработи съобщението "
+"за грешка при доставка."

diff --git a/po/templates.pot b/po/templates.pot
index e31c2ede945e8d6502471eafe4f0bb3c6d9e262d..e886f46f16c112089a619823d5bd2cda9ee498cf 100644 (file)
--- a/po/templates.pot
+++ b/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: dma@packages.debian.org\n"
-"POT-Creation-Date: 2009-03-30 16:27+0300\n"
+"POT-Creation-Date: 2009-06-17 14:29+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,15 +19,31 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../templates:1001
-msgid "Mailname of your system:"
+msgid "System mail name:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../templates:1001
 msgid ""
-"This is the fully-qualified host name of the computer running dma. It "
-"defaults to the output of \"hostname --fqdn\"."
+"The 'mail name' is the domain name used to 'qualify' mail addresses without "
+"a domain name."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"This name will also be used by other programs. It should be the single, "
+"fully qualified domain name (FQDN)."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../templates:1001
+msgid ""
+"Thus, if a mail address on the local host is foo@example.org, the correct "
+"value for this option would be example.org."
 msgstr ""
 
 #. Type: string
@@ -40,10 +56,10 @@ msgstr ""
 #. Description
 #: ../templates:2001
 msgid ""
-"This is the name of a remote server to which to send each message. If it is "
-"left blank, dma will try to deliver all messages by itself; however, for the "
-"present it cannot really handle MX record lookups. The default is a host "
-"named \"mail\" in the same domain as your computer."
+"Please enter the IP address or the host name of a mail server that this "
+"system should use as outgoing smarthost.  If no smarthost is specified, dma "
+"will try to deliver all messages by itself; however, for the present it "
+"cannot handle MX record lookups."
 msgstr ""
 
 #. Type: string
@@ -56,8 +72,8 @@ msgstr ""
 #. Description
 #: ../templates:3001
 msgid ""
-"This is the name of a program that dma will invoke when a bounced message "
-"bounces in its own right.  Leave this blank if you like dma's default "
+"Please enter the name of a program that dma will invoke when a bounced "
+"message bounces in its own right.  Leave this blank to keep dma's default "
 "behavior of simply aborting the delivery, or specify the name or full path "
 "to a program that will process the double-bounce message."
 msgstr ""

diff --git a/postinst b/postinst
index eb644652c93357cabe7c5a171e6da21ad6ec9fca..3ce8c6c6b7ee68ca9ed164600f1ba0a86c7280f7 100644 (file)
--- a/postinst
+++ b/postinst
@@ -10,7 +10,7 @@ umask 022
 
 case "$1" in
     configure)
-       db_get shared/mailname
+       db_get dma/mailname
        echo "$RET" > /etc/mailname
 
        db_get dma/relayhost

diff --git a/templates b/templates
index da10185f0d23d5b718b03cc792dbd459f875a089..3af1d6fbe0006aa6d98d27b3084c51fcc8ca46e8 100644 (file)
--- a/templates
+++ b/templates
@@ -1,21 +1,27 @@
-Template: shared/mailname
+Template: dma/mailname
 Type: string
-_Description: Mailname of your system:
- This is the fully-qualified host name of the computer running dma.
- It defaults to the output of "hostname --fqdn".
+_Description: System mail name:
+ The 'mail name' is the domain name used to 'qualify' mail addresses
+ without a domain name.
+ .
+ This name will also be used by other programs. It should be the
+ single, fully qualified domain name (FQDN).
+ .
+ Thus, if a mail address on the local host is foo@example.org,
+ the correct value for this option would be example.org.
 
 Template: dma/relayhost
 Type: string
 _Description: Smarthost:
- This is the name of a remote server to which to send each message.
- If it is left blank, dma will try to deliver all messages by itself;
- however, for the present it cannot really handle MX record lookups.
- The default is a host named "mail" in the same domain as your computer.
+ Please enter the IP address or the host name of a mail server that
+ this system should use as outgoing smarthost.  If no smarthost is
+ specified, dma will try to deliver all messages by itself; however,
+ for the present it cannot handle MX record lookups.
 
 Template: dma/dbounceprog
 Type: string
 _Description: A program to handle double-bounces:
- This is the name of a program that dma will invoke when a bounced
- message bounces in its own right.  Leave this blank if you like dma's
+ Please enter the name of a program that dma will invoke when a bounced
+ message bounces in its own right.  Leave this blank to keep dma's
  default behavior of simply aborting the delivery, or specify the name
  or full path to a program that will process the double-bounce message.