Package: mtop
Version: 0.6.6-1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my mtop 0.6.6-1.1 NMU, as agreed.

I fixed mostly translations but also some packaging errors.


Thijs
diff -u mtop-0.6.6/debian/po/templates.pot mtop-0.6.6/debian/po/templates.pot
--- mtop-0.6.6/debian/po/templates.pot
+++ mtop-0.6.6/debian/po/templates.pot
@@ -1,22 +1,14 @@
-#
-#    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.
+# 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.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 23:36+0200\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-29 15:59+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"
@@ -29,83 +21,48 @@
-#: ../mtop.templates:4
-msgid "Database host"
+#: ../mtop.templates:1001
+msgid "MySQL host name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:4
+#: ../mtop.templates:1001
 msgid ""
-"Please enter the name of the MySQL server which will host the mantis "
-"database."
+"Please enter the host name of the MySQL server which you want to monitor."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:10
-msgid "MySQL listening port"
+#: ../mtop.templates:2001
+msgid "MySQL port number:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:10
-msgid "Please enter the port MySQL listens to."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mtop.templates:15
-msgid "Information"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mtop.templates:15
-msgid ""
-"A MySQL user named mtop will be created for monitoring the server. Please "
-"read the README.Debian file if you want to monitor other MySQL servers."
+#: ../mtop.templates:2001
+msgid "Please enter the port number MySQL listens on."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:22
-msgid "Username of the MySQL administrator"
+#: ../mtop.templates:3001
+msgid "Name of your database's administrative user:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:22
+#: ../mtop.templates:3001
 msgid ""
 "Please enter the username of MySQL administrator (needed for creating the "
-"mtop user)."
+"mysqltop user)."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mtop.templates:29
-msgid "Administrator password"
+#: ../mtop.templates:4001
+msgid "Password of your database's administrative user:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../mtop.templates:35
-msgid "Administrator password confirmation"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../mtop.templates:35
+#: ../mtop.templates:4001
 msgid "Enter \"none\" if there is no password for MySQL administration."
 msgstr ""
-
-#. Type: note
-#. Description
-#: ../mtop.templates:40
-msgid "Password mismatch"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../mtop.templates:40
-msgid ""
-"The password and the confirmed password are different. Please enter the "
-"password again."
-msgstr ""
diff -u mtop-0.6.6/debian/po/ca.po mtop-0.6.6/debian/po/ca.po
--- mtop-0.6.6/debian/po/ca.po
+++ mtop-0.6.6/debian/po/ca.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mtop_0.6.4-1_templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 23:36+0200\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-29 15:44+0100\n"
 "PO-Revision-Date: 2004-01-31 18:52GMT\n"
 "Last-Translator: Aleix Badia i Bosch <[EMAIL PROTECTED]>>\n"
 "Language-Team: Debian L10n Catalan <[email protected]>\n"
@@ -19,90 +19,89 @@
-#: ../mtop.templates:4
-msgid "Database host"
-msgstr "Ordinador de la base de dades"
+#: ../mtop.templates:1001
+msgid "MySQL host name:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:4
+#: ../mtop.templates:1001
+#, fuzzy
 msgid ""
-"Please enter the name of the MySQL server which will host the mantis "
-"database."
+"Please enter the host name of the MySQL server which you want to monitor."
 msgstr ""
 "Introdu�u la direcci� del servidor de MySQL amb la base de dades del Mantis."
 
 #. Type: string
 #. Description
-#: ../mtop.templates:10
-msgid "MySQL listening port"
-msgstr "Port de MySQL que rep connexions"
+#: ../mtop.templates:2001
+msgid "MySQL port number:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:10
-msgid "Please enter the port MySQL listens to."
+#: ../mtop.templates:2001
+#, fuzzy
+msgid "Please enter the port number MySQL listens on."
 msgstr "Introdu�u el port de MySQL que rep connexions."
 
-#. Type: note
-#. Description
-#: ../mtop.templates:15
-msgid "Information"
-msgstr "Informaci�"
-
-#. Type: note
-#. Description
-#: ../mtop.templates:15
-msgid ""
-"A MySQL user named mtop will be created for monitoring the server. Please "
-"read the README.Debian file if you want to monitor other MySQL servers."
-msgstr ""
-"Es crea un usuari MySQL anomenat mtop per monitoritzar el servidor.Si voleu "
-"monitoritzar d'altres servidors MySQL llegiu el fitxer README.Debian."
-
 #. Type: string
 #. Description
-#: ../mtop.templates:22
-msgid "Username of the MySQL administrator"
-msgstr "Nom d'usuari de l'administrador de MySQL"
+#: ../mtop.templates:3001
+msgid "Name of your database's administrative user:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:22
+#: ../mtop.templates:3001
 msgid ""
 "Please enter the username of MySQL administrator (needed for creating the "
-"mtop user)."
+"mysqltop user)."
 msgstr ""
 "Introdu�u el nom d'usuari de l'administrador de MySQL (necessari per crear "
-"l'usuari de mtop)"
+"l'usuari de mysqltop)"
 
 #. Type: password
 #. Description
-#: ../mtop.templates:29
-msgid "Administrator password"
-msgstr "Contrasenya de l'administrador"
-
-#. Type: password
-#. Description
-#: ../mtop.templates:35
-msgid "Administrator password confirmation"
-msgstr "Confirmaci� de la contrasenya de l'administrador"
+#: ../mtop.templates:4001
+msgid "Password of your database's administrative user:"
+msgstr ""
 
 #. Type: password
 #. Description
-#: ../mtop.templates:35
+#: ../mtop.templates:4001
 msgid "Enter \"none\" if there is no password for MySQL administration."
 msgstr "Introdu�u \"none\" si l'administrador de MySQL no t� contrasenya."
 
-#. Type: note
-#. Description
-#: ../mtop.templates:40
-msgid "Password mismatch"
-msgstr "Les contrasenyes no coincideixen"
+#~ msgid "Database host"
+#~ msgstr "Ordinador de la base de dades"
 
-#. Type: note
-#. Description
-#: ../mtop.templates:40
-msgid ""
-"The password and the confirmed password are different. Please enter the "
-"password again."
-msgstr ""
-"La contrasenya i la corresponent confirmaci� s�n diferents. Introdu�u "
-"novament la contrasenya."
+#~ msgid "MySQL listening port"
+#~ msgstr "Port de MySQL que rep connexions"
+
+#~ msgid "Information"
+#~ msgstr "Informaci�"
+
+#~ msgid ""
+#~ "A MySQL user named mtop will be created for monitoring the server. Please "
+#~ "read the README.Debian file if you want to monitor other MySQL servers."
+#~ msgstr ""
+#~ "Es crea un usuari MySQL anomenat mtop per monitoritzar el servidor.Si "
+#~ "voleu monitoritzar d'altres servidors MySQL llegiu el fitxer README."
+#~ "Debian."
+
+#~ msgid "Username of the MySQL administrator"
+#~ msgstr "Nom d'usuari de l'administrador de MySQL"
+
+#~ msgid "Administrator password"
+#~ msgstr "Contrasenya de l'administrador"
+
+#~ msgid "Administrator password confirmation"
+#~ msgstr "Confirmaci� de la contrasenya de l'administrador"
+
+#~ msgid "Password mismatch"
+#~ msgstr "Les contrasenyes no coincideixen"
+
+#~ msgid ""
+#~ "The password and the confirmed password are different. Please enter the "
+#~ "password again."
+#~ msgstr ""
+#~ "La contrasenya i la corresponent confirmaci� s�n diferents. Introdu�u "
+#~ "novament la contrasenya."
diff -u mtop-0.6.6/debian/po/fr.po mtop-0.6.6/debian/po/fr.po
--- mtop-0.6.6/debian/po/fr.po
+++ mtop-0.6.6/debian/po/fr.po
@@ -1,3 +1,4 @@
+# translation of fr.po to French
 #
 #    Translators, if you are not familiar with the PO format, gettext
 #    documentation is worth reading, especially sections dedicated to
@@ -14,107 +15,66 @@
+# Christian Perrier <[EMAIL PROTECTED]>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: mtop\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 23:36+0200\n"
-"PO-Revision-Date: 2004-03-10 08:56+0100\n"
+"Project-Id-Version: fr\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-29 15:44+0100\n"
+"PO-Revision-Date: 2006-11-29 20:26+0100\n"
 "Last-Translator: Christian Perrier <[EMAIL PROTECTED]>\n"
 "Language-Team: French <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Type: string
 #. Description
-#: ../mtop.templates:4
-msgid "Database host"
-msgstr "Serveur de bases de donn�es :"
+#: ../mtop.templates:1001
+msgid "MySQL host name:"
+msgstr "Nom d'h�te MySQL�:"
 
 #. Type: string
 #. Description
-#: ../mtop.templates:4
-msgid ""
-"Please enter the name of the MySQL server which will host the mantis "
-"database."
-msgstr ""
-"Veuillez entrer le nom du serveur MySQL qui accueillera la base de donn�es "
-"mantis."
+#: ../mtop.templates:1001
+msgid "Please enter the host name of the MySQL server which you want to monitor."
+msgstr "Veuillez indiquer le nom du serveur MySQL que vous souhaitez surveiller."
 
 #. Type: string
 #. Description
-#: ../mtop.templates:10
-msgid "MySQL listening port"
-msgstr "Port sur lequel �coute MySQL :"
+#: ../mtop.templates:2001
+msgid "MySQL port number:"
+msgstr "Port de MySQL�:"
 
 #. Type: string
 #. Description
-#: ../mtop.templates:10
-msgid "Please enter the port MySQL listens to."
+#: ../mtop.templates:2001
+msgid "Please enter the port number MySQL listens on."
 msgstr "Veuillez entrer le port d'�coute de MySQL."
 
-#. Type: note
-#. Description
-#: ../mtop.templates:15
-msgid "Information"
-msgstr "Information"
-
-#. Type: note
-#. Description
-#: ../mtop.templates:15
-msgid ""
-"A MySQL user named mtop will be created for monitoring the server. Please "
-"read the README.Debian file if you want to monitor other MySQL servers."
-msgstr ""
-"Un utilisateur MySQL ��mtop�� va �tre cr�� pour la surveillance du serveur. "
-"Veuillez lire le fichier README.Debian si vous souhaitez surveiller d'autres "
-"serveurs MySQL."
-
 #. Type: string
 #. Description
-#: ../mtop.templates:22
-msgid "Username of the MySQL administrator"
-msgstr "Utilisateur administrateur de MySQL :"
+#: ../mtop.templates:3001
+msgid "Name of your database's administrative user:"
+msgstr "Identifiant de l'administrateur de bases de donn�es�:"
 
 #. Type: string
 #. Description
-#: ../mtop.templates:22
+#: ../mtop.templates:3001
 msgid ""
 "Please enter the username of MySQL administrator (needed for creating the "
-"mtop user)."
+"mysqltop user)."
 msgstr ""
 "Veuillez indiquer le nom de l'administrateur MySQL, qui servira pour la "
-"cr�ation de l'utilisateur ��mtop��."
+"cr�ation de l'utilisateur ��mysqltop��."
 
 #. Type: password
 #. Description
-#: ../mtop.templates:29
-msgid "Administrator password"
-msgstr "Mot de passe de l'administrateur :"
+#: ../mtop.templates:4001
+msgid "Password of your database's administrative user:"
+msgstr "Mot de passe de l'administrateur de bases de donn�es�:"
 
 #. Type: password
 #. Description
-#: ../mtop.templates:35
-msgid "Administrator password confirmation"
-msgstr "Confirmation du mot de passe de l'administrateur :"
-
-#. Type: password
-#. Description
-#: ../mtop.templates:35
+#: ../mtop.templates:4001
 msgid "Enter \"none\" if there is no password for MySQL administration."
-msgstr ""
-"Veuillez entrer ��none�� si l'administrateur MySQL n'a pas de mot de passe."
-
-#. Type: note
-#. Description
-#: ../mtop.templates:40
-msgid "Password mismatch"
-msgstr "Les mots de passe ne correspondent pas"
+msgstr "Veuillez entrer ��none�� si l'administrateur MySQL n'a pas de mot de passe."
 
-#. Type: note
-#. Description
-#: ../mtop.templates:40
-msgid ""
-"The password and the confirmed password are different. Please enter the "
-"password again."
-msgstr ""
-"Le mot de passe et sa confirmation ne sont pas identiques. Veuillez entrer � "
-"nouveau le mot de passe."
diff -u mtop-0.6.6/debian/po/pt_BR.po mtop-0.6.6/debian/po/pt_BR.po
--- mtop-0.6.6/debian/po/pt_BR.po
+++ mtop-0.6.6/debian/po/pt_BR.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mtop_0.6.4-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-22 23:36+0200\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-29 15:44+0100\n"
 "PO-Revision-Date: 2003-08-23 22:11-0300\n"
 "Last-Translator: Andr� Lu�s Lopes <[EMAIL PROTECTED]>\n"
 "Language-Team: Debian-BR Project <[email protected]>\n"
@@ -28,93 +28,90 @@
-#: ../mtop.templates:4
-msgid "Database host"
-msgstr "Host da base de dados"
+#: ../mtop.templates:1001
+msgid "MySQL host name:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:4
+#: ../mtop.templates:1001
+#, fuzzy
 msgid ""
-"Please enter the name of the MySQL server which will host the mantis "
-"database."
+"Please enter the host name of the MySQL server which you want to monitor."
 msgstr ""
 "Por favor informe o nome do servidor MySQL que ir� hospedar a base de dados "
 "do mantis."
 
 #. Type: string
 #. Description
-#: ../mtop.templates:10
-msgid "MySQL listening port"
-msgstr "Porta em que o MySQL ouve"
+#: ../mtop.templates:2001
+msgid "MySQL port number:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:10
-msgid "Please enter the port MySQL listens to."
+#: ../mtop.templates:2001
+msgid "Please enter the port number MySQL listens on."
 msgstr "Por favor informe a porta na qual o MySQL est� ouvindo."
 
-#. Type: note
-#. Description
-#: ../mtop.templates:15
-msgid "Information"
-msgstr "Informa��o"
-
-#. Type: note
-#. Description
-#: ../mtop.templates:15
-msgid ""
-"A MySQL user named mtop will be created for monitoring the server. Please "
-"read the README.Debian file if you want to monitor other MySQL servers."
-msgstr ""
-"Um usu�rio MySQL de nome mtop ser� criado para monitorar o servidor. Por "
-"favor leia o arquivo README.Debian caso voc� queira monitorar outros "
-"servidores MySQL."
-
 #. Type: string
 #. Description
-#: ../mtop.templates:22
-msgid "Username of the MySQL administrator"
-msgstr "Nome do usu�rio administrador do MySQL"
+#: ../mtop.templates:3001
+msgid "Name of your database's administrative user:"
+msgstr ""
 
 #. Type: string
 #. Description
-#: ../mtop.templates:22
+#: ../mtop.templates:3001
 msgid ""
 "Please enter the username of MySQL administrator (needed for creating the "
-"mtop user)."
+"mysqltop user)."
 msgstr ""
 "Por favor informe o nome do usu�rio administrador do MySQL (necess�rio para "
-"a cria��o do usu�rio mtop)."
+"a cria��o do usu�rio mysqltop)."
 
 #. Type: password
 #. Description
-#: ../mtop.templates:29
-msgid "Administrator password"
-msgstr "Senha do administrador"
-
-#. Type: password
-#. Description
-#: ../mtop.templates:35
-msgid "Administrator password confirmation"
-msgstr "Senha do administrador para confirma��o"
+#: ../mtop.templates:4001
+msgid "Password of your database's administrative user:"
+msgstr ""
 
 #. Type: password
 #. Description
-#: ../mtop.templates:35
+#: ../mtop.templates:4001
 msgid "Enter \"none\" if there is no password for MySQL administration."
 msgstr ""
 "Informe \"none\" caso n�o existe uma senha para administra��o do MySQL."
 
-#. Type: note
-#. Description
-#: ../mtop.templates:40
-msgid "Password mismatch"
-msgstr "Senhas n�o conferem"
+#~ msgid "Database host"
+#~ msgstr "Host da base de dados"
 
-#. Type: note
-#. Description
-#: ../mtop.templates:40
-msgid ""
-"The password and the confirmed password are different. Please enter the "
-"password again."
-msgstr ""
-"A senha e a senha de confirma��o informadas s�o diferentes. Por favor "
-"informa a senha novamente."
+#~ msgid "MySQL listening port"
+#~ msgstr "Porta em que o MySQL ouve"
+
+#~ msgid "Information"
+#~ msgstr "Informa��o"
+
+#~ msgid ""
+#~ "A MySQL user named mtop will be created for monitoring the server. Please "
+#~ "read the README.Debian file if you want to monitor other MySQL servers."
+#~ msgstr ""
+#~ "Um usu�rio MySQL de nome mtop ser� criado para monitorar o servidor. Por "
+#~ "favor leia o arquivo README.Debian caso voc� queira monitorar outros "
+#~ "servidores MySQL."
+
+#~ msgid "Username of the MySQL administrator"
+#~ msgstr "Nome do usu�rio administrador do MySQL"
+
+#~ msgid "Administrator password"
+#~ msgstr "Senha do administrador"
+
+#~ msgid "Administrator password confirmation"
+#~ msgstr "Senha do administrador para confirma��o"
+
+#~ msgid "Password mismatch"
+#~ msgstr "Senhas n�o conferem"
+
+#~ msgid ""
+#~ "The password and the confirmed password are different. Please enter the "
+#~ "password again."
+#~ msgstr ""
+#~ "A senha e a senha de confirma��o informadas s�o diferentes. Por favor "
+#~ "informa a senha novamente."
diff -u mtop-0.6.6/debian/control mtop-0.6.6/debian/control
--- mtop-0.6.6/debian/control
+++ mtop-0.6.6/debian/control
@@ -1,14 +1,15 @@
 Source: mtop
 Section: utils
 Priority: optional
-Build-Depends-Indep: debhelper (>= 4.0.0), perl, po-debconf, libdbd-mysql-perl, libcurses-perl
+Build-Depends: debhelper (>= 4.0.0)
+Build-Depends-Indep: perl, po-debconf, libdbd-mysql-perl, libcurses-perl
 Maintainer: Andrés Roldán <[EMAIL PROTECTED]>
 Uploaders: Luis Bustamante <[EMAIL PROTECTED]>
 Standards-Version: 3.6.1.0
 
 Package: mtop
 Architecture: all
-Depends: ${perl:Depends}, debconf (>= 1.2.9), libcurses-perl, libdbd-mysql-perl, libnet-perl, mysql-client
+Depends: ${perl:Depends}, debconf (>= 1.2.9) | debconf-2.0, libcurses-perl, libdbd-mysql-perl, libnet-perl, mysql-client
 Recommends: mysql-server
 Description: MySQL terminal based query monitor
  mtop (MySQL top) monitors a MySQL database showing the queries which
diff -u mtop-0.6.6/debian/rules mtop-0.6.6/debian/rules
--- mtop-0.6.6/debian/rules
+++ mtop-0.6.6/debian/rules
@@ -27,7 +27,7 @@
 	dh_testroot
 	rm -f build-stamp
 	-$(MAKE) realclean
-	rm -f mtop
+	rm -f mkill mtop
 
 	dh_clean
 
diff -u mtop-0.6.6/debian/changelog mtop-0.6.6/debian/changelog
--- mtop-0.6.6/debian/changelog
+++ mtop-0.6.6/debian/changelog
@@ -1,3 +1,27 @@
+mtop (0.6.6-1.1) unstable; urgency=low
+
+  * Non-maintainer upload with maintainer approval.
+  * Make debian/copyright more accurate w.r.t. the licence.
+  * Update debconf to modern usage: remove unneeded templates,
+    reword existing ones, correct mistakes. Fuzzies some existing
+    translations, unfuzzied where possible (Closes: #388937, #334504).
+  * Add debconf-2.0 alternate to depends (Closes: #332038), move debconf
+    to Build-Depends from BD-Indep.
+  * Make mtop purgable if mysql or debconf have already been removed.
+  * Make clean target also remove 'mkill' binary.
+  * Updated translations:
+    - Dutch by self;
+    - Vietnamese by Clytie Siddall (Closes: #312985).
+    - Italian by Luca Monducci (Closes: #284247).
+    - Czech by Miroslav Kure (Closes: #308022).
+    - Swedish by Daniel Nylander (Closes: #341626).
+    - Portuguese by Rui Branco (Closes: #381197).
+    - French by Christian Perrier.
+    - German by Matthias Julius.
+    - Russian by Yuri Kozlov.
+
+ -- Thijs Kinkhorst <[EMAIL PROTECTED]>  Thu,  7 Dec 2006 13:22:43 +0100
+
 mtop (0.6.6-1) unstable; urgency=low
 
   * New upstream release.
diff -u mtop-0.6.6/debian/mtop.templates mtop-0.6.6/debian/mtop.templates
--- mtop-0.6.6/debian/mtop.templates
+++ mtop-0.6.6/debian/mtop.templates
@@ -4,39 +4,22 @@
-_Description: Database host
- Please enter the name of the MySQL server which will host the mantis database.
+_Description: MySQL host name:
+ Please enter the host name of the MySQL server which you want to monitor.
 
 Template: mtop/mysql_port
 Type: string
 Default: 3306
-_Description: MySQL listening port
- Please enter the port MySQL listens to.
-
-Template: mtop/info
-Type: note
-_Description: Information
- A MySQL user named mtop will be created for monitoring the server. Please
- read the README.Debian file if you want to monitor other MySQL servers.
+_Description: MySQL port number:
+ Please enter the port number MySQL listens on.
 
 Template: mtop/root
 Type: string
 Default: root
-_Description: Username of the MySQL administrator
+_Description: Name of your database's administrative user:
  Please enter the username of MySQL administrator (needed for
- creating the mtop user).
+ creating the mysqltop user).
 
 Template: mtop/password
 Type: password
 Default: none
-_Description: Administrator password
- Enter "none" if there is no password for MySQL administration.
-
-Template: mtop/confirm
-Default: none
-Type: password
-_Description: Administrator password confirmation
+_Description: Password of your database's administrative user:
  Enter "none" if there is no password for MySQL administration.
 
-Template: mtop/mismatch
-Type: note
-_Description: Password mismatch
- The password and the confirmed password are different. Please
- enter the password again.
diff -u mtop-0.6.6/debian/mtop.config mtop-0.6.6/debian/mtop.config
--- mtop-0.6.6/debian/mtop.config
+++ mtop-0.6.6/debian/mtop.config
@@ -54,38 +54,11 @@
 			if db_go
 			then
 				db_get mtop/password || true
-				STATE=5
+				STATE=8
 			else
 				STATE=3
 			fi
 		;;
-		5)
-			db_input medium mtop/confirm || true
-			if db_go
-			then
-				db_get mtop/confirm || true
-				confirm="$RET"
-				db_get mtop/password || true
-				if [ "x$RET" != "x$confirm" ]
-				then
-					STATE=6
-				else
-					STATE=7
-				fi
-			else
-				STATE=4
-			fi
-		;;
-		6)
-			db_input medium mtop/mismatch || true
-			db_go
-			STATE=4
-		;;
-		7)
-			db_input low mtop/info || true
-			db_go
-			STATE=8
-		;;
 	esac
 done
 
diff -u mtop-0.6.6/debian/mtop.postrm mtop-0.6.6/debian/mtop.postrm
--- mtop-0.6.6/debian/mtop.postrm
+++ mtop-0.6.6/debian/mtop.postrm
@@ -42,19 +42,21 @@
 
 case "$1" in
        purge|remove)
-       
- 	. /usr/share/debconf/confmodule
-	db_version 2.0
 
-	get_config
-	password=`dd if=/dev/random bs=512 count=1 2> /dev/null| md5sum`
-	if [ "$root_passwd" != 'none' ]; then
-                mysqlpwd="-p${root_passwd}"
-        fi
-        mysqlcmd="mysql -h ${mysql_server} -P ${mysql_port} -u${root_mysql} ${mysqlpwd}"
-	if ${mysqlcmd} -B -e 'select user from user' mysql | grep -q "^mysqltop$"
-	then
-		remove_user;
+	if [ -f /usr/share/debconf/confmodule ] && [ -f /usr/bin/mysql ]; then
+		. /usr/share/debconf/confmodule
+		db_version 2.0
+
+		get_config
+		password=`dd if=/dev/random bs=512 count=1 2> /dev/null| md5sum`
+		if [ "$root_passwd" != 'none' ]; then
+			mysqlpwd="-p${root_passwd}"
+		fi
+		mysqlcmd="mysql -h ${mysql_server} -P ${mysql_port} -u${root_mysql} ${mysqlpwd}"
+		if ${mysqlcmd} -B -e 'select user from user' mysql | grep -q "^mysqltop$"
+		then
+			remove_user;
+		fi
 	fi
       
        
diff -u mtop-0.6.6/debian/copyright mtop-0.6.6/debian/copyright
--- mtop-0.6.6/debian/copyright
+++ mtop-0.6.6/debian/copyright
@@ -12,8 +12,19 @@
 
 Copyright:
 
-  You are free to distribute this software under the terms of
-  the GNU General Public License, Version 2.
+  Copyright (C) 2002 Marc Prewitt/Chelsea Networks <[EMAIL PROTECTED]>
+
+Licence:
+
+  mtop is free software; you can redistribute it and/or modify it under the
+  terms of the GNU General Public License as published by the Free Software
+  Foundation; either version 2 of the License, or (at your option) any later
+  version.
+
+  mtop is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+  details.
 
   On Debian systems, the complete text of the GNU General Public
   License can be found in /usr/share/common-licenses/GPL file.
only in patch2:
unchanged:
--- mtop-0.6.6.orig/debian/po/vi.po
+++ mtop-0.6.6/debian/po/vi.po
@@ -0,0 +1,103 @@
+# Vietnamese Translation for mtop.
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <[EMAIL PROTECTED]>, 2005.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: mtop 0.6.6-1\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-29 15:44+0100\n"
+"PO-Revision-Date: 2005-06-11 15:04+0930\n"
+"Last-Translator: Clytie Siddall <[EMAIL PROTECTED]>\n"
+"Language-Team: Vietnamese <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+msgid "MySQL host name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+#, fuzzy
+msgid ""
+"Please enter the host name of the MySQL server which you want to monitor."
+msgstr "Hãy nhập tên máy của máy phục vụ MySQL sẽ hỗ trợ cơ sở dữ liệu mantis."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "MySQL port number:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "Please enter the port number MySQL listens on."
+msgstr "Hãy nhập cổng nơi MySQL lắng nghe."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid "Name of your database's administrative user:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid ""
+"Please enter the username of MySQL administrator (needed for creating the "
+"mysqltop user)."
+msgstr ""
+"Hãy nhập tên người dùng của quản trị MySQL (cần đến để tạo người dùng mysqltop)."
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Password of your database's administrative user:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Enter \"none\" if there is no password for MySQL administration."
+msgstr "Hãy nhập «none» (không có) nếu không dùng mật khẩu để quản lý MySQL."
+
+#~ msgid "Database host"
+#~ msgstr "Máy hỗ trợ cơ sở dữ liệu"
+
+#~ msgid "MySQL listening port"
+#~ msgstr "Cổng lắng nghe MySQL"
+
+#~ msgid "Information"
+#~ msgstr "Thông tin"
+
+#~ msgid ""
+#~ "A MySQL user named mtop will be created for monitoring the server. Please "
+#~ "read the README.Debian file if you want to monitor other MySQL servers."
+#~ msgstr ""
+#~ "Sẽ tạo một người dùng MySQL tên «mtop», để theo dõi máy phục vụ. Hãy đọc "
+#~ "tập tin «README.Debian» để tìm thông tin về theo dõi nhiều máy phục vụ "
+#~ "MySQL."
+
+#~ msgid "Username of the MySQL administrator"
+#~ msgstr "Tên người dùng của quản trị MySQL"
+
+#~ msgid "Administrator password"
+#~ msgstr "Mật khẩu quản trị"
+
+#~ msgid "Administrator password confirmation"
+#~ msgstr "Xác nhận mật khẩu quản trị"
+
+#~ msgid "Password mismatch"
+#~ msgstr "Mật khẩu không khớp."
+
+#~ msgid ""
+#~ "The password and the confirmed password are different. Please enter the "
+#~ "password again."
+#~ msgstr "Hai mật khẩu không khớp được. Hãy nhập lại."
only in patch2:
unchanged:
--- mtop-0.6.6.orig/debian/po/pt.po
+++ mtop-0.6.6/debian/po/pt.po
@@ -0,0 +1,107 @@
+# Native Portuguese translation of mtop debconf.
+# Ricardo Silva <[EMAIL PROTECTED]>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mtop 0.6.6-1\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-29 15:44+0100\n"
+"PO-Revision-Date: 2006-08-02 15:15+0100\n"
+"Last-Translator: Ricardo Silva <[EMAIL PROTECTED]>\n"
+"Language-Team: Native Portuguese <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+msgid "MySQL host name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+#, fuzzy
+msgid ""
+"Please enter the host name of the MySQL server which you want to monitor."
+msgstr ""
+"Por favor introduza o nome do servidor MySQL que vai conter a base de dados "
+"do mantis."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "MySQL port number:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "Please enter the port number MySQL listens on."
+msgstr "Por favor introduza a porta em que o MySQL ouve."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid "Name of your database's administrative user:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid ""
+"Please enter the username of MySQL administrator (needed for creating the "
+"mysqltop user)."
+msgstr ""
+"Por favor introduza o nome de utilizador do administrador de MySQL "
+"(necessário para a criação do utilizador mysqltop)."
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Password of your database's administrative user:"
+msgstr ""
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Enter \"none\" if there is no password for MySQL administration."
+msgstr ""
+"Introduza \"none\" se não há palavra-chave para administração do MySQL."
+
+#~ msgid "Database host"
+#~ msgstr "Host da base de dados"
+
+#~ msgid "MySQL listening port"
+#~ msgstr "Porta em que o MySQL ouve"
+
+#~ msgid "Information"
+#~ msgstr "Informação"
+
+#~ msgid ""
+#~ "A MySQL user named mtop will be created for monitoring the server. Please "
+#~ "read the README.Debian file if you want to monitor other MySQL servers."
+#~ msgstr ""
+#~ "Um utilizador MySQL chamado mtop vai ser criado para monitorizar o "
+#~ "servidor. Por favor leia o ficheiro README.Debian se quiser monitorizar "
+#~ "outros servidores de MySQL."
+
+#~ msgid "Username of the MySQL administrator"
+#~ msgstr "Nome de utilizador do administrador de MySQL"
+
+#~ msgid "Administrator password"
+#~ msgstr "Palavra-chave do administrador"
+
+#~ msgid "Administrator password confirmation"
+#~ msgstr "Confirmação da palavra-chave do administrador"
+
+#~ msgid "Password mismatch"
+#~ msgstr "Palavra-chave não coincidente"
+
+#~ msgid ""
+#~ "The password and the confirmed password are different. Please enter the "
+#~ "password again."
+#~ msgstr ""
+#~ "A palavra-chave e a confirmação da palavra chave são diferentes. Por "
+#~ "favor introduza a palavra-chave de novo."
only in patch2:
unchanged:
--- mtop-0.6.6.orig/debian/po/cs.po
+++ mtop-0.6.6/debian/po/cs.po
@@ -0,0 +1,94 @@
+#
+#    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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mtop\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-29 15:44+0100\n"
+"PO-Revision-Date: 2006-11-29 19:46+0100\n"
+"Last-Translator: Miroslav Kure <[EMAIL PROTECTED]>\n"
+"Language-Team: Czech <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+msgid "MySQL host name:"
+msgstr "Jméno počítače s MySQL:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+msgid ""
+"Please enter the host name of the MySQL server which you want to monitor."
+msgstr "Zadejte jméno počítače s MySQL serverem, který chcete sledovat."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "MySQL port number:"
+msgstr "Číslo portu MySQL:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "Please enter the port number MySQL listens on."
+msgstr "Zadejte port, na kterém naslouchá MySQL."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid "Name of your database's administrative user:"
+msgstr "Uživatelské jméno správce databáze:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid ""
+"Please enter the username of MySQL administrator (needed for creating the "
+"mysqltop user)."
+msgstr ""
+"Zadejte prosím uživatelské jméno správce MySQL (nutné pro vytvoření "
+"uživatele mysqltop)."
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Password of your database's administrative user:"
+msgstr "Heslo správce databáze:"
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Enter \"none\" if there is no password for MySQL administration."
+msgstr "Jestliže pro správu MySQL nepoužíváte žádné heslo, zadejte \"none\"."
+
+#~ msgid "Username of the MySQL administrator"
+#~ msgstr "Uživatelské jméno administrátora MySQL"
+
+#~ msgid "Administrator password"
+#~ msgstr "Heslo administrátora"
+
+#~ msgid "Administrator password confirmation"
+#~ msgstr "Potvrzení administrátorského hesla"
+
+#~ msgid "Password mismatch"
+#~ msgstr "Hesla nesouhlasí"
+
+#~ msgid ""
+#~ "The password and the confirmed password are different. Please enter the "
+#~ "password again."
+#~ msgstr "Zadaná hesla nesouhlasí. Zkuste je zadat znovu."
only in patch2:
unchanged:
--- mtop-0.6.6.orig/debian/po/it.po
+++ mtop-0.6.6/debian/po/it.po
@@ -0,0 +1,70 @@
+# mtop po-debconf translation to italian
+# Copyright (C) 2004 Software in the Public Interest
+# This file is distributed under the same license as the mtop package.
+# Luca Monducci, 2004-2006.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: mtop italian debconf templates\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-29 15:44+0100\n"
+"PO-Revision-Date: 2006-12-30 21:07+0100\n"
+"Last-Translator: Luca Monducci <[EMAIL PROTECTED]>\n"
+"Language-Team: Italian <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+msgid "MySQL host name:"
+msgstr "Nome host con MySQL:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+msgid ""
+"Please enter the host name of the MySQL server which you want to monitor."
+msgstr "Inserire il nome host del server MySQL che si vuole monitorare."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "MySQL port number:"
+msgstr "Numero della porta di MySQL:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "Please enter the port number MySQL listens on."
+msgstr "Inserire la porta sulla quale MySQL è in ascolto."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid "Name of your database's administrative user:"
+msgstr "Nome dell'utente di amministrazione del database:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid ""
+"Please enter the username of MySQL administrator (needed for creating the "
+"mysqltop user)."
+msgstr ""
+"Inserire il nome utente dell'amministratore MySQL (necessario per la "
+"creazione dell'utente mysqltop)."
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Password of your database's administrative user:"
+msgstr "Password dell'utente di amministrazione del database:"
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Enter \"none\" if there is no password for MySQL administration."
+msgstr ""
+"Inserire \"none\" se non c'è una password per l'amministrazione di MySQL."
only in patch2:
unchanged:
--- mtop-0.6.6.orig/debian/po/nl.po
+++ mtop-0.6.6/debian/po/nl.po
@@ -0,0 +1,68 @@
+# mtop debconf translations
+# This file is distributed under the same license as the mtop package.
+# Thijs Kinkhorst <[EMAIL PROTECTED]>, 2006
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mtop 0.6.6-1\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-29 15:44+0100\n"
+"PO-Revision-Date: 2006-11-29 15:54+0100\n"
+"Last-Translator: Thijs Kinkhorst <[EMAIL PROTECTED]>\n"
+"Language-Team: Dutch <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+msgid "MySQL host name:"
+msgstr "MySQL computernaam:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+msgid ""
+"Please enter the host name of the MySQL server which you want to monitor."
+msgstr "Wat is de computernaam van de MySQL-server die u wilt monitoren?"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "MySQL port number:"
+msgstr "MySQL poortnummer:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "Please enter the port number MySQL listens on."
+msgstr "Wat is het poortnummer waarop MySQL luistert?"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid "Name of your database's administrative user:"
+msgstr "Naam van de beheersaccount van uw database:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid ""
+"Please enter the username of MySQL administrator (needed for creating the "
+"mysqltop user)."
+msgstr ""
+"Geef de gebuikersnaam van het beheersaccount voor MySQL (nodig voor het "
+"aanmaken van de 'mysqltop'-gebruiker)."
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Password of your database's administrative user:"
+msgstr "Wachtwoord voor het beheersaccount van uw database:"
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Enter \"none\" if there is no password for MySQL administration."
+msgstr "Voer \"none\" in als er geen wachtwoord nodig is."
only in patch2:
unchanged:
--- mtop-0.6.6.orig/debian/po/de.po
+++ mtop-0.6.6/debian/po/de.po
@@ -0,0 +1,122 @@
+# translation of po-debconf template to German
+#
+#    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.
+#
+# Matthias Julius <[EMAIL PROTECTED]>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: mtop 0.6.6-1\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2004-04-22 23:36+0200\n"
+"PO-Revision-Date: 2006-11-29 21:12-0500\n"
+"Last-Translator: Matthias Julius <[EMAIL PROTECTED]>\n"
+"Language-Team: German <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:4
+msgid "Database host"
+msgstr "Datenbank-Server"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:4
+msgid ""
+"Please enter the name of the MySQL server which will host the mantis "
+"database."
+msgstr ""
+"Bitte geben Sie den Namen des MySQL-Servers ein, der die Mantis-Datenbank "
+"verwalten soll."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:10
+msgid "MySQL listening port"
+msgstr "Port-Nummer für MySQL"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:10
+msgid "Please enter the port MySQL listens to."
+msgstr "Bitte geben Sie den Port ein, an dem MySQL Verbindungen erwartet."
+
+#. Type: note
+#. Description
+#: ../mtop.templates:15
+msgid "Information"
+msgstr "Hinweis"
+
+#. Type: note
+#. Description
+#: ../mtop.templates:15
+msgid ""
+"A MySQL user named mtop will be created for monitoring the server. Please "
+"read the README.Debian file if you want to monitor other MySQL servers."
+msgstr ""
+"Es wird ein MySQL-Benutzer zur Überwachung des Servers angelegt. Bitte lesen "
+"Sie die Datei README.Debian, falls Sie andere MySQL-Server überwachen wollen."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:22
+msgid "Username of the MySQL administrator"
+msgstr "Benutzername des MySQL-Administrators"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:22
+msgid ""
+"Please enter the username of MySQL administrator (needed for creating the "
+"mtop user)."
+msgstr ""
+"Bitte geben Sie den Benutzernamen des MySQL-Administrators ein (wird zum "
+"Anlegen des mtop-Benutzers benötigt)."
+
+#. Type: password
+#. Description
+#: ../mtop.templates:29
+msgid "Administrator password"
+msgstr "Passwort des Administrators"
+
+#. Type: password
+#. Description
+#: ../mtop.templates:35
+msgid "Administrator password confirmation"
+msgstr "Bestätigung des Administrator-Passwortes"
+
+#. Type: password
+#. Description
+#: ../mtop.templates:35
+msgid "Enter \"none\" if there is no password for MySQL administration."
+msgstr ""
+"Geben Sie »none« ein, wenn kein Passwort für die MySQL-Administration "
+"benötigt wird."
+
+#. Type: note
+#. Description
+#: ../mtop.templates:40
+msgid "Password mismatch"
+msgstr "Die Passwörter stimmen nicht überein."
+
+#. Type: note
+#. Description
+#: ../mtop.templates:40
+msgid ""
+"The password and the confirmed password are different. Please enter the "
+"password again."
+msgstr ""
+"Das Passwort und dessen Bestätigung sind unterschiedlich. Bitte geben Sie "
+"das Passwort erneut ein."
+
only in patch2:
unchanged:
--- mtop-0.6.6.orig/debian/po/ru.po
+++ mtop-0.6.6/debian/po/ru.po
@@ -0,0 +1,71 @@
+# translation of mtop_debconf_ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <[EMAIL PROTECTED]>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.6.6-1\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-11-29 15:59+0100\n"
+"PO-Revision-Date: 2006-12-05 21:19+0300\n"
+"Last-Translator: Yuri Kozlov <[EMAIL PROTECTED]>\n"
+"Language-Team: Russian <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+msgid "MySQL host name:"
+msgstr "Название машины с MySQL:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:1001
+msgid "Please enter the host name of the MySQL server which you want to monitor."
+msgstr "Укажите имя компьютера с сервером MySQL, который нужно мониторить."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "MySQL port number:"
+msgstr "Номер порта MySQL:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:2001
+msgid "Please enter the port number MySQL listens on."
+msgstr "Укажите номер порта с которого сервер MySQL принимает запросы."
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid "Name of your database's administrative user:"
+msgstr "Имя пользователя администратора баз данных:"
+
+#. Type: string
+#. Description
+#: ../mtop.templates:3001
+msgid ""
+"Please enter the username of MySQL administrator (needed for creating the "
+"mysqltop user)."
+msgstr ""
+"Введите имя пользователя администратора MySQL (нужно для "
+"создания пользователя mysqltop)."
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Password of your database's administrative user:"
+msgstr "Пароль администратора баз данных:"
+
+#. Type: password
+#. Description
+#: ../mtop.templates:4001
+msgid "Enter \"none\" if there is no password for MySQL administration."
+msgstr "Введите \"none\", если для администрирования MySQL пароль не задан."
+

Attachment: signature.asc
Description: Digital signature

Reply via email to