commit 6103634e7ed585569391b51e73d9497b79498e9a
parent 9c68e7197019cb8205d50c6e61f54ccb25d278dd
Author: Christian Grothoff <christian@grothoff.org>
Date: Sat, 4 Jul 2009 22:07:29 +0000
bump
Diffstat:
9 files changed, 369 insertions(+), 258 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 4 23:05:22 CEST 2009
+ Fixed code to work with RPM 4.7.
+ Releasing libextractor 0.5.23.
+
Sat Apr 11 20:46:14 MDT 2009
Removed code from libexiv2, linking against it instead.
diff --git a/INSTALL b/INSTALL
@@ -2,15 +2,15 @@ Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-Briefly, the shell commands `./configure; make; make install' should
+ Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
@@ -73,9 +73,9 @@ The simplest way to compile this package is:
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -88,7 +88,7 @@ is an example:
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
@@ -100,10 +100,24 @@ architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
Installation Names
==================
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -138,14 +152,36 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -171,9 +207,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -182,7 +218,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -201,11 +237,19 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
`--version'
`-V'
@@ -232,6 +276,16 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([libextractor], [0.5.22], [bug-libextractor@gnu.org])
+AC_INIT([libextractor], [0.5.23], [bug-libextractor@gnu.org])
AC_CONFIG_AUX_DIR([libltdl/config])
-AM_INIT_AUTOMAKE([libextractor], [0.5.22])
+AM_INIT_AUTOMAKE([libextractor], [0.5.23])
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 30 December 2008
-@set UPDATED-MONTH December 2008
-@set EDITION 0.5.22
-@set VERSION 0.5.22
+@set UPDATED 2 July 2009
+@set UPDATED-MONTH July 2009
+@set EDITION 0.5.23
+@set VERSION 0.5.23
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -51,8 +51,6 @@ src/include/plibc.h
src/include/winproc.h
src/main/getopt.h
src/common/convert.h
-src/plugins/exiv2/exv_msvc.h
-src/plugins/exiv2/exv_conf.h
src/common/pack.h
src/plugins/pdf/Array.h
src/plugins/pdf/Catalog.h
@@ -110,48 +108,3 @@ src/plugins/pdf/gmem.cc
src/plugins/pdf/gmempp.cc
src/plugins/pdf/parseargs.cc
src/plugins/pdf/pdfextractor.cc
-src/plugins/exiv2/olympusmn.cpp
-src/plugins/exiv2/iptc.cpp
-src/plugins/exiv2/futils.cpp
-src/plugins/exiv2/exifcomment.cpp
-src/plugins/exiv2/value.cpp
-src/plugins/exiv2/sonymn.cpp
-src/plugins/exiv2/exif.cpp
-src/plugins/exiv2/ifd.cpp
-src/plugins/exiv2/types.cpp
-src/plugins/exiv2/basicio.cpp
-src/plugins/exiv2/metadatum.cpp
-src/plugins/exiv2/error.cpp
-src/plugins/exiv2/tags.cpp
-src/plugins/exiv2/nikonmn.cpp
-src/plugins/exiv2/jpgimage.cpp
-src/plugins/exiv2/panasonicmn.cpp
-src/plugins/exiv2/fujimn.cpp
-src/plugins/exiv2/datasets.cpp
-src/plugins/exiv2/makernote.cpp
-src/plugins/exiv2/image.cpp
-src/plugins/exiv2/canonmn.cpp
-src/plugins/exiv2/sigmamn.cpp
-src/plugins/exiv2/error.hpp
-src/plugins/exiv2/tags.hpp
-src/plugins/exiv2/nikonmn.hpp
-src/plugins/exiv2/panasonicmn.hpp
-src/plugins/exiv2/jpgimage.hpp
-src/plugins/exiv2/fujimn.hpp
-src/plugins/exiv2/datasets.hpp
-src/plugins/exiv2/mn.hpp
-src/plugins/exiv2/image.hpp
-src/plugins/exiv2/exif.hpp
-src/plugins/exiv2/makernote.hpp
-src/plugins/exiv2/canonmn.hpp
-src/plugins/exiv2/sigmamn.hpp
-src/plugins/exiv2/iptc.hpp
-src/plugins/exiv2/olympusmn.hpp
-src/plugins/exiv2/rcsid.hpp
-src/plugins/exiv2/futils.hpp
-src/plugins/exiv2/value.hpp
-src/plugins/exiv2/sonymn.hpp
-src/plugins/exiv2/ifd.hpp
-src/plugins/exiv2/types.hpp
-src/plugins/exiv2/basicio.hpp
-src/plugins/exiv2/metadatum.hpp
diff --git a/po/nl.po b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-0.5.20a\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2008-03-20 23:53-0600\n"
+"POT-Creation-Date: 2009-02-15 22:36-0700\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"
@@ -30,8 +30,11 @@ msgstr ""
#: src/main/extract.c:52
#, c-format
-msgid "Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr "Argumenten die verplicht zijn voor lange opties zijn dat ook voor korte opties.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Argumenten die verplicht zijn voor lange opties zijn dat ook voor korte "
+"opties.\n"
#: src/main/extract.c:126
msgid "do not remove any duplicates"
@@ -42,7 +45,9 @@ msgid "print output in bibtex format"
msgstr "uitvoer in bibtex-indeling produceren"
#: src/main/extract.c:130
-msgid "use the generic plaintext extractor for the language with the 2-letter language code LANG"
+msgid ""
+"use the generic plaintext extractor for the language with the 2-letter "
+"language code LANG"
msgstr "de gewone-tekst-extractor voor deze (tweelettercode) taal gebruiken"
#: src/main/extract.c:132
@@ -51,11 +56,15 @@ msgstr "duplicaten alleen verwijderen indien van hetzelfde type"
#: src/main/extract.c:134
msgid "use the filename as a keyword (loads filename-extractor plugin)"
-msgstr "de bestandsnaam als sleutelwoord gebruiken (laadt de bestandsnaamextractor-plugin)"
+msgstr ""
+"de bestandsnaam als sleutelwoord gebruiken (laadt de bestandsnaamextractor-"
+"plugin)"
#: src/main/extract.c:136
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)"
+msgstr ""
+"uitvoer produceren die makkelijk te greppen is (alle resultaten op één regel "
+"per bestand)"
#: src/main/extract.c:138
msgid "print this help"
@@ -79,7 +88,8 @@ msgstr "de standaardset extractor-plugins niet gebruiken"
#: src/main/extract.c:148
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)"
+msgstr ""
+"alleen sleutelwoorden van dit type tonen (gebruik '-L' voor een overzicht)"
#: src/main/extract.c:150
msgid "remove duplicates even if keyword types do not match"
@@ -109,61 +119,61 @@ msgstr "extract [OPTIES] [BESTANDSNAAM]*"
msgid "Extract metadata from files."
msgstr "Metadata uit bestanden lezen."
-#: src/main/extract.c:190 src/main/extractor.c:1513
+#: src/main/extract.c:190 src/main/extractor.c:1544
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (binair)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1518
+#: src/main/extract.c:201 src/main/extractor.c:1549
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "ONGELDIG TYPE - %s\n"
-#: src/main/extract.c:320 src/main/extractor.c:47
+#: src/main/extract.c:320 src/main/extractor.c:48
msgid "title"
msgstr "titel"
-#: src/main/extract.c:322 src/main/extractor.c:45
+#: src/main/extract.c:322 src/main/extractor.c:46
msgid "filename"
msgstr "bestandsnaam"
-#: src/main/extract.c:327 src/main/extractor.c:48
+#: src/main/extract.c:327 src/main/extractor.c:49
msgid "author"
msgstr "auteur"
-#: src/main/extract.c:331 src/main/extractor.c:50
+#: src/main/extract.c:331 src/main/extractor.c:51
msgid "description"
msgstr "omschrijving"
-#: src/main/extract.c:333 src/main/extractor.c:62
+#: src/main/extract.c:333 src/main/extractor.c:63
msgid "keywords"
msgstr "trefwoorden"
-#: src/main/extract.c:335 src/main/extractor.c:51
+#: src/main/extract.c:335 src/main/extractor.c:52
msgid "comment"
msgstr "opmerking"
-#: src/main/extract.c:339 src/main/extractor.c:52
+#: src/main/extract.c:339 src/main/extractor.c:53
msgid "date"
msgstr "datum"
-#: src/main/extract.c:341 src/main/extractor.c:74
+#: src/main/extract.c:341 src/main/extractor.c:75
msgid "creation date"
msgstr "aanmaakdatum"
-#: src/main/extract.c:369 src/main/extractor.c:53
+#: src/main/extract.c:369 src/main/extractor.c:54
msgid "publisher"
msgstr "uitgever"
-#: src/main/extract.c:373 src/main/extractor.c:59
+#: src/main/extract.c:373 src/main/extractor.c:60
msgid "organization"
msgstr "organisatie"
-#: src/main/extract.c:377 src/main/extractor.c:61
+#: src/main/extract.c:377 src/main/extractor.c:62
msgid "subject"
msgstr "onderwerp"
-#: src/main/extract.c:381 src/main/extractor.c:78
+#: src/main/extract.c:381 src/main/extractor.c:79
msgid "page count"
msgstr "aantal bladzijden"
@@ -187,517 +197,527 @@ msgstr "%% BiBTeX-bestand\n"
msgid "Keywords for file %s:\n"
msgstr "Trefwoorden voor bestand %s:\n"
-#: src/main/extractor.c:44
+#: src/main/extractor.c:45
msgid "unknown"
msgstr "onbekend"
-#: src/main/extractor.c:46
+#: src/main/extractor.c:47
msgid "mimetype"
msgstr "mime-type"
-#: src/main/extractor.c:49
+#: src/main/extractor.c:50
msgid "artist"
msgstr "artiest"
-#: src/main/extractor.c:54
+#: src/main/extractor.c:55
msgid "language"
msgstr "taal"
-#: src/main/extractor.c:55
+#: src/main/extractor.c:56
msgid "album"
msgstr "album"
-#: src/main/extractor.c:56
+#: src/main/extractor.c:57
msgid "genre"
msgstr "genre"
-#: src/main/extractor.c:57
+#: src/main/extractor.c:58
msgid "location"
msgstr "lokatie"
-#: src/main/extractor.c:58
+#: src/main/extractor.c:59
msgid "version"
msgstr "versie"
-#: src/main/extractor.c:60
+#: src/main/extractor.c:61 src/plugins/mp3extractor.c:478
msgid "copyright"
msgstr "copyright"
-#: src/main/extractor.c:63
+#: src/main/extractor.c:64
msgid "contributor"
msgstr "bijdrager"
-#: src/main/extractor.c:64
+#: src/main/extractor.c:65
msgid "resource-type"
msgstr "resource-type"
-#: src/main/extractor.c:65
+#: src/main/extractor.c:66
msgid "format"
msgstr "indeling"
-#: src/main/extractor.c:66
+#: src/main/extractor.c:67
msgid "resource-identifier"
msgstr "resource-ID"
-#: src/main/extractor.c:67
+#: src/main/extractor.c:68
msgid "source"
msgstr "bron"
-#: src/main/extractor.c:68
+#: src/main/extractor.c:69
msgid "relation"
msgstr "relatie"
-#: src/main/extractor.c:69
+#: src/main/extractor.c:70
msgid "coverage"
msgstr "dekking"
-#: src/main/extractor.c:70
+#: src/main/extractor.c:71
msgid "software"
msgstr "software"
-#: src/main/extractor.c:71
+#: src/main/extractor.c:72
msgid "disclaimer"
msgstr "disclaimer"
-#: src/main/extractor.c:72
+#: src/main/extractor.c:73
msgid "warning"
msgstr "waarschuwing"
-#: src/main/extractor.c:73
+#: src/main/extractor.c:74
msgid "translated"
msgstr "vertaald"
-#: src/main/extractor.c:75
+#: src/main/extractor.c:76
msgid "modification date"
msgstr "wijzigingsdatum"
-#: src/main/extractor.c:76
+#: src/main/extractor.c:77
msgid "creator"
msgstr "maker"
-#: src/main/extractor.c:77
+#: src/main/extractor.c:78
msgid "producer"
msgstr "producer"
-#: src/main/extractor.c:79
+#: src/main/extractor.c:80
msgid "page orientation"
msgstr "paginastand"
-#: src/main/extractor.c:80
+#: src/main/extractor.c:81
msgid "paper size"
msgstr "papiergrootte"
-#: src/main/extractor.c:81
+#: src/main/extractor.c:82
msgid "used fonts"
msgstr "gebruikte lettertypes"
-#: src/main/extractor.c:82
+#: src/main/extractor.c:83
msgid "page order"
msgstr "paginavolgorde"
-#: src/main/extractor.c:83
+#: src/main/extractor.c:84
msgid "created for"
msgstr "gemaakt voor"
-#: src/main/extractor.c:84
+#: src/main/extractor.c:85
msgid "magnification"
msgstr "vergroting"
-#: src/main/extractor.c:85
+#: src/main/extractor.c:86
msgid "release"
msgstr "uitgave"
-#: src/main/extractor.c:86
+#: src/main/extractor.c:87
msgid "group"
msgstr "groep"
-#: src/main/extractor.c:87
+#: src/main/extractor.c:88
msgid "size"
msgstr "grootte"
-#: src/main/extractor.c:88
+#: src/main/extractor.c:89
msgid "summary"
msgstr "samenvatting"
-#: src/main/extractor.c:89
+#: src/main/extractor.c:90
msgid "packager"
msgstr "verpakker"
-#: src/main/extractor.c:90
+#: src/main/extractor.c:91
msgid "vendor"
msgstr "verkoper"
-#: src/main/extractor.c:91
+#: src/main/extractor.c:92
msgid "license"
msgstr "licentie"
-#: src/main/extractor.c:92
+#: src/main/extractor.c:93
msgid "distribution"
msgstr "distributie"
-#: src/main/extractor.c:93
+#: src/main/extractor.c:94
msgid "build-host"
msgstr "build-host"
-#: src/main/extractor.c:94
+#: src/main/extractor.c:95
msgid "operating system"
msgstr "besturingssysteem"
-#: src/main/extractor.c:95
+#: src/main/extractor.c:96
msgid "dependency"
msgstr "afhankelijkheid"
-#: src/main/extractor.c:96
+#: src/main/extractor.c:97
msgid "MD4"
msgstr "MD4"
-#: src/main/extractor.c:97
+#: src/main/extractor.c:98
msgid "MD5"
msgstr "MD5"
-#: src/main/extractor.c:98
+#: src/main/extractor.c:99
msgid "SHA-0"
msgstr "SHA-0"
-#: src/main/extractor.c:99
+#: src/main/extractor.c:100
msgid "SHA-1"
msgstr "SHA-1"
-#: src/main/extractor.c:100
+#: src/main/extractor.c:101
msgid "RipeMD160"
msgstr "RipeMD160"
-#: src/main/extractor.c:101
+#: src/main/extractor.c:102
msgid "resolution"
msgstr "resolutie"
-#: src/main/extractor.c:102
+#: src/main/extractor.c:103
msgid "category"
msgstr "categorie"
-#: src/main/extractor.c:103
+#: src/main/extractor.c:104
msgid "book title"
msgstr "boektitel"
-#: src/main/extractor.c:104
+#: src/main/extractor.c:105
msgid "priority"
msgstr "prioriteit"
-#: src/main/extractor.c:105
+#: src/main/extractor.c:106
msgid "conflicts"
msgstr "conflicteert"
-#: src/main/extractor.c:106
+#: src/main/extractor.c:107
msgid "replaces"
msgstr "vervangt"
-#: src/main/extractor.c:107
+#: src/main/extractor.c:108
msgid "provides"
msgstr "levert"
-#: src/main/extractor.c:108
+#: src/main/extractor.c:109
msgid "conductor"
msgstr "dirigent"
-#: src/main/extractor.c:109
+#: src/main/extractor.c:110
msgid "interpreter"
msgstr "vertolker"
-#: src/main/extractor.c:110
+#: src/main/extractor.c:111
msgid "owner"
msgstr "eigenaar"
-#: src/main/extractor.c:111
+#: src/main/extractor.c:112
msgid "lyrics"
msgstr "tekst"
-#: src/main/extractor.c:112
+#: src/main/extractor.c:113
msgid "media type"
msgstr "soort drager"
-#: src/main/extractor.c:113
+#: src/main/extractor.c:114
msgid "contact"
msgstr "contact"
-#: src/main/extractor.c:114
+#: src/main/extractor.c:115
msgid "binary thumbnail data"
msgstr "binaire gegevens over miniatuur"
-#: src/main/extractor.c:115
+#: src/main/extractor.c:116
msgid "publication date"
msgstr "publicatiedatum"
-#: src/main/extractor.c:116
+#: src/main/extractor.c:117
msgid "camera make"
msgstr "cameramerk"
-#: src/main/extractor.c:117
+#: src/main/extractor.c:118
msgid "camera model"
msgstr "cameramodel"
-#: src/main/extractor.c:118
+#: src/main/extractor.c:119
msgid "exposure"
msgstr "belichtingstijd"
-#: src/main/extractor.c:119
+#: src/main/extractor.c:120
msgid "aperture"
msgstr "diafragma"
-#: src/main/extractor.c:120
+#: src/main/extractor.c:121
msgid "exposure bias"
msgstr "Belichtingsafwijking"
-#: src/main/extractor.c:121
+#: src/main/extractor.c:122
msgid "flash"
msgstr "flits"
-#: src/main/extractor.c:122
+#: src/main/extractor.c:123
msgid "flash bias"
msgstr "Flitsafwijking"
-#: src/main/extractor.c:123
+#: src/main/extractor.c:124
msgid "focal length"
msgstr "brandpuntsafstand"
-#: src/main/extractor.c:124
+#: src/main/extractor.c:125
msgid "focal length (35mm equivalent)"
msgstr "brandpuntsafstand (35mm-equivalent)"
-#: src/main/extractor.c:125
+#: src/main/extractor.c:126
msgid "iso speed"
msgstr "ISO-snelheid"
-#: src/main/extractor.c:126
+#: src/main/extractor.c:127
msgid "exposure mode"
msgstr "belichtingsmodus"
-#: src/main/extractor.c:127
+#: src/main/extractor.c:128
msgid "metering mode"
msgstr "meetmodus"
-#: src/main/extractor.c:128
+#: src/main/extractor.c:129
msgid "macro mode"
msgstr "macromodus"
-#: src/main/extractor.c:129
+#: src/main/extractor.c:130
msgid "image quality"
msgstr "beeldkwaliteit"
-#: src/main/extractor.c:130
+#: src/main/extractor.c:131
msgid "white balance"
msgstr "witbalans"
-#: src/main/extractor.c:131
+#: src/main/extractor.c:132
msgid "orientation"
msgstr "orientatie"
-#: src/main/extractor.c:132
+#: src/main/extractor.c:133
msgid "template"
msgstr "sjabloon"
-#: src/main/extractor.c:133
+#: src/main/extractor.c:134
msgid "split"
msgstr "gesplitst"
-#: src/main/extractor.c:134
+#: src/main/extractor.c:135
msgid "product version"
msgstr "productversie"
-#: src/main/extractor.c:135
+#: src/main/extractor.c:136
msgid "last saved by"
msgstr "laatst opgeslagen door"
-#: src/main/extractor.c:136
+#: src/main/extractor.c:137
msgid "last printed"
msgstr "laatst afgedrukt"
-#: src/main/extractor.c:137
+#: src/main/extractor.c:138
msgid "word count"
msgstr "aantal woorden"
-#: src/main/extractor.c:138
+#: src/main/extractor.c:139
msgid "character count"
msgstr "aantal tekens"
-#: src/main/extractor.c:139
+#: src/main/extractor.c:140
msgid "total editing time"
msgstr "totale bewerkingstijd"
-#: src/main/extractor.c:140
+#: src/main/extractor.c:141
msgid "thumbnails"
msgstr "miniaturen"
-#: src/main/extractor.c:141
+#: src/main/extractor.c:142
msgid "security"
msgstr "veiligheid"
-#: src/main/extractor.c:142
+#: src/main/extractor.c:143
msgid "created by software"
msgstr "door software gemaakt"
-#: src/main/extractor.c:143
+#: src/main/extractor.c:144
msgid "modified by software"
msgstr "door software bewerkt"
-#: src/main/extractor.c:144
+#: src/main/extractor.c:145
msgid "revision history"
msgstr "revisiegeschiedenis"
-#: src/main/extractor.c:145
+#: src/main/extractor.c:146
msgid "lower case conversion"
msgstr "omzetting naar kleine letters"
-#: src/main/extractor.c:146
+#: src/main/extractor.c:147
msgid "company"
msgstr "firma"
-#: src/main/extractor.c:147
+#: src/main/extractor.c:148
msgid "generator"
msgstr "generator"
-#: src/main/extractor.c:148
+#: src/main/extractor.c:149
msgid "character set"
msgstr "tekenset"
-#: src/main/extractor.c:149
+#: src/main/extractor.c:150
msgid "line count"
msgstr "aantal regels"
-#: src/main/extractor.c:150
+#: src/main/extractor.c:151
msgid "paragraph count"
msgstr "aantal alinea's"
-#: src/main/extractor.c:151
+#: src/main/extractor.c:152
msgid "editing cycles"
msgstr "bewerkingscycli"
-#: src/main/extractor.c:152
+#: src/main/extractor.c:153
msgid "scale"
msgstr "schaal"
-#: src/main/extractor.c:153
+#: src/main/extractor.c:154
msgid "manager"
msgstr "manager"
-#: src/main/extractor.c:154
+#: src/main/extractor.c:155
msgid "director"
msgstr "regisseur"
-#: src/main/extractor.c:155
+#: src/main/extractor.c:156
msgid "duration"
msgstr "duur"
-#: src/main/extractor.c:156
+#: src/main/extractor.c:157
msgid "information"
msgstr "informatie"
-#: src/main/extractor.c:157
+#: src/main/extractor.c:158
msgid "full name"
msgstr "naam"
-#: src/main/extractor.c:158
+#: src/main/extractor.c:159
msgid "chapter"
msgstr "hoofdstuk"
-#: src/main/extractor.c:159
+#: src/main/extractor.c:160
msgid "year"
msgstr "jaar"
-#: src/main/extractor.c:160
+#: src/main/extractor.c:161
msgid "link"
msgstr "link"
-#: src/main/extractor.c:161
+#: src/main/extractor.c:162
msgid "music CD identifier"
msgstr "muziek CD-ID"
-#: src/main/extractor.c:162
+#: src/main/extractor.c:163
msgid "play counter"
msgstr "aantal malen afgespeeld"
-#: src/main/extractor.c:163
+#: src/main/extractor.c:164
msgid "popularity meter"
msgstr "populariteitsmeter"
-#: src/main/extractor.c:164
+#: src/main/extractor.c:165
msgid "content type"
msgstr "inhoudssoort"
-#: src/main/extractor.c:165
+#: src/main/extractor.c:166
msgid "encoded by"
msgstr "gecodeerd door"
-#: src/main/extractor.c:166
+#: src/main/extractor.c:167
msgid "time"
msgstr "tijd"
-#: src/main/extractor.c:167
+#: src/main/extractor.c:168
msgid "musician credits list"
msgstr "Bedanktlijst musici"
-#: src/main/extractor.c:168
+#: src/main/extractor.c:169
msgid "mood"
msgstr "sfeer"
-#: src/main/extractor.c:169
+#: src/main/extractor.c:170
msgid "format version"
msgstr "indelingsversie"
-#: src/main/extractor.c:170
+#: src/main/extractor.c:171
msgid "television system"
msgstr "televisiesysteem"
-#: src/main/extractor.c:171
+#: src/main/extractor.c:172
msgid "song count"
msgstr "aantal songs"
-#: src/main/extractor.c:172
+#: src/main/extractor.c:173
msgid "starting song"
msgstr "beginsong"
-#: src/main/extractor.c:173
+#: src/main/extractor.c:174
msgid "hardware dependency"
msgstr "hardware-afhankelijkheid"
-#: src/main/extractor.c:174
+#: src/main/extractor.c:175
msgid "ripper"
msgstr "ripper"
-#: src/main/extractor.c:175
+#: src/main/extractor.c:176
msgid "filesize"
msgstr "bestandsgrootte"
-#: src/main/extractor.c:176
+#: src/main/extractor.c:177
msgid "track number"
msgstr "tracknummer"
-#: src/main/extractor.c:177
+#: src/main/extractor.c:178
msgid "international standard recording code"
msgstr "International Standard Recording Code"
-#: src/main/extractor.c:178
+#: src/main/extractor.c:179
msgid "disc number"
msgstr "CD-nummer"
-#: src/main/extractor.c:598
+#: src/main/extractor.c:180
+msgid "preferred display style (GNUnet)"
+msgstr ""
+
+#: src/main/extractor.c:181
+msgid "GNUnet URI of ECBC data"
+msgstr ""
+
+#: src/main/extractor.c:604
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisatie van plugin-mechanisme is mislukt: %s\n"
-#: src/main/extractor.c:752
+#: src/main/extractor.c:768
#, c-format
-msgid "Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that failed also. Errors are: `%s' and `%s'.\n"
+msgid ""
+"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
+"failed also. Errors are: `%s' and `%s'.\n"
msgstr ""
"Het herleiden van symbool '%s' uit bibliotheek '%s' is mislukt;\n"
"het herleiden van '%s' mislukte ook.\n"
"De foutmeldingen waren: '%s' en '%s'.\n"
-#: src/main/extractor.c:781
+#: src/main/extractor.c:805
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Laden van plugin '%s' is mislukt: %s\n"
-#: src/main/extractor.c:986
+#: src/main/extractor.c:1017
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Verwijderen van plugin '%s' is mislukt.\n"
@@ -757,19 +777,19 @@ 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/plugins/filenameextractor.c:64
+#: src/plugins/filenameextractor.c:62
msgid "GB"
msgstr "GB"
-#: src/plugins/filenameextractor.c:66
+#: src/plugins/filenameextractor.c:64
msgid "MB"
msgstr "MB"
-#: src/plugins/filenameextractor.c:68
+#: src/plugins/filenameextractor.c:66
msgid "KB"
msgstr "KB"
-#: src/plugins/filenameextractor.c:70
+#: src/plugins/filenameextractor.c:68
msgid "Bytes"
msgstr "bytes"
@@ -1416,17 +1436,68 @@ msgstr "J-pop"
msgid "Synthpop"
msgstr "Synthipop"
-#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:252 src/plugins/wavextractor.c:119
msgid "stereo"
msgstr "stereo"
-#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:253
+#, fuzzy
+msgid "joint stereo"
+msgstr "stereo"
+
+#: src/plugins/mp3extractor.c:254
+msgid "dual channel"
+msgstr ""
+
+#: src/plugins/mp3extractor.c:255 src/plugins/wavextractor.c:119
msgid "mono"
msgstr "mono"
-#: src/plugins/mp3extractor.c:445
-msgid "(variable bps)"
-msgstr "(variabele bps)"
+#: src/plugins/mp3extractor.c:258
+msgid "MPEG-1"
+msgstr ""
+
+#: src/plugins/mp3extractor.c:259
+msgid "MPEG-2"
+msgstr ""
+
+#: src/plugins/mp3extractor.c:260
+msgid "MPEG-2.5"
+msgstr ""
+
+#: src/plugins/mp3extractor.c:263
+msgid "Layer I"
+msgstr ""
+
+#: src/plugins/mp3extractor.c:264
+msgid "Layer II"
+msgstr ""
+
+#: src/plugins/mp3extractor.c:265
+msgid "Layer III"
+msgstr ""
+
+#: src/plugins/mp3extractor.c:475
+msgid "VBR"
+msgstr ""
+
+#: src/plugins/mp3extractor.c:475
+msgid "CBR"
+msgstr ""
+
+#: src/plugins/mp3extractor.c:478
+#, fuzzy
+msgid "no copyright"
+msgstr "copyright"
+
+#: src/plugins/mp3extractor.c:479
+msgid "original"
+msgstr ""
+
+#: src/plugins/mp3extractor.c:479
+#, fuzzy
+msgid "copy"
+msgstr "firma"
#: src/plugins/ole2/ole2extractor.c:252
msgid "No Proofing"
@@ -1543,12 +1614,11 @@ msgstr "Vergroot de waarde van ALLOCSIZE (in %s).\n"
msgid "codec: %s, %u fps, %u ms"
msgstr "codec: %s, %u fps, %u ms"
-#: src/plugins/rpm/rpmextractor.c:3223
-#, c-format
-msgid "Source RPM %d.%d"
-msgstr "Source-RPM %d.%d"
+#~ msgid "(variable bps)"
+#~ msgstr "(variabele bps)"
-#: src/plugins/rpm/rpmextractor.c:3225
-#, c-format
-msgid "Binary RPM %d.%d"
-msgstr "Binaire RPM %d.%d"
+#~ msgid "Source RPM %d.%d"
+#~ msgstr "Source-RPM %d.%d"
+
+#~ msgid "Binary RPM %d.%d"
+#~ msgstr "Binaire RPM %d.%d"
diff --git a/po/sv.po b/po/sv.po
@@ -28,8 +28,11 @@ msgstr ""
#: src/main/extract.c:52
#, c-format
-msgid "Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr "Argument som är obligatoriska för långa flaggor är också obligatoriska för korta flaggor.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
+"korta flaggor.\n"
#: src/main/extract.c:126
msgid "do not remove any duplicates"
@@ -40,8 +43,12 @@ msgid "print output in bibtex format"
msgstr "skriv ut i bibtex-format"
#: src/main/extract.c:130
-msgid "use the generic plaintext extractor for the language with the 2-letter language code LANG"
-msgstr "använd den generiska klartextuppackaren för språket med 2-bokstavskoden i LANG"
+msgid ""
+"use the generic plaintext extractor for the language with the 2-letter "
+"language code LANG"
+msgstr ""
+"använd den generiska klartextuppackaren för språket med 2-bokstavskoden i "
+"LANG"
#: src/main/extract.c:132
msgid "remove duplicates only if types match"
@@ -49,7 +56,8 @@ msgstr "ta bort dubbletter endast om typen stämmer"
#: src/main/extract.c:134
msgid "use the filename as a keyword (loads filename-extractor plugin)"
-msgstr "använd filnamnet som ett nyckelord (läser in insticket filename-extractor)"
+msgstr ""
+"använd filnamnet som ett nyckelord (läser in insticket filename-extractor)"
#: src/main/extract.c:136
msgid "produce grep-friendly output (all results on one line per file)"
@@ -698,8 +706,12 @@ msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
#: src/main/extractor.c:768
#, c-format
-msgid "Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that failed also. Errors are: `%s' and `%s'.\n"
-msgstr "Uppslag av symbol \"%s\" i bibliotek \"%s\" misslyckades så jag försökte med \"%s\" men det misslyckades också. Felen är: \"%s\" och \"%s\".\n"
+msgid ""
+"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
+"failed also. Errors are: `%s' and `%s'.\n"
+msgstr ""
+"Uppslag av symbol \"%s\" i bibliotek \"%s\" misslyckades så jag försökte med "
+"\"%s\" men det misslyckades också. Felen är: \"%s\" och \"%s\".\n"
#: src/main/extractor.c:805
#, c-format
diff --git a/po/vi.po b/po/vi.po
@@ -31,8 +31,11 @@ msgstr ""
#: src/main/extract.c:52
#, c-format
-msgid "Arguments mandatory for long options are also mandatory for short options.\n"
-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"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+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:126
msgid "do not remove any duplicates"
@@ -43,8 +46,12 @@ msgid "print output in bibtex format"
msgstr "hiển thị dữ liệu xuất có dạng bibtex"
#: src/main/extract.c:130
-msgid "use the generic plaintext extractor for the language with the 2-letter language code LANG"
-msgstr "sử dụng trình rút văn bản thuần thuộc giống loại cho ngôn ngữ có mã ngôn ngữ bằng hai chữ là LANG"
+msgid ""
+"use the generic plaintext extractor for the language with the 2-letter "
+"language code LANG"
+msgstr ""
+"sử dụng trình rút văn bản thuần thuộc giống loại cho ngôn ngữ có mã ngôn ngữ "
+"bằng hai chữ là LANG"
#: src/main/extract.c:132
msgid "remove duplicates only if types match"
@@ -52,11 +59,15 @@ msgstr "gỡ bỏ bản sao chỉ nếu kiểu khớp thôi"
#: src/main/extract.c:134
msgid "use the filename as a keyword (loads filename-extractor plugin)"
-msgstr "dùng tên tập tin là một từ khoá (thì tải bổ sung « filename-extractor » [rút tên tập tin])"
+msgstr ""
+"dùng tên tập tin là một từ khoá (thì tải bổ sung « filename-extractor » [rút "
+"tên tập tin])"
#: src/main/extract.c:136
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)"
+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:138
msgid "print this help"
@@ -80,7 +91,8 @@ msgstr "đừng dùng bộ trình rút mặc định"
#: src/main/extract.c:148
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)"
+msgstr ""
+"hiển thị chỉ từ khoá KIỂU (TYPE) đã cho thôi (dùng « -L » để xem danh sách)"
#: src/main/extract.c:150
msgid "remove duplicates even if keyword types do not match"
@@ -178,7 +190,8 @@ msgstr "Bạn phải ghi rõ một đối số cho tùy chọn « %s » (tùy ch
#: src/main/extract.c:607
#, 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"
+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:663
#, c-format
@@ -702,8 +715,12 @@ msgstr "Việc khởi động cơ chế cầm phít bị lỗi: %s\n"
#: src/main/extractor.c:768
#, c-format
-msgid "Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that failed also. Errors are: `%s' and `%s'.\n"
-msgstr "Việc tháo gỡ ký hiệu « %s » trong thư viện « %s » bị lỗi, thì đã cố « %s », nhưng mà nó cũng không thành công. Gặp lỗi « %s » và « %s ».\n"
+msgid ""
+"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
+"failed also. Errors are: `%s' and `%s'.\n"
+msgstr ""
+"Việc tháo gỡ ký hiệu « %s » trong thư viện « %s » bị lỗi, thì đã cố « %s », "
+"nhưng mà nó cũng không thành công. Gặp lỗi « %s » và « %s ».\n"
#: src/main/extractor.c:805
#, c-format
@@ -1575,7 +1592,8 @@ msgstr "Bản sửa đổi #%u: Tác giả « %s » đã làm việc « %s »."
msgid ""
"Please provide the name of the language you are building\n"
"a dictionary for. For example:\n"
-msgstr "Hãy cung cấp tên ngôn ngữ mà bạn đang xây dựng từ điển cho nó. Lấy thí dụ :\n"
+msgstr ""
+"Hãy cung cấp tên ngôn ngữ mà bạn đang xây dựng từ điển cho nó. Lấy thí dụ :\n"
#: src/plugins/printable/dictionary-builder.c:111
#: src/plugins/printable/dictionary-builder.c:165
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 0x00052200
+#define EXTRACTOR_VERSION 0x00052300
#include <stdio.h>
