[evolvis-commits] r12347: One more debconf fix, and we can now get rid of the lintian overrides.

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 01:35:17 CET 2011


Author: mirabilos
Date: 2011-02-28 01:35:17 +0100 (Mon, 28 Feb 2011)
New Revision: 12347

Removed:
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.overrides
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.overrides
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.overrides
Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.dirs
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.templates.dsfh-in
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.dirs
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.dirs
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/cs.po
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/de.po
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/fi.po
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/fr.po
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/gl.po
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/nl.po
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/pt.po
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/ru.po
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/sv.po
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/templates.pot
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/vi.po
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/rules
Log:
One more debconf fix, and we can now get rid of the lintian overrides.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog	2011-02-28 00:35:17 UTC (rev 12347)
@@ -9,8 +9,9 @@
   * Removed useless gforge-ftp-proftpd.templates and
     gforge-shell-postgresql.config.
   * Various fixes in debconf files, inspired by a lintian check.
+  * Removed lintian overrides, no longer needed.
 
- -- Roland Mas <lolando at debian.org>  Tue, 26 Feb 2008 22:20:40 +0100
+ -- Roland Mas <lolando at debian.org>  Tue, 26 Feb 2008 22:45:56 +0100
 
 gforge (4.6.99+svn6368-1) unstable; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.dirs
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.dirs	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.dirs	2011-02-28 00:35:17 UTC (rev 12347)
@@ -10,4 +10,3 @@
 var/lib/gforge/etc
 var/lib/gforge/db
 var/lib/gforge/download
-usr/share/lintian/overrides

Deleted: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.overrides
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.overrides	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.overrides	2011-02-28 00:35:17 UTC (rev 12347)
@@ -1,3 +0,0 @@
-# This fields are not translated, but the choice depend on the current language
-gforge-db-postgresql: select-with-translated-default-field gforge/shared/sys_lang fr.iso-8859-15
-gforge-db-postgresql: select-with-translated-default-field gforge/shared/sys_lang nl.iso-8859-15

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.templates.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.templates.dsfh-in	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.templates.dsfh-in	2011-02-28 00:35:17 UTC (rev 12347)
@@ -31,7 +31,7 @@
 
 Template: gforge/shared/admin_login
 Type: string
-_Default: admin
+Default: admin
 _Description: GForge administrator login:
  The GForge administrator account will have full privileges on the
  system. It will be used to approve the creation of new projects.

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.dirs
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.dirs	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.dirs	2011-02-28 00:35:17 UTC (rev 12347)
@@ -3,4 +3,3 @@
 var/lib/gforge/bind
 var/lib/gforge/tmp
 var/lib/gforge/etc
-usr/share/lintian/overrides

Deleted: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.overrides
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.overrides	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.overrides	2011-02-28 00:35:17 UTC (rev 12347)
@@ -1,3 +0,0 @@
-# This fields are not translated, but the choice depend on the current language
-gforge-dns-bind9: select-with-translated-default-field gforge/shared/sys_lang fr.iso-8859-15
-gforge-dns-bind9: select-with-translated-default-field gforge/shared/sys_lang nl.iso-8859-15

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.dirs
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.dirs	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.dirs	2011-02-28 00:35:17 UTC (rev 12347)
@@ -8,4 +8,3 @@
 var/lib/gforge/download
 var/lib/gforge/etc
 var/cache/gforge
-usr/share/lintian/overrides

Deleted: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.overrides
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.overrides	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache2.overrides	2011-02-28 00:35:17 UTC (rev 12347)
@@ -1,3 +0,0 @@
-# This fields are not translated, but the choice depend on the current language
-gforge-web-apache2: select-with-translated-default-field gforge/shared/sys_lang fr.iso-8859-15
-gforge-web-apache2: select-with-translated-default-field gforge/shared/sys_lang nl.iso-8859-15

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/cs.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/cs.po	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/cs.po	2011-02-28 00:35:17 UTC (rev 12347)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: gforge\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+0100\n"
 "PO-Revision-Date: 2007-12-23 11:04+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -62,14 +62,8 @@
 msgstr "Měl by to být jiný počítač než je hlavní server GForge."
 
 #. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr "admin"
-
-#. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "GForge administrator login:"
 msgstr "Přihlašovací jméno správce GForge:"
 
@@ -77,7 +71,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 msgid ""
 "The GForge administrator account will have full privileges on the system. It "
@@ -88,7 +82,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Zadejte prosím přihlašovací jméno tohoto účtu."
 
@@ -593,3 +587,6 @@
 "Please choose the default theme for web pages. This must be a valid name."
 msgstr ""
 "Vyberte prosím výchozí téma pro webové stránky. Musí to být platný název."
+
+#~ msgid "admin"
+#~ msgstr "admin"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/de.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/de.po	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/de.po	2011-02-28 00:35:17 UTC (rev 12347)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gforge 4.6.99+svn6094-4\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+0100\n"
 "PO-Revision-Date: 2007-12-23 11:05+0100\n"
 "Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -58,14 +58,8 @@
 "Dieser sollte nicht mit dem Namen des Haupt-GForge-Rechners übereinstimmen."
 
 #. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr "Administrator"
-
-#. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "GForge administrator login:"
 msgstr "GForge-Administrator-Anmeldung:"
 
@@ -73,7 +67,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 msgid ""
 "The GForge administrator account will have full privileges on the system. It "
@@ -84,7 +78,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Bitte wählen Sie den Benutzernamen für dieses Konto."
 
@@ -605,3 +599,6 @@
 msgstr ""
 "Bitte wählen Sie das Standard-Thema für Webseiten. Dies muss ein gültiger "
 "Namen sein."
+
+#~ msgid "admin"
+#~ msgstr "Administrator"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/fi.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/fi.po	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/fi.po	2011-02-28 00:35:17 UTC (rev 12347)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: gforge\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+0100\n"
 "PO-Revision-Date: 2007-12-23 11:05+0100\n"
 "Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
@@ -51,14 +51,8 @@
 msgstr "Tämän ei tulisi olla GForgen pääpalvelin."
 
 #. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr "admin"
-
-#. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "GForge administrator login:"
 msgstr "GForgen ylläpitotunnus:"
 
@@ -66,7 +60,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 msgid ""
 "The GForge administrator account will have full privileges on the system. It "
@@ -77,7 +71,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Valitse tämän tunnuksen nimi."
 
@@ -582,3 +576,6 @@
 msgid ""
 "Please choose the default theme for web pages. This must be a valid name."
 msgstr "Valitse verkkosivujen oletusteema. Tämän tulee olla käypä nimi."
+
+#~ msgid "admin"
+#~ msgstr "admin"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/fr.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/fr.po	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/fr.po	2011-02-28 00:35:17 UTC (rev 12347)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gforge\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+0100\n"
 "PO-Revision-Date: 2007-12-23 11:05+0100\n"
 "Last-Translator: Christian Perrier <bubulle at debian.org>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -58,14 +58,8 @@
 msgstr "Ce nom devrait être différent du nom d'hôte principal de GForge."
 
 #. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr "admin"
-
-#. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "GForge administrator login:"
 msgstr "Identifiant de l'administrateur de GForge :"
 
@@ -73,7 +67,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 msgid ""
 "The GForge administrator account will have full privileges on the system. It "
@@ -84,7 +78,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Veuillez choisir l'identifiant à utiliser pour ce compte."
 
@@ -604,3 +598,6 @@
 msgstr ""
 "Veuillez choisir le thème par défaut des pages web. Veillez à indiquer un "
 "nom valable."
+
+#~ msgid "admin"
+#~ msgstr "admin"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/gl.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/gl.po	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/gl.po	2011-02-28 00:35:17 UTC (rev 12347)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gforge\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+0100\n"
 "PO-Revision-Date: 2007-12-23 11:05+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
 "Language-Team: Galician <proxecto at trasno.net>\n"
@@ -54,14 +54,8 @@
 msgstr "Non debería ser o mesmo que o servidor principal de GForge."
 
 #. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr "admin"
-
-#. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "GForge administrator login:"
 msgstr "Nome do usuario administrador de GForge:"
 
@@ -69,7 +63,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 msgid ""
 "The GForge administrator account will have full privileges on the system. It "
@@ -80,7 +74,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Escolla o nome de usuario para esta conta."
 
@@ -590,3 +584,6 @@
 "Please choose the default theme for web pages. This must be a valid name."
 msgstr ""
 "Escolla o tema por defecto para as páxinas web. Debe ser un nome válido."
+
+#~ msgid "admin"
+#~ msgstr "admin"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/nl.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/nl.po	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/nl.po	2011-02-28 00:35:17 UTC (rev 12347)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: gforge\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+0100\n"
 "PO-Revision-Date: 2007-12-23 11:05+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
 "Language-Team: debian-l10n-dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -75,18 +75,10 @@
 msgstr "Dit dient te verschillen van de hoofd-GForge-server."
 
 #  Type: string
-#  Default
-#. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr "admin"
-
-#  Type: string
 #  Description
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "GForge administrator login:"
 msgstr "Gebruikersnaam GForge-beheerder:"
 
@@ -96,7 +88,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 msgid ""
 "The GForge administrator account will have full privileges on the system. It "
@@ -107,7 +99,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Wat is de gebruikersnaam voor deze account?"
 
@@ -747,3 +739,8 @@
 msgstr ""
 "Wat wordt het standaardthema voor webpagina's? Dit dient een geldige naam te "
 "zijn."
+
+#  Type: string
+#  Default
+#~ msgid "admin"
+#~ msgstr "admin"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/pt.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/pt.po	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/pt.po	2011-02-28 00:35:17 UTC (rev 12347)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gforge 4.6.99+svn6094-4\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+0100\n"
 "PO-Revision-Date: 2007-12-23 11:05+0100\n"
 "Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -57,14 +57,8 @@
 msgstr "Não deve ser o mesmo que o host principal do GForge."
 
 #. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr "admin"
-
-#. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "GForge administrator login:"
 msgstr "Login do administrador do GForge:"
 
@@ -72,7 +66,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 msgid ""
 "The GForge administrator account will have full privileges on the system. It "
@@ -83,7 +77,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Por favor escolha o nome de utilizador para esta conta."
 
@@ -603,3 +597,6 @@
 msgstr ""
 "Por favor escolha o tema por omissão para as páginas web. Tem de introduzir "
 "um nome válido."
+
+#~ msgid "admin"
+#~ msgstr "admin"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/ru.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/ru.po	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/ru.po	2011-02-28 00:35:17 UTC (rev 12347)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 4.6.99+svn6094-4\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+0100\n"
 "PO-Revision-Date: 2007-12-23 11:06+0100\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -59,14 +59,8 @@
 msgstr "Оно не должно совпадать с главным хостом GForge."
 
 #. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr "admin"
-
-#. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "GForge administrator login:"
 msgstr "Учётная запись администратора GForge:"
 
@@ -74,7 +68,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 msgid ""
 "The GForge administrator account will have full privileges on the system. It "
@@ -85,7 +79,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Введите имя пользователя учётной записи для этого."
 
@@ -596,3 +590,6 @@
 msgstr ""
 "Выберите тему по умолчанию для веб-страниц. Должно быть указано допустимое "
 "имя."
+
+#~ msgid "admin"
+#~ msgstr "admin"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/sv.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/sv.po	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/sv.po	2011-02-28 00:35:17 UTC (rev 12347)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: gforge 3.1-31\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+0100\n"
 "PO-Revision-Date: 2007-12-23 11:06+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -67,14 +67,8 @@
 msgstr ""
 
 #. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr "admin"
-
-#. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #, fuzzy
 msgid "GForge administrator login:"
 msgstr "Gforge-administratörens användarnamn"
@@ -83,7 +77,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 #, fuzzy
 msgid ""
@@ -95,7 +89,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr ""
 
@@ -635,3 +629,6 @@
 msgstr ""
 "Här är standardtemat för webbsidorna, var försiktig och ange ett giltigt "
 "namn."
+
+#~ msgid "admin"
+#~ msgstr "admin"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/templates.pot
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/templates.pot	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/templates.pot	2011-02-28 00:35:17 UTC (rev 12347)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+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"
@@ -55,14 +55,8 @@
 msgstr ""
 
 #. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr ""
-
-#. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "GForge administrator login:"
 msgstr ""
 
@@ -70,7 +64,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 msgid ""
 "The GForge administrator account will have full privileges on the system. It "
@@ -79,7 +73,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr ""
 

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/vi.po
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/vi.po	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/po/vi.po	2011-02-28 00:35:17 UTC (rev 12347)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gforge 4.6.99+svn6094-4\n"
 "Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
-"POT-Creation-Date: 2008-02-26 22:14+0100\n"
+"POT-Creation-Date: 2008-02-26 22:50+0100\n"
 "PO-Revision-Date: 2007-12-23 11:06+0100\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -56,14 +56,8 @@
 msgstr "Không nên trùng với máy chủ GForge chính."
 
 #. Type: string
-#. Default
-#: ../gforge-db-postgresql.templates.dsfh-in:8001
-msgid "admin"
-msgstr "quản trị"
-
-#. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "GForge administrator login:"
 msgstr "Tên đăng nhập quản trị GForge:"
 
@@ -71,7 +65,7 @@
 #. Description
 #. Type: password
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
 msgid ""
 "The GForge administrator account will have full privileges on the system. It "
@@ -82,7 +76,7 @@
 
 #. Type: string
 #. Description
-#: ../gforge-db-postgresql.templates.dsfh-in:8002
+#: ../gforge-db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Hãy chọn tên người dùng cho tài khoản này."
 
@@ -583,3 +577,6 @@
 msgid ""
 "Please choose the default theme for web pages. This must be a valid name."
 msgstr "Hãy chọn sắc thái mặc định cho trang Web: nó phải là một tên hợp lệ."
+
+#~ msgid "admin"
+#~ msgstr "quản trị"

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/rules
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/rules	2011-02-28 00:35:15 UTC (rev 12346)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/rules	2011-02-28 00:35:17 UTC (rev 12347)
@@ -149,7 +149,6 @@
 	cp -r locales/* $(CURDIR)/debian/gforge-common/usr/share/locale/
 
 	# gforge/debian/gforge-web-apache2
-	install -m 644 $(CURDIR)/debian/gforge-web-apache2.overrides $(CURDIR)/debian/gforge-web-apache2/usr/share/lintian/overrides/gforge-web-apache2
 	cp -r www $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/
 	install -m 644 deb-specific/index_std.php $(CURDIR)/debian/gforge-web-apache2/etc/gforge/custom/
 	rm $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/index_std.php
@@ -189,7 +188,6 @@
 		$(CURDIR)/debian/gforge-common/usr/share/gforge/www/include
 
 	# gforge-db-postgresql
-	install -m 644 $(CURDIR)/debian/gforge-db-postgresql.overrides $(CURDIR)/debian/gforge-db-postgresql/usr/share/lintian/overrides/gforge-db-postgresql
 	install -m 644 deb-specific/sf-2.6-complete.sql $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
 	install -m 644 deb-specific/sf2.5-to-sf2.6.sql $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
 	#
@@ -258,7 +256,6 @@
 	install -m 644 deb-specific/sf-proftpd.conf $(CURDIR)/debian/gforge-ftp-proftpd/etc/gforge/
 
 	# gforge-dns-bind9
-	install -m 644 $(CURDIR)/debian/gforge-dns-bind9.overrides $(CURDIR)/debian/gforge-dns-bind9/usr/share/lintian/overrides/gforge-dns-bind9
 	install -m 755 deb-specific/install-dns.sh $(CURDIR)/debian/gforge-dns-bind9/usr/lib/gforge/bin/
 	install -m 644 deb-specific/dns.head.template $(CURDIR)/debian/gforge-dns-bind9/var/lib/gforge/bind/
 	install -m 644 deb-specific/dns.simple.template $(CURDIR)/debian/gforge-dns-bind9/var/lib/gforge/bind/



More information about the evolvis-commits mailing list