Package: glpi
Followup-For: Bug #401430
This broken template currently makes the translation effort pointless.
Please fix this bug.
Moreover, the broken template is obvious debconf abuse. The information you
give here should be added to README.Debian but not interrupt installs of
your package.
I propose you two patches:
patch1: fixes the broken template, but keep it. I prefer my patch to the one
proposed by Thomas
patch2: removes the abusive note
In both cases, if you do fix this bug, please do NOT upload the package
immediately as the French l10n team is working on the French translation of
the templates. Instead, please send me the new debian/po/templates.pot file
after applying one of our patches and running "debconf-updatepo".
-- System Information:
Debian Release: 4.0
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/dash
Kernel: Linux 2.6.18-2-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to fr_FR.UTF-8)
diff -Nru glpi-0.68.2.old/debian/glpi.templates
glpi-0.68.2/debian/glpi.templates
--- glpi-0.68.2.old/debian/glpi.templates 2006-12-09 08:06:11.524071094
+0100
+++ glpi-0.68.2/debian/glpi.templates 2006-12-09 08:06:57.712387292 +0100
@@ -1,6 +1,6 @@
Template: glpi/webserver
Type: multiselect
-_Choices: apache, apache-ssl, apache-perl, apache2
+__Choices: apache, apache-ssl, apache-perl, apache2
Default: apache, apache-ssl, apache-perl, apache2
_Description: Which web server would you like to reconfigure automatically:
If you do not select a web server to reconfigure automatically, glpi will
@@ -16,5 +16,5 @@
Template: glpi/configuration
Type: note
-_Description: Please point your browser to http://<server>/glpi/ to finish
- the configuration.
+_Description: Glpi configuration
+ Please point your browser to http://<server>/glpi/ to finish the
configuration.
diff -Nru glpi-0.68.2.old/debian/po/templates.pot
glpi-0.68.2/debian/po/templates.pot
--- glpi-0.68.2.old/debian/po/templates.pot 2006-12-09 08:06:11.540071203
+0100
+++ glpi-0.68.2/debian/po/templates.pot 2006-12-09 08:08:16.100924108 +0100
@@ -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 PROTECTED]>, 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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-11-06 13:52+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-12-09 08:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -19,7 +27,25 @@
#. Type: multiselect
#. Choices
#: ../glpi.templates:1001
-msgid "apache, apache-ssl, apache-perl, apache2"
+msgid "apache"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../glpi.templates:1001
+msgid "apache-ssl"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../glpi.templates:1001
+msgid "apache-perl"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../glpi.templates:1001
+msgid "apache2"
msgstr ""
#. Type: multiselect
@@ -54,11 +80,13 @@
#. Type: note
#. Description
#: ../glpi.templates:3001
-msgid "Please point your browser to http://<server>/glpi/ to finish"
+msgid "Glpi configuration"
msgstr ""
#. Type: note
#. Description
#: ../glpi.templates:3001
-msgid "the configuration."
+msgid ""
+"Please point your browser to http://<server>/glpi/ to finish the "
+"configuration."
msgstr ""
diff -Nru glpi-0.68.2.old/debian/glpi.config glpi-0.68.2/debian/glpi.config
--- glpi-0.68.2.old/debian/glpi.config 2006-12-09 08:06:11.536071176 +0100
+++ glpi-0.68.2/debian/glpi.config 2006-12-09 08:08:43.909114595 +0100
@@ -17,6 +17,5 @@
dbc_go glpi $@
fi
-db_input high glpi/configuration || true
db_go
diff -Nru glpi-0.68.2.old/debian/glpi.templates
glpi-0.68.2/debian/glpi.templates
--- glpi-0.68.2.old/debian/glpi.templates 2006-12-09 08:06:11.524071094
+0100
+++ glpi-0.68.2/debian/glpi.templates 2006-12-09 08:08:54.277185625 +0100
@@ -1,6 +1,6 @@
Template: glpi/webserver
Type: multiselect
-_Choices: apache, apache-ssl, apache-perl, apache2
+__Choices: apache, apache-ssl, apache-perl, apache2
Default: apache, apache-ssl, apache-perl, apache2
_Description: Which web server would you like to reconfigure automatically:
If you do not select a web server to reconfigure automatically, glpi will
@@ -14,7 +14,3 @@
to be restarted. You can also restart ${webserver} by manually executing
invoke-rc.d ${webserver} restart.
-Template: glpi/configuration
-Type: note
-_Description: Please point your browser to http://<server>/glpi/ to finish
- the configuration.
diff -Nru glpi-0.68.2.old/debian/po/templates.pot
glpi-0.68.2/debian/po/templates.pot
--- glpi-0.68.2.old/debian/po/templates.pot 2006-12-09 08:06:11.540071203
+0100
+++ glpi-0.68.2/debian/po/templates.pot 2006-12-09 08:08:58.509214619 +0100
@@ -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 PROTECTED]>, 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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-11-06 13:52+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-12-09 08:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -19,7 +27,25 @@
#. Type: multiselect
#. Choices
#: ../glpi.templates:1001
-msgid "apache, apache-ssl, apache-perl, apache2"
+msgid "apache"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../glpi.templates:1001
+msgid "apache-ssl"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../glpi.templates:1001
+msgid "apache-perl"
+msgstr ""
+
+#. Type: multiselect
+#. Choices
+#: ../glpi.templates:1001
+msgid "apache2"
msgstr ""
#. Type: multiselect
@@ -50,15 +76,3 @@
"be restarted. You can also restart ${webserver} by manually executing invoke-"
"rc.d ${webserver} restart."
msgstr ""
-
-#. Type: note
-#. Description
-#: ../glpi.templates:3001
-msgid "Please point your browser to http://<server>/glpi/ to finish"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../glpi.templates:3001
-msgid "the configuration."
-msgstr ""
