summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntti-Juhani Kaijanaho <ajk@debian.org>2012-04-21 11:15:32 +0300
committerAntti-Juhani Kaijanaho <ajk@debian.org>2012-04-21 11:15:32 +0300
commit2a9a9ac272a55fe53f0d452a4ee2a2b81e7f8d4c (patch)
tree56cbe1143eebd9c6d255b748a4e0f6ec00f9d8a2
parent6eadbc12178bcd830afce702793edd22fe8db68b (diff)
parent366c2484427113f1856e66ab230f765dc977745c (diff)
downloaddctrl-tools-2a9a9ac272a55fe53f0d452a4ee2a2b81e7f8d4c.tar.gz
Merge commit '2.21.1'
-rw-r--r--debian/changelog20
-rw-r--r--debian/control2
-rw-r--r--langs.mk2
-rw-r--r--man/po4a/po/de.po71
-rw-r--r--man/po4a/po/fr.po82
-rw-r--r--po/cs.po90
-rw-r--r--po/da.po4
-rw-r--r--po/en_GB.po507
-rw-r--r--po/es.po6
-rw-r--r--po/fi.po8
-rw-r--r--po/fr.po8
-rw-r--r--po/ja.po147
-rw-r--r--po/ru.po12
13 files changed, 170 insertions, 789 deletions
diff --git a/debian/changelog b/debian/changelog
index 4832d49..cc902fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,29 @@
-dctrl-tools (2.21) unstable; urgency=low
+dctrl-tools (2.21.1) unstable; urgency=low
* grep-dctrl: Remove the old dead annoying banner code.
* grep-dctrl: Hardcode default input file names.
- The /etc/grep-dctrl.rc conffile is removed upon package upgrade.
- grep-dctrl.1.cp: Updated to match.
* grep-dctrl.1.cp: Fix indentation.
+ * Update Standards-Version to 3.9.3 with no other changes needed.
[ Program translations ]
- * Danish, by Joe Hansen (closes: #654519).
+ * Danish, by Joe Hansen (closes: #654519, #664157).
+ * German, by Gerfried Fuchs.
+ * Japanese, by Noritada Kobayashi.
+ * Russian, by Yuri Kozlov (closes: #663608).
+ * English – United Kingdom removed.
+ * French, by David Prévot.
+ * Catalan, by Jordi Mallach.
+ * Spanish, by Javier Fernández-Sanguino (closes: #664963).
+ * Czech, by Miroslav Kure (closes: #665365).
+ * Finnish, by Antti-Juhani Kaijanaho.
+
+ [ Documentation translations ]
+ * French, by David Prévot.
+ * German, by Chris Leick (closes: #664783).
- -- Antti-Juhani Kaijanaho <ajk@debian.org> Tue, 17 Jan 2012 21:13:38 -0400
+ -- Antti-Juhani Kaijanaho <ajk@debian.org> Sat, 31 Mar 2012 21:10:48 +0300
dctrl-tools (2.20.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3c3d858..16b2d41 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
Priority: optional
Maintainer: dctrl-tools developers <dctrl-tools-devel@lists.alioth.debian.org>
Uploaders: Antti-Juhani Kaijanaho <ajk@debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Build-Depends: gettext (>= 0.11-0), gcc (>= 3.0), debhelper (>= 8), po4a (>= 0.40)
Vcs-Git: git://git.debian.org/git/collab-maint/dctrl-tools.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/dctrl-tools.git;a=summary
diff --git a/langs.mk b/langs.mk
index 8a99819..ac7a14e 100644
--- a/langs.mk
+++ b/langs.mk
@@ -1 +1 @@
-langs = ca cs da de en_GB es fi fr it ja pl pt_BR ru sv vi
+langs = ca cs da de es fi fr it ja pl pt_BR ru sv vi
diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po
index 9a702f2..31fa622 100644
--- a/man/po4a/po/de.po
+++ b/man/po4a/po/de.po
@@ -1,14 +1,14 @@
# Translation of the dctrl-tools documentation to German.
# Copyright (C) 1999-2010 Antti-Juhani Kaijanaho.
# This file is distributed under the same license as the dctrl-tools package.
-# Copyright (C) of this file 2011 Chris Leick.
+# Copyright (C) of this file 2011, 2012 Chris Leick.
#
msgid ""
msgstr ""
-"Project-Id-Version: dctrl-tools 2.20.1\n"
+"Project-Id-Version: dctrl-tools 2.21.1\n"
"Report-Msgid-Bugs-To: dctrl-tools@packages.debian.org\n"
"POT-Creation-Date: 2012-03-05 20:13-0400\n"
-"PO-Revision-Date: 2011-12-07 22:22+0100\n"
+"PO-Revision-Date: 2012-03-12 18:22+0100\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
@@ -25,10 +25,9 @@ msgstr "GREP-DCTRL"
#. type: TH
#: man/grep-dctrl.1.cp:1
-#, fuzzy, no-wrap
-#| msgid "2011-11-13"
+#, no-wrap
msgid "2011-12-18"
-msgstr "13. November 2011"
+msgstr "18. Dezember 2011"
#. type: TH
#: man/grep-dctrl.1.cp:1 man/sort-dctrl.1:1 man/sync-available.8:1
@@ -124,13 +123,6 @@ msgstr ""
#. type: Plain text
#: man/grep-dctrl.1.cp:67
-#, fuzzy
-#| msgid ""
-#| "The programs B<grep-available>, B<grep-status>, B<grep-aptavail> and "
-#| "B<grep-debtags> are aliases of (actually, symbolic links to) B<grep-"
-#| "dctrl>. In the shipped configuration, these aliases use as their default "
-#| "input the B<dpkg>(1) I<available> and I<status> files, the B<apt-cache "
-#| "dumpavail> output and the B<debtags dumpavail> output, respectively."
msgid ""
"The programs B<grep-available>, B<grep-status>, B<grep-aptavail> and B<grep-"
"debtags> are aliases of (actually, symbolic links to) B<grep-dctrl>. These "
@@ -140,10 +132,9 @@ msgid ""
msgstr ""
"Die Programme B<grep-available>, B<grep-status>, B<grep-aptavail> und B<grep-"
"debtags> sind Aliase für (tatsächlich symbolische Verweise auf) B<grep-"
-"dctrl>. In der mitgelieferten Konfiguration benutzen diese Aliase als ihre "
-"Standardeingabe die Dateien I<available> und I<status> von B<dpkg>(1), "
-"beziehungsweise die Ausgabe von B<apt-cache dumpavail> und B<debtags "
-"dumpavail>."
+"dctrl>. Diese Aliase benutzen als ihre Standardeingabe die Dateien "
+"I<available> und I<status> von B<dpkg>(1) beziehungsweise die Ausgabe von "
+"B<apt-cache dumpavail> und B<debtags dumpavail>."
#. type: Plain text
#: man/grep-dctrl.1.cp:86
@@ -210,17 +201,6 @@ msgstr ""
#. type: Plain text
#: man/grep-dctrl.1.cp:134
-#, fuzzy
-#| msgid ""
-#| "After the I<filter> expression comes zero or more I<file> names. If no "
-#| "I<file> names are specified, the I<file> name is searched in "
-#| "configuration files. The input I<file> in association with the correct "
-#| "program name is used. The program names are matched with the base form "
-#| "of the name of the current program (the 0'th command line argument, if "
-#| "you will). The I<file> name B<-> is taken to mean the standard input "
-#| "stream. The I<file>s are searched in order but separately; they are "
-#| "B<not> concatenated together. In other words, the end of a I<file> "
-#| "always implies the end of the current paragraph."
msgid ""
"After the I<filter> expression comes zero or more I<file> names. The "
"I<file> name B<-> is taken to mean the standard input stream. The I<file>s "
@@ -228,16 +208,11 @@ msgid ""
"together. In other words, the end of a I<file> always implies the end of "
"the current paragraph."
msgstr ""
-"Nach dem I<Filter>ausdruck kommen keine oder mehr I<Datei>namen. Falls keine "
-"I<Datei>namen angegeben werden, wird der I<Datei>name in "
-"Konfigurationsdateien gesucht. Es wird die EingabeI<datei> in Verbindung mit "
-"dem korrekten Programmnamen benutzt. Die Programmnamen werden mit der "
-"Basisform des Namens des aktuellen Programms verglichen (das nullte "
-"Befehlszeilenargument, wenn Sie so wollen). Der I<Datei>name B<-> wird als "
-"Synonym für den Standardeingabe-Datenstrom benutzt. Die I<Datei>en werden "
-"nacheinander, aber einzeln durchsucht; sie werden I<nicht> zusammengehängt. "
-"In anderen Worten, impliziert das Ende einer I<Datei> immer das Ende des "
-"aktuellen Absatzes."
+"Nach dem I<Filter>ausdruck kommen keine oder mehr I<Datei>namen. Der "
+"I<Datei>name B<-> wird als Synonym für den Standardeingabe-Datenstrom "
+"benutzt. Die I<Datei>en werden nacheinander, aber einzeln durchsucht; sie "
+"werden I<nicht> zusammengehängt. In anderen Worten, impliziert das Ende einer "
+"I<Datei> immer das Ende des aktuellen Absatzes."
#. type: Plain text
#: man/grep-dctrl.1.cp:141
@@ -246,6 +221,10 @@ msgid ""
"default input file. The program names are matched with the base form of the "
"name of the current program (the 0'th command line argument, if you will)."
msgstr ""
+"Falls keine I<Datei>namen angegeben wurden, wird der Programmname benutzt, um "
+"eine Standardeingabedatei zu identifizieren. Die Programmnamen werden mit der "
+"Basisform des Namens des aktuellen Programms verglichen (das nullte "
+"Befehlszeilenargument, wenn Sie so wollen)."
#. type: SH
#: man/grep-dctrl.1.cp:141 man/join-dctrl.1:60 man/sort-dctrl.1:74
@@ -1416,14 +1395,8 @@ msgstr "I</var/lib/dpkg/available>"
#. type: Plain text
#: man/grep-dctrl.1.cp:589
-#, fuzzy
-#| msgid ""
-#| "The default input file of B<grep-available> when the shipped "
-#| "configuration is in effect."
msgid "The default input file of B<grep-available>."
-msgstr ""
-"die vorgegebene Eingabedatei von B<grep-available>, wenn die mitgelieferte "
-"Konfiguration in Kraft ist"
+msgstr "die vorgegebene Eingabedatei von B<grep-available>"
#. type: IP
#: man/grep-dctrl.1.cp:589
@@ -1433,14 +1406,8 @@ msgstr "I</var/lib/dpkg/status>"
#. type: Plain text
#: man/grep-dctrl.1.cp:592
-#, fuzzy
-#| msgid ""
-#| "The default input file of B<grep-status> when the shipped configuration "
-#| "is in effect."
msgid "The default input file of B<grep-status>."
-msgstr ""
-"die vorgegebene Eingabedatei von B<grep-status>, wenn die mitgelieferte "
-"Konfiguration in Kraft ist"
+msgstr "die vorgegebene Eingabedatei von B<grep-status>"
#. type: SH
#: man/grep-dctrl.1.cp:592 man/join-dctrl.1:240 man/sort-dctrl.1:151
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 6efeb17..be5b3fa 100644
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -1,13 +1,13 @@
# Translation of dctrl-tools manual pages to French
-# Copyright (C) 2011 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# Copyright (C) 2011, 2012 Debian French l10n team <debian-l10n-french@lists.debian.org>
# This file is distributed under the same license as the dctrl-tools package.
#
-# David Prévot <david@tilapin.org>, 2011.
+# David Prévot <david@tilapin.org>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: dctrl-tools\n"
-"POT-Creation-Date: 2012-03-05 20:13-0400\n"
-"PO-Revision-Date: 2011-12-07 18:47-0400\n"
+"POT-Creation-Date: 2012-03-05 21:58-0400\n"
+"PO-Revision-Date: 2012-03-05 21:55-0400\n"
"Last-Translator: David Prévot <david@tilapin.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: fr\n"
@@ -25,10 +25,9 @@ msgstr "GREP-DCTRL"
#. type: TH
#: man/grep-dctrl.1.cp:1
-#, fuzzy, no-wrap
-#| msgid "2011-11-13"
+#, no-wrap
msgid "2011-12-18"
-msgstr "13 novembre 2011"
+msgstr "18 décembre 2011"
#. type: TH
#: man/grep-dctrl.1.cp:1 man/sort-dctrl.1:1 man/sync-available.8:1
@@ -125,13 +124,6 @@ msgstr ""
#. type: Plain text
#: man/grep-dctrl.1.cp:67
-#, fuzzy
-#| msgid ""
-#| "The programs B<grep-available>, B<grep-status>, B<grep-aptavail> and "
-#| "B<grep-debtags> are aliases of (actually, symbolic links to) B<grep-"
-#| "dctrl>. In the shipped configuration, these aliases use as their default "
-#| "input the B<dpkg>(1) I<available> and I<status> files, the B<apt-cache "
-#| "dumpavail> output and the B<debtags dumpavail> output, respectively."
msgid ""
"The programs B<grep-available>, B<grep-status>, B<grep-aptavail> and B<grep-"
"debtags> are aliases of (actually, symbolic links to) B<grep-dctrl>. These "
@@ -141,9 +133,9 @@ msgid ""
msgstr ""
"Les programmes B<grep-available>, B<grep-status>, B<grep-aptavail> et B<grep-"
"debtags> sont des alias de (en réalité, des liens symboliques vers) B<grep-"
-"dctrl>. Dans la configuration par défaut, ces alias utilisent en entrée "
-"respectivement les fichiers I<available> et I<status> de B<dpkg>(1), la "
-"sortie de B<apt-cache dumpavail>, et celle de B<debtags dumpavail>."
+"dctrl>. Ces alias utilisent en entrée respectivement les fichiers "
+"I<available> et I<status> de B<dpkg>(1), la sortie de B<apt-cache "
+"dumpavail>, et celle de B<debtags dumpavail>."
#. type: Plain text
#: man/grep-dctrl.1.cp:86
@@ -209,17 +201,6 @@ msgstr ""
#. type: Plain text
#: man/grep-dctrl.1.cp:134
-#, fuzzy
-#| msgid ""
-#| "After the I<filter> expression comes zero or more I<file> names. If no "
-#| "I<file> names are specified, the I<file> name is searched in "
-#| "configuration files. The input I<file> in association with the correct "
-#| "program name is used. The program names are matched with the base form "
-#| "of the name of the current program (the 0'th command line argument, if "
-#| "you will). The I<file> name B<-> is taken to mean the standard input "
-#| "stream. The I<file>s are searched in order but separately; they are "
-#| "B<not> concatenated together. In other words, the end of a I<file> "
-#| "always implies the end of the current paragraph."
msgid ""
"After the I<filter> expression comes zero or more I<file> names. The "
"I<file> name B<-> is taken to mean the standard input stream. The I<file>s "
@@ -228,14 +209,10 @@ msgid ""
"the current paragraph."
msgstr ""
"L'expression I<filtre> est suivie de zéro ou plusieurs noms de I<fichier>. "
-"Si aucun nom de I<fichier> n'est précisé, le nom de I<fichier> est recherché "
-"dans les fichiers de configuration. Le I<fichier> d'entrée associé au nom de "
-"programme valable est utilisé. Les noms de programme correspondent à la "
-"forme du nom de programme actuel (l'argument zéro de la ligne de commande si "
-"vous préférez). Le nom de I<fichier> B<-> est utilisé pour désigner le flux "
-"d'entrée standard. Les I<fichier>s sont parcourus dans l'ordre, mais un par "
-"un : ils ne sont B<pas> concaténés. Autrement dit, la fin d'un I<fichier> "
-"indique toujours la fin d'un paragraphe."
+"Le nom de I<fichier> B<-> est utilisé pour désigner le flux d'entrée "
+"standard. Les I<fichier>s sont parcourus dans l'ordre, mais un par un : ils "
+"ne sont B<pas> concaténés. Autrement dit, la fin d'un I<fichier> indique "
+"toujours la fin d'un paragraphe."
#. type: Plain text
#: man/grep-dctrl.1.cp:141
@@ -244,6 +221,10 @@ msgid ""
"default input file. The program names are matched with the base form of the "
"name of the current program (the 0'th command line argument, if you will)."
msgstr ""
+"Si aucun nom de I<fichier> n'est précisé, le nom de programme est utilisé "
+"pour identifier le fichier d'entrée par défaut. Les noms de programme "
+"correspondent à la forme du nom de programme actuel (l'argument zéro de la "
+"ligne de commande si vous préférez). "
#. type: SH
#: man/grep-dctrl.1.cp:141 man/join-dctrl.1:60 man/sort-dctrl.1:74
@@ -841,7 +822,7 @@ msgid ""
"redirect or pipe it somewhere (such as your favourite pager)."
msgstr ""
"Afficher la licence. La sortie est particulièrement longue, veuillez la "
-"rediriger quelque part, ou utiliser une conduite (vers votre afficheur de "
+"rediriger quelque part, ou utiliser un tube (vers votre afficheur de "
"texte préféré par exemple)."
#. type: TP
@@ -1034,7 +1015,7 @@ msgid ""
msgstr ""
"Toutes les requêtes précédentes sont basées sur de simples recherches de "
"sous-chaînes. Mais B<grep-dctrl> peut gérer des expressions rationnelles "
-"dans les motif de recherche. Par exemple, pour voir les enregistrement "
+"dans les motifs de recherche. Par exemple, pour voir les enregistrements "
"d'état de tous les paquets ayant soit « apt » soit « dpkg » dans leurs noms, "
"utiliser"
@@ -1403,14 +1384,8 @@ msgstr "I</var/lib/dpkg/available>"
#. type: Plain text
#: man/grep-dctrl.1.cp:589
-#, fuzzy
-#| msgid ""
-#| "The default input file of B<grep-available> when the shipped "
-#| "configuration is in effect."
msgid "The default input file of B<grep-available>."
-msgstr ""
-"Le fichier d'entrée par défaut de B<grep-available> quand la configuration "
-"d'origine est utilisée."
+msgstr "Le fichier d'entrée par défaut de B<grep-available>."
#. type: IP
#: man/grep-dctrl.1.cp:589
@@ -1420,14 +1395,8 @@ msgstr "I</var/lib/dpkg/status>"
#. type: Plain text
#: man/grep-dctrl.1.cp:592
-#, fuzzy
-#| msgid ""
-#| "The default input file of B<grep-status> when the shipped configuration "
-#| "is in effect."
msgid "The default input file of B<grep-status>."
-msgstr ""
-"Le fichier d'entrée par défaut de B<grep-status> quand la configuration "
-"d'origine est utilisée."
+msgstr "Le fichier d'entrée par défaut de B<grep-status>."
#. type: SH
#: man/grep-dctrl.1.cp:592 man/join-dctrl.1:240 man/sort-dctrl.1:151
@@ -1548,7 +1517,7 @@ msgstr ""
#. type: Plain text
#: man/join-dctrl.1:60
msgid "The B<sort-dctrl>(1) program can be used to make it so."
-msgstr "Le programme B<sort-dctrl>(1) peut-être utilisé pour ce faire."
+msgstr "Le programme B<sort-dctrl>(1) peut être utilisé pour ce faire."
#. type: IP
#: man/join-dctrl.1:61
@@ -1813,7 +1782,7 @@ msgid ""
"The standard locale environment, specifically its character set setting, "
"affects the interpretation of input and output as character streams."
msgstr ""
-"Les paramètres régionaux de d'environnement, en particulier la configuration "
+"Les paramètres régionaux de l'environnement, en particulier la configuration "
"du jeu de caractères, a une incidence sur l'interprétation des flux de "
"caractères en entrée et en sortie."
@@ -2517,7 +2486,7 @@ msgid ""
"B<tbl-dctrl> will read its input from the files named on the command line, "
"in the specified order."
msgstr ""
-"B<tbl-dctrl> lira son entrée à partir des fichier nommées sur la ligne de "
+"B<tbl-dctrl> lira son entrée à partir des fichiers nommés sur la ligne de "
"commande, dans l'ordre indiqué."
#. type: Plain text
@@ -2687,7 +2656,8 @@ msgstr ""
#~ "Vous devriez aussi toujours indiquer le fichier B<->."
#~ msgid "Not all features have been with us in every version"
-#~ msgstr "Les fonctionnalités n'ont pas toujours été présentes dans chaque version"
+#~ msgstr ""
+#~ "Les fonctionnalités n'ont pas toujours été présentes dans chaque version"
#~ msgid ""
#~ "Check if any of the features you use is mentioned in the changelog. Use "
diff --git a/po/cs.po b/po/cs.po
index af42052..519d7c9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,14 +1,14 @@
# Czech translation of dctrl-tools.
# Copyright (C) YEAR Antti-Juhani Kaijanaho
# This file is distributed under the same license as the dctrl-tools package.
-# Miroslav Kure <kurem@debian.cz>, 2006, 2008, 2010.
+# Miroslav Kure <kurem@debian.cz>, 2006, 2008, 2010, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: dctrl-tools\n"
"Report-Msgid-Bugs-To: ajk@debian.org\n"
"POT-Creation-Date: 2012-03-05 20:13-0400\n"
-"PO-Revision-Date: 2010-08-25 18:25+0200\n"
+"PO-Revision-Date: 2012-03-23 15:17+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
"Language: cs\n"
@@ -84,7 +84,7 @@ msgstr "grep-dctrl -- vyhledává v debianích souborech control"
#: grep-dctrl/grep-dctrl.c:51
msgid "FILTER [FILENAME...]"
-msgstr ""
+msgstr "FILTR [JMÉNOSOUBORU...]"
#: grep-dctrl/grep-dctrl.c:69 sort-dctrl/sort-dctrl.c:39
#: tbl-dctrl/tbl-dctrl.c:42 join-dctrl/join-dctrl.c:45
@@ -92,10 +92,8 @@ msgid "LEVEL"
msgstr "ÚROVEŇ"
#: grep-dctrl/grep-dctrl.c:69
-#, fuzzy
-#| msgid "Set debugging level to LEVEL."
msgid "Set log level to LEVEL."
-msgstr "Nastaví ladicí úroveň na ÚROVEŇ."
+msgstr "Nastaví logovací úroveň na ÚROVEŇ."
#: grep-dctrl/grep-dctrl.c:70 grep-dctrl/grep-dctrl.c:73
msgid "FIELD,FIELD,..."
@@ -133,11 +131,9 @@ msgstr ""
"Bude se vzorem pracovat jako s rozšířeným POSIXovým regulárním výrazem."
#: grep-dctrl/grep-dctrl.c:77
-#, fuzzy
-#| msgid "Regard the pattern as an extended POSIX regular expression."
msgid "Regard the pattern as a standard POSIX regular expression."
msgstr ""
-"Bude se vzorem pracovat jako s rozšířeným POSIXovým regulárním výrazem."
+"Bude se vzorem pracovat jako se standardním POSIXovým regulárním výrazem."
#: grep-dctrl/grep-dctrl.c:78
msgid "Ignore case when looking for a match."
@@ -165,42 +161,32 @@ msgid "Print out the copyright license."
msgstr "Vytiskne licenci."
#: grep-dctrl/grep-dctrl.c:84
-#, fuzzy
-#| msgid "Conjunct predicates."
msgid "Conjunct filters."
-msgstr "Konjunkce predikátů."
+msgstr "Konjunkce filtrů."
#: grep-dctrl/grep-dctrl.c:85
-#, fuzzy
-#| msgid "Disjunct predicates."
msgid "Disjunct filters."
-msgstr "Disjunkce predikátů."
+msgstr "Disjunkce filtrů."
#: grep-dctrl/grep-dctrl.c:86
-#, fuzzy
-#| msgid "Negate the following predicate."
msgid "Negate the following filters."
-msgstr "Neguje následující predikát."
+msgstr "Neguje následující filtry."
#: grep-dctrl/grep-dctrl.c:87
msgid "Test for version number equality."
msgstr "Testuje rovnost čísla verze."
#: grep-dctrl/grep-dctrl.c:88
-#, fuzzy
-#| msgid "Version number comparison: <."
msgid "Version number comparison: <<."
-msgstr "Porovnání čísla verze: <."
+msgstr "Porovnání čísla verze: <<."
#: grep-dctrl/grep-dctrl.c:89
msgid "Version number comparison: <=."
msgstr "Porovnání čísla verze: <=."
#: grep-dctrl/grep-dctrl.c:90
-#, fuzzy
-#| msgid "Version number comparison: >."
msgid "Version number comparison: >>."
-msgstr "Porovnání čísla verze: >."
+msgstr "Porovnání čísla verze: >>."
#: grep-dctrl/grep-dctrl.c:91
msgid "Version number comparison: >=."
@@ -237,17 +223,15 @@ msgstr "Shoduje se pouze s celými názvy balíků (implikuje -e)"
#: grep-dctrl/grep-dctrl.c:99
msgid "Ensure that the output is in dctrl format (overridden by -n)"
-msgstr ""
+msgstr "Zajistí, že je výstup ve formátu dctrl (přebito -n)"
#: grep-dctrl/grep-dctrl.c:100
msgid "Override the effect of an earlier --ensure-dctrl"
-msgstr ""
+msgstr "Přebije význam dřívějšího --ensure-dctrl "
#: grep-dctrl/grep-dctrl.c:186
-#, fuzzy
-#| msgid "predicate is too long"
msgid "filter is too long"
-msgstr "predikát je příliš dlouhý"
+msgstr "filtr je příliš dlouhý"
#: grep-dctrl/grep-dctrl.c:247 grep-dctrl/grep-dctrl.c:775
#: join-dctrl/join-dctrl.c:113
@@ -261,60 +245,46 @@ msgid "no such log level '%s'"
msgstr "úroveň logování „%s“ neexistuje"
#: grep-dctrl/grep-dctrl.c:478
-#, fuzzy, c-format
-#| msgid "internal error"
+#, c-format
msgid "internal error: unknown token %d"
-msgstr "vnitřní chyba"
+msgstr "vnitřní chyba: neznámý symbol %d"
#: grep-dctrl/grep-dctrl.c:487
-#, fuzzy
-#| msgid "unexpected end of predicate"
msgid "unexpected end of filter"
-msgstr "neočekávaný konec predikátu"
+msgstr "neočekávaný konec filtru"
#: grep-dctrl/grep-dctrl.c:490
-#, fuzzy
-#| msgid "unexpected atom in command line"
msgid "unexpected pattern in command line"
-msgstr "neočekávaný atom v příkazové řádce"
+msgstr "neočekávaný vzor v příkazové řádce"
#: grep-dctrl/grep-dctrl.c:493
-#, fuzzy
-#| msgid "unexpected atom in command line"
msgid "unexpected string in command line"
-msgstr "neočekávaný atom v příkazové řádce"
+msgstr "neočekávaný řetězec v příkazové řádce"
#: grep-dctrl/grep-dctrl.c:497
-#, fuzzy, c-format
-#| msgid "unexpected '!' in command line"
+#, c-format
msgid "unexpected '%s' in command line"
-msgstr "neočekávaný „!“ v příkazové řádce"
+msgstr "neočekávaný „%s“ v příkazové řádce"
#: grep-dctrl/grep-dctrl.c:511
msgid "missing ')' in command line"
msgstr "chybějící „)“ v příkazové řádce"
#: grep-dctrl/grep-dctrl.c:530
-#, fuzzy
-#| msgid "too many file names"
msgid "too many field names"
-msgstr "příliš mnoho názvů souborů"
+msgstr "příliš mnoho názvů polí"
#: grep-dctrl/grep-dctrl.c:588
-#, fuzzy
-#| msgid "Multiple patterns for the same atom are not allowed"
msgid "Multiple patterns for the same simple filter are not allowed"
-msgstr "Více vzorů pro stejný atom není povoleno"
+msgstr "Více vzorů pro stejný jednoduchý filtr není povoleno"
#: grep-dctrl/grep-dctrl.c:608
msgid "A pattern is mandatory"
msgstr "Vzor je povinný"
#: grep-dctrl/grep-dctrl.c:635
-#, fuzzy
-#| msgid "inconsistent atom modifiers"
msgid "inconsistent modifiers of simple filters"
-msgstr "nekonzistentní modifikátory atomu"
+msgstr "nekonzistentní modifikátory jednoduchých filtrů"
#: grep-dctrl/grep-dctrl.c:680 sort-dctrl/sort-dctrl.c:120
#: tbl-dctrl/tbl-dctrl.c:313 join-dctrl/join-dctrl.c:180
@@ -322,16 +292,12 @@ msgid "too many file names"
msgstr "příliš mnoho názvů souborů"
#: grep-dctrl/grep-dctrl.c:689
-#, fuzzy
-#| msgid "file names are not allowed within the predicate"
msgid "file names are not allowed within the filter"
-msgstr "jména souborů nejsou uvnitř predikátu povolena"
+msgstr "jména souborů nejsou uvnitř filtru povolena"
#: grep-dctrl/grep-dctrl.c:769
-#, fuzzy
-#| msgid "malformed predicate"
msgid "malformed filter"
-msgstr "zkomolený predikát"
+msgstr "zkomolený filtr"
#: grep-dctrl/grep-dctrl.c:779
msgid "Adding \"Description\" to selected output fields because of -d"
@@ -348,7 +314,7 @@ msgstr "při zobrazování celých odstavců nemohu potlačit názvy polí"
#: grep-dctrl/grep-dctrl.c:825
#, c-format
msgid "executable name '%s' is not recognised"
-msgstr ""
+msgstr "spustitelné jméno „%s“ nebylo rozpoznáno"
#: sort-dctrl/sort-dctrl.c:39 tbl-dctrl/tbl-dctrl.c:42
#: join-dctrl/join-dctrl.c:45
@@ -470,11 +436,11 @@ msgstr "nemohu sloučit proud sám se sebou"
#: lib/msg.h:52
msgid "I'm broken - please report this bug."
-msgstr ""
+msgstr "'sem pokaženej - nahlaste tudlectu chybu autorovi."
#: lib/msg.h:145
msgid "cannot find enough memory"
-msgstr ""
+msgstr "nelze nalézt dostatek paměti"
#~ msgid "Show the testing banner."
#~ msgstr "Zobrazí testovací nápis."
diff --git a/po/da.po b/po/da.po
index fa34e90..adf7967 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: dctrl-tools\n"
"Report-Msgid-Bugs-To: ajk@debian.org\n"
"POT-Creation-Date: 2012-03-05 20:13-0400\n"
-"PO-Revision-Date: 2012-01-03 17:30+01:00\n"
+"PO-Revision-Date: 2012-03-15 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
"Language: da\n"
@@ -320,7 +320,7 @@ msgstr "kan ikke undertrykke feltnavne når der vises hele paragraffer"
#: grep-dctrl/grep-dctrl.c:825
#, c-format
msgid "executable name '%s' is not recognised"
-msgstr ""
+msgstr "kørbart navn »%s« blev ikke genkendt"
#: sort-dctrl/sort-dctrl.c:39 tbl-dctrl/tbl-dctrl.c:42
#: join-dctrl/join-dctrl.c:45
diff --git a/po/en_GB.po b/po/en_GB.po
deleted file mode 100644
index ea955d7..0000000
--- a/po/en_GB.po
+++ /dev/null
@@ -1,507 +0,0 @@
-# English (United Kingdom) translation for dctrl-tools
-# Copyright (c) 2006 Rosetta Contributors and Canonical Ltd 2006
-# This file is distributed under the same license as the dctrl-tools package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: dctrl-tools\n"
-"Report-Msgid-Bugs-To: ajk@debian.org\n"
-"POT-Creation-Date: 2012-03-05 20:13-0400\n"
-"PO-Revision-Date: 2011-12-08 23:47+1100\n"
-"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
-"Language-Team: English (United Kingdom) <debian-l10n-english@lists.debian."
-"org>\n"
-"Language: en\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: lib/ifile.c:58
-#, c-format
-msgid "%s (child): failed to exec /bin/sh: %s\n"
-msgstr "%s (child): failed to exec /bin/sh: %s\n"
-
-#: lib/ifile.c:104
-#, c-format
-msgid "%s: command (%s) failed (exit status %d)\n"
-msgstr "%s: command (%s) failed (exit status %d)\n"
-
-#: lib/ifile.c:113
-#, c-format
-msgid "%s: command (%s) was killed by signal %d\n"
-msgstr "%s: command (%s) was killed by signal %d\n"
-
-#: lib/ifile.c:131
-#, c-format
-msgid "%s: %s: cannot stat: %s\n"
-msgstr "%s: %s: cannot stat: %s\n"
-
-#: lib/ifile.c:142
-msgid "is a directory, skipping"
-msgstr "is a directory, skipping"
-
-#: lib/ifile.c:143
-msgid "is a block device, skipping"
-msgstr "is a block device, skipping"
-
-#: lib/ifile.c:144
-msgid "internal error"
-msgstr "internal error"
-
-#: lib/ifile.c:145
-msgid "is a socket, skipping"
-msgstr "is a socket, skipping"
-
-#: lib/ifile.c:146
-msgid "unknown file type, skipping"
-msgstr "unknown file type, skipping"
-
-#: lib/misc.c:37
-#, c-format
-msgid "%s: using `%s' as pager\n"
-msgstr "%s: using `%s' as pager\n"
-
-#: lib/misc.c:47
-#, c-format
-msgid "%s: popen failed for %s: %s\n"
-msgstr "%s: popen failed for %s: %s\n"
-
-#: lib/paragraph.c:172
-msgid "warning: expected a colon"
-msgstr "warning: expected a colon"
-
-#: lib/paragraph.c:177
-msgid "expected a colon"
-msgstr "expected a colon"
-
-#: lib/sorter.c:49
-msgid "Parse error in field."
-msgstr "Parse error in field."
-
-#: grep-dctrl/grep-dctrl.c:49
-msgid "grep-dctrl -- grep Debian control files"
-msgstr "grep-dctrl -- grep Debian control files"
-
-#: grep-dctrl/grep-dctrl.c:51
-msgid "FILTER [FILENAME...]"
-msgstr "FILTER [FILENAME...]"
-
-#: grep-dctrl/grep-dctrl.c:69 sort-dctrl/sort-dctrl.c:39
-#: tbl-dctrl/tbl-dctrl.c:42 join-dctrl/join-dctrl.c:45
-msgid "LEVEL"
-msgstr "LEVEL"
-
-#: grep-dctrl/grep-dctrl.c:69
-msgid "Set log level to LEVEL."
-msgstr "Set log level to LEVEL."
-
-#: grep-dctrl/grep-dctrl.c:70 grep-dctrl/grep-dctrl.c:73
-msgid "FIELD,FIELD,..."
-msgstr "FIELD,FIELD,..."
-
-#: grep-dctrl/grep-dctrl.c:70
-msgid "Restrict pattern matching to the FIELDs given."
-msgstr "Restrict pattern matching to the FIELDs given."
-
-#: grep-dctrl/grep-dctrl.c:71
-msgid "This is a shorthand for -FPackage."
-msgstr "This is a shorthand for -FPackage."
-
-#: grep-dctrl/grep-dctrl.c:72
-msgid "This is a shorthand for -FSource:Package."
-msgstr "This is a shorthand for -FSource:Package."
-
-#: grep-dctrl/grep-dctrl.c:73
-msgid "Show only the body of these fields from the matching paragraphs."
-msgstr "Show only the body of these fields from the matching paragraphs."
-
-#: grep-dctrl/grep-dctrl.c:74
-msgid ""
-"Show only the first line of the \"Description\" field from the matching "
-"paragraphs."
-msgstr ""
-"Show only the first line of the \"Description\" field from the matching "
-"paragraphs."
-
-#: grep-dctrl/grep-dctrl.c:75
-msgid "Suppress field names when showing specified fields."
-msgstr "Suppress field names when showing specified fields."
-
-#: grep-dctrl/grep-dctrl.c:76
-msgid "Regard the pattern as an extended POSIX regular expression."
-msgstr "Regard the pattern as an extended POSIX regular expression."
-
-#: grep-dctrl/grep-dctrl.c:77
-msgid "Regard the pattern as a standard POSIX regular expression."
-msgstr "Regard the pattern as a standard POSIX regular expression."
-
-#: grep-dctrl/grep-dctrl.c:78
-msgid "Ignore case when looking for a match."
-msgstr "Ignore case when looking for a match."
-
-#: grep-dctrl/grep-dctrl.c:79
-msgid "Show only paragraphs that do not match."
-msgstr "Show only paragraphs that do not match."
-
-#: grep-dctrl/grep-dctrl.c:80
-msgid "Show those fields that have NOT been selected with -s"
-msgstr "Show those fields that have NOT been selected with -s"
-
-#: grep-dctrl/grep-dctrl.c:81
-msgid "Show only the count of matching paragraphs."
-msgstr "Show only the count of matching paragraphs."
-
-#: grep-dctrl/grep-dctrl.c:82
-msgid "Do an exact match."
-msgstr "Do an exact match."
-
-#: grep-dctrl/grep-dctrl.c:83 sort-dctrl/sort-dctrl.c:38
-#: tbl-dctrl/tbl-dctrl.c:41 join-dctrl/join-dctrl.c:44
-msgid "Print out the copyright license."
-msgstr "Print out the copyright licence."
-
-#: grep-dctrl/grep-dctrl.c:84
-msgid "Conjunct filters."
-msgstr "Conjunct filters."
-
-#: grep-dctrl/grep-dctrl.c:85
-msgid "Disjunct filters."
-msgstr "Disjunct filters."
-
-#: grep-dctrl/grep-dctrl.c:86
-msgid "Negate the following filters."
-msgstr "Negate the following filters."
-
-#: grep-dctrl/grep-dctrl.c:87
-msgid "Test for version number equality."
-msgstr "Test for version number equality."
-
-#: grep-dctrl/grep-dctrl.c:88
-msgid "Version number comparison: <<."
-msgstr "Version number comparison: <<."
-
-#: grep-dctrl/grep-dctrl.c:89
-msgid "Version number comparison: <=."
-msgstr "Version number comparison: <=."
-
-#: grep-dctrl/grep-dctrl.c:90
-msgid "Version number comparison: >>."
-msgstr "Version number comparison: >>."
-
-#: grep-dctrl/grep-dctrl.c:91
-msgid "Version number comparison: >=."
-msgstr "Version number comparison: >=."
-
-#: grep-dctrl/grep-dctrl.c:92
-msgid "Debug option parsing."
-msgstr "Debug option parsing."
-
-#: grep-dctrl/grep-dctrl.c:93 grep-dctrl/grep-dctrl.c:94
-msgid "Do not output to stdout."
-msgstr "Do not output to stdout."
-
-#: grep-dctrl/grep-dctrl.c:95 sort-dctrl/sort-dctrl.c:41
-#: tbl-dctrl/tbl-dctrl.c:43 join-dctrl/join-dctrl.c:46
-msgid "Attempt mmapping input files"
-msgstr "Attempt mmapping input files"
-
-#: grep-dctrl/grep-dctrl.c:96
-msgid "Ignore parse errors"
-msgstr "Ignore parse errors"
-
-#: grep-dctrl/grep-dctrl.c:97
-msgid "PATTERN"
-msgstr "PATTERN"
-
-#: grep-dctrl/grep-dctrl.c:97
-msgid "Specify the pattern to search for"
-msgstr "Specify the pattern to search for"
-
-#: grep-dctrl/grep-dctrl.c:98
-msgid "Match only whole package names (this implies -e)"
-msgstr "Match only whole package names (this implies -e)"
-
-#: grep-dctrl/grep-dctrl.c:99
-msgid "Ensure that the output is in dctrl format (overridden by -n)"
-msgstr "Ensure that the output is in dctrl format (overridden by -n)"
-
-#: grep-dctrl/grep-dctrl.c:100
-msgid "Override the effect of an earlier --ensure-dctrl"
-msgstr "Override the effect of an earlier --ensure-dctrl"
-
-#: grep-dctrl/grep-dctrl.c:186
-msgid "filter is too long"
-msgstr "filter is too long"
-
-#: grep-dctrl/grep-dctrl.c:247 grep-dctrl/grep-dctrl.c:775
-#: join-dctrl/join-dctrl.c:113
-msgid "too many output fields"
-msgstr "too many output fields"
-
-#: grep-dctrl/grep-dctrl.c:271 sort-dctrl/sort-dctrl.c:104
-#: tbl-dctrl/tbl-dctrl.c:301 join-dctrl/join-dctrl.c:168
-#, c-format
-msgid "no such log level '%s'"
-msgstr "no such log level '%s'"
-
-#: grep-dctrl/grep-dctrl.c:478
-#, c-format
-msgid "internal error: unknown token %d"
-msgstr "internal error: unknown token %d"
-
-#: grep-dctrl/grep-dctrl.c:487
-msgid "unexpected end of filter"
-msgstr "unexpected end of filter"
-
-#: grep-dctrl/grep-dctrl.c:490
-msgid "unexpected pattern in command line"
-msgstr "unexpected pattern in command line"
-
-#: grep-dctrl/grep-dctrl.c:493
-msgid "unexpected string in command line"
-msgstr "unexpected string in command line"
-
-#: grep-dctrl/grep-dctrl.c:497
-#, c-format
-msgid "unexpected '%s' in command line"
-msgstr "unexpected '%s' in command line"
-
-#: grep-dctrl/grep-dctrl.c:511
-msgid "missing ')' in command line"
-msgstr "missing ')' in command line"
-
-#: grep-dctrl/grep-dctrl.c:530
-msgid "too many field names"
-msgstr "too many field names"
-
-#: grep-dctrl/grep-dctrl.c:588
-msgid "Multiple patterns for the same simple filter are not allowed"
-msgstr "Multiple patterns for the same simple filter are not allowed"
-
-#: grep-dctrl/grep-dctrl.c:608
-msgid "A pattern is mandatory"
-msgstr "A pattern is mandatory"
-
-#: grep-dctrl/grep-dctrl.c:635
-msgid "inconsistent modifiers of simple filters"
-msgstr "inconsistent modifiers of simple filters"
-
-#: grep-dctrl/grep-dctrl.c:680 sort-dctrl/sort-dctrl.c:120
-#: tbl-dctrl/tbl-dctrl.c:313 join-dctrl/join-dctrl.c:180
-msgid "too many file names"
-msgstr "too many file names"
-
-#: grep-dctrl/grep-dctrl.c:689
-msgid "file names are not allowed within the filter"
-msgstr "file names are not allowed within the filter"
-
-#: grep-dctrl/grep-dctrl.c:769
-msgid "malformed filter"
-msgstr "malformed filter"
-
-#: grep-dctrl/grep-dctrl.c:779
-msgid "Adding \"Description\" to selected output fields because of -d"
-msgstr "Adding \"Description\" to selected output fields because of -d"
-
-#: grep-dctrl/grep-dctrl.c:787
-msgid "-I requires at least one instance of -s"
-msgstr "-I requires at least one instance of -s"
-
-#: grep-dctrl/grep-dctrl.c:793
-msgid "cannot suppress field names when showing whole paragraphs"
-msgstr "cannot suppress field names when showing whole paragraphs"
-
-#: grep-dctrl/grep-dctrl.c:825
-#, c-format
-msgid "executable name '%s' is not recognised"
-msgstr ""
-
-#: sort-dctrl/sort-dctrl.c:39 tbl-dctrl/tbl-dctrl.c:42
-#: join-dctrl/join-dctrl.c:45
-msgid "Set debugging level to LEVEL."
-msgstr "Set debugging level to LEVEL."
-
-#: sort-dctrl/sort-dctrl.c:40
-msgid "KEYSPEC"
-msgstr "KEYSPEC"
-
-#: sort-dctrl/sort-dctrl.c:40
-msgid "Specify sort keys."
-msgstr "Specify sort keys."
-
-#: sort-dctrl/sort-dctrl.c:88
-msgid "invalid key flag"
-msgstr "invalid key flag"
-
-#: sort-dctrl/sort-dctrl.c:140
-msgid "sort-dctrl -- sort Debian control files"
-msgstr "sort-dctrl -- sort Debian control files"
-
-#: tbl-dctrl/tbl-dctrl.c:38
-msgid "DELIM"
-msgstr "DELIM"
-
-#: tbl-dctrl/tbl-dctrl.c:38
-msgid "Specify a delimiter."
-msgstr "Specify a delimiter."
-
-#: tbl-dctrl/tbl-dctrl.c:39
-msgid "Do not print a table heading"
-msgstr "Do not print a table heading"
-
-#: tbl-dctrl/tbl-dctrl.c:40
-msgid "SPEC"
-msgstr "SPEC"
-
-#: tbl-dctrl/tbl-dctrl.c:40
-msgid "Append the specified column."
-msgstr "Append the specified column."
-
-#: tbl-dctrl/tbl-dctrl.c:284
-msgid "invalid column length"
-msgstr "invalid column length"
-
-#: tbl-dctrl/tbl-dctrl.c:338
-msgid "tbl-dctrl -- tabularize Debian control files"
-msgstr "tbl-dctrl -- tabularise Debian control files"
-
-#: tbl-dctrl/tbl-dctrl.c:359
-msgid "bad multibyte character"
-msgstr "bad multibyte character"
-
-#: join-dctrl/join-dctrl.c:39 join-dctrl/join-dctrl.c:40
-#: join-dctrl/join-dctrl.c:41
-msgid "FIELD"
-msgstr "FIELD"
-
-#: join-dctrl/join-dctrl.c:39
-msgid "Specify the join field to use for the first file"
-msgstr "Specify the join field to use for the first file"
-
-#: join-dctrl/join-dctrl.c:40
-msgid "Specify the join field to use for the second file"
-msgstr "Specify the join field to use for the second file"
-
-#: join-dctrl/join-dctrl.c:41
-msgid "Specify the common join field"
-msgstr "Specify the common join field"
-
-#: join-dctrl/join-dctrl.c:42
-msgid "FIELDNO"
-msgstr "FIELDNO"
-
-#: join-dctrl/join-dctrl.c:42
-msgid "Print unpairable records from the indicated file (either 1 or 2)"
-msgstr "Print unpairable records from the indicated file (either 1 or 2)"
-
-#: join-dctrl/join-dctrl.c:43
-msgid "FIELDSPEC"
-msgstr "FIELDSPEC"
-
-#: join-dctrl/join-dctrl.c:43
-msgid "Specify the format of the output file"
-msgstr "Specify the format of the output file"
-
-#: join-dctrl/join-dctrl.c:81
-msgid "malformed argument to '-a'"
-msgstr "malformed argument to '-a'"
-
-#: join-dctrl/join-dctrl.c:88
-msgid "the join field of the first file has already been specified"
-msgstr "the join field of the first file has already been specified"
-
-#: join-dctrl/join-dctrl.c:89
-msgid "the join field of the second file has already been specified"
-msgstr "the join field of the second file has already been specified"
-
-#: join-dctrl/join-dctrl.c:128
-msgid "missing '.' in output field specification"
-msgstr "missing '.' in output field specification"
-
-#: join-dctrl/join-dctrl.c:146
-msgid "expected either '1.' or '2.' at the start of the field specification"
-msgstr "expected either '1.' or '2.' at the start of the field specification"
-
-#: join-dctrl/join-dctrl.c:251
-msgid "join-dctrl -- join two Debian control files"
-msgstr "join-dctrl -- join two Debian control files"
-
-#: join-dctrl/join-dctrl.c:270
-msgid "need exactly two input files"
-msgstr "need exactly two input files"
-
-#: join-dctrl/join-dctrl.c:295
-msgid "cannot join a stream with itself"
-msgstr "cannot join a stream with itself"
-
-#: lib/msg.h:52
-msgid "I'm broken - please report this bug."
-msgstr "I'm broken - please report this bug."
-
-#: lib/msg.h:145
-msgid "cannot find enough memory"
-msgstr "cannot find enough memory"
-
-#~ msgid "Show the testing banner."
-#~ msgstr "Show the testing banner."
-
-#~ msgid "FNAME"
-#~ msgstr "FNAME"
-
-#~ msgid "Use FNAME as the config file."
-#~ msgstr "Use FNAME as the config file."
-
-#~ msgid "Malformed default input file name"
-#~ msgstr "Malformed default input file name"
-
-#~ msgid "not owned by you or root, ignoring"
-#~ msgstr "not owned by you or root, ignoring"
-
-#~ msgid "write permissions for group or others, ignoring"
-#~ msgstr "write permissions for group or others, ignoring"
-
-#~ msgid "reading config file"
-#~ msgstr "reading config file"
-
-#~ msgid "read failure or out of memory"
-#~ msgstr "read failure or out of memory"
-
-#~ msgid "syntax error: need an executable name"
-#~ msgstr "syntax error: need an executable name"
-
-#~ msgid "syntax error: need an input file name"
-#~ msgstr "syntax error: need an input file name"
-
-#~ msgid "considering executable name"
-#~ msgstr "considering executable name"
-
-#~ msgid "yes, will use executable name"
-#~ msgstr "yes, will use executable name"
-
-#~ msgid "default input file"
-#~ msgstr "default input file"
-
-#~ msgid "executable name not found; reading from standard input"
-#~ msgstr "executable name not found; reading from standard input"
-
-#~ msgid "predicate is too complex"
-#~ msgstr "predicate is too complex"
-
-#~ msgid "The pattern is a standard POSIX regular expression."
-#~ msgstr "The pattern is a standard POSIX regular expression."
-
-#~ msgid "unexpected '-a' in command line"
-#~ msgstr "unexpected '-a' in command line"
-
-#~ msgid "unexpected '-o' in command line"
-#~ msgstr "unexpected '-o' in command line"
-
-#~ msgid "unexpected '(' in command line"
-#~ msgstr "unexpected '(' in command line"
-
-#~ msgid "unexpected ')' in command line"
-#~ msgstr "unexpected ')' in command line"
-
-#~ msgid "a predicate is required"
-#~ msgstr "a predicate is required"
diff --git a/po/es.po b/po/es.po
index a92dea1..91ed70a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
# - Initial translation
# Javier Fernández-Sanguino, 2006
# - Translation updates
-# Javier Fernández-Sanguino <jfs@debian.org>, 2011
+# Javier Fernández-Sanguino <jfs@debian.org>, 2011-2012
#
#
# Traductores, si no conoce el formato PO, merece la pena leer la
@@ -36,7 +36,7 @@ msgstr ""
"Project-Id-Version: dctrl-tools\n"
"Report-Msgid-Bugs-To: ajk@debian.org\n"
"POT-Creation-Date: 2012-03-05 20:13-0400\n"
-"PO-Revision-Date: 2011-12-08 12:43+0100\n"
+"PO-Revision-Date: 2012-03-21 22:09+0100\n"
"Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
"Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
"Language: es\n"
@@ -359,7 +359,7 @@ msgstr ""
#: grep-dctrl/grep-dctrl.c:825
#, c-format
msgid "executable name '%s' is not recognised"
-msgstr ""
+msgstr "no se reconoce el nombre del ejecutable «%s»"
#: sort-dctrl/sort-dctrl.c:39 tbl-dctrl/tbl-dctrl.c:42
#: join-dctrl/join-dctrl.c:45
diff --git a/po/fi.po b/po/fi.po
index 685adfe..a9f81da 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,14 +1,14 @@
# Finnish translation of dctrl-tools
-# Copyright (C) 2004-2011 Antti-Juhani Kaijanaho
+# Copyright (C) 2004-2012 Antti-Juhani Kaijanaho
# This file is distributed under the same license as the dctrl-tools package.
-# Antti-Juhani Kaijanaho <ajk@debian.org>, 2004-2010.
+# Antti-Juhani Kaijanaho <ajk@debian.org>, 2004-2012.
#
msgid ""
msgstr ""
"Project-Id-Version: dctrl-tools\n"
"Report-Msgid-Bugs-To: ajk@debian.org\n"
"POT-Creation-Date: 2012-03-05 20:13-0400\n"
-"PO-Revision-Date: 2011-12-18 18:47+0200\n"
+"PO-Revision-Date: 2012-03-31 15:24+0300\n"
"Last-Translator: Antti-Juhani Kaijanaho <ajk@debian.org>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
"Language: fi\n"
@@ -314,7 +314,7 @@ msgstr ""
#: grep-dctrl/grep-dctrl.c:825
#, c-format
msgid "executable name '%s' is not recognised"
-msgstr ""
+msgstr "ohjelmanimeä '%s' ei tunnisteta"
#: sort-dctrl/sort-dctrl.c:39 tbl-dctrl/tbl-dctrl.c:42
#: join-dctrl/join-dctrl.c:45
diff --git a/po/fr.po b/po/fr.po
index 3d3dbc3..9b7d013 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,16 +1,16 @@
# French translation for dctrl-tools
-# Copyright (C) 2004-2007, 2010, 2011 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# Copyright (C) 2004-2007, 2010-2012 Debian French l10n team <debian-l10n-french@lists.debian.org>
# This file is distributed under the same license as the dctrl-tools package.
#
# Nicolas Bertolissio <nico.bertol@free.fr>, 2004, 2005.
# Frédéric Bothamy <frederic.bothamy@free.fr>, 2006, 2007.
-# David Prévot <david@tilapin.org>, 2010, 2011.
+# David Prévot <david@tilapin.org>, 2010-2012.
msgid ""
msgstr ""
"Project-Id-Version: dctrl-tools 2.11\n"
"Report-Msgid-Bugs-To: ajk@debian.org\n"
"POT-Creation-Date: 2012-03-05 20:13-0400\n"
-"PO-Revision-Date: 2011-12-07 18:44-0400\n"
+"PO-Revision-Date: 2012-03-05 21:50-0400\n"
"Last-Translator: David Prévot <david@tilapin.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: fr\n"
@@ -325,7 +325,7 @@ msgstr ""
#: grep-dctrl/grep-dctrl.c:825
#, c-format
msgid "executable name '%s' is not recognised"
-msgstr ""
+msgstr "le nom d'exécutable « %s » n'est pas reconnu"
#: sort-dctrl/sort-dctrl.c:39 tbl-dctrl/tbl-dctrl.c:42
#: join-dctrl/join-dctrl.c:45
diff --git a/po/ja.po b/po/ja.po
index b88e54c..6546b50 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,10 +9,10 @@ msgstr ""
"Project-Id-Version: dctrl-tools 2.9.2\n"
"Report-Msgid-Bugs-To: ajk@debian.org\n"
"POT-Creation-Date: 2012-03-05 20:13-0400\n"
-"PO-Revision-Date: 2006-10-30 23:27+0900\n"
-"Last-Translator: Noritada Kobayashi <nori1@dolphin.c.u-tokyo.ac.jp>\n"
-"Language-Team: Japanese\n"
-"Language: \n"
+"PO-Revision-Date: 2012-03-13 02:44+0900\n"
+"Last-Translator: Noritada Kobayashi <noritadak@gmail.com>\n"
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +86,7 @@ msgstr "grep-dctrl -- Debian control ファイルを grep します"
#: grep-dctrl/grep-dctrl.c:51
msgid "FILTER [FILENAME...]"
-msgstr ""
+msgstr "<フィルタ> [<ファイル名>...]"
#: grep-dctrl/grep-dctrl.c:69 sort-dctrl/sort-dctrl.c:39
#: tbl-dctrl/tbl-dctrl.c:42 join-dctrl/join-dctrl.c:45
@@ -94,10 +94,8 @@ msgid "LEVEL"
msgstr "<レベル>"
#: grep-dctrl/grep-dctrl.c:69
-#, fuzzy
-#| msgid "Set debugging level to LEVEL."
msgid "Set log level to LEVEL."
-msgstr "デバッグレベルを <レベル> に設定します。"
+msgstr "ログレベルを <レベル> に設定します。"
#: grep-dctrl/grep-dctrl.c:70 grep-dctrl/grep-dctrl.c:73
msgid "FIELD,FIELD,..."
@@ -136,10 +134,8 @@ msgid "Regard the pattern as an extended POSIX regular expression."
msgstr "パターンを POSIX 拡張正規表現と見なします。"
#: grep-dctrl/grep-dctrl.c:77
-#, fuzzy
-#| msgid "Regard the pattern as an extended POSIX regular expression."
msgid "Regard the pattern as a standard POSIX regular expression."
-msgstr "パターンを POSIX 拡張正規表現と見なします。"
+msgstr "パターンを POSIX 標準正規表現と見なします。"
#: grep-dctrl/grep-dctrl.c:78
msgid "Ignore case when looking for a match."
@@ -151,7 +147,7 @@ msgstr "マッチしないパラグラフのみ表示します。"
#: grep-dctrl/grep-dctrl.c:80
msgid "Show those fields that have NOT been selected with -s"
-msgstr ""
+msgstr "-s で選択されて「いない」フィールドを表示します。"
#: grep-dctrl/grep-dctrl.c:81
msgid "Show only the count of matching paragraphs."
@@ -167,42 +163,32 @@ msgid "Print out the copyright license."
msgstr "著作権使用許諾を表示します。"
#: grep-dctrl/grep-dctrl.c:84
-#, fuzzy
-#| msgid "Conjunct predicates."
msgid "Conjunct filters."
-msgstr "述部を結合します。"
+msgstr "フィルタを結合します。"
#: grep-dctrl/grep-dctrl.c:85
-#, fuzzy
-#| msgid "Disjunct predicates."
msgid "Disjunct filters."
-msgstr "述部を分離します。"
+msgstr "フィルタを分離します。"
#: grep-dctrl/grep-dctrl.c:86
-#, fuzzy
-#| msgid "Negate the following predicate."
msgid "Negate the following filters."
-msgstr "以降の述部を否定します。"
+msgstr "以降のフィルタを否定します。"
#: grep-dctrl/grep-dctrl.c:87
msgid "Test for version number equality."
msgstr "バージョン番号が等しいかをテストします。"
#: grep-dctrl/grep-dctrl.c:88
-#, fuzzy
-#| msgid "Version number comparison: <."
msgid "Version number comparison: <<."
-msgstr "バージョン番号の比較: <。"
+msgstr "バージョン番号の比較: <<。"
#: grep-dctrl/grep-dctrl.c:89
msgid "Version number comparison: <=."
msgstr "バージョン番号の比較: <=。"
#: grep-dctrl/grep-dctrl.c:90
-#, fuzzy
-#| msgid "Version number comparison: >."
msgid "Version number comparison: >>."
-msgstr "バージョン番号の比較: >。"
+msgstr "バージョン番号の比較: >>。"
#: grep-dctrl/grep-dctrl.c:91
msgid "Version number comparison: >=."
@@ -233,23 +219,24 @@ msgstr "<パターン>"
msgid "Specify the pattern to search for"
msgstr "検索に用いるパターンを指定します"
+# needs to be checked
#: grep-dctrl/grep-dctrl.c:98
msgid "Match only whole package names (this implies -e)"
-msgstr ""
+msgstr "パッケージ名全体のみにマッチします (これは裏で -e を使います)"
+# needs to be checked
#: grep-dctrl/grep-dctrl.c:99
msgid "Ensure that the output is in dctrl format (overridden by -n)"
-msgstr ""
+msgstr "dctrl 形式で出力します (-n で上書きされます)"
+# needs to be checked
#: grep-dctrl/grep-dctrl.c:100
msgid "Override the effect of an earlier --ensure-dctrl"
-msgstr ""
+msgstr "前に指定された --ensure-dctrl の効果を上書きします"
#: grep-dctrl/grep-dctrl.c:186
-#, fuzzy
-#| msgid "predicate is too long"
msgid "filter is too long"
-msgstr "述部が長すぎます"
+msgstr "フィルタが長すぎます"
#: grep-dctrl/grep-dctrl.c:247 grep-dctrl/grep-dctrl.c:775
#: join-dctrl/join-dctrl.c:113
@@ -258,65 +245,51 @@ msgstr "出力フィールドが多すぎます"
#: grep-dctrl/grep-dctrl.c:271 sort-dctrl/sort-dctrl.c:104
#: tbl-dctrl/tbl-dctrl.c:301 join-dctrl/join-dctrl.c:168
-#, fuzzy, c-format
+#, c-format
msgid "no such log level '%s'"
-msgstr "そのようなログレベルはありません"
+msgstr "'%s' というログレベルはありません"
#: grep-dctrl/grep-dctrl.c:478
-#, fuzzy, c-format
-#| msgid "internal error"
+#, c-format
msgid "internal error: unknown token %d"
-msgstr "内部エラーです"
+msgstr "内部エラーです: 未知のトークン %d"
#: grep-dctrl/grep-dctrl.c:487
-#, fuzzy
-#| msgid "unexpected end of predicate"
msgid "unexpected end of filter"
-msgstr "述部が突然途切れました"
+msgstr "フィルタが突然途切れました"
#: grep-dctrl/grep-dctrl.c:490
-#, fuzzy
-#| msgid "unexpected atom in command line"
msgid "unexpected pattern in command line"
-msgstr "コマンドラインに想定外の単位が含まれています"
+msgstr "コマンドラインに想定外のパターンが含まれています"
#: grep-dctrl/grep-dctrl.c:493
-#, fuzzy
-#| msgid "unexpected atom in command line"
msgid "unexpected string in command line"
-msgstr "コマンドラインに想定外の単位が含まれています"
+msgstr "コマンドラインに想定外の文字列が含まれています"
#: grep-dctrl/grep-dctrl.c:497
-#, fuzzy, c-format
-#| msgid "unexpected '!' in command line"
+#, c-format
msgid "unexpected '%s' in command line"
-msgstr "コマンドラインに想定外の '!' が含まれています"
+msgstr "コマンドラインに想定外の '%s' が含まれています"
#: grep-dctrl/grep-dctrl.c:511
msgid "missing ')' in command line"
msgstr "コマンドラインに ')' が含まれていません"
#: grep-dctrl/grep-dctrl.c:530
-#, fuzzy
-#| msgid "too many file names"
msgid "too many field names"
-msgstr "ファイル名が多すぎます"
+msgstr "フィールド名が多すぎます"
#: grep-dctrl/grep-dctrl.c:588
-#, fuzzy
-#| msgid "Multiple patterns for the same atom are not allowed"
msgid "Multiple patterns for the same simple filter are not allowed"
-msgstr "同じ単位に複数のパターンを使用することはできません"
+msgstr "同一のフィルタに複数のパターンを使用することはできません"
#: grep-dctrl/grep-dctrl.c:608
msgid "A pattern is mandatory"
msgstr "パターンが必須です"
#: grep-dctrl/grep-dctrl.c:635
-#, fuzzy
-#| msgid "inconsistent atom modifiers"
msgid "inconsistent modifiers of simple filters"
-msgstr "単位修飾子が矛盾しています"
+msgstr "同一のフィルタに与える修飾子が矛盾しています"
#: grep-dctrl/grep-dctrl.c:680 sort-dctrl/sort-dctrl.c:120
#: tbl-dctrl/tbl-dctrl.c:313 join-dctrl/join-dctrl.c:180
@@ -325,13 +298,11 @@ msgstr "ファイル名が多すぎます"
#: grep-dctrl/grep-dctrl.c:689
msgid "file names are not allowed within the filter"
-msgstr ""
+msgstr "ファイル名はフィルタ内に含めることができません"
#: grep-dctrl/grep-dctrl.c:769
-#, fuzzy
-#| msgid "malformed predicate"
msgid "malformed filter"
-msgstr "述部が不正です"
+msgstr "フィルタが不正です"
#: grep-dctrl/grep-dctrl.c:779
msgid "Adding \"Description\" to selected output fields because of -d"
@@ -341,7 +312,7 @@ msgstr ""
#: grep-dctrl/grep-dctrl.c:787
msgid "-I requires at least one instance of -s"
-msgstr ""
+msgstr "-I には 1 つ以上の -s が必要です"
#: grep-dctrl/grep-dctrl.c:793
msgid "cannot suppress field names when showing whole paragraphs"
@@ -350,7 +321,7 @@ msgstr "パラグラフ全体を表示する際にフィールド名を表示し
#: grep-dctrl/grep-dctrl.c:825
#, c-format
msgid "executable name '%s' is not recognised"
-msgstr ""
+msgstr "実行ファイル名 '%s' を認識できません"
#: sort-dctrl/sort-dctrl.c:39 tbl-dctrl/tbl-dctrl.c:42
#: join-dctrl/join-dctrl.c:45
@@ -383,7 +354,7 @@ msgstr "デリミタを指定します。"
#: tbl-dctrl/tbl-dctrl.c:39
msgid "Do not print a table heading"
-msgstr ""
+msgstr "表に見出しをつけません"
#: tbl-dctrl/tbl-dctrl.c:40
msgid "SPEC"
@@ -403,83 +374,83 @@ msgstr "tbl-dctrl -- Debian control ファイルを集計して表にします"
#: tbl-dctrl/tbl-dctrl.c:359
msgid "bad multibyte character"
-msgstr "マルチバイト文字が不正です"
+msgstr "不正なマルチバイト文字です"
#: join-dctrl/join-dctrl.c:39 join-dctrl/join-dctrl.c:40
#: join-dctrl/join-dctrl.c:41
msgid "FIELD"
-msgstr ""
+msgstr "<フィールド>"
+# needs to be checked
#: join-dctrl/join-dctrl.c:39
msgid "Specify the join field to use for the first file"
-msgstr ""
+msgstr "結合に使う最初のファイル由来のフィールドを指定します"
+# needs to be checked
#: join-dctrl/join-dctrl.c:40
msgid "Specify the join field to use for the second file"
-msgstr ""
+msgstr "結合に使う 2 つ目のファイル由来のフィールドを指定します"
+# needs to be checked
#: join-dctrl/join-dctrl.c:41
msgid "Specify the common join field"
-msgstr ""
+msgstr "結合に使う共通のフィールドを指定します"
#: join-dctrl/join-dctrl.c:42
msgid "FIELDNO"
-msgstr ""
+msgstr "<フィールド番号>"
#: join-dctrl/join-dctrl.c:42
msgid "Print unpairable records from the indicated file (either 1 or 2)"
-msgstr ""
+msgstr "指定されたファイル (1 または 2) にしか存在しないレコードを表示します"
#: join-dctrl/join-dctrl.c:43
-#, fuzzy
msgid "FIELDSPEC"
-msgstr "<キー指定>"
+msgstr "<フィールド指定子>"
#: join-dctrl/join-dctrl.c:43
msgid "Specify the format of the output file"
-msgstr ""
+msgstr "出力ファイル形式を指定します"
#: join-dctrl/join-dctrl.c:81
msgid "malformed argument to '-a'"
-msgstr ""
+msgstr "'-a' に与える引数が不正です"
#: join-dctrl/join-dctrl.c:88
msgid "the join field of the first file has already been specified"
-msgstr ""
+msgstr "最初のファイルの結合フィールドが既に指定されています"
#: join-dctrl/join-dctrl.c:89
msgid "the join field of the second file has already been specified"
-msgstr ""
+msgstr "2 つ目のファイルの結合フィールドが既に指定されています"
#: join-dctrl/join-dctrl.c:128
msgid "missing '.' in output field specification"
-msgstr ""
+msgstr "出力フィールド指定子に '.' がありません"
#: join-dctrl/join-dctrl.c:146
msgid "expected either '1.' or '2.' at the start of the field specification"
-msgstr ""
+msgstr "フィールド指定子の頭には '1.' と '2.' のどちらか一方がついていなければいけません"
#: join-dctrl/join-dctrl.c:251
-#, fuzzy
msgid "join-dctrl -- join two Debian control files"
-msgstr "sort-dctrl -- Debian control ファイルをソートします"
+msgstr "join-dctrl -- 2 つの Debian control ファイルを結合します"
#: join-dctrl/join-dctrl.c:270
-#, fuzzy
msgid "need exactly two input files"
-msgstr "デフォルトの入力ファイル"
+msgstr "ちょうど 2 つの入力ファイルが必要です"
#: join-dctrl/join-dctrl.c:295
msgid "cannot join a stream with itself"
-msgstr ""
+msgstr "ストリームをそれ自体とは結合できません"
#: lib/msg.h:52
msgid "I'm broken - please report this bug."
-msgstr ""
+msgstr "壊れています - このバグを報告してください。"
#: lib/msg.h:145
msgid "cannot find enough memory"
-msgstr ""
+msgstr "十分なメモリがありません"
#~ msgid "Show the testing banner."
#~ msgstr "テスト用のバナーを表示します。"
diff --git a/po/ru.po b/po/ru.po
index 568f929..bb52e06 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the dctrl-tools package.
#
# Yuri Kozlov <kozlov.y@gmail.com>, 2006.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2011, 2012.
msgid ""
msgstr ""
-"Project-Id-Version: dctrl-tools 2.20.1\n"
+"Project-Id-Version: dctrl-tools 2.21.1\n"
"Report-Msgid-Bugs-To: ajk@debian.org\n"
"POT-Creation-Date: 2012-03-05 20:13-0400\n"
-"PO-Revision-Date: 2011-12-08 20:35+0400\n"
+"PO-Revision-Date: 2012-03-12 20:56+0400\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
"Language: ru\n"
@@ -17,8 +17,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.0\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"
+"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"
#: lib/ifile.c:58
#, c-format
@@ -318,7 +318,7 @@ msgstr ""
#: grep-dctrl/grep-dctrl.c:825
#, c-format
msgid "executable name '%s' is not recognised"
-msgstr ""
+msgstr "не распознано имя исполняемого файла «%s»"
#: sort-dctrl/sort-dctrl.c:39 tbl-dctrl/tbl-dctrl.c:42
#: join-dctrl/join-dctrl.c:45