Dear maintainer of ocfs2-tools, On Monday, June 02, 2008 I sent you a notice announcing my intent to upload a NMU of your package to fix its pending l10n issues, after an initial notice sent on Monday, June 02, 2008.
You either agreed for this NMU or did not respond to my notices.
I will now upload this NMU to DELAYED/2-DAY.
The NMU patch is attached to this mail.
The NMU changelog is:
Source: ocfs2-tools
Version: 1.2.4-1.1
Distribution: unstable
Urgency: low
Maintainer: Christian Perrier <[EMAIL PROTECTED]>
Date: Mon, 02 Jun 2008 07:39:23 +0200
Closes: 463445 475317 484151 484155 484179 484227
Changes:
ocfs2-tools (1.2.4-1.1) unstable; urgency=low
.
* Non-maintainer upload to fix pending l10n issues and an RC bug.
* Fix FTBFS by commenting asm/page.h in mount.ocfs2/mount.ocfs2.h
(debian/patches/200_ftbfs)
* Debconf translations:
- Dutch. Closes: #463445
- German. Closes: #475317
- Galician. Closes: #484151
- Portuguese. Closes: #484155
- Basque. Closes: #484179
- Finnish. Closes: #484227
--
diff -Nru ocfs2-tools-1.2.4.old/debian/changelog ocfs2-tools-1.2.4/debian/changelog --- ocfs2-tools-1.2.4.old/debian/changelog 2008-06-02 06:00:27.183120039 +0200 +++ ocfs2-tools-1.2.4/debian/changelog 2008-06-05 22:38:52.884805781 +0200 @@ -1,3 +1,18 @@ +ocfs2-tools (1.2.4-1.1) unstable; urgency=low + + * Non-maintainer upload to fix pending l10n issues and an RC bug. + * Fix FTBFS by commenting asm/page.h in mount.ocfs2/mount.ocfs2.h + (debian/patches/200_ftbfs) + * Debconf translations: + - Dutch. Closes: #463445 + - German. Closes: #475317 + - Galician. Closes: #484151 + - Portuguese. Closes: #484155 + - Basque. Closes: #484179 + - Finnish. Closes: #484227 + + -- Christian Perrier <[EMAIL PROTECTED]> Mon, 02 Jun 2008 07:39:23 +0200 + ocfs2-tools (1.2.4-1) unstable; urgency=low * The "Lazo rosa" release. diff -Nru ocfs2-tools-1.2.4.old/debian/patches/200_ftbfs ocfs2-tools-1.2.4/debian/patches/200_ftbfs --- ocfs2-tools-1.2.4.old/debian/patches/200_ftbfs 1970-01-01 01:00:00.000000000 +0100 +++ ocfs2-tools-1.2.4/debian/patches/200_ftbfs 2008-06-02 19:55:35.750389176 +0200 @@ -0,0 +1,13 @@ +Index: ocfs2-tools-1.2.4/mount.ocfs2/mount.ocfs2.h +=================================================================== +--- ocfs2-tools-1.2.4.orig/mount.ocfs2/mount.ocfs2.h ++++ ocfs2-tools-1.2.4/mount.ocfs2/mount.ocfs2.h +@@ -27,7 +27,7 @@ + #include <asm/types.h> + #include <inttypes.h> + +-#include <asm/page.h> ++/* #include <asm/page.h> */ + #include <sys/mount.h> + #include <dirent.h> + #include <stdio.h> diff -Nru ocfs2-tools-1.2.4.old/debian/patches/series ocfs2-tools-1.2.4/debian/patches/series --- ocfs2-tools-1.2.4.old/debian/patches/series 2008-06-02 06:00:27.179120740 +0200 +++ ocfs2-tools-1.2.4/debian/patches/series 2008-06-02 19:54:53.723912696 +0200 @@ -1,2 +1,3 @@ +200_ftbfs 02-init-typos -p0 101_debian_init -p0 diff -Nru ocfs2-tools-1.2.4.old/debian/po/de.po ocfs2-tools-1.2.4/debian/po/de.po --- ocfs2-tools-1.2.4.old/debian/po/de.po 2008-06-02 06:00:27.179120740 +0200 +++ ocfs2-tools-1.2.4/debian/po/de.po 2008-06-02 07:40:40.751118000 +0200 @@ -1,22 +1,14 @@ # translation of po-debconf template to German +# This file is distributed under the same license as the ocfs2-tools package. +# Copyright (C): # -# 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. +# Matthias Julius <[EMAIL PROTECTED]>, 2006, 2008. msgid "" msgstr "" -"Project-Id-Version: ocfs2-tools 1.2.1-1.2\n" +"Project-Id-Version: ocfs2-tools 1.2.4-1\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" "POT-Creation-Date: 2007-08-22 01:25+0200\n" -"PO-Revision-Date: 2006-12-14 21:25-0500\n" +"PO-Revision-Date: 2008-02-16 00:09-0500\n" "Last-Translator: Matthias Julius <[EMAIL PROTECTED]>\n" "Language-Team: German <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" @@ -41,7 +33,7 @@ #. Description #: ../ocfs2-tools.templates:3001 msgid "O2CB heartbeat threshold:" -msgstr "Grenzwert des O2BC-Heartbeats:" +msgstr "Schwellwert des O2BC-Heartbeats:" #. Type: string #. Description @@ -51,7 +43,7 @@ "awaits for an I/O operation. After it, the node \"fences\" itself, and you " "will probably see a crash." msgstr "" -"Der Grenzwert des O2CB-Heartbeats bestimmt die maximale Zeit in Sekunden, " +"Der Schwellwert des O2CB-Heartbeats bestimmt die maximale Zeit in Sekunden, " "die ein Knoten für eine E/A-Operation abwartet. Danach »grenzt« sich der " "Knoten aus, und Sie werden wahrscheinlich einen Absturz beobachten." @@ -59,7 +51,7 @@ #. Description #: ../ocfs2-tools.templates:3001 msgid "It is calculated as the result of: (threshold - 1) x 2." -msgstr "Er ist berechnet als das Ergebnis von: (Grenzwert - 1) x 2." +msgstr "Er berechnet sich wie folgt: (Schwellwert - 1) x 2." #. Type: string #. Description @@ -80,7 +72,7 @@ #. Description #: ../ocfs2-tools.templates:4001 msgid "O2CB idle timeout:" -msgstr "" +msgstr "O2CB-Leerlaufzeitlimit:" #. Type: string #. Description @@ -89,22 +81,24 @@ "The O2CB idle timeout (expressed in milliseconds) is the time before a " "network connection is considered dead." msgstr "" +"Das O2CB-Leerlaufzeitlimit (in Millisekunden) ist die Zeit, nach der eine " +"Netzwerkverbindung als tot angesehen wird." #. Type: string #. Description #: ../ocfs2-tools.templates:4001 -#, fuzzy -#| msgid "Its default value is 7 (12 seconds)." msgid "" "Its default value is 10000 (10 seconds) and the minimum recommended value is " "5000 (5 seconds)." -msgstr "Der voreingestellte Wert ist 7 (12 Sekunden)." +msgstr "" +"Der voreingestellte Wert ist 10000 (10 Sekunden) und der minimale empfohlene " +"Wert ist 5000 (5 Sekunden)." #. Type: string #. Description #: ../ocfs2-tools.templates:5001 msgid "O2CB keepalive delay:" -msgstr "" +msgstr "O2CB-Keepalive-Verzögerung:" #. Type: string #. Description @@ -113,22 +107,24 @@ "The O2CB keepalive delay (expressed in milliseconds) is the maximum time " "before a keepalive package is sent." msgstr "" +"Die O2CB-Keepalive-Verzögerung (in Millisekunden) ist die maximale Zeit, " +"nach der ein Keepalive-Paket gesendet wird." #. Type: string #. Description #: ../ocfs2-tools.templates:5001 -#, fuzzy -#| msgid "Its default value is 7 (12 seconds)." msgid "" "Its default value is 5000 (5 seconds) and the minimum recommended value is " "1000 (1 second)." -msgstr "Der voreingestellte Wert ist 7 (12 Sekunden)." +msgstr "" +"Der voreingestellte Wert ist 5000 (5 Sekunden) und der minimale empfohlene " +"Wert ist 1000 (1 Sekunde)." #. Type: string #. Description #: ../ocfs2-tools.templates:6001 msgid "O2CB reconnect delay:" -msgstr "" +msgstr "O2CB-Wiederverbindungsverzögerung:" #. Type: string #. Description @@ -137,11 +133,12 @@ "The O2CB reconnect delay (expressed in milliseconds) is the minimum time " "between connection attempts." msgstr "" +"Die O2CB-Wiederverbindungsverzögerung (in Millisekunden) ist die minimale " +"Zeit zwischen Verbindungsversuchen." #. Type: string #. Description #: ../ocfs2-tools.templates:6001 -#, fuzzy -#| msgid "Its default value is 7 (12 seconds)." msgid "Its default and recommended minimum value is 2000 (2 seconds)." -msgstr "Der voreingestellte Wert ist 7 (12 Sekunden)." +msgstr "" +"Der voreingestellte und empfohlene minimale Wert ist 2000 (2 Sekunden)." diff -Nru ocfs2-tools-1.2.4.old/debian/po/eu.po ocfs2-tools-1.2.4/debian/po/eu.po --- ocfs2-tools-1.2.4.old/debian/po/eu.po 1970-01-01 01:00:00.000000000 +0100 +++ ocfs2-tools-1.2.4/debian/po/eu.po 2008-06-03 23:56:08.998814000 +0200 @@ -0,0 +1,142 @@ +# translation of ocfs2-tools-eu.po to Euskara +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Piarres Beobide <[EMAIL PROTECTED]>, 2008. +msgid "" +msgstr "" +"Project-Id-Version: ocfs2-tools-eu\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2007-08-22 01:25+0200\n" +"PO-Revision-Date: 2008-06-02 23:27+0200\n" +"Last-Translator: Piarres Beobide <[EMAIL PROTECTED]>\n" +"Language-Team: Euskara <[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: boolean +#. Description +#: ../ocfs2-tools.templates:1001 +msgid "Would you like to start an OCFS2 cluster (O2CB) at boot time?" +msgstr "Abioan OCFS2 cluster bat (O2CB) abiarazi nahi al duzu?" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:2001 +msgid "Name of the cluster to start at boot time:" +msgstr "Abioan abiarazi behar den klusterraren izena:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "O2CB heartbeat threshold:" +msgstr "O2CB taupada muga:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "" +"The O2CB heartbeat threshold sets up the maximum time in seconds that a node " +"awaits for an I/O operation. After it, the node \"fences\" itself, and you " +"will probably see a crash." +msgstr "" +"O2CB taupada mugak nodo batek segundutan S/I ekintza baten zain egon " +"daiteken denbora-muga ezartzen du. Honen ondoren, nodoak bere burua " +"\"hesitzen\" du eta ziurrenik kraskatze bat ikusiko duzu." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "It is calculated as the result of: (threshold - 1) x 2." +msgstr "Berau honen emaitza bezala kalkulatzen da (muga - 1) x 2." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "Its default value is 7 (12 seconds)." +msgstr "Lehenetsiriko balioa 7 da (12 segundu)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "" +"Raise it if you have slow disks and/or crashes with kernel messages like:" +msgstr "" +"Handitu ezazu disko geldoak edo/eta horrelako kernel mezudun kraskatzeak " +"badituzu:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "O2CB idle timeout:" +msgstr "O2CB inaktibo denbora-muga:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "" +"The O2CB idle timeout (expressed in milliseconds) is the time before a " +"network connection is considered dead." +msgstr "" +"O2CB inaktibo denbora-muga (milisegundutan) sare konexio bat hilda " +"kontsideratu aurretik itxarongo den denbora da." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "" +"Its default value is 10000 (10 seconds) and the minimum recommended value is " +"5000 (5 seconds)." +msgstr "" +"Bere lehenetsiriko balioa 10000 da (10 segundu) eta gomendaturiko gutxieneko " +"balioa 5000 da (5 segundu)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "O2CB keepalive delay:" +msgstr "O2CB bizirik-mantedu (keepalive) atzerapena:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "" +"The O2CB keepalive delay (expressed in milliseconds) is the maximum time " +"before a keepalive package is sent." +msgstr "" +"O2CB bizirik-mantedu atzerapena (milisegundutan zehaztua) mantedu-bizirik " +"paketeak bidaltzeko tarte handiena da." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "" +"Its default value is 5000 (5 seconds) and the minimum recommended value is " +"1000 (1 second)." +msgstr "" +"Bere lehenetsiriko balioa 5000 da (5 segundu) eta gomendaturiko gutxieneko " +"balioa 10000 da (10 segundu)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "O2CB reconnect delay:" +msgstr "O2CB berkonexio atzerapena:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "" +"The O2CB reconnect delay (expressed in milliseconds) is the minimum time " +"between connection attempts." +msgstr "" +"O2CB berkonexio atzerapena (milisegundutan zehaztua) konexio saiakera arteko " +"gutxieneko tartea da." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "Its default and recommended minimum value is 2000 (2 seconds)." +msgstr "Lehenetsiriko eta gomendaturiko gutxieneko balioa 2000 da (2 segundu)." diff -Nru ocfs2-tools-1.2.4.old/debian/po/fi.po ocfs2-tools-1.2.4/debian/po/fi.po --- ocfs2-tools-1.2.4.old/debian/po/fi.po 1970-01-01 01:00:00.000000000 +0100 +++ ocfs2-tools-1.2.4/debian/po/fi.po 2008-06-03 23:56:14.994813000 +0200 @@ -0,0 +1,139 @@ +msgid "" +msgstr "" +"Project-Id-Version: ocfs2-tools\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2007-08-22 01:25+0200\n" +"PO-Revision-Date: 2008-06-03 08:52+0200\n" +"Last-Translator: Esko Arajärvi <[EMAIL PROTECTED]>\n" +"Language-Team: Finnish <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Finnish\n" +"X-Poedit-Country: FINLAND\n" + +#. Type: boolean +#. Description +#: ../ocfs2-tools.templates:1001 +msgid "Would you like to start an OCFS2 cluster (O2CB) at boot time?" +msgstr "" +"Tulisiko OCFS2-klusteri (O2CB) käynnistää käynnistettäessä järjestelmä?" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:2001 +msgid "Name of the cluster to start at boot time:" +msgstr "Järjestelmän käynnistyksen yhteydessä käynnistettävän klusterin nimi:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "O2CB heartbeat threshold:" +msgstr "O2CB:n ajoituksen rajoitin: " + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "" +"The O2CB heartbeat threshold sets up the maximum time in seconds that a node " +"awaits for an I/O operation. After it, the node \"fences\" itself, and you " +"will probably see a crash." +msgstr "" +"O2CB:n ajoituksen rajoitin määrittää enimmäisajan sekunneissa kauanko solmu " +"odottaa I/O-operaation valmistumista. Tämän jälkeen solmu ”sulkee” itsensä " +"ja ohjelma luultavasti kaatuu." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "It is calculated as the result of: (threshold - 1) x 2." +msgstr "Enimmäisaika lasketaan kaavasta: (raja -1) x 2." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "Its default value is 7 (12 seconds)." +msgstr "Oletusarvo on 7 (12 sekuntia)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "" +"Raise it if you have slow disks and/or crashes with kernel messages like:" +msgstr "" +"Arvoa kannattaa suurentaa, jos käytössä on hitaita levyjä tai tapahtuu " +"kaatumisia, jotka tuottavat seuraavanlaisia ytimen viestejä:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "O2CB idle timeout:" +msgstr "O2CB:n odotuksen aikaraja:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "" +"The O2CB idle timeout (expressed in milliseconds) is the time before a " +"network connection is considered dead." +msgstr "" +"O2CB:n odotuksen aikaraja (määritetään millisekunteina) on aika, jonka " +"jälkeen verkkoyhteyden oletetaan katkenneen." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "" +"Its default value is 10000 (10 seconds) and the minimum recommended value is " +"5000 (5 seconds)." +msgstr "" +"Oletusarvo on 10000 (10 sekuntia) ja suositeltu vähimmäisarvo 5000 (5 " +"sekuntia)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "O2CB keepalive delay:" +msgstr "O2CB:n virkistysviive:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "" +"The O2CB keepalive delay (expressed in milliseconds) is the maximum time " +"before a keepalive package is sent." +msgstr "" +"O2CB:n virkistysviive (määritetään millisekunteina) on enimmäisaika ennen " +"keepalive-paketin lähettämistä." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "" +"Its default value is 5000 (5 seconds) and the minimum recommended value is " +"1000 (1 second)." +msgstr "" +"Oletusarvo on 5000 (5 sekuntia) ja suositeltu vähimmäisarvo on 1000 (1 " +"sekunti)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "O2CB reconnect delay:" +msgstr "O2CB:n yhteydenottoviive:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "" +"The O2CB reconnect delay (expressed in milliseconds) is the minimum time " +"between connection attempts." +msgstr "" +"O2CB:n yhteydenottoviive (määritetään millisekunteina) on vähimmäisaika " +"yhteydenottoyritysten välillä." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "Its default and recommended minimum value is 2000 (2 seconds)." +msgstr "Se oletusarvo ja suositeltu vähimmäisarvo on 2000 (2 sekuntia)." diff -Nru ocfs2-tools-1.2.4.old/debian/po/gl.po ocfs2-tools-1.2.4/debian/po/gl.po --- ocfs2-tools-1.2.4.old/debian/po/gl.po 1970-01-01 01:00:00.000000000 +0100 +++ ocfs2-tools-1.2.4/debian/po/gl.po 2008-06-03 23:55:54.910813000 +0200 @@ -0,0 +1,140 @@ +# Galician translation of ocfs2-tools's debconf templates +# This file is distributed under the same license as the ocfs2-tools package. +# Jacobo Tarrio <[EMAIL PROTECTED]>, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: ocfs2-tools\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2007-08-22 01:25+0200\n" +"PO-Revision-Date: 2008-06-02 19:06+0100\n" +"Last-Translator: Jacobo Tarrio <[EMAIL PROTECTED]>\n" +"Language-Team: Galician <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../ocfs2-tools.templates:1001 +msgid "Would you like to start an OCFS2 cluster (O2CB) at boot time?" +msgstr "¿Quere iniciar un clúster OCFS2 (O2CB) co ordenador?" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:2001 +msgid "Name of the cluster to start at boot time:" +msgstr "Nome do clúster a iniciar co ordenador:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "O2CB heartbeat threshold:" +msgstr "Umbral de latexo de O2CB:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "" +"The O2CB heartbeat threshold sets up the maximum time in seconds that a node " +"awaits for an I/O operation. After it, the node \"fences\" itself, and you " +"will probably see a crash." +msgstr "" +"O umbral de latexo de O2CB establece o tempo máximo, en segundos, que un " +"nodo ha agardar por unha operación de E/S. Despois del, o nodo establece " +"unha barreira e, probablemente, vexa un fallo." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "It is calculated as the result of: (threshold - 1) x 2." +msgstr "Calcúlase coma resultado de: (umbral - 1) x 2." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "Its default value is 7 (12 seconds)." +msgstr "O seu valor por defecto é 7 (12 segundos)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "" +"Raise it if you have slow disks and/or crashes with kernel messages like:" +msgstr "" +"Auménteo se ten discos lentos e/ou fallos con mensaxes do núcleo semellantes " +"a:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "O2CB idle timeout:" +msgstr "Tempo de espera de inactividade para O2CB:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "" +"The O2CB idle timeout (expressed in milliseconds) is the time before a " +"network connection is considered dead." +msgstr "" +"O tempo de espera de inactividade (expresado en milisegundos) é o tempo a " +"agardar antes de considerar morta unha conexión de rede." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "" +"Its default value is 10000 (10 seconds) and the minimum recommended value is " +"5000 (5 seconds)." +msgstr "" +"O seu valor por defecto é 10000 (10 segundos) e o valor mínimo recomendado é " +"5000 (5 segundos)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "O2CB keepalive delay:" +msgstr "Retraso de \"keepalive\" de O2CB:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "" +"The O2CB keepalive delay (expressed in milliseconds) is the maximum time " +"before a keepalive package is sent." +msgstr "" +"O retraso de \"keepalive\" de O2CB (expresado en milisegundos) é o tempo " +"máximo a agardar antes de enviar un paquete \"keepalive\"." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "" +"Its default value is 5000 (5 seconds) and the minimum recommended value is " +"1000 (1 second)." +msgstr "" +"O seu valor por defecto é 5000 (5 segundos) e o valor mínimo recomendado é " +"1000 (1 segundo)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "O2CB reconnect delay:" +msgstr "Retardo de reconexión de O2CB:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "" +"The O2CB reconnect delay (expressed in milliseconds) is the minimum time " +"between connection attempts." +msgstr "" +"O retardo de reconexión de O2CB (expresado en milisegundos) é o tempo mínimo " +"a agardar entre tentativas de reconexión." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "Its default and recommended minimum value is 2000 (2 seconds)." +msgstr "O seu valor por defecto e mínimo recomendado é 2000 (2 segundos)." diff -Nru ocfs2-tools-1.2.4.old/debian/po/nl.po ocfs2-tools-1.2.4/debian/po/nl.po --- ocfs2-tools-1.2.4.old/debian/po/nl.po 2008-06-02 06:00:27.179120740 +0200 +++ ocfs2-tools-1.2.4/debian/po/nl.po 2008-06-02 07:40:25.307118000 +0200 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: ocfs2-tools\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2007-08-16 11:58+0200\n" -"PO-Revision-Date: 2007-05-18 18:33+0100\n" +"POT-Creation-Date: 2007-08-22 01:25+0200\n" +"PO-Revision-Date: 2008-01-31 18:53+0100\n" "Last-Translator: Bart Cornelis <[EMAIL PROTECTED]>\n" "Language-Team: debian-l10n-dutch <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" @@ -80,7 +80,7 @@ #. Description #: ../ocfs2-tools.templates:4001 msgid "O2CB idle timeout:" -msgstr "" +msgstr "O2CB inactivitet-timeout:" #. Type: string #. Description @@ -89,20 +89,25 @@ "The O2CB idle timeout (expressed in milliseconds) is the time before a " "network connection is considered dead." msgstr "" +"De 02CB inactiviteit-timeout (aangegeven in milliseconden) is de tijd die " +"zonder activiteit moet verlopen voordat de netwerkverbinding als dood wordt " +"gezien." #. Type: string #. Description #: ../ocfs2-tools.templates:4001 msgid "" -"Its default value is 10000 (10 seconds) and the minimum recommended value " -"is 5000 (5 seconds)." +"Its default value is 10000 (10 seconds) and the minimum recommended value is " +"5000 (5 seconds)." msgstr "" +"De standaardwaarde is 10000 (10 seconden) en de minimum aanbevolen waarde is " +"5000 (5 seconden)." #. Type: string #. Description #: ../ocfs2-tools.templates:5001 msgid "O2CB keepalive delay:" -msgstr "" +msgstr "02CB levend-houden-vertraging:" #. Type: string #. Description @@ -111,22 +116,25 @@ "The O2CB keepalive delay (expressed in milliseconds) is the maximum time " "before a keepalive package is sent." msgstr "" +"De 02CB levend-houden-vertraging (aangegeven in milliseconden) is de " +"maximale tijd die mag verlopen alvorens een 'hou-levend'-pakket verstuurd " +"wordt. " #. Type: string #. Description #: ../ocfs2-tools.templates:5001 -#, fuzzy -#| msgid "Its default value is 7 (12 seconds)." msgid "" "Its default value is 5000 (5 seconds) and the minimum recommended value is " "1000 (1 second)." -msgstr "De standaardwaarde is 7 (12 seconden)." +msgstr "" +"De standaardwaarde is 5000 (5 seconden) en de minimum aanbevolen waarde is " +"1000 (1 seconde)." #. Type: string #. Description #: ../ocfs2-tools.templates:6001 msgid "O2CB reconnect delay:" -msgstr "" +msgstr "02CB herverbindingsvertraging:" #. Type: string #. Description @@ -135,11 +143,11 @@ "The O2CB reconnect delay (expressed in milliseconds) is the minimum time " "between connection attempts." msgstr "" +"De 02CB herverbindingsverlaging (aangegeven in milliseconden) is de minimum " +"tijd tussen twee verbindingspogingen. " #. Type: string #. Description #: ../ocfs2-tools.templates:6001 -#, fuzzy -#| msgid "Its default value is 7 (12 seconds)." msgid "Its default and recommended minimum value is 2000 (2 seconds)." -msgstr "De standaardwaarde is 7 (12 seconden)." +msgstr "De standaard en aanbevolen minimumwaarde is 2000 (2 seconden)." diff -Nru ocfs2-tools-1.2.4.old/debian/po/pt.po ocfs2-tools-1.2.4/debian/po/pt.po --- ocfs2-tools-1.2.4.old/debian/po/pt.po 1970-01-01 01:00:00.000000000 +0100 +++ ocfs2-tools-1.2.4/debian/po/pt.po 2008-06-03 23:56:02.242813000 +0200 @@ -0,0 +1,142 @@ +# Portuguese translation of ocfs2-tools. +# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the ocfs2-tools package. +# Rui Branco <[EMAIL PROTECTED]>, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: ocfs2-tools\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED]" +"POT-Creation-Date: 2007-08-22 01:25+0200\n" +"PO-Revision-Date: 2008-06-02 19:31+0100\n" +"Last-Translator: Rui Branco <[EMAIL PROTECTED]>\n" +"Language-Team: Portuguese <[EMAIL PROTECTED]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../ocfs2-tools.templates:1001 +msgid "Would you like to start an OCFS2 cluster (O2CB) at boot time?" +msgstr "Deseja iniciar o cluster OCFS2·(O2CB) durante o arranque do sistema?" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:2001 +msgid "Name of the cluster to start at boot time:" +msgstr "Nome do cluster a iniciar durante o arranque do sistema:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "O2CB heartbeat threshold:" +msgstr "Limite de \"batimento cardíaco\" do O2CB:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "" +"The O2CB heartbeat threshold sets up the maximum time in seconds that a node " +"awaits for an I/O operation. After it, the node \"fences\" itself, and you " +"will probably see a crash." +msgstr "" +"O limite de \"batimento cardíaco\" do O2CB define o tempo máximo em segundos " +"em que um 'node' espera por uma operação de I/O. Após este tempo, o 'node' " +"\"fecha-se sobre ele próprio\" e provavelmente verá um crash." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "It is calculated as the result of: (threshold - 1) x 2." +msgstr "Está calculado como o resultado de:(limite - 1) x 2." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "Its default value is 7 (12 seconds)." +msgstr "O valor por omissão é de 7 (12 segundos)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:3001 +msgid "" +"Raise it if you have slow disks and/or crashes with kernel messages like:" +msgstr "" +"Aumente o valor se tiver discos lentos e/ou 'crashes' com mensagens do " +"kernel como:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "O2CB idle timeout:" +msgstr "Tempo limite de inactividade do O2CB:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "" +"The O2CB idle timeout (expressed in milliseconds) is the time before a " +"network connection is considered dead." +msgstr "" +"O tempo limite de inactividade do O2CB (expresso em milisegundos) " +"corresponde ao tempo antes do qual uma ligação de rede é considerada " +"inactiva." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:4001 +msgid "" +"Its default value is 10000 (10 seconds) and the minimum recommended value is " +"5000 (5 seconds)." +msgstr "" +"O valor por omissão é de 10000 (10 segundos) e o valor minimo recomendado de " +"5000 (5 segundos)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "O2CB keepalive delay:" +msgstr "Atraso de manutenção da ligação O2CB:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "" +"The O2CB keepalive delay (expressed in milliseconds) is the maximum time " +"before a keepalive package is sent." +msgstr "" +"O atraso de manutenção da ligação (expresso em milisegundos) corresponde ao " +"tempo máximo antes do qual um pacote de manutenção da ligação é enviado." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:5001 +msgid "" +"Its default value is 5000 (5 seconds) and the minimum recommended value is " +"1000 (1 second)." +msgstr "" +"O valor por omissão é de 5000 (5 segundos) e o valor minimo recomendado de " +"1000 (1 segundos)." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "O2CB reconnect delay:" +msgstr "Atraso de re-ligação O2CB:" + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "" +"The O2CB reconnect delay (expressed in milliseconds) is the minimum time " +"between connection attempts." +msgstr "" +"O atraso de re-ligação (expresso em milisegundos) corresponde ao tempo " +"minimo entre tentivas de ligação." + +#. Type: string +#. Description +#: ../ocfs2-tools.templates:6001 +msgid "Its default and recommended minimum value is 2000 (2 seconds)." +msgstr "O valor por omissão e minimo recomemndado é de 2000 (2 segundos)." diff -Nru ocfs2-tools-1.2.4.old/patches/Makefile ocfs2-tools-1.2.4/patches/Makefile --- ocfs2-tools-1.2.4.old/patches/Makefile 2008-06-02 06:00:26.727119999 +0200 +++ ocfs2-tools-1.2.4/patches/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -TOPDIR = .. - -include $(TOPDIR)/Preamble.make - -DIST_FILES = README mountocfs2support.patch libblkidocfs2support.patch - -include $(TOPDIR)/Postamble.make diff -Nru ocfs2-tools-1.2.4.old/patches/README ocfs2-tools-1.2.4/patches/README --- ocfs2-tools-1.2.4.old/patches/README 2008-06-02 06:00:26.727119999 +0200 +++ ocfs2-tools-1.2.4/patches/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -mountocfs2support.patch patch for mount(8) to autodetect ocfs/ocfs2 and - to mount ocfs2 by label and uuid diff -Nru ocfs2-tools-1.2.4.old/patches/libblkidocfs2support.patch ocfs2-tools-1.2.4/patches/libblkidocfs2support.patch --- ocfs2-tools-1.2.4.old/patches/libblkidocfs2support.patch 2008-06-02 06:00:26.727119999 +0200 +++ ocfs2-tools-1.2.4/patches/libblkidocfs2support.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,72 +0,0 @@ ---- probe.h.ocfs2 2004-09-15 17:11:55.000000000 -0700 -+++ probe.h 2004-09-15 17:12:53.000000000 -0700 -@@ -234,6 +234,21 @@ - - #define OCFS_MAGIC "OracleCFS" - -+struct ocfs2_super_block { -+ u_char signature[8]; -+ u_char s_dummy1[184]; -+ u_char s_dummy2[80]; -+ u_char s_label[64]; -+ u_char s_uuid[16]; -+}; -+ -+#define OCFS2_MIN_BLOCKSIZE 512 -+#define OCFS2_MAX_BLOCKSIZE 4096 -+ -+#define OCFS2_SUPER_BLOCK_BLKNO 2 -+ -+#define OCFS2_SUPER_BLOCK_SIGNATURE "OCFSV2" -+ - #define ISODCL(from, to) (to - from + 1) - struct iso_volume_descriptor { - char type[ISODCL(1,1)]; /* 711 */ ---- probe.c.ocfs2 2004-09-15 17:11:55.000000000 -0700 -+++ probe.c 2004-09-15 17:12:53.000000000 -0700 -@@ -327,9 +327,7 @@ - - major = ocfsmajor(ovh); - if (major == 1) -- blkid_set_tag(dev,"SEC_TYPE","ocfs1",sizeof("ocfs1")); -- else if (major == 2) -- blkid_set_tag(dev,"SEC_TYPE","ocfs2",sizeof("ocfs2")); -+ blkid_set_tag(dev,"SEC_TYPE","ocfs1",sizeof("ocfs")); - else if (major >= 9) - blkid_set_tag(dev,"SEC_TYPE","ntocfs",sizeof("ntocfs")); - -@@ -339,6 +337,21 @@ - return 0; - } - -+static int probe_ocfs2(int fd __BLKID_ATTR((unused)), -+ blkid_cache cache __BLKID_ATTR((unused)), -+ blkid_dev dev, -+ struct blkid_magic *id __BLKID_ATTR((unused)), -+ unsigned char *buf) -+{ -+ struct ocfs2_super_block *osb; -+ -+ osb = (struct ocfs2_super_block *)buf; -+ -+ blkid_set_tag(dev, "LABEL", osb->s_label, sizeof(osb->s_label)); -+ set_uuid(dev, osb->s_uuid); -+ return 0; -+} -+ - /* - * BLKID_BLK_OFFS is at least as large as the highest bim_kboff defined - * in the type_array table below + bim_kbalign. -@@ -398,7 +411,11 @@ - { "swap", 0, 0x1ff6, 10, "SWAPSPACE2", 0 }, - { "swap", 0, 0x3ff6, 10, "SWAP-SPACE", 0 }, - { "swap", 0, 0x3ff6, 10, "SWAPSPACE2", 0 }, -- { "ocfs", 0, 8, 9, "OracleCFS", probe_ocfs }, -+ { "ocfs", 0, 8, 9, "OracleCFS", probe_ocfs }, -+ { "ocfs2", 1, 0, 6, "OCFSV2", probe_ocfs2 }, -+ { "ocfs2", 2, 0, 6, "OCFSV2", probe_ocfs2 }, -+ { "ocfs2", 4, 0, 6, "OCFSV2", probe_ocfs2 }, -+ { "ocfs2", 8, 0, 6, "OCFSV2", probe_ocfs2 }, - { NULL, 0, 0, 0, NULL, NULL } - }; - diff -Nru ocfs2-tools-1.2.4.old/patches/mountocfs2support.patch ocfs2-tools-1.2.4/patches/mountocfs2support.patch --- ocfs2-tools-1.2.4.old/patches/mountocfs2support.patch 2008-06-02 06:00:26.727119999 +0200 +++ ocfs2-tools-1.2.4/patches/mountocfs2support.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,112 +0,0 @@ ---- util-linux-2.11y/mount/linux_fs.h.ocfs2 2004-09-15 15:51:45.000000000 -0700 -+++ util-linux-2.11y/mount/linux_fs.h 2004-09-15 15:53:25.000000000 -0700 -@@ -231,6 +231,21 @@ - #define ocfslabellen(o) assemble2le(o.label_len) - #define OCFS_MAGIC "OracleCFS" - -+struct ocfs2_super_block { -+ u_char signature[8]; -+ u_char s_dummy1[184]; -+ u_char s_dummy2[80]; -+ u_char s_label[64]; -+ u_char s_uuid[16]; -+}; -+ -+#define OCFS2_MIN_BLOCKSIZE 512 -+#define OCFS2_MAX_BLOCKSIZE 4096 -+ -+#define OCFS2_SUPER_BLOCK_BLKNO 2 -+ -+#define OCFS2_SUPER_BLOCK_SIGNATURE "OCFSV2" -+ - static inline int - assemble2le(unsigned char *p) { - return (p[0] | (p[1] << 8)); ---- util-linux-2.11y/mount/get_label_uuid.c.ocfs2 2004-09-15 15:51:45.000000000 -0700 -+++ util-linux-2.11y/mount/get_label_uuid.c 2004-09-15 15:53:25.000000000 -0700 -@@ -90,6 +90,8 @@ - struct jfs_super_block jfssb; - struct ocfs_volume_header ovh; /* Oracle */ - struct ocfs_volume_label olbl; -+ struct ocfs2_super_block osb; -+ int blksize, blkoff; - - fd = open(device, O_RDONLY); - if (fd < 0) -@@ -148,6 +150,27 @@ - } - rv = 0; - } -+ else { -+ for (blksize = OCFS2_MIN_BLOCKSIZE; -+ blksize <= OCFS2_MAX_BLOCKSIZE; -+ blksize <<= 1) { -+ blkoff = blksize * OCFS2_SUPER_BLOCK_BLKNO; -+ if (lseek(fd, blkoff, SEEK_SET) == blkoff -+ && read(fd, (char *) &osb, -+ sizeof(osb)) == sizeof(osb) -+ && (strncmp(osb.signature, -+ OCFS2_SUPER_BLOCK_SIGNATURE, -+ sizeof(OCFS2_SUPER_BLOCK_SIGNATURE)) -+ == 0)) { -+ memcpy(uuid, osb.s_uuid, sizeof(osb.s_uuid)); -+ namesize = sizeof(osb.s_label); -+ if ((*label = calloc(namesize, 1)) != NULL) -+ memcpy(*label, osb.s_label, namesize); -+ rv = 0; -+ break; -+ } -+ } -+ } - - close(fd); - return rv; ---- util-linux-2.11y/mount/mount_guess_fstype.c.ocfs2 2002-11-25 03:42:21.000000000 -0800 -+++ util-linux-2.11y/mount/mount_guess_fstype.c 2004-09-15 15:53:25.000000000 -0700 -@@ -243,6 +243,7 @@ - struct fat_super_block fatsb; - struct xfs_super_block xfsb; - struct cramfs_super_block cramfssb; -+ struct ocfs_volume_header ovh; - } xsb; - struct ufs_super_block ufssb; - union { -@@ -255,6 +256,7 @@ - struct hpfs_super_block hpfssb; - struct adfs_super_block adfssb; - struct sysv_super_block svsb; -+ struct ocfs2_super_block osb; - struct stat statbuf; - - /* opening and reading an arbitrary unknown path can have -@@ -284,6 +286,8 @@ - type = "romfs"; - else if(!strncmp(xsb.xfsb.s_magic, XFS_SUPER_MAGIC, 4)) - type = "xfs"; -+ else if(!strncmp(xsb.ovh.signature, OCFS_MAGIC, sizeof(OCFS_MAGIC))) -+ type = "ocfs"; - else if(!strncmp(xsb.qnx4fs_magic+4, "QNX4FS", 6)) - type = "qnx4"; - else if(xsb.bfs_magic == 0x1badface) -@@ -457,6 +461,21 @@ - } - - if (!type) { -+ int blksize, blkoff; -+ for (blksize = OCFS2_MIN_BLOCKSIZE; -+ blksize <= OCFS2_MAX_BLOCKSIZE; -+ blksize <<= 1) { -+ blkoff = blksize * OCFS2_SUPER_BLOCK_BLKNO; -+ if (lseek(fd, blkoff, SEEK_SET) != blkoff -+ || read(fd, (char *) &osb, sizeof(osb)) != sizeof(osb)) -+ goto io_error; -+ if (strncmp(osb.signature, OCFS2_SUPER_BLOCK_SIGNATURE, -+ sizeof(OCFS2_SUPER_BLOCK_SIGNATURE)) == 0) -+ type = "ocfs2"; -+ } -+ } -+ -+ if (!type) { - /* perhaps the user tries to mount the swap space - on a new disk; warn her before she does mke2fs on it */ - int pagesize = getpagesize();
signature.asc
Description: Digital signature
