commit c36a9c507db16cea9c29e75420a1452ff5452904
parent 09fea22133b3d8f459feeed87ca09e49b06652a6
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 28 Nov 2011 11:56:00 +0000
making 0.6.3 release
Diffstat:
28 files changed, 943 insertions(+), 992 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 28 12:17:42 CET 2011
+ Fixing compiler warnings, cleaning up ASF plugin. Finishing
+ Matroska plugin. -CG
+ Releasing libextractor 0.6.3.
+
Fri Jul 22 21:46:32 CEST 2011
Added Ukrainian translation. -CG
@@ -10,10 +15,10 @@ Sun Jun 13 13:15:43 CEST 2010
Sat Jun 12 22:32:32 CEST 2010
Fixing various bugs, including some that can cause crashes given
malformed inputs. -CG
-
+
Sat Jun 12 16:23:14 CEST 2010
Only pass 'unsigned char's to 'isspace' and similar functions. -CG
-
+
Sun Mar 14 00:09:45 CET 2010
Releasing libextractor 0.6.1.
@@ -46,7 +51,7 @@ Sun Feb 15 16:57:46 MST 2009
Sun Nov 2 20:19:02 MST 2008
Releasing libextractor 0.5.21.
-
+
Tue Aug 12 04:40:49 EEST 2008
Added an S3M (Scream Tracker 3 Module) plugin.
@@ -238,7 +243,7 @@ Fri Mar 24 21:43:43 PST 2006
Started re-implementation of PDF support from scratch
(incomplete but working). Improvements to the build
system.
-
+
Thu Mar 9 17:46:39 PST 2006
Added support for wordleaker (additional meta-data for
OLE2 streams). Releasing libextractor 0.5.11.
@@ -279,7 +284,7 @@ Sun Dec 4 23:36:00 PST 2005
Sat Nov 12 10:50:46 PST 2005
Releasing libextractor 0.5.7.
-
+
Wed Nov 9 12:51:52 PST 2005
Fix in LE unload code (potential double-free, maybe BSD-specific).
@@ -325,7 +330,7 @@ Fri Sep 16 16:41:04 PDT 2005
Thu Sep 15 21:55:19 PDT 2005
Fixing compiler warnings given by gcc 4.0.
-
+
Thu Sep 15 00:56:51 PDT 2005
Fixed incorrectly handled integer overflow in png extractor.
@@ -376,7 +381,7 @@ Sat Aug 20 21:27:17 PDT 2005
Thu Aug 18 21:18:28 PDT 2005
Made quotations match GNU standards.
-
+
Sat Aug 13 18:41:02 PDT 2005
Fixed problems with ole2 extractor. Also removed
requirement for static version of glib (!).
@@ -406,7 +411,7 @@ Mon Jul 4 18:10:14 CEST 2005
by default due to bugs). Moved Python and Java
bindings into separate packages.
Releasing libextractor 0.5.1.
-
+
Wed Jun 29 15:37:51 CEST 2005
Finally found out how to disable building static libs.
This should cut down compile time and installed size
@@ -416,7 +421,7 @@ Wed Jun 29 15:37:51 CEST 2005
Sat Jun 18 14:56:38 EST 2005
Fixed a score of compiler warnings and some minor bugs,
none of which should have been observable.
-
+
Sat May 21 13:42:46 EST 2005
Releasing libextractor 0.5.0.
@@ -438,7 +443,7 @@ Thu Feb 24 00:32:44 EST 2005
Wed Feb 23 22:42:08 EST 2005
Comment tag was not extracted from ID3 tags. Fixed.
-
+
Sun Feb 20 16:36:17 EST 2005
Fixed similar problem in REAL extractor. Added support
for new Helix/Real format to REAL extractor.
@@ -510,12 +515,12 @@ Sat Oct 23 13:21:23 EST 2004
Fri Oct 22 22:22:28 EST 2004
Fixing memory leak after extensive valgrinding.
-
+
Fri Oct 22 19:18:38 EST 2004
id3v2.3 and id3v2.4 work. Some bugfixes.
Sun Oct 17 18:12:11 EST 2004
- tar and tar.gz work. Releasing libextractor 0.3.9.
+ tar and tar.gz work. Releasing libextractor 0.3.9.
Sun Oct 17 17:42:16 EST 2004
deb works.
@@ -559,17 +564,17 @@ Tue Sep 14 21:25:22 EST 2004
to run 720 times on the same 5 MB file passing that file as an
argument; the remaining time is pretty much doing 720x mmap and
related system calls).
-
+
Fri Sep 10 22:00:09 EST 2004
Added support for RipeMD-160.
-
+
Fri Sep 10 19:49:39 EST 2004
Added support for SHA-1 and MD5. Releasing libextractor 0.3.6.
-
+
Fri Sep 10 10:35:27 EST 2004
Added support for OpenOffice documents (meta.xml in
zip-file).
-
+
Mon Aug 30 23:16:17 IST 2004
Added support for OLE2 (WinWord, Excel, PowerPoint).
Fixed various bugs (Segfault in elf, leaks in zip and RPM,
@@ -588,20 +593,20 @@ Wed Jun 23 13:37:02 IST 2004
Sun Jun 6 18:42:28 IST 2004
Fixed segfault in qtextractor.
-
+
Mon May 31 18:19:07 EST 2004
- Fixed more minor bugs. Releasing libextractor 0.3.2.
-
+ Fixed more minor bugs. Releasing libextractor 0.3.2.
+
Mon May 31 17:14:55 EST 2004
Removed comment extraction from RIFF extractor (format
detection is not good enough to avoid garbage for non-RIFF
files). Also fixed rare seg-fault in PDF-extractor (xpdf
author notified).
-
+
Mon May 24 13:40:27 EST 2004
Changed build system to avoid having an extra library
(libextractor_util is gone).
-
+
Wed Apr 28 19:28:39 EST 2004
Releasing libextractor 0.3.1.
@@ -617,7 +622,7 @@ Mon Apr 12 01:30:20 EST 2004
methods that are sufficient to build a Java class to
access libextractor. The API is still incomplete but
already basically functional. Releasing 0.3.0
-
+
Sat Apr 10 01:34:04 EST 2004
Added RIFF/AVI extractor based on AVInfo.
Fixed memory-leak and potential segfault in zipextractor.
@@ -625,10 +630,10 @@ Sat Apr 10 01:34:04 EST 2004
Sat Apr 10 00:30:19 EST 2004
Added MPEG (video) extractor based on AVInfo. Improved
output of mp3 extractor.
-
+
Fri Apr 9 22:58:51 EST 2004
Improved library initialization (and destruction) code.
-
+
Thu Apr 8 22:25:19 EST 2004
Revisited type signatures adding const where applicable.
Improved formatting of --help for extract. Added some
@@ -667,7 +672,7 @@ Sun Jun 15 18:05:24 EST 2003
Sat Apr 19 04:11:14 EST 2003
Fixed missing delete operation in PDF extractor for
non-PDF files (caused memory leak and file-handle leak).
-
+
Thu Apr 10 23:54:17 EST 2003
Fixed segmentation violation in png extractor.
@@ -709,7 +714,7 @@ Tue Jan 7 18:31:38 EST 2003
Tue Dec 31 15:26:00 EST 2002
Added pdf extractor based on xpdf code.
-
+
Tue Dec 17 20:36:13 CET 2002
Added MIME-extractor.
@@ -743,14 +748,14 @@ Sun Jun 2 22:49:17 EST 2002
Added support for JPEG and HTML. HTML does not
support concurrent use, though (inherent problem
with libhtmlparse). Released v0.0.2.
-
+
Sat May 25 16:56:59 EST 2002
Added building of a description from artist,
title and album, fixed bugs.
Tue May 21 22:24:07 EST 2002
Added removing of duplicates, splitting keywords,
- extraction of keywords from filenames.
+ extraction of keywords from filenames.
Sat May 18 16:33:28 EST 2002
more convenience methods ('configuration', default
diff --git a/Makefile.am b/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = libltdl m4 po src doc .
EXTRA_DIST = config.rpath \
- ABOUT-NLS mkinstalldirs install-sh
+ ABOUT-NLS install-sh
pkgconfigdatadir = $(libdir)/pkgconfig
pkgconfigdata_DATA = libextractor.pc
diff --git a/NEWS b/NEWS
@@ -1,3 +1,6 @@
+Mon Nov 28 12:17:42 CET 2011
+ Added MKV (Matroska) plugin.
+
Tue Aug 12 04:40:49 EEST 2008
Added an S3M (Scream Tracker 3 Module) plugin.
Added an XM (eXtended Module) plugin.
diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([libextractor], [0.6.2], [bug-libextractor@gnu.org])
-AM_INIT_AUTOMAKE([libextractor], [0.6.2])
+AC_INIT([libextractor], [0.6.3], [bug-libextractor@gnu.org])
+AM_INIT_AUTOMAKE([libextractor], [0.6.3])
AC_CONFIG_HEADERS([config.h])
AH_TOP([#define _GNU_SOURCE 1])
diff --git a/doc/version.texi b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 31 March 2010
-@set UPDATED-MONTH March 2010
-@set EDITION 0.6.2
-@set VERSION 0.6.2
+@set UPDATED 17 May 2010
+@set UPDATED-MONTH May 2010
+@set EDITION 0.6.3
+@set VERSION 0.6.3
diff --git a/m4/Makefile.am b/m4/Makefile.am
@@ -21,7 +21,6 @@ EXTRA_DIST = glibc2.m4 intl.m4 intldir.m4 lock.m4 visibility.m4 \
lib-prefix.m4 \
longdouble.m4 \
longlong.m4 \
- mkdirp.m4 \
nls.m4 \
pkg.m4 \
po.m4 \
diff --git a/po/de.po b/po/de.po
@@ -8,10 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.14\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-06-13 13:15+0200\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: 2007-03-23 23:16+0100\n"
"Last-Translator: Nils Durner <durner@gnunet.org>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -790,28 +791,28 @@ msgstr ""
msgid "Layer III"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
msgid "copyright"
msgstr "Copyright"
-#: src/plugins/mp3_extractor.c:250
+#: src/plugins/mp3_extractor.c:248
#, fuzzy
msgid "no copyright"
msgstr "Copyright"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "original"
msgstr ""
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
#, fuzzy
msgid "copy"
msgstr "Unternehmen"
@@ -891,12 +892,12 @@ msgstr "%s: Option »-W %s« ist mehrdeutig\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: Option »-W %s« erwartet kein Argument\n"
-#: src/main/extractor.c:2294
+#: src/main/extractor.c:2372
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisierung des Plugin-Mechanismus' ist fehlgeschlagen: %s.\n"
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, c-format
msgid ""
"Usage: %s\n"
@@ -907,7 +908,7 @@ msgstr ""
"%s\n"
"\n"
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, c-format
msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -915,104 +916,105 @@ msgstr ""
"Argumente, die für lange Optionen notwendig sind, sind ebenfalls für die\n"
"Optionen in Kurzform notwendig.\n"
-#: src/main/extract.c:170
+#: src/main/extract.c:171
msgid "print output in bibtex format"
msgstr "Ausgabe im BibTeX format"
-#: src/main/extract.c:172
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
msgstr ""
"grep-freundliche Ausgabe erzeugen (alle Ergebnisse als eine Zeile pro Datei)"
-#: src/main/extract.c:174
+#: src/main/extract.c:175
msgid "print this help"
msgstr "diese Hilfe anzeigen"
-#: src/main/extract.c:176
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr ""
-#: src/main/extract.c:178
+#: src/main/extract.c:179
msgid "load an extractor plugin named LIBRARY"
msgstr "extractor-Erweiterung mit der Bezeichnung LIBRARY laden"
-#: src/main/extract.c:180
+#: src/main/extract.c:181
msgid "list all keyword types"
msgstr "alle Arten Schlüsselwörter auflisten"
-#: src/main/extract.c:182
+#: src/main/extract.c:183
msgid "do not use the default set of extractor plugins"
msgstr "Standardsatz der extractor-Erweiterungen nicht verwenden"
-#: src/main/extract.c:184
+#: src/main/extract.c:185
msgid "print only keywords of the given TYPE (use -L to get a list)"
msgstr ""
"nur Schlüsselwörter einer bestimmten ART ausgeben (mit -L die Liste anzeigen "
"lassen)"
-#: src/main/extract.c:186
+#: src/main/extract.c:187
msgid "print the version number"
msgstr "die Versionsnummer anzeigen"
-#: src/main/extract.c:188
+#: src/main/extract.c:189
msgid "be verbose"
msgstr "viele Informationen ausgeben"
-#: src/main/extract.c:190
+#: src/main/extract.c:191
msgid "do not print keywords of the given TYPE"
msgstr "Schlüsselwörter einer bestimmten ART nicht ausgeben"
-#: src/main/extract.c:193
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr "extract [OPTIONEN] [DATEINAME]*"
-#: src/main/extract.c:194
+#: src/main/extract.c:195
msgid "Extract metadata from files."
msgstr "Metadaten aus den Dateien extrahieren."
-#: src/main/extract.c:235
+#: src/main/extract.c:236
#, fuzzy, c-format
msgid "Found by `%s' plugin:\n"
msgstr "Laden des »%s«-Plugins ist fehlgeschlagen: %s\n"
-#: src/main/extract.c:238 src/main/extract.c:319
+#: src/main/extract.c:239 src/main/extract.c:320
#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
msgid "unknown"
msgstr "unbekannt"
-#: src/main/extract.c:243
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:267
+#: src/main/extract.c:268
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binär)\n"
-#: src/main/extract.c:600 src/main/extract.c:610
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:637
+#: src/main/extract.c:638
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
-"Sie müssen ein Argument für die Option »%s« angeben (Option wird ignoriert).\n"
+"Sie müssen ein Argument für die Option »%s« angeben (Option wird "
+"ignoriert).\n"
-#: src/main/extract.c:702
+#: src/main/extract.c:703
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Verwenden Sie --help, um eine Liste aller Optionen zu sehen.\n"
-#: src/main/extract.c:740
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% BibTeX Datei\n"
-#: src/main/extract.c:747
+#: src/main/extract.c:748
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Schlüsserwörter für die Datei %s:\n"
@@ -1923,8 +1925,9 @@ msgid "paragraph count"
msgstr "Absatzanzahl"
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
-msgstr ""
+#, fuzzy
+msgid "number of paragraphs"
+msgstr "Änderungszyklen"
#: src/main/extractor_metatypes.c:304
msgid "word count"
@@ -2403,7 +2406,17 @@ msgstr "Gruppe"
msgid "name of the group or band"
msgstr "Herausgeber"
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+#, fuzzy
+msgid "original filename"
+msgstr "vollständiger Name"
+
+#: src/main/extractor_metatypes.c:437
+#, fuzzy
+msgid "name of the original file (reserved for GNUnet)"
+msgstr "Herausgeber"
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
#, fuzzy
msgid "last"
msgstr "Blitz"
diff --git a/po/fr.po b/po/fr.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-0.5.20a\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-06-13 13:15+0200\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: 2008-08-24 19:08+0100\n"
"Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
"Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -811,28 +812,28 @@ msgstr ""
msgid "Layer III"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
msgid "copyright"
msgstr "copyright"
-#: src/plugins/mp3_extractor.c:250
+#: src/plugins/mp3_extractor.c:248
#, fuzzy
msgid "no copyright"
msgstr "copyright"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "original"
msgstr ""
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
#, fuzzy
msgid "copy"
msgstr "société"
@@ -912,12 +913,12 @@ msgstr "%s: l'option `-W %s' est ambiguë\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: l'option `-W %s' ne prend pas d'argument\n"
-#: src/main/extractor.c:2294
+#: src/main/extractor.c:2372
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Echec de l'initialisation du module %s !\n"
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, c-format
msgid ""
"Usage: %s\n"
@@ -928,7 +929,7 @@ msgstr ""
"%s\n"
"\n"
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, c-format
msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -936,104 +937,104 @@ msgstr ""
"Les arguments obligatoires pour les options longues le sont aussi pour les "
"options courtes.\n"
-#: src/main/extract.c:170
+#: src/main/extract.c:171
msgid "print output in bibtex format"
msgstr "sortie au format bibtex"
-#: src/main/extract.c:172
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
msgstr ""
"produit une sortie exploitable avec \"grep\" (une ligne contenant tous les "
"résultats d'un fichier)"
-#: src/main/extract.c:174
+#: src/main/extract.c:175
msgid "print this help"
msgstr "affiche cette aide"
-#: src/main/extract.c:176
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr ""
-#: src/main/extract.c:178
+#: src/main/extract.c:179
msgid "load an extractor plugin named LIBRARY"
msgstr "charge le module d'extraction nommé LIBRARY"
-#: src/main/extract.c:180
+#: src/main/extract.c:181
msgid "list all keyword types"
msgstr "liste tous les types de mots-clés"
-#: src/main/extract.c:182
+#: src/main/extract.c:183
msgid "do not use the default set of extractor plugins"
msgstr "ne pas utiliser les modules d'extraction par défaut"
-#: src/main/extract.c:184
+#: src/main/extract.c:185
msgid "print only keywords of the given TYPE (use -L to get a list)"
msgstr ""
"affiche seulement les mots-clés du TYPE donné (utiliser -L pour avoir la "
"liste)"
-#: src/main/extract.c:186
+#: src/main/extract.c:187
msgid "print the version number"
msgstr "affiche le numéro de version"
-#: src/main/extract.c:188
+#: src/main/extract.c:189
msgid "be verbose"
msgstr "affichage détaillé"
-#: src/main/extract.c:190
+#: src/main/extract.c:191
msgid "do not print keywords of the given TYPE"
msgstr "ne pas afficher les mots-clés du TYPE donné"
-#: src/main/extract.c:193
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr "extract [OPTIONS] [FICHIER]*"
-#: src/main/extract.c:194
+#: src/main/extract.c:195
msgid "Extract metadata from files."
msgstr "Extraction des métadonnées des fichiers."
-#: src/main/extract.c:235
+#: src/main/extract.c:236
#, fuzzy, c-format
msgid "Found by `%s' plugin:\n"
msgstr "Le chargement du module `%s' a échoué : %s\n"
-#: src/main/extract.c:238 src/main/extract.c:319
+#: src/main/extract.c:239 src/main/extract.c:320
#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
msgid "unknown"
msgstr "inconnu"
-#: src/main/extract.c:243
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:267
+#: src/main/extract.c:268
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binaire)\n"
-#: src/main/extract.c:600 src/main/extract.c:610
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:637
+#: src/main/extract.c:638
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Vous devez préciser un argument pour l'option `%s' (option ignorée).\n"
-#: src/main/extract.c:702
+#: src/main/extract.c:703
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Utilisez --help pour obtenir une liste d'options.\n"
-#: src/main/extract.c:740
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% fichier BiBTeX\n"
-#: src/main/extract.c:747
+#: src/main/extract.c:748
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Mots-clés pour le fichier %s:\n"
@@ -1943,8 +1944,9 @@ msgid "paragraph count"
msgstr "nombre de paragraphes"
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
-msgstr ""
+#, fuzzy
+msgid "number of paragraphs"
+msgstr "cycles d'édition"
#: src/main/extractor_metatypes.c:304
msgid "word count"
@@ -2420,7 +2422,17 @@ msgstr "groupe"
msgid "name of the group or band"
msgstr "éditeur"
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+#, fuzzy
+msgid "original filename"
+msgstr "nom complet"
+
+#: src/main/extractor_metatypes.c:437
+#, fuzzy
+msgid "name of the original file (reserved for GNUnet)"
+msgstr "éditeur"
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
#, fuzzy
msgid "last"
msgstr "flash"
diff --git a/po/ga.po b/po/ga.po
@@ -6,10 +6,11 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.20\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-06-13 13:15+0200\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: 2008-03-21 20:46-0700\n"
"Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -788,28 +789,28 @@ msgstr ""
msgid "Layer III"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
msgid "copyright"
msgstr "cipcheart"
-#: src/plugins/mp3_extractor.c:250
+#: src/plugins/mp3_extractor.c:248
#, fuzzy
msgid "no copyright"
msgstr "cipcheart"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "original"
msgstr ""
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
#, fuzzy
msgid "copy"
msgstr "comhlacht"
@@ -889,12 +890,12 @@ msgstr "%s: T
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: n cheadatear argint i ndiaidh na rogha `-W %s'\n"
-#: src/main/extractor.c:2294
+#: src/main/extractor.c:2372
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Theip ar ths meicnocht na mbreisen: %s!\n"
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, c-format
msgid ""
"Usage: %s\n"
@@ -905,7 +906,7 @@ msgstr ""
"%s\n"
"\n"
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, c-format
msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -913,104 +914,104 @@ msgstr ""
"Is riachtanach le rogha ghearr aon argint at riachtanach leis an rogha "
"fhada.\n"
-#: src/main/extract.c:170
+#: src/main/extract.c:171
msgid "print output in bibtex format"
msgstr "priontil aschur i bhformid bibtex"
-#: src/main/extract.c:172
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
msgstr ""
"aschur is fidir priseil le grep (gach toradh ar lne amhin sa chomhad)"
-#: src/main/extract.c:174
+#: src/main/extract.c:175
msgid "print this help"
msgstr "taispein an chabhair seo"
-#: src/main/extract.c:176
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr ""
-#: src/main/extract.c:178
+#: src/main/extract.c:179
msgid "load an extractor plugin named LIBRARY"
msgstr "luchtaigh breisen asbhainteora darb ainm LEABHARLANN"
-#: src/main/extract.c:180
+#: src/main/extract.c:181
msgid "list all keyword types"
msgstr "taispein gach cinel lorgfhocail"
-#: src/main/extract.c:182
+#: src/main/extract.c:183
msgid "do not use the default set of extractor plugins"
msgstr "n hsid na breisein asbhainteora ramhshocraithe"
-#: src/main/extract.c:184
+#: src/main/extract.c:185
msgid "print only keywords of the given TYPE (use -L to get a list)"
msgstr ""
"n taispein ach lorgfhocail den CHINEL tugtha (sid -L chun liosta a "
"fhil)"
-#: src/main/extract.c:186
+#: src/main/extract.c:187
msgid "print the version number"
msgstr "taispein an leagan"
-#: src/main/extract.c:188
+#: src/main/extract.c:189
msgid "be verbose"
msgstr "b foclach"
-#: src/main/extract.c:190
+#: src/main/extract.c:191
msgid "do not print keywords of the given TYPE"
msgstr "n taispein lorgfhocail den CHINEL tugtha"
-#: src/main/extract.c:193
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr "extract [ROGHANNA] [COMHADAINM]*"
-#: src/main/extract.c:194
+#: src/main/extract.c:195
msgid "Extract metadata from files."
msgstr "Bain meiteashonra as comhaid."
-#: src/main/extract.c:235
+#: src/main/extract.c:236
#, fuzzy, c-format
msgid "Found by `%s' plugin:\n"
msgstr "Theip ar lucht an bhreisein `%s': %s\n"
-#: src/main/extract.c:238 src/main/extract.c:319
+#: src/main/extract.c:239 src/main/extract.c:320
#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
msgid "unknown"
msgstr "anaithnid"
-#: src/main/extract.c:243
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:267
+#: src/main/extract.c:268
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (dnrtha)\n"
-#: src/main/extract.c:600 src/main/extract.c:610
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:637
+#: src/main/extract.c:638
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"N mr duit argint a thabhairt i ndiaidh na rogha `%s' ( ligean thart).\n"
-#: src/main/extract.c:702
+#: src/main/extract.c:703
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Bain sid as '--help' le haghaidh nos m roghanna.\n"
-#: src/main/extract.c:740
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% Comhad BiBTeX\n"
-#: src/main/extract.c:747
+#: src/main/extract.c:748
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Lorgfhocail do chomhad %s:\n"
@@ -1921,8 +1922,9 @@ msgid "paragraph count"
msgstr "lon na n-alt"
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
-msgstr ""
+#, fuzzy
+msgid "number of paragraphs"
+msgstr "timthriallta eagarthireachta"
#: src/main/extractor_metatypes.c:304
msgid "word count"
@@ -2401,7 +2403,17 @@ msgstr "gr
msgid "name of the group or band"
msgstr "foilsitheoir"
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+#, fuzzy
+msgid "original filename"
+msgstr "ainm iomln"
+
+#: src/main/extractor_metatypes.c:437
+#, fuzzy
+msgid "name of the original file (reserved for GNUnet)"
+msgstr "foilsitheoir"
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
#, fuzzy
msgid "last"
msgstr "splanc"
diff --git a/po/it.po b/po/it.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-0.6.0\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-01-13 15:36+0100\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: 2010-09-30 23:41+0200\n"
"Last-Translator: Sergio Zanchetta <primes2h@ubuntu.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -683,7 +684,7 @@ msgstr ""
msgid "Farsi"
msgstr "Farsi"
-#: src/plugins/ole2_extractor.c:462
+#: src/plugins/ole2_extractor.c:471
#, c-format
msgid "Revision #%u: Author '%s' worked on '%s'"
msgstr ""
@@ -696,43 +697,43 @@ msgstr "mono"
msgid "stereo"
msgstr "stereo"
-#: src/plugins/man_extractor.c:156
+#: src/plugins/man_extractor.c:161
msgid "Commands"
msgstr ""
-#: src/plugins/man_extractor.c:160
+#: src/plugins/man_extractor.c:165
msgid "System calls"
msgstr ""
-#: src/plugins/man_extractor.c:164
+#: src/plugins/man_extractor.c:169
msgid "Library calls"
msgstr ""
-#: src/plugins/man_extractor.c:168
+#: src/plugins/man_extractor.c:173
msgid "Special files"
msgstr ""
-#: src/plugins/man_extractor.c:172
+#: src/plugins/man_extractor.c:177
msgid "File formats and conventions"
msgstr ""
-#: src/plugins/man_extractor.c:176
+#: src/plugins/man_extractor.c:181
msgid "Games"
msgstr "Giochi"
-#: src/plugins/man_extractor.c:180
+#: src/plugins/man_extractor.c:185
msgid "Conventions and miscellaneous"
msgstr ""
-#: src/plugins/man_extractor.c:184
+#: src/plugins/man_extractor.c:189
msgid "System management commands"
msgstr ""
-#: src/plugins/man_extractor.c:188
+#: src/plugins/man_extractor.c:193
msgid "Kernel routines"
msgstr "Routine del kernel"
-#: src/plugins/flac_extractor.c:187
+#: src/plugins/flac_extractor.c:192
#, c-format
msgid "%u Hz, %u channels"
msgstr ""
@@ -785,27 +786,27 @@ msgstr "Layer II"
msgid "Layer III"
msgstr "Layer III"
-#: src/plugins/mp3_extractor.c:248
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr "VBR"
-#: src/plugins/mp3_extractor.c:248
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr "CBR"
-#: src/plugins/mp3_extractor.c:251 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
msgid "copyright"
msgstr "copyright"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:248
msgid "no copyright"
msgstr "nessun copyright"
-#: src/plugins/mp3_extractor.c:252
+#: src/plugins/mp3_extractor.c:249
msgid "original"
msgstr "originale"
-#: src/plugins/mp3_extractor.c:252
+#: src/plugins/mp3_extractor.c:249
msgid "copy"
msgstr "copia"
@@ -814,17 +815,17 @@ msgstr "copia"
msgid "codec: %s, %u fps, %u ms"
msgstr "codec: %s, %u fps, %u ms"
-#: src/plugins/jpeg_extractor.c:180
+#: src/plugins/jpeg_extractor.c:182
#, c-format
msgid "%ux%u dots per inch"
msgstr "%ux%u punti per pollice"
-#: src/plugins/jpeg_extractor.c:195
+#: src/plugins/jpeg_extractor.c:197
#, c-format
msgid "%ux%u dots per cm"
msgstr "%ux%u punti per cm"
-#: src/plugins/jpeg_extractor.c:210
+#: src/plugins/jpeg_extractor.c:212
#, c-format
msgid "%ux%u dots per inch?"
msgstr "%ux%u punti per pollice?"
@@ -884,12 +885,12 @@ msgstr "%s: l'opzione \"-W %s\" è ambigua\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: l'opzione \"-W %s\" non ammette un argomento\n"
-#: src/main/extractor.c:2145
+#: src/main/extractor.c:2372
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr ""
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, c-format
msgid ""
"Usage: %s\n"
@@ -900,99 +901,108 @@ msgstr ""
"%s\n"
"\n"
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, c-format
-msgid "Arguments mandatory for long options are also mandatory for short options.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
msgstr ""
-#: src/main/extract.c:174
+#: src/main/extract.c:171
msgid "print output in bibtex format"
msgstr ""
-#: src/main/extract.c:176
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
msgstr ""
-#: src/main/extract.c:178
+#: src/main/extract.c:175
msgid "print this help"
msgstr ""
-#: src/main/extract.c:180
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr ""
-#: src/main/extract.c:182
+#: src/main/extract.c:179
msgid "load an extractor plugin named LIBRARY"
msgstr ""
-#: src/main/extract.c:184
+#: src/main/extract.c:181
msgid "list all keyword types"
msgstr ""
-#: src/main/extract.c:186
+#: src/main/extract.c:183
msgid "do not use the default set of extractor plugins"
msgstr ""
-#: src/main/extract.c:188
+#: src/main/extract.c:185
msgid "print only keywords of the given TYPE (use -L to get a list)"
msgstr ""
-#: src/main/extract.c:190
+#: src/main/extract.c:187
msgid "print the version number"
msgstr ""
-#: src/main/extract.c:192
+#: src/main/extract.c:189
msgid "be verbose"
msgstr ""
-#: src/main/extract.c:194
+#: src/main/extract.c:191
msgid "do not print keywords of the given TYPE"
msgstr ""
-#: src/main/extract.c:197
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr ""
-#: src/main/extract.c:198
+#: src/main/extract.c:195
msgid "Extract metadata from files."
msgstr ""
-#: src/main/extract.c:238
+#: src/main/extract.c:236
#, c-format
msgid "Found by `%s' plugin:\n"
msgstr ""
-#: src/main/extract.c:245
+#: src/main/extract.c:239 src/main/extract.c:320
+#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
+msgid "unknown"
+msgstr ""
+
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:266
+#: src/main/extract.c:268
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binario, %u bite)\n"
-#: src/main/extract.c:603 src/main/extract.c:613
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
-msgid "Illegal combination of options, cannot combine multiple styles of printing.\n"
+msgid ""
+"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:640
+#: src/main/extract.c:638
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
-msgstr "Deve essere specificato un argomento per l'opzione \"%s\" (opzione ignorata).\n"
+msgstr ""
+"Deve essere specificato un argomento per l'opzione \"%s\" (opzione "
+"ignorata).\n"
-#: src/main/extract.c:705
+#: src/main/extract.c:703
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Usare --help per ottenere un elenco di opzioni.\n"
-#: src/main/extract.c:737
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% file BiBTeX\n"
-#: src/main/extract.c:744
+#: src/main/extract.c:748
#, c-format
msgid "Keywords for file %s:\n"
msgstr ""
@@ -1146,7 +1156,9 @@ msgid "publishing institution"
msgstr ""
#: src/main/extractor_metatypes.c:77
-msgid "institution that was involved in the publishing, but not necessarily the publisher"
+msgid ""
+"institution that was involved in the publishing, but not necessarily the "
+"publisher"
msgstr ""
#: src/main/extractor_metatypes.c:78
@@ -1186,8 +1198,12 @@ msgid "publication day"
msgstr "giorno di pubblicazione"
#: src/main/extractor_metatypes.c:88
-msgid "day of publication (or, if unpublished, the day of creation), relative to the given month"
-msgstr "giorno di pubblicazione (o, se non pubblicato, il giorno di creazione), relativo al mese dato"
+msgid ""
+"day of publication (or, if unpublished, the day of creation), relative to "
+"the given month"
+msgstr ""
+"giorno di pubblicazione (o, se non pubblicato, il giorno di creazione), "
+"relativo al mese dato"
#: src/main/extractor_metatypes.c:89
msgid "publication date"
@@ -1341,10 +1357,6 @@ msgstr ""
msgid "ISO 2-letter country code for the country of origin"
msgstr ""
-#: src/main/extractor_metatypes.c:136
-msgid "unknown"
-msgstr ""
-
#: src/main/extractor_metatypes.c:137
msgid "specifics are not known"
msgstr ""
@@ -1422,7 +1434,9 @@ msgid "unknown date"
msgstr ""
#: src/main/extractor_metatypes.c:163
-msgid "ambiguous date (could specify creation time, modification time or access time)"
+msgid ""
+"ambiguous date (could specify creation time, modification time or access "
+"time)"
msgstr ""
#: src/main/extractor_metatypes.c:164
@@ -1690,7 +1704,9 @@ msgid "target platform"
msgstr ""
#: src/main/extractor_metatypes.c:238
-msgid "name of the architecture, operating system and distribution this package is for"
+msgid ""
+"name of the architecture, operating system and distribution this package is "
+"for"
msgstr ""
#: src/main/extractor_metatypes.c:239
@@ -1698,7 +1714,9 @@ msgid "resource type"
msgstr ""
#: src/main/extractor_metatypes.c:240
-msgid "categorization of the nature of the resource that is more specific than the file format"
+msgid ""
+"categorization of the nature of the resource that is more specific than the "
+"file format"
msgstr ""
#: src/main/extractor_metatypes.c:241
@@ -1706,7 +1724,8 @@ msgid "library search path"
msgstr ""
#: src/main/extractor_metatypes.c:242
-msgid "path in the file system to be considered when looking for required libraries"
+msgid ""
+"path in the file system to be considered when looking for required libraries"
msgstr ""
#: src/main/extractor_metatypes.c:243
@@ -1838,7 +1857,7 @@ msgid "paragraph count"
msgstr ""
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
+msgid "number of paragraphs"
msgstr ""
#: src/main/extractor_metatypes.c:304
@@ -1934,7 +1953,9 @@ msgid "performer"
msgstr ""
#: src/main/extractor_metatypes.c:335
-msgid "The artist(s) who performed the work (conductor, orchestra, soloists, actor, etc.)"
+msgid ""
+"The artist(s) who performed the work (conductor, orchestra, soloists, actor, "
+"etc.)"
msgstr ""
#: src/main/extractor_metatypes.c:337
@@ -2122,7 +2143,8 @@ msgid "interpretation"
msgstr ""
#: src/main/extractor_metatypes.c:388
-msgid "information about the people behind interpretations of an existing piece"
+msgid ""
+"information about the people behind interpretations of an existing piece"
msgstr ""
#: src/main/extractor_metatypes.c:389
@@ -2246,7 +2268,8 @@ msgid "full data"
msgstr ""
#: src/main/extractor_metatypes.c:423
-msgid "entry that contains the full, original binary data (not really meta data)"
+msgid ""
+"entry that contains the full, original binary data (not really meta data)"
msgstr ""
#: src/main/extractor_metatypes.c:425
@@ -2277,6 +2300,15 @@ msgstr ""
msgid "name of the group or band"
msgstr ""
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+#, fuzzy
+msgid "original filename"
+msgstr "originale"
+
+#: src/main/extractor_metatypes.c:437
+msgid "name of the original file (reserved for GNUnet)"
+msgstr ""
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
msgid "last"
msgstr ""
diff --git a/po/libextractor.pot b/po/libextractor.pot
@@ -8,10 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-06-13 13:15+0200\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -786,27 +787,27 @@ msgstr ""
msgid "Layer III"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
msgid "copyright"
msgstr ""
-#: src/plugins/mp3_extractor.c:250
+#: src/plugins/mp3_extractor.c:248
msgid "no copyright"
msgstr ""
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "original"
msgstr ""
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "copy"
msgstr ""
@@ -885,12 +886,12 @@ msgstr ""
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
-#: src/main/extractor.c:2294
+#: src/main/extractor.c:2372
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr ""
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, c-format
msgid ""
"Usage: %s\n"
@@ -898,106 +899,106 @@ msgid ""
"\n"
msgstr ""
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, c-format
msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
msgstr ""
-#: src/main/extract.c:170
+#: src/main/extract.c:171
msgid "print output in bibtex format"
msgstr ""
-#: src/main/extract.c:172
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
msgstr ""
-#: src/main/extract.c:174
+#: src/main/extract.c:175
msgid "print this help"
msgstr ""
-#: src/main/extract.c:176
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr ""
-#: src/main/extract.c:178
+#: src/main/extract.c:179
msgid "load an extractor plugin named LIBRARY"
msgstr ""
-#: src/main/extract.c:180
+#: src/main/extract.c:181
msgid "list all keyword types"
msgstr ""
-#: src/main/extract.c:182
+#: src/main/extract.c:183
msgid "do not use the default set of extractor plugins"
msgstr ""
-#: src/main/extract.c:184
+#: src/main/extract.c:185
msgid "print only keywords of the given TYPE (use -L to get a list)"
msgstr ""
-#: src/main/extract.c:186
+#: src/main/extract.c:187
msgid "print the version number"
msgstr ""
-#: src/main/extract.c:188
+#: src/main/extract.c:189
msgid "be verbose"
msgstr ""
-#: src/main/extract.c:190
+#: src/main/extract.c:191
msgid "do not print keywords of the given TYPE"
msgstr ""
-#: src/main/extract.c:193
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr ""
-#: src/main/extract.c:194
+#: src/main/extract.c:195
msgid "Extract metadata from files."
msgstr ""
-#: src/main/extract.c:235
+#: src/main/extract.c:236
#, c-format
msgid "Found by `%s' plugin:\n"
msgstr ""
-#: src/main/extract.c:238 src/main/extract.c:319
+#: src/main/extract.c:239 src/main/extract.c:320
#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
msgid "unknown"
msgstr ""
-#: src/main/extract.c:243
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:267
+#: src/main/extract.c:268
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:600 src/main/extract.c:610
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:637
+#: src/main/extract.c:638
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
-#: src/main/extract.c:702
+#: src/main/extract.c:703
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr ""
-#: src/main/extract.c:740
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr ""
-#: src/main/extract.c:747
+#: src/main/extract.c:748
#, c-format
msgid "Keywords for file %s:\n"
msgstr ""
@@ -1850,7 +1851,7 @@ msgid "paragraph count"
msgstr ""
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
+msgid "number of paragraphs"
msgstr ""
#: src/main/extractor_metatypes.c:304
@@ -2293,6 +2294,14 @@ msgstr ""
msgid "name of the group or band"
msgstr ""
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+msgid "original filename"
+msgstr ""
+
+#: src/main/extractor_metatypes.c:437
+msgid "name of the original file (reserved for GNUnet)"
+msgstr ""
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
msgid "last"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-0.5.20a\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-06-13 13:15+0200\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: 2009-03-08 16:59+0100\n"
"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -790,28 +791,28 @@ msgstr ""
msgid "Layer III"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
msgid "copyright"
msgstr "copyright"
-#: src/plugins/mp3_extractor.c:250
+#: src/plugins/mp3_extractor.c:248
#, fuzzy
msgid "no copyright"
msgstr "copyright"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "original"
msgstr ""
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
#, fuzzy
msgid "copy"
msgstr "firma"
@@ -891,12 +892,12 @@ msgstr "%s: optie '-W %s' is niet eenduidig\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: optie '-W %s' staat geen argument toe\n"
-#: src/main/extractor.c:2294
+#: src/main/extractor.c:2372
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisatie van plugin-mechanisme is mislukt: %s\n"
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, c-format
msgid ""
"Usage: %s\n"
@@ -907,7 +908,7 @@ msgstr ""
"%s\n"
"\n"
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, c-format
msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -915,103 +916,103 @@ msgstr ""
"Argumenten die verplicht zijn voor lange opties zijn dat ook voor korte "
"opties.\n"
-#: src/main/extract.c:170
+#: src/main/extract.c:171
msgid "print output in bibtex format"
msgstr "uitvoer in bibtex-indeling produceren"
-#: src/main/extract.c:172
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
msgstr ""
"uitvoer produceren die makkelijk te greppen is (alle resultaten op één regel "
"per bestand)"
-#: src/main/extract.c:174
+#: src/main/extract.c:175
msgid "print this help"
msgstr "deze hulptekst tonen"
-#: src/main/extract.c:176
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr ""
-#: src/main/extract.c:178
+#: src/main/extract.c:179
msgid "load an extractor plugin named LIBRARY"
msgstr "deze extractor-plugin laden"
-#: src/main/extract.c:180
+#: src/main/extract.c:181
msgid "list all keyword types"
msgstr "alle sleutelwoordtypes opsommen"
-#: src/main/extract.c:182
+#: src/main/extract.c:183
msgid "do not use the default set of extractor plugins"
msgstr "de standaardset extractor-plugins niet gebruiken"
-#: src/main/extract.c:184
+#: src/main/extract.c:185
msgid "print only keywords of the given TYPE (use -L to get a list)"
msgstr ""
"alleen sleutelwoorden van dit type tonen (gebruik '-L' voor een overzicht)"
-#: src/main/extract.c:186
+#: src/main/extract.c:187
msgid "print the version number"
msgstr "programmaversie tonen"
-#: src/main/extract.c:188
+#: src/main/extract.c:189
msgid "be verbose"
msgstr "gedetailleerde uivoer produceren"
-#: src/main/extract.c:190
+#: src/main/extract.c:191
msgid "do not print keywords of the given TYPE"
msgstr "sleutelwoorden van dit type niet tonen"
-#: src/main/extract.c:193
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr "extract [OPTIES] [BESTANDSNAAM]*"
-#: src/main/extract.c:194
+#: src/main/extract.c:195
msgid "Extract metadata from files."
msgstr "Metadata uit bestanden lezen."
-#: src/main/extract.c:235
+#: src/main/extract.c:236
#, fuzzy, c-format
msgid "Found by `%s' plugin:\n"
msgstr "Laden van plugin '%s' is mislukt: %s\n"
-#: src/main/extract.c:238 src/main/extract.c:319
+#: src/main/extract.c:239 src/main/extract.c:320
#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
msgid "unknown"
msgstr "onbekend"
-#: src/main/extract.c:243
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:267
+#: src/main/extract.c:268
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binair)\n"
-#: src/main/extract.c:600 src/main/extract.c:610
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:637
+#: src/main/extract.c:638
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Optie '%s' vereist een argument -- optie is genegeerd.\n"
-#: src/main/extract.c:702
+#: src/main/extract.c:703
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Gebruik '--help' voor een lijst met mogelijke opties.\n"
-#: src/main/extract.c:740
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% BiBTeX-bestand\n"
-#: src/main/extract.c:747
+#: src/main/extract.c:748
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Trefwoorden voor bestand %s:\n"
@@ -1922,8 +1923,9 @@ msgid "paragraph count"
msgstr "aantal alinea's"
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
-msgstr ""
+#, fuzzy
+msgid "number of paragraphs"
+msgstr "bewerkingscycli"
#: src/main/extractor_metatypes.c:304
msgid "word count"
@@ -2402,7 +2404,17 @@ msgstr "groep"
msgid "name of the group or band"
msgstr "uitgever"
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+#, fuzzy
+msgid "original filename"
+msgstr "naam"
+
+#: src/main/extractor_metatypes.c:437
+#, fuzzy
+msgid "name of the original file (reserved for GNUnet)"
+msgstr "uitgever"
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
#, fuzzy
msgid "last"
msgstr "flits"
diff --git a/po/ro.po b/po/ro.po
@@ -9,10 +9,11 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.3\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-06-13 13:15+0200\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: 2005-08-16 12:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -792,28 +793,28 @@ msgstr ""
msgid "Layer III"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
msgid "copyright"
msgstr "copyright"
-#: src/plugins/mp3_extractor.c:250
+#: src/plugins/mp3_extractor.c:248
#, fuzzy
msgid "no copyright"
msgstr "copyright"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "original"
msgstr ""
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
#, fuzzy
msgid "copy"
msgstr "copyright"
@@ -893,12 +894,12 @@ msgstr "%s: op
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: opiunea `-W %s' nu permite un argument\n"
-#: src/main/extractor.c:2294
+#: src/main/extractor.c:2372
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "iniializare mecanismului de plugin a euat: %s!\n"
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, c-format
msgid ""
"Usage: %s\n"
@@ -909,7 +910,7 @@ msgstr ""
"%s\n"
"\n"
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, c-format
msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -917,103 +918,103 @@ msgstr ""
"Argumentele obligatorii pentru opiunile lungi sunt obligatorii i pentru "
"opiunile scurte.\n"
-#: src/main/extract.c:170
+#: src/main/extract.c:171
msgid "print output in bibtex format"
msgstr "afieaz ieirea n format bibtex"
-#: src/main/extract.c:172
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
msgstr ""
-#: src/main/extract.c:174
+#: src/main/extract.c:175
msgid "print this help"
msgstr "afieaz acest mesaj de ajutor"
-#: src/main/extract.c:176
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr ""
-#: src/main/extract.c:178
+#: src/main/extract.c:179
msgid "load an extractor plugin named LIBRARY"
msgstr "ncarc un plugin extractor numit LIBRRIE"
-#: src/main/extract.c:180
+#: src/main/extract.c:181
msgid "list all keyword types"
msgstr "listeaz toate tipurile de cuvinte cheie"
-#: src/main/extract.c:182
+#: src/main/extract.c:183
msgid "do not use the default set of extractor plugins"
msgstr "nu folosi setul implicit de plugin-uri extractor"
-#: src/main/extract.c:184
+#: src/main/extract.c:185
msgid "print only keywords of the given TYPE (use -L to get a list)"
msgstr ""
"afieaz numai cuvintele cheie pentru TIP-ul dat (folosete -L pentru a "
"obine o list"
-#: src/main/extract.c:186
+#: src/main/extract.c:187
msgid "print the version number"
msgstr "afieaz numrul versiunii"
-#: src/main/extract.c:188
+#: src/main/extract.c:189
msgid "be verbose"
msgstr "fi vorbre"
-#: src/main/extract.c:190
+#: src/main/extract.c:191
msgid "do not print keywords of the given TYPE"
msgstr "nu afia cuvinte cheie de TIP-ul dat"
-#: src/main/extract.c:193
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr "extract [OPIUNI] [NUME_FIIER]*"
-#: src/main/extract.c:194
+#: src/main/extract.c:195
msgid "Extract metadata from files."
msgstr "Extrage metadata din fiiere."
-#: src/main/extract.c:235
+#: src/main/extract.c:236
#, fuzzy, c-format
msgid "Found by `%s' plugin:\n"
msgstr "ncrcarea plugin-ului '%s' a euat: %s\n"
-#: src/main/extract.c:238 src/main/extract.c:319
+#: src/main/extract.c:239 src/main/extract.c:320
#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
msgid "unknown"
msgstr "necunoscut"
-#: src/main/extract.c:243
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:267
+#: src/main/extract.c:268
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binar)\n"
-#: src/main/extract.c:600 src/main/extract.c:610
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:637
+#: src/main/extract.c:638
#, fuzzy, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
"Trebuie s specificai un argument pentru opiunea '%s' (opiune ignorat).\n"
-#: src/main/extract.c:702
+#: src/main/extract.c:703
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Folosii --help pentru a obine o list de opiuni.\n"
-#: src/main/extract.c:740
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% BiBTeX file\n"
-#: src/main/extract.c:747
+#: src/main/extract.c:748
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Cuvinte cheie pentru fiier %s:\n"
@@ -1924,8 +1925,9 @@ msgid "paragraph count"
msgstr "numr de pagini"
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
-msgstr ""
+#, fuzzy
+msgid "number of paragraphs"
+msgstr "Numr legturi n afara domeniului"
#: src/main/extractor_metatypes.c:304
#, fuzzy
@@ -2410,7 +2412,17 @@ msgstr "grup"
msgid "name of the group or band"
msgstr "publicist"
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+#, fuzzy
+msgid "original filename"
+msgstr "nume_fiier"
+
+#: src/main/extractor_metatypes.c:437
+#, fuzzy
+msgid "name of the original file (reserved for GNUnet)"
+msgstr "publicist"
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
#, fuzzy
msgid "last"
msgstr "bli"
diff --git a/po/rw.po b/po/rw.po
@@ -16,10 +16,11 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.4.2\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-06-13 13:15+0200\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
+"Language: rw\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -853,29 +854,29 @@ msgstr ""
msgid "Layer III"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr ""
-#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
#, fuzzy
msgid "copyright"
msgstr "Uburenganzira bw'umuhimbyi"
-#: src/plugins/mp3_extractor.c:250
+#: src/plugins/mp3_extractor.c:248
#, fuzzy
msgid "no copyright"
msgstr "Uburenganzira bw'umuhimbyi"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "original"
msgstr ""
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
#, fuzzy
msgid "copy"
msgstr "Uburenganzira bw'umuhimbyi"
@@ -955,12 +956,12 @@ msgstr "%s:Ihitamo ni"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s:Ihitamo Kwemerera"
-#: src/main/extractor.c:2294
+#: src/main/extractor.c:2372
#, fuzzy, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Bya Byanze"
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, fuzzy, c-format
msgid ""
"Usage: %s\n"
@@ -968,115 +969,115 @@ msgid ""
"\n"
msgstr "Ikoresha:"
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, fuzzy, c-format
msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
msgstr "kugirango Amahitamo kugirango Amahitamo"
-#: src/main/extract.c:170
+#: src/main/extract.c:171
#, fuzzy
msgid "print output in bibtex format"
msgstr "Gucapa Ibisohoka in Imiterere"
-#: src/main/extract.c:172
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
msgstr ""
-#: src/main/extract.c:174
+#: src/main/extract.c:175
#, fuzzy
msgid "print this help"
msgstr "Gucapa iyi Ifashayobora"
-#: src/main/extract.c:176
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr ""
-#: src/main/extract.c:178
+#: src/main/extract.c:179
#, fuzzy
msgid "load an extractor plugin named LIBRARY"
msgstr "Ibirimo"
-#: src/main/extract.c:180
+#: src/main/extract.c:181
#, fuzzy
msgid "list all keyword types"
msgstr "Urutonde Byose Ijambo- banze"
-#: src/main/extract.c:182
+#: src/main/extract.c:183
#, fuzzy
msgid "do not use the default set of extractor plugins"
msgstr "OYA Gukoresha i Mburabuzi Gushyiraho Bya"
-#: src/main/extract.c:184
+#: src/main/extract.c:185
#, fuzzy
msgid "print only keywords of the given TYPE (use -L to get a list)"
msgstr "Gucapa Amagambo fatizo Bya i Gukoresha Kuri Kubona a Urutonde"
-#: src/main/extract.c:186
+#: src/main/extract.c:187
#, fuzzy
msgid "print the version number"
msgstr "Gucapa i Verisiyo Umubare"
-#: src/main/extract.c:188
+#: src/main/extract.c:189
msgid "be verbose"
msgstr ""
-#: src/main/extract.c:190
+#: src/main/extract.c:191
#, fuzzy
msgid "do not print keywords of the given TYPE"
msgstr "OYA Gucapa Amagambo fatizo Bya i"
-#: src/main/extract.c:193
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr ""
-#: src/main/extract.c:194
+#: src/main/extract.c:195
#, fuzzy
msgid "Extract metadata from files."
msgstr "Bivuye Idosiye"
-#: src/main/extract.c:235
+#: src/main/extract.c:236
#, fuzzy, c-format
msgid "Found by `%s' plugin:\n"
msgstr "Byanze"
-#: src/main/extract.c:238 src/main/extract.c:319
+#: src/main/extract.c:239 src/main/extract.c:320
#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
msgid "unknown"
msgstr "itazwi"
-#: src/main/extract.c:243
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:267
+#: src/main/extract.c:268
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s-(Nyabibiri"
-#: src/main/extract.c:600 src/main/extract.c:610
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:637
+#: src/main/extract.c:638
#, fuzzy, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "kugirango i Ihitamo Ihitamo"
-#: src/main/extract.c:702
+#: src/main/extract.c:703
#, fuzzy, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
-#: src/main/extract.c:740
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr ""
-#: src/main/extract.c:747
+#: src/main/extract.c:748
#, fuzzy, c-format
msgid "Keywords for file %s:\n"
msgstr "kugirango IDOSIYE"
@@ -2081,8 +2082,9 @@ msgid "paragraph count"
msgstr "Kubara amapaje"
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
-msgstr ""
+#, fuzzy
+msgid "number of paragraphs"
+msgstr "Umubare Inyuma Bya Urutonde"
# sw/source\ui\inc\swmn.hrc:_MN_INS.MN_SUB_FIELD.FN_INSERT_FLD_PGCOUNT.text
#: src/main/extractor_metatypes.c:304
@@ -2637,7 +2639,17 @@ msgstr "Itsinda"
msgid "name of the group or band"
msgstr "Uwasohoye inyandiko"
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+#, fuzzy
+msgid "original filename"
+msgstr "Izina ry'idosiye"
+
+#: src/main/extractor_metatypes.c:437
+#, fuzzy
+msgid "name of the original file (reserved for GNUnet)"
+msgstr "Uwasohoye inyandiko"
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
#, fuzzy
msgid "last"
msgstr "Umuhanzi"
diff --git a/po/sv.po b/po/sv.po
@@ -7,10 +7,11 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.22\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-06-13 13:15+0200\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: 2009-05-12 17:45+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -788,28 +789,28 @@ msgstr "Layer II"
msgid "Layer III"
msgstr "Layer III"
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr "VBR"
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr "CBR"
-#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
msgid "copyright"
msgstr "copyright"
-#: src/plugins/mp3_extractor.c:250
+#: src/plugins/mp3_extractor.c:248
msgid "no copyright"
msgstr "ingen copyright"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
#, fuzzy
msgid "original"
msgstr "original"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "copy"
msgstr "kopia"
@@ -888,12 +889,12 @@ msgstr "%s: flagga \"-W %s\" är tvetydig\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
-#: src/main/extractor.c:2294
+#: src/main/extractor.c:2372
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, c-format
msgid ""
"Usage: %s\n"
@@ -904,7 +905,7 @@ msgstr ""
"%s\n"
"\n"
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, c-format
msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -912,100 +913,100 @@ msgstr ""
"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
"korta flaggor.\n"
-#: src/main/extract.c:170
+#: src/main/extract.c:171
msgid "print output in bibtex format"
msgstr "skriv ut i bibtex-format"
-#: src/main/extract.c:172
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
msgstr "producera grep-vänligt utdata (alla resultat på en rad per fil)"
-#: src/main/extract.c:174
+#: src/main/extract.c:175
msgid "print this help"
msgstr "skriv ut denna hjälp"
-#: src/main/extract.c:176
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr ""
-#: src/main/extract.c:178
+#: src/main/extract.c:179
msgid "load an extractor plugin named LIBRARY"
msgstr "läser in instick för uppackning med namnet BIBLIOTEK"
-#: src/main/extract.c:180
+#: src/main/extract.c:181
msgid "list all keyword types"
msgstr "lista alla typer av nyckelord"
-#: src/main/extract.c:182
+#: src/main/extract.c:183
msgid "do not use the default set of extractor plugins"
msgstr "använd inte förvalda uppsättningen av uppackningsinstick"
-#: src/main/extract.c:184
+#: src/main/extract.c:185
msgid "print only keywords of the given TYPE (use -L to get a list)"
msgstr "skriv endast ut nyckelord av angiven TYP (använd -L för lista)"
-#: src/main/extract.c:186
+#: src/main/extract.c:187
msgid "print the version number"
msgstr "skriv ut versionsnummer"
-#: src/main/extract.c:188
+#: src/main/extract.c:189
msgid "be verbose"
msgstr "var informativ"
-#: src/main/extract.c:190
+#: src/main/extract.c:191
msgid "do not print keywords of the given TYPE"
msgstr "skriv inte ut nyckelord av angiven TYP"
-#: src/main/extract.c:193
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr "extract [FLAGGOR] [FILNAMN]*"
-#: src/main/extract.c:194
+#: src/main/extract.c:195
msgid "Extract metadata from files."
msgstr "Extrahera metadata från filer."
-#: src/main/extract.c:235
+#: src/main/extract.c:236
#, fuzzy, c-format
msgid "Found by `%s' plugin:\n"
msgstr "Inläsning av instick \"%s\" misslyckades: %s\n"
-#: src/main/extract.c:238 src/main/extract.c:319
+#: src/main/extract.c:239 src/main/extract.c:320
#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
msgid "unknown"
msgstr "okänd"
-#: src/main/extract.c:243
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr ""
-#: src/main/extract.c:267
+#: src/main/extract.c:268
#, fuzzy, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (binär)\n"
-#: src/main/extract.c:600 src/main/extract.c:610
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr ""
-#: src/main/extract.c:637
+#: src/main/extract.c:638
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Du måste ange ett argument för flaggan \"%s\" (flagga ignoreras).\n"
-#: src/main/extract.c:702
+#: src/main/extract.c:703
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr "Använd --help för att få en lista på flaggor.\n"
-#: src/main/extract.c:740
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% BiBTeX-fil\n"
-#: src/main/extract.c:747
+#: src/main/extract.c:748
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Nyckelord för filen %s:\n"
@@ -1918,8 +1919,9 @@ msgid "paragraph count"
msgstr "antal stycken"
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
-msgstr ""
+#, fuzzy
+msgid "number of paragraphs"
+msgstr "redigeringscykler"
#: src/main/extractor_metatypes.c:304
msgid "word count"
@@ -2404,7 +2406,17 @@ msgstr "grupp"
msgid "name of the group or band"
msgstr "publicerad av"
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+#, fuzzy
+msgid "original filename"
+msgstr "original"
+
+#: src/main/extractor_metatypes.c:437
+#, fuzzy
+msgid "name of the original file (reserved for GNUnet)"
+msgstr "publicerad av"
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
#, fuzzy
msgid "last"
msgstr "blixt"
diff --git a/po/uk.po b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.6.2\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-06-13 13:15+0200\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: 2011-07-22 16:22+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -16,7 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 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"
+"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"
#: src/plugins/qt_extractor.c:30 src/plugins/id3_extractor.c:44
msgid "Blues"
@@ -788,27 +789,27 @@ msgstr "Layer II"
msgid "Layer III"
msgstr "Layer III"
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr "VBR"
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr "CBR"
-#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
msgid "copyright"
msgstr "захищено авторськими правами"
-#: src/plugins/mp3_extractor.c:250
+#: src/plugins/mp3_extractor.c:248
msgid "no copyright"
msgstr "без захисту авторськими правами"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "original"
msgstr "оригінал"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "copy"
msgstr "копія"
@@ -887,12 +888,12 @@ msgstr "%s: параметр «-W %s» неоднозначний\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: параметр «-W %s» не повинен мати аргументу\n"
-#: src/main/extractor.c:2294
+#: src/main/extractor.c:2372
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Помилка під час спроби ініціалізації механізму додатків: %s!\n"
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, c-format
msgid ""
"Usage: %s\n"
@@ -903,104 +904,118 @@ msgstr ""
"%s\n"
"\n"
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, c-format
-msgid "Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr "Обов’язкові аргументи для довгих форм запису параметрів є обов’язковими і для скорочених форм.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Обов’язкові аргументи для довгих форм запису параметрів є обов’язковими і "
+"для скорочених форм.\n"
-#: src/main/extract.c:170
+#: src/main/extract.c:171
msgid "print output in bibtex format"
msgstr "вивести дані у форматі bibtex"
-#: src/main/extract.c:172
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
-msgstr "виводити дані у режимі сумісності з grep (єдиний рядок для всіх результатів з файла)"
+msgstr ""
+"виводити дані у режимі сумісності з grep (єдиний рядок для всіх результатів "
+"з файла)"
-#: src/main/extract.c:174
+#: src/main/extract.c:175
msgid "print this help"
msgstr "показати ці довідкові дані"
-#: src/main/extract.c:176
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr "запускати додатки у межах процесу (спрощує діагностику)"
-#: src/main/extract.c:178
+#: src/main/extract.c:179
msgid "load an extractor plugin named LIBRARY"
msgstr "завантажити додаток видобування з назвою LIBRARY"
-#: src/main/extract.c:180
+#: src/main/extract.c:181
msgid "list all keyword types"
msgstr "список всіх типів ключових слів"
-#: src/main/extract.c:182
+#: src/main/extract.c:183
msgid "do not use the default set of extractor plugins"
msgstr "не використовувати типовий набір додатків видобування"
-#: src/main/extract.c:184
+#: src/main/extract.c:185
msgid "print only keywords of the given TYPE (use -L to get a list)"
-msgstr "виводити ключові слова лише вказаного типу TYPE (скористайтеся -L, щоб отримати список)"
+msgstr ""
+"виводити ключові слова лише вказаного типу TYPE (скористайтеся -L, щоб "
+"отримати список)"
-#: src/main/extract.c:186
+#: src/main/extract.c:187
msgid "print the version number"
msgstr "вивести номер версії"
-#: src/main/extract.c:188
+#: src/main/extract.c:189
msgid "be verbose"
msgstr "режим з докладних повідомлень"
-#: src/main/extract.c:190
+#: src/main/extract.c:191
msgid "do not print keywords of the given TYPE"
msgstr "не виводити ключових слів вказаного типу TYPE"
-#: src/main/extract.c:193
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr "extract [ПАРАМЕТРИ] [НАЗВА_ФАЙЛА]*"
-#: src/main/extract.c:194
+#: src/main/extract.c:195
msgid "Extract metadata from files."
msgstr "Видобути метадані з файлів."
-#: src/main/extract.c:235
+#: src/main/extract.c:236
#, c-format
msgid "Found by `%s' plugin:\n"
msgstr "Знайдено додатком «%s»:\n"
-#: src/main/extract.c:238 src/main/extract.c:319
+#: src/main/extract.c:239 src/main/extract.c:320
#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
msgid "unknown"
msgstr "невідомий"
-#: src/main/extract.c:243
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr "%s — (невідомий, %u байтів)\n"
-#: src/main/extract.c:267
+#: src/main/extract.c:268
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s — (бінарний, %u байтів)\n"
-#: src/main/extract.c:600 src/main/extract.c:610
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
-msgid "Illegal combination of options, cannot combine multiple styles of printing.\n"
-msgstr "Некоректне поєднання параметрів, не можна визначати декілька стилів виведення даних.\n"
+msgid ""
+"Illegal combination of options, cannot combine multiple styles of printing.\n"
+msgstr ""
+"Некоректне поєднання параметрів, не можна визначати декілька стилів "
+"виведення даних.\n"
-#: src/main/extract.c:637
+#: src/main/extract.c:638
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
-msgstr "Параметр «%s» можна використовувати лише з додатковим аргументом (параметр проігноровано).\n"
+msgstr ""
+"Параметр «%s» можна використовувати лише з додатковим аргументом (параметр "
+"проігноровано).\n"
-#: src/main/extract.c:702
+#: src/main/extract.c:703
#, c-format
msgid "Use --help to get a list of options.\n"
-msgstr "Скористайтеся параметром --help для отримання списку можливих параметрів командного рядка.\n"
+msgstr ""
+"Скористайтеся параметром --help для отримання списку можливих параметрів "
+"командного рядка.\n"
-#: src/main/extract.c:740
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% файл BiBTeX\n"
-#: src/main/extract.c:747
+#: src/main/extract.c:748
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Ключові слова для файла %s:\n"
@@ -1154,8 +1169,12 @@ msgid "publishing institution"
msgstr "організація-видавець"
#: src/main/extractor_metatypes.c:77
-msgid "institution that was involved in the publishing, but not necessarily the publisher"
-msgstr "установа, яка брала участь у опублікуванні, не обов’язково безпосередній видавець"
+msgid ""
+"institution that was involved in the publishing, but not necessarily the "
+"publisher"
+msgstr ""
+"установа, яка брала участь у опублікуванні, не обов’язково безпосередній "
+"видавець"
#: src/main/extractor_metatypes.c:78
msgid "publication series"
@@ -1194,8 +1213,12 @@ msgid "publication day"
msgstr "день публікації"
#: src/main/extractor_metatypes.c:88
-msgid "day of publication (or, if unpublished, the day of creation), relative to the given month"
-msgstr "день публікації (або, якщо не опубліковано, день створення) у вказаному місяці"
+msgid ""
+"day of publication (or, if unpublished, the day of creation), relative to "
+"the given month"
+msgstr ""
+"день публікації (або, якщо не опубліковано, день створення) у вказаному "
+"місяці"
#: src/main/extractor_metatypes.c:89
msgid "publication date"
@@ -1426,8 +1449,12 @@ msgid "unknown date"
msgstr "невідома дата"
#: src/main/extractor_metatypes.c:163
-msgid "ambiguous date (could specify creation time, modification time or access time)"
-msgstr "неоднозначні дані (можуть відповідати часу створення, часу внесення змін або часу доступу)"
+msgid ""
+"ambiguous date (could specify creation time, modification time or access "
+"time)"
+msgstr ""
+"неоднозначні дані (можуть відповідати часу створення, часу внесення змін або "
+"часу доступу)"
#: src/main/extractor_metatypes.c:164
msgid "creation date"
@@ -1694,15 +1721,21 @@ msgid "target platform"
msgstr "платформа призначення"
#: src/main/extractor_metatypes.c:238
-msgid "name of the architecture, operating system and distribution this package is for"
-msgstr "назва архітектури, операційної системи та дистрибутива, для яких призначено цей пакунок"
+msgid ""
+"name of the architecture, operating system and distribution this package is "
+"for"
+msgstr ""
+"назва архітектури, операційної системи та дистрибутива, для яких призначено "
+"цей пакунок"
#: src/main/extractor_metatypes.c:239
msgid "resource type"
msgstr "тип ресурсу"
#: src/main/extractor_metatypes.c:240
-msgid "categorization of the nature of the resource that is more specific than the file format"
+msgid ""
+"categorization of the nature of the resource that is more specific than the "
+"file format"
msgstr "категорія, до якої належить ресурс, специфічніша за формат файла"
#: src/main/extractor_metatypes.c:241
@@ -1710,7 +1743,8 @@ msgid "library search path"
msgstr "шлях пошуку бібліотек"
#: src/main/extractor_metatypes.c:242
-msgid "path in the file system to be considered when looking for required libraries"
+msgid ""
+"path in the file system to be considered when looking for required libraries"
msgstr "шлях у файловій системі, за яким слід шукати потрібні бібліотеки"
#: src/main/extractor_metatypes.c:243
@@ -1842,7 +1876,8 @@ msgid "paragraph count"
msgstr "кількість абзаців"
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
+#, fuzzy
+msgid "number of paragraphs"
msgstr "кількість абзаців"
#: src/main/extractor_metatypes.c:304
@@ -1938,7 +1973,9 @@ msgid "performer"
msgstr "виконавець"
#: src/main/extractor_metatypes.c:335
-msgid "The artist(s) who performed the work (conductor, orchestra, soloists, actor, etc.)"
+msgid ""
+"The artist(s) who performed the work (conductor, orchestra, soloists, actor, "
+"etc.)"
msgstr "Виконавець твору (диригент, оркестр, солісти тощо)"
#: src/main/extractor_metatypes.c:337
@@ -2126,7 +2163,8 @@ msgid "interpretation"
msgstr "інтерпретація"
#: src/main/extractor_metatypes.c:388
-msgid "information about the people behind interpretations of an existing piece"
+msgid ""
+"information about the people behind interpretations of an existing piece"
msgstr "дані щодо творців інтерпретації твору"
#: src/main/extractor_metatypes.c:389
@@ -2250,7 +2288,8 @@ msgid "full data"
msgstr "дані повністю"
#: src/main/extractor_metatypes.c:423
-msgid "entry that contains the full, original binary data (not really meta data)"
+msgid ""
+"entry that contains the full, original binary data (not really meta data)"
msgstr "запис, що містить повні початкові двійкові дані (а не метадані)"
#: src/main/extractor_metatypes.c:425
@@ -2281,6 +2320,16 @@ msgstr "група"
msgid "name of the group or band"
msgstr "назва групи"
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+#, fuzzy
+msgid "original filename"
+msgstr "початкова назва"
+
+#: src/main/extractor_metatypes.c:437
+#, fuzzy
+msgid "name of the original file (reserved for GNUnet)"
+msgstr "ім’я або назва виконавця оригіналу"
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
msgid "last"
msgstr "тривалість"
diff --git a/po/vi.po b/po/vi.po
@@ -8,10 +8,11 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.6.0\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2010-06-13 13:15+0200\n"
+"POT-Creation-Date: 2011-11-28 12:53+0100\n"
"PO-Revision-Date: 2010-02-11 00:13+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -788,27 +789,27 @@ msgstr "Lớp 2"
msgid "Layer III"
msgstr "Lớp 3"
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "VBR"
msgstr "VBR"
-#: src/plugins/mp3_extractor.c:247
+#: src/plugins/mp3_extractor.c:245
msgid "CBR"
msgstr "CBR"
-#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140
+#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
msgid "copyright"
msgstr "bản quyền"
-#: src/plugins/mp3_extractor.c:250
+#: src/plugins/mp3_extractor.c:248
msgid "no copyright"
msgstr "không có tác quyền"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "original"
msgstr "gốc"
-#: src/plugins/mp3_extractor.c:251
+#: src/plugins/mp3_extractor.c:249
msgid "copy"
msgstr "chép"
@@ -887,12 +888,12 @@ msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
-#: src/main/extractor.c:2294
+#: src/main/extractor.c:2372
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Việc khởi động cơ chế cầm phít bị lỗi: %s\n"
-#: src/main/extract.c:97
+#: src/main/extract.c:98
#, c-format
msgid ""
"Usage: %s\n"
@@ -903,7 +904,7 @@ msgstr ""
"%s\n"
"\n"
-#: src/main/extract.c:100
+#: src/main/extract.c:101
#, c-format
msgid ""
"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -911,106 +912,106 @@ msgstr ""
"Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
"ngắn.\n"
-#: src/main/extract.c:170
+#: src/main/extract.c:171
msgid "print output in bibtex format"
msgstr "hiển thị dữ liệu xuất có dạng bibtex"
-#: src/main/extract.c:172
+#: src/main/extract.c:173
msgid "produce grep-friendly output (all results on one line per file)"
msgstr ""
"tạo ra kết xuất thân thiện với grep (mọi kết quả trên cùng dòng của mỗi tập "
"tin)"
-#: src/main/extract.c:174
+#: src/main/extract.c:175
msgid "print this help"
msgstr "hiển thị trợ giúp này"
-#: src/main/extract.c:176
+#: src/main/extract.c:177
msgid "run plugins in-process (simplifies debugging)"
msgstr "chạy phần bổ sung bên trong tiến trình (giản dị hoá chức năng gỡ rối)"
-#: src/main/extract.c:178
+#: src/main/extract.c:179
msgid "load an extractor plugin named LIBRARY"
msgstr "tải một trình cầm phít rút có tên LIBRARY (THƯ VIÊN)"
-#: src/main/extract.c:180
+#: src/main/extract.c:181
msgid "list all keyword types"
msgstr "liệt kê mọi kiểu từ khoá"
-#: src/main/extract.c:182
+#: src/main/extract.c:183
msgid "do not use the default set of extractor plugins"
msgstr "đừng dùng bộ trình rút mặc định"
-#: src/main/extract.c:184
+#: src/main/extract.c:185
msgid "print only keywords of the given TYPE (use -L to get a list)"
msgstr ""
"hiển thị chỉ từ khoá KIỂU (TYPE) đã cho thôi (dùng « -L » để xem danh sách)"
-#: src/main/extract.c:186
+#: src/main/extract.c:187
msgid "print the version number"
msgstr "hiển thị số thứ tự phiên bản"
-#: src/main/extract.c:188
+#: src/main/extract.c:189
msgid "be verbose"
msgstr "xuất chi tiết"
-#: src/main/extract.c:190
+#: src/main/extract.c:191
msgid "do not print keywords of the given TYPE"
msgstr "đừng hiển thị từ khoá KIỂU (TYPE) đã cho"
-#: src/main/extract.c:193
+#: src/main/extract.c:194
msgid "extract [OPTIONS] [FILENAME]*"
msgstr ""
"extract [TÙY_CHỌN] [TÊN_TẬP_TIN]*\n"
"[extract: trích ra]"
-#: src/main/extract.c:194
+#: src/main/extract.c:195
msgid "Extract metadata from files."
msgstr "Rút siêu dữ liệu ra tập tin."
-#: src/main/extract.c:235
+#: src/main/extract.c:236
#, c-format
msgid "Found by `%s' plugin:\n"
msgstr "Tìm bởi phần bổ sung « %s »:\n"
-#: src/main/extract.c:238 src/main/extract.c:319
+#: src/main/extract.c:239 src/main/extract.c:320
#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
msgid "unknown"
msgstr "không rõ"
-#: src/main/extract.c:243
+#: src/main/extract.c:244
#, c-format
msgid "%s - (unknown, %u bytes)\n"
msgstr "%s - (không rõ, %u byte)\n"
-#: src/main/extract.c:267
+#: src/main/extract.c:268
#, c-format
msgid "%s - (binary, %u bytes)\n"
msgstr "%s - (nhị phân, %u byte)\n"
-#: src/main/extract.c:600 src/main/extract.c:610
+#: src/main/extract.c:601 src/main/extract.c:611
#, c-format
msgid ""
"Illegal combination of options, cannot combine multiple styles of printing.\n"
msgstr "sai tổ hợp các tuỳ chọn này, không thể kết hợp nhiều cách in.\n"
-#: src/main/extract.c:637
+#: src/main/extract.c:638
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr "Bạn phải ghi rõ một đối số cho tùy chọn « %s » (tùy chọn bị bỏ qua).\n"
-#: src/main/extract.c:702
+#: src/main/extract.c:703
#, c-format
msgid "Use --help to get a list of options.\n"
msgstr ""
"Hãy sử dụng lệnh « --help » (trợ giúp) để xem một danh sách các tùy chọn.\n"
-#: src/main/extract.c:740
+#: src/main/extract.c:741
#, c-format
msgid "%% BiBTeX file\n"
msgstr "%% tập tin BiBTeX\n"
-#: src/main/extract.c:747
+#: src/main/extract.c:748
#, c-format
msgid "Keywords for file %s:\n"
msgstr "Từ khoá cho tập tin %s:\n"
@@ -1872,7 +1873,8 @@ msgid "paragraph count"
msgstr "số đếm đoạn văn"
#: src/main/extractor_metatypes.c:302
-msgid "number o paragraphs"
+#, fuzzy
+msgid "number of paragraphs"
msgstr "số các đoạn văn"
#: src/main/extractor_metatypes.c:304
@@ -2318,6 +2320,16 @@ msgstr "nhóm"
msgid "name of the group or band"
msgstr "tên của nhóm hay dàn nhạc"
-#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437
+#: src/main/extractor_metatypes.c:436
+#, fuzzy
+msgid "original filename"
+msgstr "tên gốc"
+
+#: src/main/extractor_metatypes.c:437
+#, fuzzy
+msgid "name of the original file (reserved for GNUnet)"
+msgstr "tên của người biểu diễn gốc"
+
+#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
msgid "last"
msgstr "cuối"
diff --git a/src/include/extractor.h b/src/include/extractor.h
@@ -32,7 +32,7 @@ extern "C" {
* 0.2.6-1 => 0x00020601
* 4.5.2-0 => 0x04050200
*/
-#define EXTRACTOR_VERSION 0x00060201
+#define EXTRACTOR_VERSION 0x00060300
#include <stdio.h>
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
@@ -30,7 +30,7 @@ libextractor_la_LIBADD = \
EXTRA_DIST = \
- iconv.c
+ iconv.c fuzz_default.sh fuzz_thumbnail.sh
libextractor_la_CPPFLAGS = -DPLUGINDIR=\"@RPLUGINDIR@\" -DPLUGININSTDIR=\"${plugindir}\" $(AM_CPPFLAGS)
diff --git a/src/main/extractor.c b/src/main/extractor.c
@@ -308,7 +308,6 @@ get_path_from_PATH() {
char * buf;
char * ret;
const char * p;
- size_t size;
p = getenv("PATH");
if (p == NULL)
@@ -322,7 +321,6 @@ get_path_from_PATH() {
free (path);
return NULL;
}
- size = strlen(path);
pos = path;
while (NULL != (end = strchr(pos, ':'))) {
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
@@ -131,6 +131,7 @@ libextractor_applefile_la_LIBADD = \
libextractor_asf_la_SOURCES = \
asf_extractor.c
libextractor_asf_la_LDFLAGS = \
+ $(top_builddir)/src/common/libextractor_common.la \
$(PLUGINFLAGS)
libextractor_deb_la_SOURCES = \
diff --git a/src/plugins/asf_extractor.c b/src/plugins/asf_extractor.c
@@ -1,6 +1,6 @@
/*
This file is part of libextractor.
- (C) 2002, 2003 Vidyut Samanta and Christian Grothoff
+ (C) 2002, 2003, 2011 Vidyut Samanta and Christian Grothoff
libextractor is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -53,28 +53,20 @@
#include "platform.h"
#include "extractor.h"
+#include "convert.h"
+#include <stdint.h>
-#define CODEC_TYPE_AUDIO 0
-#define CODEC_TYPE_VIDEO 1
-#define CODEC_TYPE_CONTROL 2
-#define MAX_NUM_STREAMS 23
-
-#define DEFRAG_BUFSIZE 65536
-#define DEMUX_START 1
#define DEMUX_FINISHED 0
+#define DEMUX_START 1
/*
* define asf GUIDs (list from avifile)
*/
#define GUID_ERROR 0
-
- /* base ASF objects */
#define GUID_ASF_HEADER 1
#define GUID_ASF_DATA 2
#define GUID_ASF_SIMPLE_INDEX 3
-
- /* header ASF objects */
#define GUID_ASF_FILE_PROPERTIES 4
#define GUID_ASF_STREAM_PROPERTIES 5
#define GUID_ASF_STREAM_BITRATE_PROPERTIES 6
@@ -88,33 +80,16 @@
#define GUID_ASF_EXTENDED_CONTENT_DESCRIPTION 14
#define GUID_ASF_ERROR_CORRECTION 15
#define GUID_ASF_PADDING 16
-
- /* stream properties object stream type */
#define GUID_ASF_AUDIO_MEDIA 17
#define GUID_ASF_VIDEO_MEDIA 18
#define GUID_ASF_COMMAND_MEDIA 19
-
- /* stream properties object error correction type */
#define GUID_ASF_NO_ERROR_CORRECTION 20
#define GUID_ASF_AUDIO_SPREAD 21
-
- /* mutual exclusion object exlusion type */
#define GUID_ASF_MUTEX_BITRATE 22
#define GUID_ASF_MUTEX_UKNOWN 23
-
- /* header extension */
#define GUID_ASF_RESERVED_1 24
-
- /* script command */
#define GUID_ASF_RESERVED_SCRIPT_COMMNAND 25
-
- /* marker object */
#define GUID_ASF_RESERVED_MARKER 26
-
- /* various */
-/*
-#define GUID_ASF_HEAD2 27
-*/
#define GUID_ASF_AUDIO_CONCEAL_NONE 27
#define GUID_ASF_CODEC_COMMENT1_HEADER 28
#define GUID_ASF_2_0_HEADER 29
@@ -122,28 +97,15 @@
#define GUID_END 30
-/* asf stream types */
-#define ASF_STREAM_TYPE_UNKNOWN 0
-#define ASF_STREAM_TYPE_AUDIO 1
-#define ASF_STREAM_TYPE_VIDEO 2
-#define ASF_STREAM_TYPE_CONTROL 3
-
-#define ASF_MAX_NUM_STREAMS 23
-
-
-typedef unsigned long long ext_uint64_t;
-typedef unsigned int ext_uint32_t;
-typedef unsigned short ext_uint16_t;
-typedef unsigned char ext_uint8_t;
-
typedef struct
{
- ext_uint32_t v1;
- ext_uint16_t v2;
- ext_uint16_t v3;
- ext_uint8_t v4[8];
+ uint32_t v1;
+ uint16_t v2;
+ uint16_t v3;
+ uint8_t v4[8];
} LE_GUID;
+
static const struct
{
const char *name;
@@ -342,92 +304,29 @@ static const struct
{
0x90, 0x34, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xbe}}},};
-typedef struct
-{
- int num;
- int seq;
-
- int frag_offset;
- int64_t timestamp;
- int ts_per_kbyte;
- int defrag;
- ext_uint32_t buf_type;
- int stream_id;
-
- ext_uint8_t *buffer;
-} asf_stream_t;
-
-typedef struct demux_asf_s
+struct demux_asf_s
{
/* pointer to the stream data */
const char *input;
/* current position in stream */
size_t inputPos;
- size_t inputLen;
-
- int keyframe_found;
-
- int seqno;
- ext_uint32_t packet_size;
- ext_uint8_t packet_flags;
- ext_uint32_t data_size;
-
- ext_uint32_t bitrates[MAX_NUM_STREAMS];
- int num_streams;
- int num_audio_streams;
- int num_video_streams;
- int audio_stream;
- int video_stream;
- int audio_stream_id;
- int video_stream_id;
- int control_stream_id;
-
- ext_uint16_t wavex[1024];
- int wavex_size;
-
- char title[512];
- char author[512];
- char copyright[512];
- char comment[512];
-
- ext_uint32_t length, rate;
- /* packet filling */
- int packet_size_left;
-
- /* frame rate calculations, discontinuity detection */
-
- int64_t last_pts[2];
- int32_t frame_duration;
- int send_newpts;
- int64_t last_frame_pts;
+ size_t inputLen;
- /* only for reading */
- ext_uint32_t packet_padsize;
- int nb_frames;
- ext_uint8_t frame_flag;
- ext_uint8_t segtype;
- int frame;
+ uint32_t length;
int status;
- /* byte reordering from audio streams */
- int reorder_h;
- int reorder_w;
- int reorder_b;
-
- off_t header_size;
- int buf_flag_seek;
-
- /* first packet position */
- int64_t first_packet_pos;
-
- int reference_mode;
-} demux_asf_t;
+ char *title;
+ char *author;
+ char *copyright;
+ char *comment;
+ char *rating;
+};
static int
-readBuf (demux_asf_t * this, void *buf, int len)
+readBuf (struct demux_asf_s * this, void *buf, int len)
{
int min;
@@ -439,10 +338,10 @@ readBuf (demux_asf_t * this, void *buf, int len)
return min;
}
-static ext_uint8_t
-get_byte (demux_asf_t * this)
+static uint8_t
+get_byte (struct demux_asf_s * this)
{
- ext_uint8_t buf;
+ uint8_t buf;
int i;
i = readBuf (this, &buf, 1);
@@ -451,10 +350,10 @@ get_byte (demux_asf_t * this)
return buf;
}
-static ext_uint16_t
-get_le16 (demux_asf_t * this)
+static uint16_t
+get_le16 (struct demux_asf_s * this)
{
- ext_uint8_t buf[2];
+ uint8_t buf[2];
int i;
i = readBuf (this, buf, 2);
@@ -463,10 +362,10 @@ get_le16 (demux_asf_t * this)
return buf[0] | (buf[1] << 8);
}
-static ext_uint32_t
-get_le32 (demux_asf_t * this)
+static uint32_t
+get_le32 (struct demux_asf_s * this)
{
- ext_uint8_t buf[4];
+ uint8_t buf[4];
int i;
i = readBuf (this, buf, 4);
@@ -475,26 +374,26 @@ get_le32 (demux_asf_t * this)
return buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24);
}
-static ext_uint64_t
-get_le64 (demux_asf_t * this)
+static uint64_t
+get_le64 (struct demux_asf_s * this)
{
- ext_uint8_t buf[8];
+ uint8_t buf[8];
int i;
i = readBuf (this, buf, 8);
if (i != 8)
this->status = DEMUX_FINISHED;
- return (ext_uint64_t) buf[0]
- | ((ext_uint64_t) buf[1] << 8)
- | ((ext_uint64_t) buf[2] << 16)
- | ((ext_uint64_t) buf[3] << 24)
- | ((ext_uint64_t) buf[4] << 32)
- | ((ext_uint64_t) buf[5] << 40)
- | ((ext_uint64_t) buf[6] << 48) | ((ext_uint64_t) buf[7] << 54);
+ return (uint64_t) buf[0]
+ | ((uint64_t) buf[1] << 8)
+ | ((uint64_t) buf[2] << 16)
+ | ((uint64_t) buf[3] << 24)
+ | ((uint64_t) buf[4] << 32)
+ | ((uint64_t) buf[5] << 40)
+ | ((uint64_t) buf[6] << 48) | ((uint64_t) buf[7] << 54);
}
static int
-get_guid (demux_asf_t * this)
+get_guid (struct demux_asf_s * this)
{
int i;
LE_GUID g;
@@ -513,193 +412,72 @@ get_guid (demux_asf_t * this)
return GUID_ERROR;
}
-static void
-get_str16_nolen (demux_asf_t * this, int len, char *buf, int buf_size)
-{
-
- int c;
- char *q;
-
- q = buf;
- while (len > 0)
- {
- c = get_le16 (this);
- if ((q - buf) < buf_size - 1)
- *q++ = c;
- len -= 2;
- }
- *q = '\0';
-}
static int
-asf_read_header (demux_asf_t * this)
+asf_read_header (struct demux_asf_s * this)
{
int guid;
- ext_uint64_t gsize;
+ uint64_t gsize;
+ uint16_t len1, len2, len3, len4, len5;
guid = get_guid (this);
if (guid != GUID_ASF_HEADER)
return 0;
- get_le64 (this);
- get_le32 (this);
- get_byte (this);
- get_byte (this);
-
+ get_le64 (this); /* object size */
+ get_le32 (this); /* number of header objects */
+ get_byte (this); /* reserved 1 */
+ get_byte (this); /* reserved 2 */
while (this->status != DEMUX_FINISHED)
{
- guid = get_guid (this);
- gsize = get_le64 (this);
-
+ guid = get_guid (this); /* object ID */
+ gsize = get_le64 (this); /* object size */
if (gsize < 24)
goto fail;
-
switch (guid)
{
case GUID_ASF_FILE_PROPERTIES:
- {
- ext_uint64_t start_time, end_time;
-
- guid = get_guid (this);
- get_le64 (this); /* file size */
- get_le64 (this); /* file time */
- get_le64 (this); /* nb_packets */
-
- end_time = get_le64 (this);
-
- this->length = get_le64 (this) / 10000;
- if (this->length)
- this->rate = this->inputLen / (this->length / 1000);
- else
- this->rate = 0;
-
-
- start_time = get_le32 (this); /* start timestamp in 1/1000 s */
-
- get_le32 (this); /* unknown */
- get_le32 (this); /* min size */
- this->packet_size = get_le32 (this); /* max size */
- get_le32 (this); /* max bitrate */
- get_le32 (this);
- }
+ guid = get_guid (this); /* file ID */
+ get_le64 (this); /* file size */
+ get_le64 (this); /* creation date */
+ get_le64 (this); /* nb_packets */
+ this->length = get_le64 (this); /* play duration in 100 ns units */
+ get_le64 (this); /* send duration */
+ get_le64 (this); /* preroll */
+ get_le32 (this); /* flags */
+ get_le32 (this); /* min size */
+ get_le32 (this); /* max size */
+ get_le32 (this); /* max bitrate */
break;
-
- case (GUID_ASF_STREAM_PROPERTIES):
- {
- int type;
- ext_uint32_t total_size, stream_data_size;
- ext_uint16_t stream_id;
- ext_uint64_t pos1, pos2;
- pos1 = this->inputPos;
-
- guid = get_guid (this);
- switch (guid)
- {
- case GUID_ASF_AUDIO_MEDIA:
- type = CODEC_TYPE_AUDIO;
- break;
-
- case GUID_ASF_VIDEO_MEDIA:
- type = CODEC_TYPE_VIDEO;
- break;
-
- case GUID_ASF_COMMAND_MEDIA:
- type = CODEC_TYPE_CONTROL;
- break;
-
- default:
- goto fail;
- }
-
- guid = get_guid (this);
- get_le64 (this);
- total_size = get_le32 (this);
- if (total_size > sizeof (this->wavex))
- goto fail;
- stream_data_size = get_le32 (this);
- stream_id = get_le16 (this); /* stream id */
- get_le32 (this);
-
- if (type == CODEC_TYPE_AUDIO)
- {
- ext_uint8_t buffer[6];
-
- readBuf (this, (ext_uint8_t *) this->wavex, total_size);
- if (guid == GUID_ASF_AUDIO_SPREAD)
- {
- readBuf (this, buffer, 6);
- this->reorder_h = buffer[0];
- this->reorder_w = (buffer[2] << 8) | buffer[1];
- this->reorder_b = (buffer[4] << 8) | buffer[3];
- this->reorder_w /= this->reorder_b;
- }
- else
- {
- this->reorder_b = this->reorder_h = this->reorder_w = 1;
- }
-
- this->wavex_size = total_size; /* 18 + this->wavex[8]; */
- this->num_audio_streams++;
- }
- else if (type == CODEC_TYPE_VIDEO)
- {
-
- ext_uint16_t i;
-
- get_le32 (this); /* width */
- get_le32 (this); /* height */
- get_byte (this);
-
- i = get_le16 (this); /* size */
- this->inputPos += i;
- this->num_video_streams++;
- }
- else if (type == CODEC_TYPE_CONTROL)
- {
- this->control_stream_id = stream_id;
- }
-
- this->num_streams++;
- pos2 = this->inputPos;
- this->inputPos += gsize - (pos2 - pos1 + 24);
- }
- break;
-
case GUID_ASF_DATA:
goto headers_ok;
break;
case GUID_ASF_CONTENT_DESCRIPTION:
- {
- ext_uint16_t len1, len2, len3, len4, len5;
-
- len1 = get_le16 (this);
- len2 = get_le16 (this);
- len3 = get_le16 (this);
- len4 = get_le16 (this);
- len5 = get_le16 (this);
- get_str16_nolen (this, len1, this->title, sizeof (this->title));
- get_str16_nolen (this, len2, this->author, sizeof (this->author));
- get_str16_nolen (this, len3, this->copyright,
- sizeof (this->copyright));
- get_str16_nolen (this, len4, this->comment,
- sizeof (this->comment));
- this->inputPos += len5;
- }
+ len1 = get_le16 (this);
+ len2 = get_le16 (this);
+ len3 = get_le16 (this);
+ len4 = get_le16 (this);
+ len5 = get_le16 (this);
+ this->title = EXTRACTOR_common_convert_to_utf8 (&this->input[this->inputPos],
+ len1,
+ "UTF-16");
+ this->inputPos += len1;
+ this->author = EXTRACTOR_common_convert_to_utf8 (&this->input[this->inputPos],
+ len2,
+ "UTF-16");
+ this->inputPos += len2;
+ this->copyright = EXTRACTOR_common_convert_to_utf8 (&this->input[this->inputPos],
+ len3,
+ "UTF-16");
+ this->inputPos += len3;
+ this->comment = EXTRACTOR_common_convert_to_utf8 (&this->input[this->inputPos],
+ len4,
+ "UTF-16");
+ this->inputPos += len4;
+ this->rating = EXTRACTOR_common_convert_to_utf8 (&this->input[this->inputPos],
+ len5,
+ "UTF-16");
+ this->inputPos += len5;
break;
-
- case GUID_ASF_STREAM_BITRATE_PROPERTIES:
- {
- ext_uint16_t streams, stream_id;
- ext_uint16_t i;
-
- streams = get_le16 (this);
- for (i = 0; i < streams; i++)
- {
- stream_id = get_le16 (this);
- this->bitrates[stream_id] = get_le32 (this);
- }
- }
- break;
-
default:
this->inputPos += gsize - 24;
}
@@ -707,10 +485,7 @@ asf_read_header (demux_asf_t * this)
headers_ok:
this->inputPos += sizeof (LE_GUID) + 10;
- this->packet_size_left = 0;
- this->first_packet_pos = this->inputPos;
return 1;
-
fail:
return 0;
}
@@ -734,57 +509,79 @@ EXTRACTOR_asf_extract (const char *data,
void *proc_cls,
const char *options)
{
- demux_asf_t this;
+ struct demux_asf_s this;
size_t slen;
+ char duration_str[30];
+ int ret;
- memset (&this, 0, sizeof (demux_asf_t));
+ memset (&this, 0, sizeof (struct demux_asf_s));
this.input = data;
this.inputLen = size;
this.status = DEMUX_START;
- if (0 == asf_read_header (&this))
- return 0;
-
- if ( ( (0 < (slen = strlen(this.title))) &&
- (0 != proc (proc_cls,
- "asf",
- EXTRACTOR_METATYPE_TITLE,
- EXTRACTOR_METAFORMAT_C_STRING,
- "text/plain",
- this.title,
- slen + 1)) ) ||
- ( (0 < (slen = strlen(this.author))) &&
- (0 != proc (proc_cls,
- "asf",
- EXTRACTOR_METATYPE_AUTHOR_NAME,
- EXTRACTOR_METAFORMAT_C_STRING,
- "text/plain",
- this.author,
- slen + 1)) ) ||
- ( (0 < (slen = strlen(this.comment))) &&
+ ret = 0;
+ if (1 == asf_read_header (&this))
+ {
+ snprintf (duration_str,
+ sizeof (duration_str),
+ "%llu ms", (unsigned long long) (this.length / 10000LL));
+ if ( ( (this.title != NULL) &&
+ (0 < (slen = strlen(this.title))) &&
+ (0 != proc (proc_cls,
+ "asf",
+ EXTRACTOR_METATYPE_TITLE,
+ EXTRACTOR_METAFORMAT_C_STRING,
+ "text/plain",
+ this.title,
+ slen + 1)) ) ||
+ ( (this.author != NULL) &&
+ (0 < (slen = strlen(this.author))) &&
+ (0 != proc (proc_cls,
+ "asf",
+ EXTRACTOR_METATYPE_AUTHOR_NAME,
+ EXTRACTOR_METAFORMAT_C_STRING,
+ "text/plain",
+ this.author,
+ slen + 1)) ) ||
+ ( (this.comment != NULL) &&
+ (0 < (slen = strlen(this.comment))) &&
+ (0 != proc (proc_cls,
+ "asf",
+ EXTRACTOR_METATYPE_COMMENT,
+ EXTRACTOR_METAFORMAT_C_STRING,
+ "text/plain",
+ this.comment,
+ slen + 1)) ) ||
+ ( (this.copyright != NULL) &&
+ (0 < (slen = strlen(this.copyright))) &&
+ (0 != proc (proc_cls,
+ "asf",
+ EXTRACTOR_METATYPE_COPYRIGHT,
+ EXTRACTOR_METAFORMAT_C_STRING,
+ "text/plain",
+ this.copyright,
+ slen + 1)) ) ||
(0 != proc (proc_cls,
"asf",
- EXTRACTOR_METATYPE_COMMENT,
+ EXTRACTOR_METATYPE_MIMETYPE,
EXTRACTOR_METAFORMAT_C_STRING,
"text/plain",
- this.comment,
- slen + 1)) ) ||
- ( (0 < (slen = strlen(this.copyright))) &&
+ "video/x-ms-asf",
+ strlen("video/x-ms-asf") + 1)) ||
(0 != proc (proc_cls,
"asf",
- EXTRACTOR_METATYPE_COPYRIGHT,
+ EXTRACTOR_METATYPE_DURATION,
EXTRACTOR_METAFORMAT_C_STRING,
"text/plain",
- this.copyright,
- slen + 1)) ) ||
- (0 != proc (proc_cls,
- "asf",
- EXTRACTOR_METATYPE_MIMETYPE,
- EXTRACTOR_METAFORMAT_C_STRING,
- "text/plain",
- "video/x-ms-asf",
- strlen("video/x-ms-asf") + 1)) )
- return 1;
- return 0;
+ duration_str,
+ strlen(duration_str) + 1)) )
+ ret = 1;
+ }
+ free (this.title);
+ free (this.author);
+ free (this.copyright);
+ free (this.comment);
+ free (this.rating);
+ return ret;
}
/* end of asf_extractor.c */
diff --git a/src/plugins/flv_extractor.c b/src/plugins/flv_extractor.c
@@ -316,13 +316,12 @@ static int parse_amf(const unsigned char **data,
{
char *key;
unsigned char type;
- long max_index;
-
+
if (*len < 4) {
ret = -1;
break;
}
- max_index = readInt32(&ptr);
+ /* max_index */ readInt32(&ptr);
*len -= 4;
ret = readASString(&ptr, len, &key);
if (ret == -1)
diff --git a/src/plugins/id3v24_extractor.c b/src/plugins/id3v24_extractor.c
@@ -138,11 +138,9 @@ EXTRACTOR_id3v24_extract (const unsigned char *data,
int unsync;
int extendedHdr;
int experimental;
- int footer;
uint32_t tsize;
uint32_t pos;
uint32_t ehdrSize;
- uint32_t padding;
uint32_t csize;
int i;
uint16_t flags;
@@ -162,14 +160,13 @@ EXTRACTOR_id3v24_extract (const unsigned char *data,
experimental = (data[5] & 0x20) > 0;
if (experimental)
return 0;
- footer = (data[5] & 0x10) > 0;
+ /* footer = (data[5] & 0x10) > 0; */
tsize = (((data[6] & 0x7F) << 21) |
((data[7] & 0x7F) << 14) |
((data[8] & 0x7F) << 7) | ((data[9] & 0x7F) << 0));
if (tsize + 10 > size)
return 0;
pos = 10;
- padding = 0;
if (extendedHdr)
{
ehdrSize = (((data[10] & 0x7F) << 21) |
diff --git a/src/plugins/id3v2_extractor.c b/src/plugins/id3v2_extractor.c
@@ -125,7 +125,6 @@ EXTRACTOR_id3v2_extract (const unsigned char *data,
void *proc_cls,
const char *options)
{
- int unsync;
unsigned int tsize;
unsigned int pos;
unsigned int off;
@@ -137,7 +136,7 @@ EXTRACTOR_id3v2_extract (const unsigned char *data,
(data[1] != 0x44) ||
(data[2] != 0x33) || (data[3] != 0x02) || (data[4] != 0x00))
return 0;
- unsync = (data[5] & 0x80) > 0;
+ /* unsync: (data[5] & 0x80) > 0; */
tsize = (((data[6] & 0x7F) << 21) |
((data[7] & 0x7F) << 14) |
((data[8] & 0x7F) << 07) | ((data[9] & 0x7F) << 00));
diff --git a/src/plugins/mkv_extractor.c b/src/plugins/mkv_extractor.c
@@ -48,7 +48,7 @@
/**
* FIXME: document
*/
-enum
+enum MKV_TrackType
{
MKV_Track_video = 1,
MKV_Track_audio = 2,
@@ -135,12 +135,11 @@ VINTparse (const unsigned char *buffer, size_t start, size_t end,
/**
- * FIXME: 'unsigned int' or 'uint32_t' for ID?
* FIXME: document arguments, return value...
*/
-static int
+static unsigned int
elementRead (const unsigned char *buffer, size_t start, size_t end,
- unsigned int *id, int64_t * size)
+ uint32_t *id, int64_t * size)
{
int64_t tempID;
int64_t tempsize;
@@ -155,7 +154,7 @@ elementRead (const unsigned char *buffer, size_t start, size_t end,
size_offset = VINTparse (buffer, start + id_offset, end, &tempsize, 1);
if (!size_offset)
return 0;
- *id = (unsigned int) tempID; /*id must be <4 and must fit in uint */
+ *id = (uint32_t) tempID;
*size = tempsize;
return id_offset + size_offset;
}
@@ -173,15 +172,14 @@ getInt (const unsigned char *buffer, size_t start, size_t size)
result = 0;
for (c = 1; c <= size; c++)
- result += buffer[start + c - 1] << (8 * (size - c));
+ result += ((uint64_t)buffer[start + c - 1]) << (8 * (size - c));
return result;
}
static float
-getFloat (const char *buffer, size_t start, size_t size)
+getFloat (const unsigned char *buffer, size_t start, size_t size)
{
- float result;
- char tmp[4];
+ unsigned char tmp[4];
if (size != sizeof (float))
return 0.0;
@@ -193,7 +191,7 @@ getFloat (const char *buffer, size_t start, size_t size)
tmp[3] = buffer[start];
return *((float *) (tmp));
}
- return result;
+ return 0.0;
}
static const unsigned int MKV_Parse_list[] = {
@@ -216,27 +214,27 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
const char *options)
{
int ret;
- char buffer[128];
- char temp[128];
- size_t p; /*pointer in buffer */
- int c, c2; /*counter in some loops */
- unsigned int eID; /*element ID */
- int64_t eSize; /*Size of element content */
- int offs;
+ char buffer[256];
+ size_t p;
+ int c;
+ uint32_t eID;
+ int64_t eSize; /* signed? */
+ unsigned int offs;
int64_t timescale = 1000000;
float duration = -1.0;
- int64_t DefaultDuration = 0;
- int TrackType = 0;
- int pvt_look_flag = 0;
- int curr_c = -1;
- int a_c = -1;
- int v_c = -1;
- int t_c = -1;
- int value_width = 0;
- int value_height = 0;
- int value = 0;
+ enum MKV_TrackType trackType;
+ int have_audio = 0;
+ int have_video = 0;
+ unsigned int value_width = 0;
+ unsigned int value_height = 0;
+ int64_t value;
size_t size1;
const unsigned char *start;
+ int is_mkv = 0;
+ unsigned int fps = 0;
+ unsigned int bit_depth = 0;
+ const unsigned char *codec = NULL;
+ int codec_strlen = 0;
if (size > 32 * 1024)
size1 = 32 * 1024;
@@ -255,125 +253,65 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
p += offs;
if (!offs || p >= size)
break;
+ if (MKVID_EBML == eID)
+ {
+ ADD ("video/mkv", EXTRACTOR_METATYPE_MIMETYPE);
+ is_mkv = 1;
+ continue;
+ }
+ if (! is_mkv)
+ return 0;
for (c = 0; c < sizeof (MKV_Parse_list) / sizeof (*MKV_Parse_list); c++)
- if (MKV_Parse_list[c] == eID)
- {
- break;
- }
+ if (MKV_Parse_list[c] == eID)
+ break;
if (c < sizeof (MKV_Parse_list) / sizeof (*MKV_Parse_list))
continue;
+
if (p + eSize > size)
- break; /*TODO - add (if requied) suckup from file to data */
- if (eSize == 4 || eSize == 8 || eSize == 1 || eSize == 2)
- value = (int) getInt (data, p, eSize);
+ break;
+ if ( (eSize == 4) || (eSize == 8) || (eSize == 1) || (eSize == 2))
+ value = getInt (data, p, eSize);
+
switch (eID)
{
case MKVID_TrackType: /*detect a stream type (video/audio/text) */
- TrackType = value;
- pvt_look_flag = 0;
- switch (TrackType)
+ trackType = (enum MKV_TrackType) value;
+ switch (trackType)
{
case MKV_Track_video:
- v_c++;
- if (v_c > MAX_STREAMS)
- v_c = MAX_STREAMS;
- if (duration != -1.0)
- {
- /* FIXME: duration might still be -1 here, defer until
- end of function & check if duration is != -1 */
- snprintf (buffer,
- sizeof(buffer),
- "%u s (video)",
- (int) (duration / 1e+9 * (float) timescale));
- ADD (buffer, EXTRACTOR_METATYPE_DURATION);
- }
- curr_c = v_c;
+ have_video = 1;
break;
case MKV_Track_audio:
- a_c++;
- if (a_c > MAX_STREAMS)
- a_c = MAX_STREAMS;
- if (duration != -1.0)
- {
- /* FIXME: duration might still be -1 here, defer until
- end of function & check if duration is != -1 */
- snprintf (buffer,
- sizeof (buffer),
- "%u s (audio)",
- (unsigned int) (duration / 1e+9 * (float) timescale));
- ADD (buffer, EXTRACTOR_METATYPE_DURATION);
- }
- curr_c = a_c;
+ have_audio = 1;
break;
+ case MKV_Track_subtitle:
+ break;
case MKV_Track_subtitle_orig:
- t_c++;
- TrackType = MKV_Track_subtitle; /*for normal use in lang array */
- if (t_c > MAX_STREAMS)
- t_c = MAX_STREAMS;
- curr_c = t_c;
- break;
+ break;
}
break;
- case MKVID_DefaultDuration: /*fps detection */
- if (TrackType == MKV_Track_video && v_c >= 0)
- {
- DefaultDuration = value;
- if (DefaultDuration > 100)
- {
- /* FIXME: integrate with codec name/id into 'METATYPE_FORMAT' */
- snprintf (buffer,
- sizeof (buffer),
- "fps: %u", 1000000000 / DefaultDuration);
- ADD (buffer, EXTRACTOR_METATYPE_UNKNOWN);
- }
- }
+ case MKVID_DefaultDuration:
+ fps = (unsigned int) (1000000000 / value);
break;
- case MKVID_Language: /*stream language */
- if (curr_c >= 0 && TrackType < 4 && eSize < MAX_STRING_SIZE)
- {
- /* FIXME: why first temp, then buffer? */
- snprintf (buffer,
- sizeof (buffer),
- "%.*s",
- (int) eSize,
- data + p);
- ADD (buffer, EXTRACTOR_METATYPE_LANGUAGE);
- }
+ case MKVID_Language:
+ snprintf (buffer,
+ sizeof (buffer),
+ "%.*s",
+ (int) eSize,
+ data + p);
+ ADD (buffer, EXTRACTOR_METATYPE_LANGUAGE);
break;
- case MKVID_CodecName: /*passtrough */
- case MKVID_CodecID: /*codec detection (if V_MS/VFW/FOURCC - set a fourcc code, else fill a vcodecs value) */
- if (curr_c >= 0 && TrackType < 4 && eSize < MAX_STRING_SIZE)
- {
- if (!strncmp (data + p, "V_MS/VFW/FOURCC", eSize))
- pvt_look_flag = 1;
- snprintf (buffer,
- sizeof (buffer),
- "codec: %.*s",
- (int) eSize,
- data + p);
- ADD (buffer,
- EXTRACTOR_METATYPE_FORMAT);
- }
+ case MKVID_CodecName:
+ case MKVID_CodecID:
+ codec = data + p;
+ codec_strlen = eSize;
break;
case MKVID_CodecPrivate:
- if (pvt_look_flag && v_c >= 0 && eSize >= 24)
- { /*CodecPrivate contains a BITMAPINFOHEADER structure due CodecID==V_MS/VFW/FOURCC */
- pvt_look_flag = 0;
- //TODO
- /*
- video[v_c][V_cc]=(buffer[p+16]<<24)+(buffer[p+17]<<16)+(buffer[p+18]<<8)+buffer[p+19];
- if (codec[v_c][MKV_Track_video])
- {
- free (codec[v_c][MKV_Track_video]);
- codec[v_c][MKV_Track_video] = NULL;
- }
- */
- }
break;
case MKVID_PixelWidth: /*pasthough *//*bug with aspect differ from 1:1 */
case MKVID_DisplayWidth:
- value_width = value;
+ value_width = value;
break;
case MKVID_PixelHeight: /*pasthough */
case MKVID_DisplayHeight:
@@ -381,60 +319,88 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
break;
case MKVID_TimeCodeScale:
timescale = getInt (data, p, eSize);
- snprintf (buffer,
- sizeof (buffer),
- "TimeScale: %u", timescale);
- ADD (buffer, EXTRACTOR_METATYPE_UNKNOWN);
break;
case MKVID_Duration:
duration = getFloat (data, p, eSize);
- snprintf (buffer,
- sizeof (buffer),
- "%f ms", duration);
- ADD (buffer, EXTRACTOR_METATYPE_DURATION);
break;
case MKVID_Channels:
- snprintf (buffer,
- sizeof (buffer),
- "channels: %u", value);
- ADD (buffer, EXTRACTOR_METATYPE_UNKNOWN);
+ /* num_channels = (unsigned int) value; */
break;
case MKVID_BitDepth:
- snprintf (buffer,
- sizeof (buffer),
- "BitDepth: %u", value);
- ADD (buffer, EXTRACTOR_METATYPE_UNKNOWN);
+ bit_depth = (unsigned int) value;
break;
- case MKVID_OutputSamplingFrequency: /*pasthough */
+ case MKVID_OutputSamplingFrequency:
case MKVID_SamplingFrequency:
- /* FIXME: the resulting value seems wrong... Unit? */
- snprintf (buffer,
- sizeof (buffer),
- "Sampling Frequency: %u", value);
- ADD (buffer, EXTRACTOR_METATYPE_UNKNOWN);
- break;
+ /* FIXME: what unit has 'value'? */
break;
case MKVID_Title:
if (eSize > MAX_STRING_SIZE)
break;
- strncpy(temp,data+p,eSize);
- temp[eSize] = '\0';
- ADD (temp, EXTRACTOR_METATYPE_TITLE);
+ snprintf (buffer,
+ sizeof (buffer),
+ "%.*s",
+ (int) eSize,
+ (const char*) data + p);
+ ADD (buffer, EXTRACTOR_METATYPE_TITLE);
+ break;
+ default:
break;
-/*TODO case MKVID_Tags:*/
}
p += eSize; /*skip unknown or uninteresting */
}
while (1);
+
+ snprintf (buffer,
+ sizeof (buffer),
+ "%u s (%s%s%s)",
+ (unsigned int) (duration / 1e+9 * (float) timescale),
+ (have_audio ? "audio" : ""),
+ ((have_audio && have_video) ? "/" : ""),
+ (have_video ? "video" : ""));
+ if ( (have_audio || have_video) && (duration >= 0.0) )
+ ADD (buffer, EXTRACTOR_METATYPE_DURATION);
if ( (value_width != 0) && (value_height != 0) )
+ {
snprintf (buffer,
sizeof(buffer),
"%ux%u",
value_width, value_height);
- ADD (buffer, EXTRACTOR_METATYPE_IMAGE_DIMENSIONS);
-
-EXIT:
+ ADD (buffer, EXTRACTOR_METATYPE_IMAGE_DIMENSIONS);
+ }
+ if (NULL != codec)
+ {
+ if ( (fps != 0) && (bit_depth != 0) )
+ snprintf (buffer,
+ sizeof (buffer),
+ "%.*s (%u fps, %u bit)",
+ codec_strlen,
+ codec,
+ fps,
+ bit_depth);
+ else if (fps != 0)
+ snprintf (buffer,
+ sizeof (buffer),
+ "%.*s (%u fps)",
+ codec_strlen,
+ codec,
+ fps);
+ else if (bit_depth != 0)
+ snprintf (buffer,
+ sizeof (buffer),
+ "%.*s (%u bit)",
+ codec_strlen,
+ codec,
+ bit_depth);
+ else
+ snprintf (buffer,
+ sizeof (buffer),
+ "%.*s",
+ codec_strlen,
+ codec);
+ ADD (buffer,
+ EXTRACTOR_METATYPE_FORMAT);
+ }
+EXIT:
return ret;
-
}
diff --git a/src/plugins/tar_extractor.c b/src/plugins/tar_extractor.c
@@ -472,14 +472,9 @@ EXTRACTOR_tar_extract (const char *data,
if ((0 < keylength) && (NULL != valptr)
&& (keyptr != valptr))
{
- unsigned int difflength = 0;
-
while ((valptr < data + pos + (size_t) fsize)
&& (' ' == *valptr))
valptr += 1;
-
- difflength = (valptr - keyptr);
-
if (0 == memcmp (valptr, "path=", 5))
{
nameptr = valptr + 5;
diff --git a/src/plugins/zip_extractor.c b/src/plugins/zip_extractor.c
@@ -91,9 +91,14 @@ EXTRACTOR_zip_extract (const unsigned char *data,
char *filecomment;
const unsigned char *pos;
unsigned int offset, stop;
- unsigned int name_length, extra_length, comment_length;
+ unsigned int name_length;
+ unsigned int extra_length;
+ unsigned int comment_length;
unsigned int filecomment_length;
- unsigned int entry_total, entry_count;
+ unsigned int entry_count;
+#if DEBUG_EXTRACT_ZIP
+ unsigned int entry_total;
+#endif
/* I think the smallest zipfile you can have is about 120 bytes */
if ((NULL == data) || (size < 100))
@@ -192,8 +197,8 @@ EXTRACTOR_zip_extract (const unsigned char *data,
fprintf (stderr,
"WARNING: May not be able to find all the files in this"
" ZIP archive (no multi-volume support right now).\n");
+ entry_total = pos[10] + (pos[11] << 8);
#endif
- entry_total = pos[10] + (pos[11] << 8);
entry_count = 0;
/* jump to start of central directory, ASSUMING that the starting disk that it's on is disk 0 */
