gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r2064 - in Extractor: . po src/include src/plugins src/plug

From: grothoff
Subject: [GNUnet-SVN] r2064 - in Extractor: . po src/include src/plugins src/plugins/exiv2 src/plugins/ole2 src/plugins/pdf src/plugins/printable src/plugins/rpm src/plugins/thumbnail
Date: Mon, 5 Sep 2005 06:48:50 -0700 (PDT) 
Author: grothoff
Date: 2005-09-05 06:48:39 -0700 (Mon, 05 Sep 2005)
New Revision: 2064

Added:
   Extractor/src/plugins/ASF_SYMBOLS
   Extractor/src/plugins/DEB_SYMBOLS
   Extractor/src/plugins/DVI_SYMBOLS
   Extractor/src/plugins/ELF_SYMBOLS
   Extractor/src/plugins/FILENAME_SYMBOLS
   Extractor/src/plugins/GIF_SYMBOLS
   Extractor/src/plugins/HTML_SYMBOLS
   Extractor/src/plugins/ID3V23_SYMBOLS
   Extractor/src/plugins/ID3V24_SYMBOLS
   Extractor/src/plugins/ID3V2_SYMBOLS
   Extractor/src/plugins/JPEG_SYMBOLS
   Extractor/src/plugins/LOWER_SYMBOLS
   Extractor/src/plugins/MAN_SYMBOLS
   Extractor/src/plugins/MIME_SYMBOLS
   Extractor/src/plugins/MP3_SYMBOLS
   Extractor/src/plugins/MPEG_SYMBOLS
   Extractor/src/plugins/OGG_SYMBOLS
   Extractor/src/plugins/PNG_SYMBOLS
   Extractor/src/plugins/QT_SYMBOLS
   Extractor/src/plugins/REAL_SYMBOLS
   Extractor/src/plugins/RIFF_SYMBOLS
   Extractor/src/plugins/SPLIT_SYMBOLS
   Extractor/src/plugins/TAR_SYMBOLS
   Extractor/src/plugins/TIFF_SYMBOLS
   Extractor/src/plugins/TRANSLIT_SYMBOLS
   Extractor/src/plugins/WAV_SYMBOLS
   Extractor/src/plugins/ZIP_SYMBOLS
   Extractor/src/plugins/exiv2/SYMBOLS
   Extractor/src/plugins/ole2/SYMBOLS
   Extractor/src/plugins/pdf/SYMBOLS
   Extractor/src/plugins/printable/DA_SYMBOLS
   Extractor/src/plugins/printable/DE_SYMBOLS
   Extractor/src/plugins/printable/EN_SYMBOLS
   Extractor/src/plugins/printable/ES_SYMBOLS
   Extractor/src/plugins/printable/IT_SYMBOLS
   Extractor/src/plugins/printable/NO_SYMBOLS
   Extractor/src/plugins/rpm/SYMBOLS
   Extractor/src/plugins/thumbnail/SYMBOLS
Modified:
   Extractor/ChangeLog
   Extractor/TODO
   Extractor/configure.ac
   Extractor/po/POTFILES.in
   Extractor/po/de.po
   Extractor/po/libextractor.pot
   Extractor/po/ro.po
   Extractor/po/rw.po
   Extractor/src/include/extractor.h
   Extractor/src/plugins/Makefile.am
   Extractor/src/plugins/debextractor.c
   Extractor/src/plugins/exiv2/Makefile.am
   Extractor/src/plugins/pdf/Makefile.am
   Extractor/src/plugins/printable/Makefile.am
   Extractor/src/plugins/printable/bloomfilter.c
   Extractor/src/plugins/printable/bloomfilter.h
   Extractor/src/plugins/printable/dictionary-builder.c
   Extractor/src/plugins/printable/printableextractor.c
   Extractor/src/plugins/printable/sha1.c
   Extractor/src/plugins/printable/sha1.h
   Extractor/src/plugins/rpm/Makefile.am
   Extractor/src/plugins/thumbnail/Makefile.am
Log:
fix

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/ChangeLog 2005-09-05 13:48:39 UTC (rev 2064)
@@ -1,3 +1,9 @@
+Sun Sep  4 02:08:56 PDT 2005
+       Changed code to export fewer symbols (refactoring plus linker options,
+       goal is to address Mantis #925.  Changed debian extractor to no longer
+       require threads.  Dead code elimination in OO and OLE2 extractors.
+       Minor bugfixes ported from libgsf 1.12.2 to OLE2 extractor.
+
 Fri Sep  2 03:17:10 PDT 2005
        Added support for Mime-types for Microsoft Office formats.
 

Modified: Extractor/TODO
===================================================================
--- Extractor/TODO      2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/TODO      2005-09-05 13:48:39 UTC (rev 2064)
@@ -1,12 +1,12 @@
 Core:
 * error reporting facilities
 * add support for different character sets (to 'all' extractors)
-* add support for passing options to extractors
 
 'Unclean' code:
 * QT
 * ASF
 * RPM
+* REMOVE pthread requirement from debextractor!
 
 Incomplete code (missing features):
 * RIFF (idx1 attribute)

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/configure.ac      2005-09-05 13:48:39 UTC (rev 2064)
@@ -1,8 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
-AC_INIT([libextractor], [0.5.4], address@hidden)
+AC_INIT([libextractor], [0.5.4a], address@hidden)
 AC_REVISION($Revision: 1.67 $)
-AM_INIT_AUTOMAKE([libextractor], [0.5.4])
+AM_INIT_AUTOMAKE([libextractor], [0.5.4a])
 AM_CONFIG_HEADER(src/include/config.h)
 
 AH_TOP([#define _GNU_SOURCE  1])

Modified: Extractor/po/POTFILES.in
===================================================================
--- Extractor/po/POTFILES.in    2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/po/POTFILES.in    2005-09-05 13:48:39 UTC (rev 2064)
@@ -1,8 +1,6 @@
 src/plugins/hash/rmd160extractor.c
 src/plugins/hash/md5extractor.c
-src/plugins/hash/md5.c
 src/plugins/hash/sha1extractor.c
-src/plugins/hash/sha1.c
 src/plugins/thumbnail/thumbnailextractor.c
 src/plugins/rpm/rpmextractor.c
 src/plugins/printable/peXX.c
@@ -11,7 +9,6 @@
 src/plugins/printable/en.c
 src/plugins/printable/it.c
 src/plugins/printable/dictionary-builder.c
-src/plugins/printable/sha1.c
 src/plugins/printable/peen.c
 src/plugins/printable/peit.c
 src/plugins/printable/da.c
@@ -22,12 +19,7 @@
 src/plugins/printable/pees.c
 src/plugins/printable/no.c
 src/plugins/printable/peno.c
-src/plugins/ole2/gsf-infile-msole.c
-src/plugins/ole2/gsf-utils.c
-src/plugins/ole2/gsf-input.c
 src/plugins/ole2/ole2extractor.c
-src/plugins/oo/ioapi.c
-src/plugins/oo/unzip.c
 src/plugins/oo/ooextractor.c
 src/plugins/id3v24extractor.c
 src/plugins/zipextractor.c
@@ -48,27 +40,6 @@
 src/plugins/htmlextractor.c
 src/plugins/templateextractor.c
 src/plugins/oggextractor.c
-src/plugins/filenameextractor.c
-src/plugins/psextractor.c
-src/plugins/realextractor.c
-src/plugins/convert.c
-src/plugins/jpegextractor.c
-src/plugins/riffextractor.c
-src/plugins/tarextractor.c
-src/plugins/mpegextractor.c
-src/plugins/lowerextractor.c
-src/plugins/tiffextractor.c
-src/plugins/splitextractor.c
-src/plugins/mp3extractor.c
-src/main/iconv.c
-src/main/winproc.c
-src/main/getopt.c
-src/main/getopt1.c
-src/main/extract.c
-src/main/extractor.c
-src/plugins/hash/sha1.h
-src/plugins/hash/md5.h
-src/plugins/printable/sha1.h
 src/plugins/printable/bloomfilter.h
 src/plugins/pdf/Error.h
 src/plugins/pdf/StdFontInfo.h
@@ -99,9 +70,6 @@
 src/plugins/pdf/Function.h
 src/plugins/pdf/gmem.h
 src/plugins/pdf/aconf.h
-src/plugins/oo/crypt.h
-src/plugins/oo/ioapi.h
-src/plugins/oo/unzip.h
 src/plugins/pack.h
 src/plugins/convert.h
 src/plugins/exiv2/exv_msvc.h

Modified: Extractor/po/de.po
===================================================================
--- Extractor/po/de.po  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/po/de.po  2005-09-05 13:48:39 UTC (rev 2064)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libextractor 0.5.0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-08-26 22:35-0700\n"
+"POT-Creation-Date: 2005-09-04 02:59-0700\n"
 "PO-Revision-Date: 2005-06-22 15:05+0200\n"
 "Last-Translator: Karl Eichwalder <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -28,7 +28,7 @@
 msgid "Binary RPM %d.%d"
 msgstr "Binäres RPM %d.%d"
 
-#: src/plugins/printable/dictionary-builder.c:52
+#: src/plugins/printable/dictionary-builder.c:50
 #, c-format
 msgid ""
 "Please provide the name of the language you are building\n"
@@ -37,12 +37,12 @@
 "Bitte geben Sie den Namen der Sprache an, für die Sie ein Wörterbuch\n"
 "erstellen.  Zum Beispiel:\n"
 
-#: src/plugins/printable/dictionary-builder.c:65
+#: src/plugins/printable/dictionary-builder.c:63
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fehler beim Öffnen der Datei »%s«: %s\n"
 
-#: src/plugins/printable/dictionary-builder.c:73
+#: src/plugins/printable/dictionary-builder.c:71
 #, c-format
 msgid ""
 "Error allocating: %s\n"
@@ -51,7 +51,7 @@
 "Fehler beim Allokieren: %s\n"
 "."
 
-#: src/plugins/printable/dictionary-builder.c:85
+#: src/plugins/printable/dictionary-builder.c:83
 #, c-format
 msgid "Increase ALLOCSIZE (in %s).\n"
 msgstr "ALLOCSIZE vergrößern (in %s).\n"
@@ -92,11 +92,11 @@
 msgid "Kernel routines"
 msgstr "Kernelroutinen"
 
-#: src/plugins/wavextractor.c:113 src/plugins/mp3extractor.c:426
+#: src/plugins/wavextractor.c:113
 msgid "mono"
 msgstr "Mono"
 
-#: src/plugins/wavextractor.c:113 src/plugins/mp3extractor.c:426
+#: src/plugins/wavextractor.c:113
 msgid "stereo"
 msgstr "Stereo"
 
@@ -105,1182 +105,500 @@
 msgid "Fatal: could not allocate (%s at %s:%d).\n"
 msgstr "Fatal: Allokieren nicht möglich (%s bei %s:%d).\n"
 
-#: src/plugins/jpegextractor.c:178
-#, c-format
-msgid "%ux%u dots per inch"
-msgstr "%ux%u Punkte je Zoll"
+#~ msgid "%ux%u dots per inch"
+#~ msgstr "%ux%u Punkte je Zoll"
 
-#: src/plugins/jpegextractor.c:188
-#, c-format
-msgid "%ux%u dots per cm"
-msgstr "%ux%u Punkte je Zentimeter"
+#~ msgid "%ux%u dots per cm"
+#~ msgstr "%ux%u Punkte je Zentimeter"
 
-#: src/plugins/jpegextractor.c:198
-#, c-format
-msgid "%ux%u dots per inch?"
-msgstr "%ux%u Punkte je Zentimeter?"
+#~ msgid "%ux%u dots per inch?"
+#~ msgstr "%ux%u Punkte je Zentimeter?"
 
-#: src/plugins/riffextractor.c:167
-#, c-format
-msgid "codec: %s, %u fps, %u ms"
-msgstr ""
+#~ msgid "Blues"
+#~ msgstr "Blues"
 
-#: src/plugins/mp3extractor.c:49
-msgid "Blues"
-msgstr "Blues"
+#~ msgid "Classic Rock"
+#~ msgstr "Klassischer Rock"
 
-#: src/plugins/mp3extractor.c:50
-msgid "Classic Rock"
-msgstr "Klassischer Rock"
+#~ msgid "Country"
+#~ msgstr "Country"
 
-#: src/plugins/mp3extractor.c:51
-msgid "Country"
-msgstr "Country"
+#~ msgid "Disco"
+#~ msgstr "Disco"
 
-#: src/plugins/mp3extractor.c:52
-msgid "Dance"
-msgstr ""
+#~ msgid "Funk"
+#~ msgstr "Funk"
 
-#: src/plugins/mp3extractor.c:53
-msgid "Disco"
-msgstr "Disco"
+#~ msgid "Hip-Hop"
+#~ msgstr "Hip-Hop"
 
-#: src/plugins/mp3extractor.c:54
-msgid "Funk"
-msgstr "Funk"
+#~ msgid "Jazz"
+#~ msgstr "Jazz"
 
-#: src/plugins/mp3extractor.c:55
-msgid "Grunge"
-msgstr ""
+#~ msgid "Metal"
+#~ msgstr "Metal"
 
-#: src/plugins/mp3extractor.c:56
-msgid "Hip-Hop"
-msgstr "Hip-Hop"
+#~ msgid "New Age"
+#~ msgstr "New Age"
 
-#: src/plugins/mp3extractor.c:57
-msgid "Jazz"
-msgstr "Jazz"
+#~ msgid "Oldies"
+#~ msgstr "Oldies"
 
-#: src/plugins/mp3extractor.c:58
-msgid "Metal"
-msgstr "Metal"
+#~ msgid "Other"
+#~ msgstr "Sonstiges"
 
-#: src/plugins/mp3extractor.c:59
-msgid "New Age"
-msgstr "New Age"
+#~ msgid "Pop"
+#~ msgstr "Pop"
 
-#: src/plugins/mp3extractor.c:60
-msgid "Oldies"
-msgstr "Oldies"
+#~ msgid "R&B"
+#~ msgstr "R&B"
 
-#: src/plugins/mp3extractor.c:61
-msgid "Other"
-msgstr "Sonstiges"
+#~ msgid "Rap"
+#~ msgstr "Rap"
 
-#: src/plugins/mp3extractor.c:62
-msgid "Pop"
-msgstr "Pop"
+#~ msgid "Reggae"
+#~ msgstr "Reggae"
 
-#: src/plugins/mp3extractor.c:63
-msgid "R&B"
-msgstr "R&B"
+#~ msgid "Rock"
+#~ msgstr "Rock"
 
-#: src/plugins/mp3extractor.c:64
-msgid "Rap"
-msgstr "Rap"
+#~ msgid "Techno"
+#~ msgstr "Techno"
 
-#: src/plugins/mp3extractor.c:65
-msgid "Reggae"
-msgstr "Reggae"
+#~ msgid "Ska"
+#~ msgstr "Ska"
 
-#: src/plugins/mp3extractor.c:66
-msgid "Rock"
-msgstr "Rock"
+#~ msgid "Vocal"
+#~ msgstr "Vokal"
 
-#: src/plugins/mp3extractor.c:67
-msgid "Techno"
-msgstr "Techno"
+#~ msgid "Jazz+Funk"
+#~ msgstr "Jazz+Funk"
 
-#: src/plugins/mp3extractor.c:68
-msgid "Industrial"
-msgstr ""
+#~ msgid "Fusion"
+#~ msgstr "Fusion"
 
-#: src/plugins/mp3extractor.c:69
-msgid "Alternative"
-msgstr ""
+#~ msgid "Classical"
+#~ msgstr "Klassik"
 
-#: src/plugins/mp3extractor.c:70
-msgid "Ska"
-msgstr "Ska"
+#~ msgid "Instrumental"
+#~ msgstr "Instrumental"
 
-#: src/plugins/mp3extractor.c:71
-msgid "Death Metal"
-msgstr ""
+#~ msgid "House"
+#~ msgstr "House"
 
-#: src/plugins/mp3extractor.c:72
-msgid "Pranks"
-msgstr ""
+#~ msgid "Game"
+#~ msgstr "Spiel"
 
-#: src/plugins/mp3extractor.c:73
-msgid "Soundtrack"
-msgstr ""
+#~ msgid "Sound Clip"
+#~ msgstr "Soundclip"
 
-#: src/plugins/mp3extractor.c:74
-msgid "Euro-Techno"
-msgstr ""
+#~ msgid "Gospel"
+#~ msgstr "Gospel"
 
-#: src/plugins/mp3extractor.c:75
-msgid "Ambient"
-msgstr ""
+#~ msgid "Noise"
+#~ msgstr "Noise"
 
-#: src/plugins/mp3extractor.c:76
-msgid "Trip-Hop"
-msgstr ""
+#~ msgid "Soul"
+#~ msgstr "Soul"
 
-#: src/plugins/mp3extractor.c:77
-msgid "Vocal"
-msgstr "Vokal"
+#~ msgid "Punk"
+#~ msgstr "Punk"
 
-#: src/plugins/mp3extractor.c:78
-msgid "Jazz+Funk"
-msgstr "Jazz+Funk"
+#~ msgid "Gothic"
+#~ msgstr "Gothic"
 
-#: src/plugins/mp3extractor.c:79
-msgid "Fusion"
-msgstr "Fusion"
+#~ msgid "New Wave"
+#~ msgstr "New Wave"
 
-#: src/plugins/mp3extractor.c:80
-msgid "Trance"
-msgstr ""
+#~ msgid "Rock & Roll"
+#~ msgstr "Rock & Roll"
 
-#: src/plugins/mp3extractor.c:81
-msgid "Classical"
-msgstr "Klassik"
+#~ msgid "Folk"
+#~ msgstr "Folk"
 
-#: src/plugins/mp3extractor.c:82
-msgid "Instrumental"
-msgstr "Instrumental"
+#~ msgid "Folk/Rock"
+#~ msgstr "Folk/Rock"
 
-#: src/plugins/mp3extractor.c:83
-msgid "Acid"
-msgstr ""
+#~ msgid "Swing"
+#~ msgstr "Swing"
 
-#: src/plugins/mp3extractor.c:84
-msgid "House"
-msgstr "House"
+#~ msgid "Humour"
+#~ msgstr "Humor"
 
-#: src/plugins/mp3extractor.c:85
-msgid "Game"
-msgstr "Spiel"
+#~ msgid "Speech"
+#~ msgstr "Sprache"
 
-#: src/plugins/mp3extractor.c:86
-msgid "Sound Clip"
-msgstr "Soundclip"
+#~ msgid "Chanson"
+#~ msgstr "Chanson"
 
-#: src/plugins/mp3extractor.c:87
-msgid "Gospel"
-msgstr "Gospel"
+#~ msgid "Opera"
+#~ msgstr "Oper"
 
-#: src/plugins/mp3extractor.c:88
-msgid "Noise"
-msgstr "Noise"
+#~ msgid "Chamber Music"
+#~ msgstr "Kammermusik"
 
-#: src/plugins/mp3extractor.c:89
-msgid "Alt. Rock"
-msgstr ""
+#~ msgid "Sonata"
+#~ msgstr "Sonate"
 
-#: src/plugins/mp3extractor.c:90
-msgid "Bass"
-msgstr ""
+#~ msgid "Symphony"
+#~ msgstr "Symphonie"
 
-#: src/plugins/mp3extractor.c:91
-msgid "Soul"
-msgstr "Soul"
+#~ msgid "Tango"
+#~ msgstr "Tango"
 
-#: src/plugins/mp3extractor.c:92
-msgid "Punk"
-msgstr "Punk"
+#~ msgid "Samba"
+#~ msgstr "Samba"
 
-#: src/plugins/mp3extractor.c:93
-msgid "Space"
-msgstr ""
+#~ msgid "A Cappella"
+#~ msgstr "A cappella"
 
-#: src/plugins/mp3extractor.c:94
-msgid "Meditative"
-msgstr ""
+#~ msgid "Merengue"
+#~ msgstr "Merengue"
 
-#: src/plugins/mp3extractor.c:95
-msgid "Instrumental Pop"
-msgstr ""
+#~ msgid "Salsa"
+#~ msgstr "Salsa"
 
-#: src/plugins/mp3extractor.c:96
-msgid "Instrumental Rock"
-msgstr ""
+#~ msgid "(variable bps)"
+#~ msgstr "(variable BPS)"
 
-#: src/plugins/mp3extractor.c:97
-msgid "Ethnic"
-msgstr ""
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: Option »%s« ist mehrdeutig\n"
 
-#: src/plugins/mp3extractor.c:98
-msgid "Gothic"
-msgstr "Gothic"
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: Option »--%s« erwartet kein Argument\n"
 
-#: src/plugins/mp3extractor.c:99
-msgid "Darkwave"
-msgstr ""
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: Option »%c%s« erwartet kein Argument\n"
 
-#: src/plugins/mp3extractor.c:100
-msgid "Techno-Industrial"
-msgstr ""
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: Option »%s« erwartet ein Argument\n"
 
-#: src/plugins/mp3extractor.c:101
-msgid "Electronic"
-msgstr ""
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: unbekannte Option »--%s«\n"
 
-#: src/plugins/mp3extractor.c:102
-msgid "Pop-Folk"
-msgstr ""
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: unbekannte Option »%c%s«\n"
 
-#: src/plugins/mp3extractor.c:103
-msgid "Eurodance"
-msgstr ""
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: unzulässige Option -- %c\n"
 
-#: src/plugins/mp3extractor.c:104
-msgid "Dream"
-msgstr ""
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: ungültige Option -- %c\n"
 
-#: src/plugins/mp3extractor.c:105
-msgid "Southern Rock"
-msgstr ""
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: Option erwartet ein Argument -- %c\n"
 
-#: src/plugins/mp3extractor.c:106
-msgid "Comedy"
-msgstr ""
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: Option »-W %s« ist mehrdeutig\n"
 
-#: src/plugins/mp3extractor.c:107
-msgid "Cult"
-msgstr ""
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: Option »-W %s« erwartet kein Argument\n"
 
-#: src/plugins/mp3extractor.c:108
-msgid "Gangsta Rap"
-msgstr ""
+#~ msgid ""
+#~ "Usage: %s\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Aufruf: %s\n"
+#~ "%s\n"
+#~ "\n"
 
-#: src/plugins/mp3extractor.c:109
-msgid "Top 40"
-msgstr ""
+#~ msgid ""
+#~ "Arguments mandatory for long options are also mandatory for short "
+#~ "options.\n"
+#~ msgstr ""
+#~ "Argumente, die für lange Optionen notwendig sind, sind ebenfalls für die\n"
+#~ "Optionen in Kurzform notwendig.\n"
 
-#: src/plugins/mp3extractor.c:110
-msgid "Christian Rap"
-msgstr ""
+#~ msgid "do not remove any duplicates"
+#~ msgstr "doppelte Einträge nicht entfernen"
 
-#: src/plugins/mp3extractor.c:111
-msgid "Pop/Funk"
-msgstr ""
+#~ msgid "print output in bibtex format"
+#~ msgstr "Ausgabe im BibTeX format"
 
-#: src/plugins/mp3extractor.c:112
-msgid "Jungle"
-msgstr ""
+#~ msgid ""
+#~ "use the generic plaintext extractor for the language with the 2-letter "
+#~ "language code LANG"
+#~ msgstr ""
+#~ "generischen Klartext-extractor für die Sprache mit dem 2-Buchstabenkürzel "
+#~ "LANG verwenden"
 
-#: src/plugins/mp3extractor.c:113
-msgid "Native American"
-msgstr ""
+#~ msgid "remove duplicates only if types match"
+#~ msgstr "doppelte Einträge nur entfernen, wenn die Art übereinstimmt"
 
-#: src/plugins/mp3extractor.c:114
-msgid "Cabaret"
-msgstr ""
+#~ msgid "use the filename as a keyword (loads filename-extractor plugin)"
+#~ msgstr ""
+#~ "Dateinamen als Schlüsselwort verwenden (filename-extractor-Erweiterung "
+#~ "wird geladen)"
 
-#: src/plugins/mp3extractor.c:115
-msgid "New Wave"
-msgstr "New Wave"
+#~ msgid "print this help"
+#~ msgstr "diese Hilfe anzeigen"
 
-#: src/plugins/mp3extractor.c:116
-msgid "Psychedelic"
-msgstr ""
+#~ msgid "compute hash using the given ALGORITHM (currently sha1 or md5)"
+#~ msgstr ""
+#~ "Hash gemäß dem angegebenen ALGORITHMUS errechnen (z.Zt. »sha1« oder »md5«)"
 
-#: src/plugins/mp3extractor.c:117
-msgid "Rave"
-msgstr ""
+#~ msgid "load an extractor plugin named LIBRARY"
+#~ msgstr "extractor-Erweiterung mit der Bezeichnung LIBRARY laden"
 
-#: src/plugins/mp3extractor.c:118
-msgid "Showtunes"
-msgstr ""
+#~ msgid "list all keyword types"
+#~ msgstr "alle Arten Schlüsselwörter auflisten"
 
-#: src/plugins/mp3extractor.c:119
-msgid "Trailer"
-msgstr ""
+#~ msgid "do not use the default set of extractor plugins"
+#~ msgstr "Standardsatz der extractor-Erweiterungen nicht verwenden"
 
-#: src/plugins/mp3extractor.c:120
-msgid "Lo-Fi"
-msgstr ""
+#~ 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/plugins/mp3extractor.c:121
-msgid "Tribal"
-msgstr ""
+#~ msgid "remove duplicates even if keyword types do not match"
+#~ msgstr "doppelte Einträge auch entfernen, wenn die Art nicht übereinstimmt"
 
-#: src/plugins/mp3extractor.c:122
-msgid "Acid Punk"
-msgstr ""
+#~ msgid "use keyword splitting (loads split-extractor plugin)"
+#~ msgstr "Schlüsselwörter splitten (split-extractor-Erweiterung wird geladen)"
 
-#: src/plugins/mp3extractor.c:123
-msgid "Acid Jazz"
-msgstr ""
+#~ msgid "print the version number"
+#~ msgstr "die Versionsnummer anzeigen"
 
-#: src/plugins/mp3extractor.c:124
-msgid "Polka"
-msgstr ""
+#~ msgid "be verbose"
+#~ msgstr "viele Informationen ausgeben"
 
-#: src/plugins/mp3extractor.c:125
-msgid "Retro"
-msgstr ""
+#~ msgid "do not print keywords of the given TYPE"
+#~ msgstr "Schlüsselwörter einer bestimmten ART nicht ausgeben"
 
-#: src/plugins/mp3extractor.c:126
-msgid "Musical"
-msgstr ""
+#~ msgid "extract [OPTIONS] [FILENAME]*"
+#~ msgstr "extract [OPTIONEN] [DATEINAME]*"
 
-#: src/plugins/mp3extractor.c:127
-msgid "Rock & Roll"
-msgstr "Rock & Roll"
+#~ msgid "Extract metadata from files."
+#~ msgstr "Metadaten aus den Dateien extrahieren."
 
-#: src/plugins/mp3extractor.c:128
-msgid "Hard Rock"
-msgstr ""
+#~ msgid "%s - (binary)\n"
+#~ msgstr "%s - (binär)\n"
 
-#: src/plugins/mp3extractor.c:129
-msgid "Folk"
-msgstr "Folk"
+#~ msgid "INVALID TYPE - %s\n"
+#~ msgstr "UNGÜLTIGE ART - %s\n"
 
-#: src/plugins/mp3extractor.c:130
-msgid "Folk/Rock"
-msgstr "Folk/Rock"
+#~ msgid "title"
+#~ msgstr "Titel"
 
-#: src/plugins/mp3extractor.c:131
-msgid "National Folk"
-msgstr ""
+#~ msgid "filename"
+#~ msgstr "Dateiname"
 
-#: src/plugins/mp3extractor.c:132
-msgid "Swing"
-msgstr "Swing"
+#~ msgid "author"
+#~ msgstr "Autor"
 
-#: src/plugins/mp3extractor.c:133
-msgid "Fast-Fusion"
-msgstr ""
+#~ msgid "description"
+#~ msgstr "Beschreibung"
 
-#: src/plugins/mp3extractor.c:134
-msgid "Bebob"
-msgstr ""
+#~ msgid "keywords"
+#~ msgstr "Schlüsselwörter"
 
-#: src/plugins/mp3extractor.c:135
-msgid "Latin"
-msgstr ""
+#~ msgid "comment"
+#~ msgstr "Kommentar"
 
-#: src/plugins/mp3extractor.c:136
-msgid "Revival"
-msgstr ""
+#~ msgid "date"
+#~ msgstr "Datum"
 
-#: src/plugins/mp3extractor.c:137
-msgid "Celtic"
-msgstr ""
+#~ msgid "creation date"
+#~ msgstr "Datum der Erstellung"
 
-#: src/plugins/mp3extractor.c:138
-msgid "Bluegrass"
-msgstr ""
+#~ msgid "publisher"
+#~ msgstr "Herausgeber"
 
-#: src/plugins/mp3extractor.c:139
-msgid "Avantgarde"
-msgstr ""
+#~ msgid "organization"
+#~ msgstr "Organisation"
 
-#: src/plugins/mp3extractor.c:140
-msgid "Gothic Rock"
-msgstr ""
+#~ msgid "subject"
+#~ msgstr "Gegenstand"
 
-#: src/plugins/mp3extractor.c:141
-msgid "Progressive Rock"
-msgstr ""
+#~ msgid "page count"
+#~ msgstr "Seitenanzahl"
 
-#: src/plugins/mp3extractor.c:142
-msgid "Psychedelic Rock"
-msgstr ""
+#~ 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"
 
-#: src/plugins/mp3extractor.c:143
-msgid "Symphonic Rock"
-msgstr ""
+#~ msgid "Use --help to get a list of options.\n"
+#~ msgstr "Verwenden Sie --help, um eine Liste aller Optionen zu sehen.\n"
 
-#: src/plugins/mp3extractor.c:144
-msgid "Slow Rock"
-msgstr ""
+#~ msgid "%% BiBTeX file\n"
+#~ msgstr "%% BibTeX Datei\n"
 
-#: src/plugins/mp3extractor.c:145
-msgid "Big Band"
-msgstr ""
+#~ msgid "Keywords for file %s:\n"
+#~ msgstr "Schlüsserwörter für die Datei %s:\n"
 
-#: src/plugins/mp3extractor.c:146
-msgid "Chorus"
-msgstr ""
+#~ msgid "unknown"
+#~ msgstr "unbekannt"
 
-#: src/plugins/mp3extractor.c:147
-msgid "Easy Listening"
-msgstr ""
+#~ msgid "mimetype"
+#~ msgstr "MIME-Typ"
 
-#: src/plugins/mp3extractor.c:148
-msgid "Acoustic"
-msgstr ""
+#~ msgid "artist"
+#~ msgstr "Künstler"
 
-#: src/plugins/mp3extractor.c:149
-msgid "Humour"
-msgstr "Humor"
+#~ msgid "language"
+#~ msgstr "Sprache"
 
-#: src/plugins/mp3extractor.c:150
-msgid "Speech"
-msgstr "Sprache"
+#~ msgid "album"
+#~ msgstr "Album"
 
-#: src/plugins/mp3extractor.c:151
-msgid "Chanson"
-msgstr "Chanson"
+#~ msgid "genre"
+#~ msgstr "Fach"
 
-#: src/plugins/mp3extractor.c:152
-msgid "Opera"
-msgstr "Oper"
+#~ msgid "location"
+#~ msgstr "Ort"
 
-#: src/plugins/mp3extractor.c:153
-msgid "Chamber Music"
-msgstr "Kammermusik"
+#~ msgid "version"
+#~ msgstr "Version"
 
-#: src/plugins/mp3extractor.c:154
-msgid "Sonata"
-msgstr "Sonate"
+#~ msgid "copyright"
+#~ msgstr "Copyright"
 
-#: src/plugins/mp3extractor.c:155
-msgid "Symphony"
-msgstr "Symphonie"
+#~ msgid "contributor"
+#~ msgstr "Beiträger"
 
-#: src/plugins/mp3extractor.c:156
-msgid "Booty Bass"
-msgstr ""
+#~ msgid "resource-type"
+#~ msgstr "Art der Ressource"
 
-#: src/plugins/mp3extractor.c:157
-msgid "Primus"
-msgstr ""
+#~ msgid "format"
+#~ msgstr "Format"
 
-#: src/plugins/mp3extractor.c:158
-msgid "Porn Groove"
-msgstr ""
+#~ msgid "source"
+#~ msgstr "Quelle"
 
-#: src/plugins/mp3extractor.c:159
-msgid "Satire"
-msgstr ""
+#~ msgid "relation"
+#~ msgstr "Beziehung"
 
-#: src/plugins/mp3extractor.c:160
-msgid "Slow Jam"
-msgstr ""
+#~ msgid "software"
+#~ msgstr "Software"
 
-#: src/plugins/mp3extractor.c:161
-msgid "Club"
-msgstr ""
+#~ msgid "warning"
+#~ msgstr "Warnung"
 
-#: src/plugins/mp3extractor.c:162
-msgid "Tango"
-msgstr "Tango"
+#~ msgid "translated"
+#~ msgstr "übersetzt"
 
-#: src/plugins/mp3extractor.c:163
-msgid "Samba"
-msgstr "Samba"
+#~ msgid "modification date"
+#~ msgstr "Datum der Veränderung"
 
-#: src/plugins/mp3extractor.c:164
-msgid "Folklore"
-msgstr ""
+#~ msgid "creator"
+#~ msgstr "Ersteller"
 
-#: src/plugins/mp3extractor.c:165
-msgid "Ballad"
-msgstr ""
+#~ msgid "producer"
+#~ msgstr "Hersteller"
 
-#: src/plugins/mp3extractor.c:166
-msgid "Power Ballad"
-msgstr ""
+#~ msgid "page orientation"
+#~ msgstr "Seitenausrichtung"
 
-#: src/plugins/mp3extractor.c:167
-msgid "Rhythmic Soul"
-msgstr ""
+#~ msgid "paper size"
+#~ msgstr "Seitengröße"
 
-#: src/plugins/mp3extractor.c:168
-msgid "Freestyle"
-msgstr ""
+#~ msgid "used fonts"
+#~ msgstr "verwendete Schriften"
 
-#: src/plugins/mp3extractor.c:169
-msgid "Duet"
-msgstr ""
+#~ msgid "page order"
+#~ msgstr "Seitenreihenfolge"
 
-#: src/plugins/mp3extractor.c:170
-msgid "Punk Rock"
-msgstr ""
+#~ msgid "created for"
+#~ msgstr "erstellt für"
 
-#: src/plugins/mp3extractor.c:171
-msgid "Drum Solo"
-msgstr ""
+#~ msgid "magnification"
+#~ msgstr "Vergrößerung"
 
-#: src/plugins/mp3extractor.c:172
-msgid "A Cappella"
-msgstr "A cappella"
+#~ msgid "release"
+#~ msgstr "Release"
 
-#: src/plugins/mp3extractor.c:173
-msgid "Euro-House"
-msgstr ""
+#~ msgid "group"
+#~ msgstr "Gruppe"
 
-#: src/plugins/mp3extractor.c:174
-msgid "Dance Hall"
-msgstr ""
+#~ msgid "size"
+#~ msgstr "Größe"
 
-#: src/plugins/mp3extractor.c:175
-msgid "Goa"
-msgstr ""
+#~ msgid "summary"
+#~ msgstr "Kurzbeschreibung"
 
-#: src/plugins/mp3extractor.c:176
-msgid "Drum & Bass"
-msgstr ""
+#~ msgid "packager"
+#~ msgstr "Paket-Ersteller"
 
-#: src/plugins/mp3extractor.c:177
-msgid "Club-House"
-msgstr ""
+#~ msgid "license"
+#~ msgstr "Lizenz"
 
-#: src/plugins/mp3extractor.c:178
-msgid "Hardcore"
-msgstr ""
+#~ msgid "distribution"
+#~ msgstr "Distribution"
 
-#: src/plugins/mp3extractor.c:179
-msgid "Terror"
-msgstr ""
+#~ msgid "os"
+#~ msgstr "Betriebssystem"
 
-#: src/plugins/mp3extractor.c:180
-msgid "Indie"
-msgstr ""
+#~ msgid "dependency"
+#~ msgstr "Abhängigkeit"
 
-#: src/plugins/mp3extractor.c:181
-msgid "BritPop"
-msgstr ""
+#~ msgid "MD4"
+#~ msgstr "MD4"
 
-#: src/plugins/mp3extractor.c:182
-msgid "Negerpunk"
-msgstr ""
+#~ msgid "MD5"
+#~ msgstr "MD5"
 
-#: src/plugins/mp3extractor.c:183
-msgid "Polsk Punk"
-msgstr ""
+#~ msgid "SHA-0"
+#~ msgstr "SHA-0"
 
-#: src/plugins/mp3extractor.c:184
-msgid "Beat"
-msgstr ""
+#~ msgid "SHA-1"
+#~ msgstr "SHA-1"
 
-#: src/plugins/mp3extractor.c:185
-msgid "Christian Gangsta Rap"
-msgstr ""
+#~ msgid "RipeMD160"
+#~ msgstr "RipeMD160"
 
-#: src/plugins/mp3extractor.c:186
-msgid "Heavy Metal"
-msgstr ""
+#~ msgid "resolution"
+#~ msgstr "Auflösung"
 
-#: src/plugins/mp3extractor.c:187
-msgid "Black Metal"
-msgstr ""
+#~ msgid "category"
+#~ msgstr "Kategorie"
 
-#: src/plugins/mp3extractor.c:188
-msgid "Crossover"
-msgstr ""
+#~ msgid "book title"
+#~ msgstr "Buchtitel"
 
-#: src/plugins/mp3extractor.c:189
-msgid "Contemporary Christian"
-msgstr ""
+#~ msgid "priority"
+#~ msgstr "Priorität"
 
-#: src/plugins/mp3extractor.c:190
-msgid "Christian Rock"
-msgstr ""
+#~ msgid "replaces"
+#~ msgstr "Ersatz für"
 
-#: src/plugins/mp3extractor.c:191
-msgid "Merengue"
-msgstr "Merengue"
+#~ msgid "interpreter"
+#~ msgstr "Interpret"
 
-#: src/plugins/mp3extractor.c:192
-msgid "Salsa"
-msgstr "Salsa"
+#~ msgid "owner"
+#~ msgstr "Besitzer"
 
-#: src/plugins/mp3extractor.c:193
-msgid "Thrash Metal"
-msgstr ""
+#~ msgid "lyrics"
+#~ msgstr "Liedtexte"
 
-#: src/plugins/mp3extractor.c:194
-msgid "Anime"
-msgstr ""
+#~ msgid "media type"
+#~ msgstr "Medien-Art"
 
-#: src/plugins/mp3extractor.c:195
-msgid "JPop"
-msgstr ""
+#~ msgid "contact"
+#~ msgstr "Kontakt"
 
-#: src/plugins/mp3extractor.c:196
-msgid "Synthpop"
-msgstr ""
+#~ msgid "publication date"
+#~ msgstr "Erstellungsdatum"
 
-#: src/plugins/mp3extractor.c:427
-msgid "(variable bps)"
-msgstr "(variable BPS)"
+#~ msgid "camera model"
+#~ msgstr "Kamera Modell"
 
-#: src/main/getopt.c:681
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Option »%s« ist mehrdeutig\n"
+#~ msgid "flash"
+#~ msgstr "Blitz"
 
-#: src/main/getopt.c:706
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Option »--%s« erwartet kein Argument\n"
+#~ msgid "orientation"
+#~ msgstr "Ausrichtung"
 
-#: src/main/getopt.c:712
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: Option »%c%s« erwartet kein Argument\n"
+#~ msgid "Initialization of plugin mechanism failed: %s!\n"
+#~ msgstr "Initialisierung des Plugin-Mechanismus' ist fehlgeschlagen: %s.\n"
 
-#: src/main/getopt.c:729 src/main/getopt.c:900
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option »%s« erwartet ein Argument\n"
+#~ msgid "Loading `%s' plugin failed: %s\n"
+#~ msgstr "Laden des »%s«-Plugins ist fehlgeschlagen: %s\n"
 
-#: src/main/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: unbekannte Option »--%s«\n"
+#~ msgid "Unloading plugin `%s' failed!\n"
+#~ msgstr "Entladen des »%s«-Erweiterung ist fehlgeschlagen.\n"
 
-#: src/main/getopt.c:762
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: unbekannte Option »%c%s«\n"
-
-#: src/main/getopt.c:788
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: unzulässige Option -- %c\n"
-
-#: src/main/getopt.c:790
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ungültige Option -- %c\n"
-
-#: src/main/getopt.c:819 src/main/getopt.c:949
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Option erwartet ein Argument -- %c\n"
-
-#: src/main/getopt.c:867
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option »-W %s« ist mehrdeutig\n"
-
-#: src/main/getopt.c:885
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: Option »-W %s« erwartet kein Argument\n"
-
-#: src/main/extract.c:49
-#, c-format
-msgid ""
-"Usage: %s\n"
-"%s\n"
-"\n"
-msgstr ""
-"Aufruf: %s\n"
-"%s\n"
-"\n"
-
-#: src/main/extract.c:52
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-"Argumente, die für lange Optionen notwendig sind, sind ebenfalls für die\n"
-"Optionen in Kurzform notwendig.\n"
-
-#: src/main/extract.c:126
-msgid "do not remove any duplicates"
-msgstr "doppelte Einträge nicht entfernen"
-
-#: src/main/extract.c:128
-msgid "print output in bibtex format"
-msgstr "Ausgabe im BibTeX format"
-
-#: src/main/extract.c:130
-msgid ""
-"use the generic plaintext extractor for the language with the 2-letter "
-"language code LANG"
-msgstr ""
-"generischen Klartext-extractor für die Sprache mit dem 2-Buchstabenkürzel "
-"LANG verwenden"
-
-#: src/main/extract.c:132
-msgid "remove duplicates only if types match"
-msgstr "doppelte Einträge nur entfernen, wenn die Art übereinstimmt"
-
-#: src/main/extract.c:134
-msgid "use the filename as a keyword (loads filename-extractor plugin)"
-msgstr ""
-"Dateinamen als Schlüsselwort verwenden (filename-extractor-Erweiterung wird "
-"geladen)"
-
-#: src/main/extract.c:136
-msgid "print this help"
-msgstr "diese Hilfe anzeigen"
-
-#: src/main/extract.c:138
-msgid "compute hash using the given ALGORITHM (currently sha1 or md5)"
-msgstr ""
-"Hash gemäß dem angegebenen ALGORITHMUS errechnen (z.Zt. »sha1« oder »md5«)"
-
-#: src/main/extract.c:140
-msgid "load an extractor plugin named LIBRARY"
-msgstr "extractor-Erweiterung mit der Bezeichnung LIBRARY laden"
-
-#: src/main/extract.c:142
-msgid "list all keyword types"
-msgstr "alle Arten Schlüsselwörter auflisten"
-
-#: src/main/extract.c:144
-msgid "do not use the default set of extractor plugins"
-msgstr "Standardsatz der extractor-Erweiterungen nicht verwenden"
-
-#: src/main/extract.c:146
-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:148
-msgid "remove duplicates even if keyword types do not match"
-msgstr "doppelte Einträge auch entfernen, wenn die Art nicht übereinstimmt"
-
-#: src/main/extract.c:150
-msgid "use keyword splitting (loads split-extractor plugin)"
-msgstr "Schlüsselwörter splitten (split-extractor-Erweiterung wird geladen)"
-
-#: src/main/extract.c:152
-msgid "print the version number"
-msgstr "die Versionsnummer anzeigen"
-
-#: src/main/extract.c:154
-msgid "be verbose"
-msgstr "viele Informationen ausgeben"
-
-#: src/main/extract.c:156
-msgid "do not print keywords of the given TYPE"
-msgstr "Schlüsselwörter einer bestimmten ART nicht ausgeben"
-
-#: src/main/extract.c:159
-msgid "extract [OPTIONS] [FILENAME]*"
-msgstr "extract [OPTIONEN] [DATEINAME]*"
-
-#: src/main/extract.c:160
-msgid "Extract metadata from files."
-msgstr "Metadaten aus den Dateien extrahieren."
-
-#: src/main/extract.c:198 src/main/extractor.c:875
-#, c-format
-msgid "%s - (binary)\n"
-msgstr "%s - (binär)\n"
-
-#: src/main/extract.c:204 src/main/extractor.c:880
-#, c-format
-msgid "INVALID TYPE - %s\n"
-msgstr "UNGÜLTIGE ART - %s\n"
-
-#: src/main/extract.c:270 src/main/extractor.c:40
-msgid "title"
-msgstr "Titel"
-
-#: src/main/extract.c:272 src/main/extractor.c:38
-msgid "filename"
-msgstr "Dateiname"
-
-#: src/main/extract.c:277 src/main/extractor.c:41
-msgid "author"
-msgstr "Autor"
-
-#: src/main/extract.c:281 src/main/extractor.c:43
-msgid "description"
-msgstr "Beschreibung"
-
-#: src/main/extract.c:283 src/main/extractor.c:55
-msgid "keywords"
-msgstr "Schlüsselwörter"
-
-#: src/main/extract.c:285 src/main/extractor.c:44
-msgid "comment"
-msgstr "Kommentar"
-
-#: src/main/extract.c:289 src/main/extractor.c:45
-msgid "date"
-msgstr "Datum"
-
-#: src/main/extract.c:291 src/main/extractor.c:67
-msgid "creation date"
-msgstr "Datum der Erstellung"
-
-#: src/main/extract.c:319 src/main/extractor.c:46
-msgid "publisher"
-msgstr "Herausgeber"
-
-#: src/main/extract.c:323 src/main/extractor.c:52
-msgid "organization"
-msgstr "Organisation"
-
-#: src/main/extract.c:327 src/main/extractor.c:54
-msgid "subject"
-msgstr "Gegenstand"
-
-#: src/main/extract.c:331 src/main/extractor.c:71
-msgid "page count"
-msgstr "Seitenanzahl"
-
-#: src/main/extract.c:473
-#, 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"
-
-#: src/main/extract.c:540
-#, 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:599
-#, c-format
-msgid "%% BiBTeX file\n"
-msgstr "%% BibTeX Datei\n"
-
-#: src/main/extract.c:606
-#, c-format
-msgid "Keywords for file %s:\n"
-msgstr "Schlüsserwörter für die Datei %s:\n"
-
-#: src/main/extractor.c:37
-msgid "unknown"
-msgstr "unbekannt"
-
-#: src/main/extractor.c:39
-msgid "mimetype"
-msgstr "MIME-Typ"
-
-#: src/main/extractor.c:42
-msgid "artist"
-msgstr "Künstler"
-
-#: src/main/extractor.c:47
-msgid "language"
-msgstr "Sprache"
-
-#: src/main/extractor.c:48
-msgid "album"
-msgstr "Album"
-
-#: src/main/extractor.c:49
-msgid "genre"
-msgstr "Fach"
-
-#: src/main/extractor.c:50
-msgid "location"
-msgstr "Ort"
-
-#: src/main/extractor.c:51
-msgid "version"
-msgstr "Version"
-
-#: src/main/extractor.c:53
-msgid "copyright"
-msgstr "Copyright"
-
-#: src/main/extractor.c:56
-msgid "contributor"
-msgstr "Beiträger"
-
-#: src/main/extractor.c:57
-msgid "resource-type"
-msgstr "Art der Ressource"
-
-#: src/main/extractor.c:58
-msgid "format"
-msgstr "Format"
-
-#: src/main/extractor.c:59
-msgid "resource-identifier"
-msgstr ""
-
-#: src/main/extractor.c:60
-msgid "source"
-msgstr "Quelle"
-
-#: src/main/extractor.c:61
-msgid "relation"
-msgstr "Beziehung"
-
-#: src/main/extractor.c:62
-msgid "coverage"
-msgstr ""
-
-#: src/main/extractor.c:63
-msgid "software"
-msgstr "Software"
-
-#: src/main/extractor.c:64
-msgid "disclaimer"
-msgstr ""
-
-#: src/main/extractor.c:65
-msgid "warning"
-msgstr "Warnung"
-
-#: src/main/extractor.c:66
-msgid "translated"
-msgstr "übersetzt"
-
-#: src/main/extractor.c:68
-msgid "modification date"
-msgstr "Datum der Veränderung"
-
-#: src/main/extractor.c:69
-msgid "creator"
-msgstr "Ersteller"
-
-#: src/main/extractor.c:70
-msgid "producer"
-msgstr "Hersteller"
-
-#: src/main/extractor.c:72
-msgid "page orientation"
-msgstr "Seitenausrichtung"
-
-#: src/main/extractor.c:73
-msgid "paper size"
-msgstr "Seitengröße"
-
-#: src/main/extractor.c:74
-msgid "used fonts"
-msgstr "verwendete Schriften"
-
-#: src/main/extractor.c:75
-msgid "page order"
-msgstr "Seitenreihenfolge"
-
-#: src/main/extractor.c:76
-msgid "created for"
-msgstr "erstellt für"
-
-#: src/main/extractor.c:77
-msgid "magnification"
-msgstr "Vergrößerung"
-
-#: src/main/extractor.c:78
-msgid "release"
-msgstr "Release"
-
-#: src/main/extractor.c:79
-msgid "group"
-msgstr "Gruppe"
-
-#: src/main/extractor.c:80
-msgid "size"
-msgstr "Größe"
-
-#: src/main/extractor.c:81
-msgid "summary"
-msgstr "Kurzbeschreibung"
-
-#: src/main/extractor.c:82
-msgid "packager"
-msgstr "Paket-Ersteller"
-
-#: src/main/extractor.c:83
-msgid "vendor"
-msgstr ""
-
-#: src/main/extractor.c:84
-msgid "license"
-msgstr "Lizenz"
-
-#: src/main/extractor.c:85
-msgid "distribution"
-msgstr "Distribution"
-
-#: src/main/extractor.c:86
-msgid "build-host"
-msgstr ""
-
-#: src/main/extractor.c:87
-msgid "os"
-msgstr "Betriebssystem"
-
-#: src/main/extractor.c:88
-msgid "dependency"
-msgstr "Abhängigkeit"
-
-#: src/main/extractor.c:89
-msgid "MD4"
-msgstr "MD4"
-
-#: src/main/extractor.c:90
-msgid "MD5"
-msgstr "MD5"
-
-#: src/main/extractor.c:91
-msgid "SHA-0"
-msgstr "SHA-0"
-
-#: src/main/extractor.c:92
-msgid "SHA-1"
-msgstr "SHA-1"
-
-#: src/main/extractor.c:93
-msgid "RipeMD160"
-msgstr "RipeMD160"
-
-#: src/main/extractor.c:94
-msgid "resolution"
-msgstr "Auflösung"
-
-#: src/main/extractor.c:95
-msgid "category"
-msgstr "Kategorie"
-
-#: src/main/extractor.c:96
-msgid "book title"
-msgstr "Buchtitel"
-
-#: src/main/extractor.c:97
-msgid "priority"
-msgstr "Priorität"
-
-#: src/main/extractor.c:98
-msgid "conflicts"
-msgstr ""
-
-#: src/main/extractor.c:99
-msgid "replaces"
-msgstr "Ersatz für"
-
-#: src/main/extractor.c:100
-msgid "provides"
-msgstr ""
-
-#: src/main/extractor.c:101
-msgid "conductor"
-msgstr ""
-
-#: src/main/extractor.c:102
-msgid "interpreter"
-msgstr "Interpret"
-
-#: src/main/extractor.c:103
-msgid "owner"
-msgstr "Besitzer"
-
-#: src/main/extractor.c:104
-msgid "lyrics"
-msgstr "Liedtexte"
-
-#: src/main/extractor.c:105
-msgid "media type"
-msgstr "Medien-Art"
-
-#: src/main/extractor.c:106
-msgid "contact"
-msgstr "Kontakt"
-
-#: src/main/extractor.c:107
-msgid "binary thumbnail data"
-msgstr ""
-
-#: src/main/extractor.c:108
-msgid "publication date"
-msgstr "Erstellungsdatum"
-
-#: src/main/extractor.c:109
-msgid "camera make"
-msgstr ""
-
-#: src/main/extractor.c:110
-msgid "camera model"
-msgstr "Kamera Modell"
-
-#: src/main/extractor.c:111
-msgid "exposure"
-msgstr ""
-
-#: src/main/extractor.c:112
-msgid "aperture"
-msgstr ""
-
-#: src/main/extractor.c:113
-msgid "exposure bias"
-msgstr ""
-
-#: src/main/extractor.c:114
-msgid "flash"
-msgstr "Blitz"
-
-#: src/main/extractor.c:115
-msgid "flash bias"
-msgstr ""
-
-#: src/main/extractor.c:116
-msgid "focal length"
-msgstr ""
-
-#: src/main/extractor.c:117
-msgid "focal length (35mm equivalent)"
-msgstr ""
-
-#: src/main/extractor.c:118
-msgid "iso speed"
-msgstr ""
-
-#: src/main/extractor.c:119
-msgid "exposure mode"
-msgstr ""
-
-#: src/main/extractor.c:120
-msgid "metering mode"
-msgstr ""
-
-#: src/main/extractor.c:121
-msgid "macro mode"
-msgstr ""
-
-#: src/main/extractor.c:122
-msgid "image quality"
-msgstr ""
-
-#: src/main/extractor.c:123
-msgid "white balance"
-msgstr ""
-
-#: src/main/extractor.c:124
-msgid "orientation"
-msgstr "Ausrichtung"
-
-#: src/main/extractor.c:218
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Initialisierung des Plugin-Mechanismus' ist fehlgeschlagen: %s.\n"
-
-#: src/main/extractor.c:365
-#, 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 ""
-
-#: src/main/extractor.c:394
-#, c-format
-msgid "Loading `%s' plugin failed: %s\n"
-msgstr "Laden des »%s«-Plugins ist fehlgeschlagen: %s\n"
-
-#: src/main/extractor.c:599
-#, c-format
-msgid "Unloading plugin `%s' failed!\n"
-msgstr "Entladen des »%s«-Erweiterung ist fehlgeschlagen.\n"
-
 #~ msgid "No error"
 #~ msgstr "Kein Fehler"

Modified: Extractor/po/libextractor.pot
===================================================================
--- Extractor/po/libextractor.pot       2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/po/libextractor.pot       2005-09-05 13:48:39 UTC (rev 2064)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-08-26 22:35-0700\n"
+"POT-Creation-Date: 2005-09-04 02:59-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -26,26 +26,26 @@
 msgid "Binary RPM %d.%d"
 msgstr ""
 
-#: src/plugins/printable/dictionary-builder.c:52
+#: src/plugins/printable/dictionary-builder.c:50
 #, c-format
 msgid ""
 "Please provide the name of the language you are building\n"
 "a dictionary for.  For example:\n"
 msgstr ""
 
-#: src/plugins/printable/dictionary-builder.c:65
+#: src/plugins/printable/dictionary-builder.c:63
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr ""
 
-#: src/plugins/printable/dictionary-builder.c:73
+#: src/plugins/printable/dictionary-builder.c:71
 #, c-format
 msgid ""
 "Error allocating: %s\n"
 "."
 msgstr ""
 
-#: src/plugins/printable/dictionary-builder.c:85
+#: src/plugins/printable/dictionary-builder.c:83
 #, c-format
 msgid "Increase ALLOCSIZE (in %s).\n"
 msgstr ""
@@ -86,11 +86,11 @@
 msgid "Kernel routines"
 msgstr ""
 
-#: src/plugins/wavextractor.c:113 src/plugins/mp3extractor.c:426
+#: src/plugins/wavextractor.c:113
 msgid "mono"
 msgstr ""
 
-#: src/plugins/wavextractor.c:113 src/plugins/mp3extractor.c:426
+#: src/plugins/wavextractor.c:113
 msgid "stereo"
 msgstr ""
 
@@ -98,1166 +98,3 @@
 #, c-format
 msgid "Fatal: could not allocate (%s at %s:%d).\n"
 msgstr ""
-
-#: src/plugins/jpegextractor.c:178
-#, c-format
-msgid "%ux%u dots per inch"
-msgstr ""
-
-#: src/plugins/jpegextractor.c:188
-#, c-format
-msgid "%ux%u dots per cm"
-msgstr ""
-
-#: src/plugins/jpegextractor.c:198
-#, c-format
-msgid "%ux%u dots per inch?"
-msgstr ""
-
-#: src/plugins/riffextractor.c:167
-#, c-format
-msgid "codec: %s, %u fps, %u ms"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:49
-msgid "Blues"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:50
-msgid "Classic Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:51
-msgid "Country"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:52
-msgid "Dance"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:53
-msgid "Disco"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:54
-msgid "Funk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:55
-msgid "Grunge"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:56
-msgid "Hip-Hop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:57
-msgid "Jazz"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:58
-msgid "Metal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:59
-msgid "New Age"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:60
-msgid "Oldies"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:61
-msgid "Other"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:62
-msgid "Pop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:63
-msgid "R&B"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:64
-msgid "Rap"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:65
-msgid "Reggae"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:66
-msgid "Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:67
-msgid "Techno"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:68
-msgid "Industrial"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:69
-msgid "Alternative"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:70
-msgid "Ska"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:71
-msgid "Death Metal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:72
-msgid "Pranks"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:73
-msgid "Soundtrack"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:74
-msgid "Euro-Techno"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:75
-msgid "Ambient"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:76
-msgid "Trip-Hop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:77
-msgid "Vocal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:78
-msgid "Jazz+Funk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:79
-msgid "Fusion"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:80
-msgid "Trance"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:81
-msgid "Classical"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:82
-msgid "Instrumental"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:83
-msgid "Acid"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:84
-msgid "House"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:85
-msgid "Game"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:86
-msgid "Sound Clip"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:87
-msgid "Gospel"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:88
-msgid "Noise"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:89
-msgid "Alt. Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:90
-msgid "Bass"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:91
-msgid "Soul"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:92
-msgid "Punk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:93
-msgid "Space"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:94
-msgid "Meditative"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:95
-msgid "Instrumental Pop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:96
-msgid "Instrumental Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:97
-msgid "Ethnic"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:98
-msgid "Gothic"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:99
-msgid "Darkwave"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:100
-msgid "Techno-Industrial"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:101
-msgid "Electronic"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:102
-msgid "Pop-Folk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:103
-msgid "Eurodance"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:104
-msgid "Dream"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:105
-msgid "Southern Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:106
-msgid "Comedy"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:107
-msgid "Cult"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:108
-msgid "Gangsta Rap"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:109
-msgid "Top 40"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:110
-msgid "Christian Rap"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:111
-msgid "Pop/Funk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:112
-msgid "Jungle"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:113
-msgid "Native American"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:114
-msgid "Cabaret"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:115
-msgid "New Wave"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:116
-msgid "Psychedelic"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:117
-msgid "Rave"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:118
-msgid "Showtunes"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:119
-msgid "Trailer"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:120
-msgid "Lo-Fi"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:121
-msgid "Tribal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:122
-msgid "Acid Punk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:123
-msgid "Acid Jazz"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:124
-msgid "Polka"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:125
-msgid "Retro"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:126
-msgid "Musical"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:127
-msgid "Rock & Roll"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:128
-msgid "Hard Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:129
-msgid "Folk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:130
-msgid "Folk/Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:131
-msgid "National Folk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:132
-msgid "Swing"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:133
-msgid "Fast-Fusion"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:134
-msgid "Bebob"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:135
-msgid "Latin"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:136
-msgid "Revival"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:137
-msgid "Celtic"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:138
-msgid "Bluegrass"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:139
-msgid "Avantgarde"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:140
-msgid "Gothic Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:141
-msgid "Progressive Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:142
-msgid "Psychedelic Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:143
-msgid "Symphonic Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:144
-msgid "Slow Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:145
-msgid "Big Band"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:146
-msgid "Chorus"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:147
-msgid "Easy Listening"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:148
-msgid "Acoustic"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:149
-msgid "Humour"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:150
-msgid "Speech"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:151
-msgid "Chanson"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:152
-msgid "Opera"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:153
-msgid "Chamber Music"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:154
-msgid "Sonata"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:155
-msgid "Symphony"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:156
-msgid "Booty Bass"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:157
-msgid "Primus"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:158
-msgid "Porn Groove"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:159
-msgid "Satire"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:160
-msgid "Slow Jam"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:161
-msgid "Club"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:162
-msgid "Tango"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:163
-msgid "Samba"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:164
-msgid "Folklore"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:165
-msgid "Ballad"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:166
-msgid "Power Ballad"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:167
-msgid "Rhythmic Soul"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:168
-msgid "Freestyle"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:169
-msgid "Duet"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:170
-msgid "Punk Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:171
-msgid "Drum Solo"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:172
-msgid "A Cappella"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:173
-msgid "Euro-House"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:174
-msgid "Dance Hall"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:175
-msgid "Goa"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:176
-msgid "Drum & Bass"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:177
-msgid "Club-House"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:178
-msgid "Hardcore"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:179
-msgid "Terror"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:180
-msgid "Indie"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:181
-msgid "BritPop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:182
-msgid "Negerpunk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:183
-msgid "Polsk Punk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:184
-msgid "Beat"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:185
-msgid "Christian Gangsta Rap"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:186
-msgid "Heavy Metal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:187
-msgid "Black Metal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:188
-msgid "Crossover"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:189
-msgid "Contemporary Christian"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:190
-msgid "Christian Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:191
-msgid "Merengue"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:192
-msgid "Salsa"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:193
-msgid "Thrash Metal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:194
-msgid "Anime"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:195
-msgid "JPop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:196
-msgid "Synthpop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:427
-msgid "(variable bps)"
-msgstr ""
-
-#: src/main/getopt.c:681
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/main/getopt.c:706
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/main/getopt.c:712
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/main/getopt.c:729 src/main/getopt.c:900
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#: src/main/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#: src/main/getopt.c:762
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#: src/main/getopt.c:788
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/main/getopt.c:790
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: src/main/getopt.c:819 src/main/getopt.c:949
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: src/main/getopt.c:867
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/main/getopt.c:885
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/main/extract.c:49
-#, c-format
-msgid ""
-"Usage: %s\n"
-"%s\n"
-"\n"
-msgstr ""
-
-#: src/main/extract.c:52
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-
-#: src/main/extract.c:126
-msgid "do not remove any duplicates"
-msgstr ""
-
-#: src/main/extract.c:128
-msgid "print output in bibtex format"
-msgstr ""
-
-#: src/main/extract.c:130
-msgid ""
-"use the generic plaintext extractor for the language with the 2-letter "
-"language code LANG"
-msgstr ""
-
-#: src/main/extract.c:132
-msgid "remove duplicates only if types match"
-msgstr ""
-
-#: src/main/extract.c:134
-msgid "use the filename as a keyword (loads filename-extractor plugin)"
-msgstr ""
-
-#: src/main/extract.c:136
-msgid "print this help"
-msgstr ""
-
-#: src/main/extract.c:138
-msgid "compute hash using the given ALGORITHM (currently sha1 or md5)"
-msgstr ""
-
-#: src/main/extract.c:140
-msgid "load an extractor plugin named LIBRARY"
-msgstr ""
-
-#: src/main/extract.c:142
-msgid "list all keyword types"
-msgstr ""
-
-#: src/main/extract.c:144
-msgid "do not use the default set of extractor plugins"
-msgstr ""
-
-#: src/main/extract.c:146
-msgid "print only keywords of the given TYPE (use -L to get a list)"
-msgstr ""
-
-#: src/main/extract.c:148
-msgid "remove duplicates even if keyword types do not match"
-msgstr ""
-
-#: src/main/extract.c:150
-msgid "use keyword splitting (loads split-extractor plugin)"
-msgstr ""
-
-#: src/main/extract.c:152
-msgid "print the version number"
-msgstr ""
-
-#: src/main/extract.c:154
-msgid "be verbose"
-msgstr ""
-
-#: src/main/extract.c:156
-msgid "do not print keywords of the given TYPE"
-msgstr ""
-
-#: src/main/extract.c:159
-msgid "extract [OPTIONS] [FILENAME]*"
-msgstr ""
-
-#: src/main/extract.c:160
-msgid "Extract metadata from files."
-msgstr ""
-
-#: src/main/extract.c:198 src/main/extractor.c:875
-#, c-format
-msgid "%s - (binary)\n"
-msgstr ""
-
-#: src/main/extract.c:204 src/main/extractor.c:880
-#, c-format
-msgid "INVALID TYPE - %s\n"
-msgstr ""
-
-#: src/main/extract.c:270 src/main/extractor.c:40
-msgid "title"
-msgstr ""
-
-#: src/main/extract.c:272 src/main/extractor.c:38
-msgid "filename"
-msgstr ""
-
-#: src/main/extract.c:277 src/main/extractor.c:41
-msgid "author"
-msgstr ""
-
-#: src/main/extract.c:281 src/main/extractor.c:43
-msgid "description"
-msgstr ""
-
-#: src/main/extract.c:283 src/main/extractor.c:55
-msgid "keywords"
-msgstr ""
-
-#: src/main/extract.c:285 src/main/extractor.c:44
-msgid "comment"
-msgstr ""
-
-#: src/main/extract.c:289 src/main/extractor.c:45
-msgid "date"
-msgstr ""
-
-#: src/main/extract.c:291 src/main/extractor.c:67
-msgid "creation date"
-msgstr ""
-
-#: src/main/extract.c:319 src/main/extractor.c:46
-msgid "publisher"
-msgstr ""
-
-#: src/main/extract.c:323 src/main/extractor.c:52
-msgid "organization"
-msgstr ""
-
-#: src/main/extract.c:327 src/main/extractor.c:54
-msgid "subject"
-msgstr ""
-
-#: src/main/extract.c:331 src/main/extractor.c:71
-msgid "page count"
-msgstr ""
-
-#: src/main/extract.c:473
-#, c-format
-msgid "You must specify an argument for the `%s' option (option ignored).\n"
-msgstr ""
-
-#: src/main/extract.c:540
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr ""
-
-#: src/main/extract.c:599
-#, c-format
-msgid "%% BiBTeX file\n"
-msgstr ""
-
-#: src/main/extract.c:606
-#, c-format
-msgid "Keywords for file %s:\n"
-msgstr ""
-
-#: src/main/extractor.c:37
-msgid "unknown"
-msgstr ""
-
-#: src/main/extractor.c:39
-msgid "mimetype"
-msgstr ""
-
-#: src/main/extractor.c:42
-msgid "artist"
-msgstr ""
-
-#: src/main/extractor.c:47
-msgid "language"
-msgstr ""
-
-#: src/main/extractor.c:48
-msgid "album"
-msgstr ""
-
-#: src/main/extractor.c:49
-msgid "genre"
-msgstr ""
-
-#: src/main/extractor.c:50
-msgid "location"
-msgstr ""
-
-#: src/main/extractor.c:51
-msgid "version"
-msgstr ""
-
-#: src/main/extractor.c:53
-msgid "copyright"
-msgstr ""
-
-#: src/main/extractor.c:56
-msgid "contributor"
-msgstr ""
-
-#: src/main/extractor.c:57
-msgid "resource-type"
-msgstr ""
-
-#: src/main/extractor.c:58
-msgid "format"
-msgstr ""
-
-#: src/main/extractor.c:59
-msgid "resource-identifier"
-msgstr ""
-
-#: src/main/extractor.c:60
-msgid "source"
-msgstr ""
-
-#: src/main/extractor.c:61
-msgid "relation"
-msgstr ""
-
-#: src/main/extractor.c:62
-msgid "coverage"
-msgstr ""
-
-#: src/main/extractor.c:63
-msgid "software"
-msgstr ""
-
-#: src/main/extractor.c:64
-msgid "disclaimer"
-msgstr ""
-
-#: src/main/extractor.c:65
-msgid "warning"
-msgstr ""
-
-#: src/main/extractor.c:66
-msgid "translated"
-msgstr ""
-
-#: src/main/extractor.c:68
-msgid "modification date"
-msgstr ""
-
-#: src/main/extractor.c:69
-msgid "creator"
-msgstr ""
-
-#: src/main/extractor.c:70
-msgid "producer"
-msgstr ""
-
-#: src/main/extractor.c:72
-msgid "page orientation"
-msgstr ""
-
-#: src/main/extractor.c:73
-msgid "paper size"
-msgstr ""
-
-#: src/main/extractor.c:74
-msgid "used fonts"
-msgstr ""
-
-#: src/main/extractor.c:75
-msgid "page order"
-msgstr ""
-
-#: src/main/extractor.c:76
-msgid "created for"
-msgstr ""
-
-#: src/main/extractor.c:77
-msgid "magnification"
-msgstr ""
-
-#: src/main/extractor.c:78
-msgid "release"
-msgstr ""
-
-#: src/main/extractor.c:79
-msgid "group"
-msgstr ""
-
-#: src/main/extractor.c:80
-msgid "size"
-msgstr ""
-
-#: src/main/extractor.c:81
-msgid "summary"
-msgstr ""
-
-#: src/main/extractor.c:82
-msgid "packager"
-msgstr ""
-
-#: src/main/extractor.c:83
-msgid "vendor"
-msgstr ""
-
-#: src/main/extractor.c:84
-msgid "license"
-msgstr ""
-
-#: src/main/extractor.c:85
-msgid "distribution"
-msgstr ""
-
-#: src/main/extractor.c:86
-msgid "build-host"
-msgstr ""
-
-#: src/main/extractor.c:87
-msgid "os"
-msgstr ""
-
-#: src/main/extractor.c:88
-msgid "dependency"
-msgstr ""
-
-#: src/main/extractor.c:89
-msgid "MD4"
-msgstr ""
-
-#: src/main/extractor.c:90
-msgid "MD5"
-msgstr ""
-
-#: src/main/extractor.c:91
-msgid "SHA-0"
-msgstr ""
-
-#: src/main/extractor.c:92
-msgid "SHA-1"
-msgstr ""
-
-#: src/main/extractor.c:93
-msgid "RipeMD160"
-msgstr ""
-
-#: src/main/extractor.c:94
-msgid "resolution"
-msgstr ""
-
-#: src/main/extractor.c:95
-msgid "category"
-msgstr ""
-
-#: src/main/extractor.c:96
-msgid "book title"
-msgstr ""
-
-#: src/main/extractor.c:97
-msgid "priority"
-msgstr ""
-
-#: src/main/extractor.c:98
-msgid "conflicts"
-msgstr ""
-
-#: src/main/extractor.c:99
-msgid "replaces"
-msgstr ""
-
-#: src/main/extractor.c:100
-msgid "provides"
-msgstr ""
-
-#: src/main/extractor.c:101
-msgid "conductor"
-msgstr ""
-
-#: src/main/extractor.c:102
-msgid "interpreter"
-msgstr ""
-
-#: src/main/extractor.c:103
-msgid "owner"
-msgstr ""
-
-#: src/main/extractor.c:104
-msgid "lyrics"
-msgstr ""
-
-#: src/main/extractor.c:105
-msgid "media type"
-msgstr ""
-
-#: src/main/extractor.c:106
-msgid "contact"
-msgstr ""
-
-#: src/main/extractor.c:107
-msgid "binary thumbnail data"
-msgstr ""
-
-#: src/main/extractor.c:108
-msgid "publication date"
-msgstr ""
-
-#: src/main/extractor.c:109
-msgid "camera make"
-msgstr ""
-
-#: src/main/extractor.c:110
-msgid "camera model"
-msgstr ""
-
-#: src/main/extractor.c:111
-msgid "exposure"
-msgstr ""
-
-#: src/main/extractor.c:112
-msgid "aperture"
-msgstr ""
-
-#: src/main/extractor.c:113
-msgid "exposure bias"
-msgstr ""
-
-#: src/main/extractor.c:114
-msgid "flash"
-msgstr ""
-
-#: src/main/extractor.c:115
-msgid "flash bias"
-msgstr ""
-
-#: src/main/extractor.c:116
-msgid "focal length"
-msgstr ""
-
-#: src/main/extractor.c:117
-msgid "focal length (35mm equivalent)"
-msgstr ""
-
-#: src/main/extractor.c:118
-msgid "iso speed"
-msgstr ""
-
-#: src/main/extractor.c:119
-msgid "exposure mode"
-msgstr ""
-
-#: src/main/extractor.c:120
-msgid "metering mode"
-msgstr ""
-
-#: src/main/extractor.c:121
-msgid "macro mode"
-msgstr ""
-
-#: src/main/extractor.c:122
-msgid "image quality"
-msgstr ""
-
-#: src/main/extractor.c:123
-msgid "white balance"
-msgstr ""
-
-#: src/main/extractor.c:124
-msgid "orientation"
-msgstr ""
-
-#: src/main/extractor.c:218
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr ""
-
-#: src/main/extractor.c:365
-#, 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 ""
-
-#: src/main/extractor.c:394
-#, c-format
-msgid "Loading `%s' plugin failed: %s\n"
-msgstr ""
-
-#: src/main/extractor.c:599
-#, c-format
-msgid "Unloading plugin `%s' failed!\n"
-msgstr ""

Modified: Extractor/po/ro.po
===================================================================
--- Extractor/po/ro.po  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/po/ro.po  2005-09-05 13:48:39 UTC (rev 2064)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libextractor 0.4.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-08-26 22:35-0700\n"
+"POT-Creation-Date: 2005-09-04 02:59-0700\n"
 "PO-Revision-Date: 2005-02-25 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <address@hidden>\n"
 "Language-Team: Romanian <address@hidden>\n"
@@ -28,7 +28,7 @@
 msgid "Binary RPM %d.%d"
 msgstr "Binar RPM %d.%d"
 
-#: src/plugins/printable/dictionary-builder.c:52
+#: src/plugins/printable/dictionary-builder.c:50
 #, c-format
 msgid ""
 "Please provide the name of the language you are building\n"
@@ -37,12 +37,12 @@
 "V� rug�m furniza�i numele limbii pentru care contrui�i\n"
 "un dic�ionar.  De exemplu:\n"
 
-#: src/plugins/printable/dictionary-builder.c:65
+#: src/plugins/printable/dictionary-builder.c:63
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Eroare deschidere fi�ier `%s': %s\n"
 
-#: src/plugins/printable/dictionary-builder.c:73
+#: src/plugins/printable/dictionary-builder.c:71
 #, c-format
 msgid ""
 "Error allocating: %s\n"
@@ -51,7 +51,7 @@
 "Eroare de alocare: %s\n"
 "."
 
-#: src/plugins/printable/dictionary-builder.c:85
+#: src/plugins/printable/dictionary-builder.c:83
 #, c-format
 msgid "Increase ALLOCSIZE (in %s).\n"
 msgstr "Cre�te�i ALLOCSIZE (�n %s).\n"
@@ -92,11 +92,11 @@
 msgid "Kernel routines"
 msgstr "Proceduri kernel"
 
-#: src/plugins/wavextractor.c:113 src/plugins/mp3extractor.c:426
+#: src/plugins/wavextractor.c:113
 msgid "mono"
 msgstr "mono"
 
-#: src/plugins/wavextractor.c:113 src/plugins/mp3extractor.c:426
+#: src/plugins/wavextractor.c:113
 msgid "stereo"
 msgstr "stereo"
 
@@ -105,1189 +105,837 @@
 msgid "Fatal: could not allocate (%s at %s:%d).\n"
 msgstr "Fatal: nu am putut aloca (%s la %s:%d).\n"
 
-#: src/plugins/jpegextractor.c:178
-#, c-format
-msgid "%ux%u dots per inch"
-msgstr "%ux%u puncte pe inci (dpi)"
+#~ msgid "%ux%u dots per inch"
+#~ msgstr "%ux%u puncte pe inci (dpi)"
 
-#: src/plugins/jpegextractor.c:188
-#, c-format
-msgid "%ux%u dots per cm"
-msgstr "%ux%u puncte pe cm"
+#~ msgid "%ux%u dots per cm"
+#~ msgstr "%ux%u puncte pe cm"
 
-#: src/plugins/jpegextractor.c:198
-#, c-format
-msgid "%ux%u dots per inch?"
-msgstr "%ux%u puncte pe inci?"
+#~ msgid "%ux%u dots per inch?"
+#~ msgstr "%ux%u puncte pe inci?"
 
-#: src/plugins/riffextractor.c:167
-#, c-format
-msgid "codec: %s, %u fps, %u ms"
-msgstr "codec: %s, %u fps, %u ms"
+#~ msgid "codec: %s, %u fps, %u ms"
+#~ msgstr "codec: %s, %u fps, %u ms"
 
-#: src/plugins/mp3extractor.c:49
-msgid "Blues"
-msgstr "Blues"
+#~ msgid "Blues"
+#~ msgstr "Blues"
 
-#: src/plugins/mp3extractor.c:50
-msgid "Classic Rock"
-msgstr "Rock clasic"
+#~ msgid "Classic Rock"
+#~ msgstr "Rock clasic"
 
-#: src/plugins/mp3extractor.c:51
-msgid "Country"
-msgstr "�ar�"
+#~ msgid "Country"
+#~ msgstr "�ar�"
 
-#: src/plugins/mp3extractor.c:52
-msgid "Dance"
-msgstr "Dance"
+#~ msgid "Dance"
+#~ msgstr "Dance"
 
-#: src/plugins/mp3extractor.c:53
-msgid "Disco"
-msgstr "Disco"
+#~ msgid "Disco"
+#~ msgstr "Disco"
 
-#: src/plugins/mp3extractor.c:54
-msgid "Funk"
-msgstr "Funk"
+#~ msgid "Funk"
+#~ msgstr "Funk"
 
-#: src/plugins/mp3extractor.c:55
-msgid "Grunge"
-msgstr "Grunge"
+#~ msgid "Grunge"
+#~ msgstr "Grunge"
 
-#: src/plugins/mp3extractor.c:56
-msgid "Hip-Hop"
-msgstr "Hip-Hop"
+#~ msgid "Hip-Hop"
+#~ msgstr "Hip-Hop"
 
-#: src/plugins/mp3extractor.c:57
-msgid "Jazz"
-msgstr "Jazz"
+#~ msgid "Jazz"
+#~ msgstr "Jazz"
 
-#: src/plugins/mp3extractor.c:58
-msgid "Metal"
-msgstr "Metal"
+#~ msgid "Metal"
+#~ msgstr "Metal"
 
-#: src/plugins/mp3extractor.c:59
-msgid "New Age"
-msgstr "New Age"
+#~ msgid "New Age"
+#~ msgstr "New Age"
 
-#: src/plugins/mp3extractor.c:60
-msgid "Oldies"
-msgstr "Oldies"
+#~ msgid "Oldies"
+#~ msgstr "Oldies"
 
-#: src/plugins/mp3extractor.c:61
-msgid "Other"
-msgstr "Altele"
+#~ msgid "Other"
+#~ msgstr "Altele"
 
-#: src/plugins/mp3extractor.c:62
-msgid "Pop"
-msgstr "Pop"
+#~ msgid "Pop"
+#~ msgstr "Pop"
 
-#: src/plugins/mp3extractor.c:63
-msgid "R&B"
-msgstr "R&B"
+#~ msgid "R&B"
+#~ msgstr "R&B"
 
-#: src/plugins/mp3extractor.c:64
-msgid "Rap"
-msgstr "Rap"
+#~ msgid "Rap"
+#~ msgstr "Rap"
 
-#: src/plugins/mp3extractor.c:65
-msgid "Reggae"
-msgstr "Reggae"
+#~ msgid "Reggae"
+#~ msgstr "Reggae"
 
-#: src/plugins/mp3extractor.c:66
-msgid "Rock"
-msgstr "Rock"
+#~ msgid "Rock"
+#~ msgstr "Rock"
 
-#: src/plugins/mp3extractor.c:67
-msgid "Techno"
-msgstr "Techno"
+#~ msgid "Techno"
+#~ msgstr "Techno"
 
-#: src/plugins/mp3extractor.c:68
-msgid "Industrial"
-msgstr "Industrial"
+#~ msgid "Industrial"
+#~ msgstr "Industrial"
 
-#: src/plugins/mp3extractor.c:69
-msgid "Alternative"
-msgstr "Alternative"
+#~ msgid "Alternative"
+#~ msgstr "Alternative"
 
-#: src/plugins/mp3extractor.c:70
-msgid "Ska"
-msgstr "Ska"
+#~ msgid "Ska"
+#~ msgstr "Ska"
 
-#: src/plugins/mp3extractor.c:71
-msgid "Death Metal"
-msgstr "Death Metal"
+#~ msgid "Death Metal"
+#~ msgstr "Death Metal"
 
-#: src/plugins/mp3extractor.c:72
-msgid "Pranks"
-msgstr "Pranks"
+#~ msgid "Pranks"
+#~ msgstr "Pranks"
 
-#: src/plugins/mp3extractor.c:73
-msgid "Soundtrack"
-msgstr "Soundtrack"
+#~ msgid "Soundtrack"
+#~ msgstr "Soundtrack"
 
-#: src/plugins/mp3extractor.c:74
-msgid "Euro-Techno"
-msgstr "Euro-Techno"
+#~ msgid "Euro-Techno"
+#~ msgstr "Euro-Techno"
 
-#: src/plugins/mp3extractor.c:75
-msgid "Ambient"
-msgstr "Ambient"
+#~ msgid "Ambient"
+#~ msgstr "Ambient"
 
-#: src/plugins/mp3extractor.c:76
-msgid "Trip-Hop"
-msgstr "Trip-Hop"
+#~ msgid "Trip-Hop"
+#~ msgstr "Trip-Hop"
 
-#: src/plugins/mp3extractor.c:77
-msgid "Vocal"
-msgstr "Vocal"
+#~ msgid "Vocal"
+#~ msgstr "Vocal"
 
-#: src/plugins/mp3extractor.c:78
-msgid "Jazz+Funk"
-msgstr "Jazz+Funk"
+#~ msgid "Jazz+Funk"
+#~ msgstr "Jazz+Funk"
 
-#: src/plugins/mp3extractor.c:79
-msgid "Fusion"
-msgstr "Fusion"
+#~ msgid "Fusion"
+#~ msgstr "Fusion"
 
-#: src/plugins/mp3extractor.c:80
-msgid "Trance"
-msgstr "Trance"
+#~ msgid "Trance"
+#~ msgstr "Trance"
 
-#: src/plugins/mp3extractor.c:81
-msgid "Classical"
-msgstr "Clasic�"
+#~ msgid "Classical"
+#~ msgstr "Clasic�"
 
-#: src/plugins/mp3extractor.c:82
-msgid "Instrumental"
-msgstr "Instrumental"
+#~ msgid "Instrumental"
+#~ msgstr "Instrumental"
 
-#: src/plugins/mp3extractor.c:83
-msgid "Acid"
-msgstr "Acid"
+#~ msgid "Acid"
+#~ msgstr "Acid"
 
-#: src/plugins/mp3extractor.c:84
-msgid "House"
-msgstr "House"
+#~ msgid "House"
+#~ msgstr "House"
 
-#: src/plugins/mp3extractor.c:85
-msgid "Game"
-msgstr "Joc"
+#~ msgid "Game"
+#~ msgstr "Joc"
 
-#: src/plugins/mp3extractor.c:86
-msgid "Sound Clip"
-msgstr "Clip sonor"
+#~ msgid "Sound Clip"
+#~ msgstr "Clip sonor"
 
-#: src/plugins/mp3extractor.c:87
-msgid "Gospel"
-msgstr "Gospel"
+#~ msgid "Gospel"
+#~ msgstr "Gospel"
 
-#: src/plugins/mp3extractor.c:88
-msgid "Noise"
-msgstr "Zgomot"
+#~ msgid "Noise"
+#~ msgstr "Zgomot"
 
-#: src/plugins/mp3extractor.c:89
-msgid "Alt. Rock"
-msgstr "Rock Alternativ"
+#~ msgid "Alt. Rock"
+#~ msgstr "Rock Alternativ"
 
-#: src/plugins/mp3extractor.c:90
-msgid "Bass"
-msgstr "Bass"
+#~ msgid "Bass"
+#~ msgstr "Bass"
 
-#: src/plugins/mp3extractor.c:91
-msgid "Soul"
-msgstr "Soul"
+#~ msgid "Soul"
+#~ msgstr "Soul"
 
-#: src/plugins/mp3extractor.c:92
-msgid "Punk"
-msgstr "Punk"
+#~ msgid "Punk"
+#~ msgstr "Punk"
 
-#: src/plugins/mp3extractor.c:93
-msgid "Space"
-msgstr "Spa�iu"
+#~ msgid "Space"
+#~ msgstr "Spa�iu"
 
-#: src/plugins/mp3extractor.c:94
-msgid "Meditative"
-msgstr "Meditativ"
+#~ msgid "Meditative"
+#~ msgstr "Meditativ"
 
-#: src/plugins/mp3extractor.c:95
-msgid "Instrumental Pop"
-msgstr "Instrumental Pop"
+#~ msgid "Instrumental Pop"
+#~ msgstr "Instrumental Pop"
 
-#: src/plugins/mp3extractor.c:96
-msgid "Instrumental Rock"
-msgstr "Instrumental Rock"
+#~ msgid "Instrumental Rock"
+#~ msgstr "Instrumental Rock"
 
-#: src/plugins/mp3extractor.c:97
-msgid "Ethnic"
-msgstr "Ethnic"
+#~ msgid "Ethnic"
+#~ msgstr "Ethnic"
 
-#: src/plugins/mp3extractor.c:98
-msgid "Gothic"
-msgstr "Gothic"
+#~ msgid "Gothic"
+#~ msgstr "Gothic"
 
-#: src/plugins/mp3extractor.c:99
-msgid "Darkwave"
-msgstr "Darkwave"
+#~ msgid "Darkwave"
+#~ msgstr "Darkwave"
 
-#: src/plugins/mp3extractor.c:100
-msgid "Techno-Industrial"
-msgstr "Techno-Industrial"
+#~ msgid "Techno-Industrial"
+#~ msgstr "Techno-Industrial"
 
-#: src/plugins/mp3extractor.c:101
-msgid "Electronic"
-msgstr "Electronic"
+#~ msgid "Electronic"
+#~ msgstr "Electronic"
 
-#: src/plugins/mp3extractor.c:102
-msgid "Pop-Folk"
-msgstr "Pop-Folk"
+#~ msgid "Pop-Folk"
+#~ msgstr "Pop-Folk"
 
-#: src/plugins/mp3extractor.c:103
-msgid "Eurodance"
-msgstr "Eurodance"
+#~ msgid "Eurodance"
+#~ msgstr "Eurodance"
 
-#: src/plugins/mp3extractor.c:104
-msgid "Dream"
-msgstr "Dream"
+#~ msgid "Dream"
+#~ msgstr "Dream"
 
-#: src/plugins/mp3extractor.c:105
-msgid "Southern Rock"
-msgstr "Southern Rock"
+#~ msgid "Southern Rock"
+#~ msgstr "Southern Rock"
 
-#: src/plugins/mp3extractor.c:106
-msgid "Comedy"
-msgstr "Comedy"
+#~ msgid "Comedy"
+#~ msgstr "Comedy"
 
-#: src/plugins/mp3extractor.c:107
-msgid "Cult"
-msgstr "Cult"
+#~ msgid "Cult"
+#~ msgstr "Cult"
 
-#: src/plugins/mp3extractor.c:108
-msgid "Gangsta Rap"
-msgstr "Gangsta Rap"
+#~ msgid "Gangsta Rap"
+#~ msgstr "Gangsta Rap"
 
-#: src/plugins/mp3extractor.c:109
-msgid "Top 40"
-msgstr "Top 40"
+#~ msgid "Top 40"
+#~ msgstr "Top 40"
 
-#: src/plugins/mp3extractor.c:110
-msgid "Christian Rap"
-msgstr "Christian Rap"
+#~ msgid "Christian Rap"
+#~ msgstr "Christian Rap"
 
-#: src/plugins/mp3extractor.c:111
-msgid "Pop/Funk"
-msgstr "Pop/Funk"
+#~ msgid "Pop/Funk"
+#~ msgstr "Pop/Funk"
 
-#: src/plugins/mp3extractor.c:112
-msgid "Jungle"
-msgstr "Jungle"
+#~ msgid "Jungle"
+#~ msgstr "Jungle"
 
-#: src/plugins/mp3extractor.c:113
-msgid "Native American"
-msgstr "Native American"
+#~ msgid "Native American"
+#~ msgstr "Native American"
 
-#: src/plugins/mp3extractor.c:114
-msgid "Cabaret"
-msgstr "Cabaret"
+#~ msgid "Cabaret"
+#~ msgstr "Cabaret"
 
-#: src/plugins/mp3extractor.c:115
-msgid "New Wave"
-msgstr "New Wave"
+#~ msgid "New Wave"
+#~ msgstr "New Wave"
 
-#: src/plugins/mp3extractor.c:116
-msgid "Psychedelic"
-msgstr "Psychedelic"
+#~ msgid "Psychedelic"
+#~ msgstr "Psychedelic"
 
-#: src/plugins/mp3extractor.c:117
-msgid "Rave"
-msgstr "Rave"
+#~ msgid "Rave"
+#~ msgstr "Rave"
 
-#: src/plugins/mp3extractor.c:118
-msgid "Showtunes"
-msgstr "Showtunes"
+#~ msgid "Showtunes"
+#~ msgstr "Showtunes"
 
-#: src/plugins/mp3extractor.c:119
-msgid "Trailer"
-msgstr "Trailer"
+#~ msgid "Trailer"
+#~ msgstr "Trailer"
 
-#: src/plugins/mp3extractor.c:120
-msgid "Lo-Fi"
-msgstr "Lo-Fi"
+#~ msgid "Lo-Fi"
+#~ msgstr "Lo-Fi"
 
-#: src/plugins/mp3extractor.c:121
-msgid "Tribal"
-msgstr "Tribal"
+#~ msgid "Tribal"
+#~ msgstr "Tribal"
 
-#: src/plugins/mp3extractor.c:122
-msgid "Acid Punk"
-msgstr "Acid Punk"
+#~ msgid "Acid Punk"
+#~ msgstr "Acid Punk"
 
-#: src/plugins/mp3extractor.c:123
-msgid "Acid Jazz"
-msgstr "Acid Jazz"
+#~ msgid "Acid Jazz"
+#~ msgstr "Acid Jazz"
 
-#: src/plugins/mp3extractor.c:124
-msgid "Polka"
-msgstr "Polka"
+#~ msgid "Polka"
+#~ msgstr "Polka"
 
-#: src/plugins/mp3extractor.c:125
-msgid "Retro"
-msgstr "Retro"
+#~ msgid "Retro"
+#~ msgstr "Retro"
 
-#: src/plugins/mp3extractor.c:126
-msgid "Musical"
-msgstr "Musical"
+#~ msgid "Musical"
+#~ msgstr "Musical"
 
-#: src/plugins/mp3extractor.c:127
-msgid "Rock & Roll"
-msgstr "Rock & Roll"
+#~ msgid "Rock & Roll"
+#~ msgstr "Rock & Roll"
 
-#: src/plugins/mp3extractor.c:128
-msgid "Hard Rock"
-msgstr "Hard Rock"
+#~ msgid "Hard Rock"
+#~ msgstr "Hard Rock"
 
-#: src/plugins/mp3extractor.c:129
-msgid "Folk"
-msgstr "Folk"
+#~ msgid "Folk"
+#~ msgstr "Folk"
 
-#: src/plugins/mp3extractor.c:130
-msgid "Folk/Rock"
-msgstr "Folk/Rock"
+#~ msgid "Folk/Rock"
+#~ msgstr "Folk/Rock"
 
-#: src/plugins/mp3extractor.c:131
-msgid "National Folk"
-msgstr "National Folk"
+#~ msgid "National Folk"
+#~ msgstr "National Folk"
 
-#: src/plugins/mp3extractor.c:132
-msgid "Swing"
-msgstr "Swing"
+#~ msgid "Swing"
+#~ msgstr "Swing"
 
-#: src/plugins/mp3extractor.c:133
-msgid "Fast-Fusion"
-msgstr "Fast-Fusion"
+#~ msgid "Fast-Fusion"
+#~ msgstr "Fast-Fusion"
 
-#: src/plugins/mp3extractor.c:134
-msgid "Bebob"
-msgstr "Bebob"
+#~ msgid "Bebob"
+#~ msgstr "Bebob"
 
-#: src/plugins/mp3extractor.c:135
-msgid "Latin"
-msgstr "Latin"
+#~ msgid "Latin"
+#~ msgstr "Latin"
 
-#: src/plugins/mp3extractor.c:136
-msgid "Revival"
-msgstr "Revival"
+#~ msgid "Revival"
+#~ msgstr "Revival"
 
-#: src/plugins/mp3extractor.c:137
-msgid "Celtic"
-msgstr "Celtic"
+#~ msgid "Celtic"
+#~ msgstr "Celtic"
 
-#: src/plugins/mp3extractor.c:138
-msgid "Bluegrass"
-msgstr "Bluegrass"
+#~ msgid "Bluegrass"
+#~ msgstr "Bluegrass"
 
-#: src/plugins/mp3extractor.c:139
-msgid "Avantgarde"
-msgstr "Avantgarde"
+#~ msgid "Avantgarde"
+#~ msgstr "Avantgarde"
 
-#: src/plugins/mp3extractor.c:140
-msgid "Gothic Rock"
-msgstr "Gothic Rock"
+#~ msgid "Gothic Rock"
+#~ msgstr "Gothic Rock"
 
-#: src/plugins/mp3extractor.c:141
-msgid "Progressive Rock"
-msgstr "Progressive Rock"
+#~ msgid "Progressive Rock"
+#~ msgstr "Progressive Rock"
 
-#: src/plugins/mp3extractor.c:142
-msgid "Psychedelic Rock"
-msgstr "Psychedelic Rock"
+#~ msgid "Psychedelic Rock"
+#~ msgstr "Psychedelic Rock"
 
-#: src/plugins/mp3extractor.c:143
-msgid "Symphonic Rock"
-msgstr "Symphonic Rock"
+#~ msgid "Symphonic Rock"
+#~ msgstr "Symphonic Rock"
 
-#: src/plugins/mp3extractor.c:144
-msgid "Slow Rock"
-msgstr "Slow Rock"
+#~ msgid "Slow Rock"
+#~ msgstr "Slow Rock"
 
-#: src/plugins/mp3extractor.c:145
-msgid "Big Band"
-msgstr "Big Band"
+#~ msgid "Big Band"
+#~ msgstr "Big Band"
 
-#: src/plugins/mp3extractor.c:146
-msgid "Chorus"
-msgstr "Chorus"
+#~ msgid "Chorus"
+#~ msgstr "Chorus"
 
-#: src/plugins/mp3extractor.c:147
-msgid "Easy Listening"
-msgstr "Easy Listening"
+#~ msgid "Easy Listening"
+#~ msgstr "Easy Listening"
 
-#: src/plugins/mp3extractor.c:148
-msgid "Acoustic"
-msgstr "Acoustic"
+#~ msgid "Acoustic"
+#~ msgstr "Acoustic"
 
-#: src/plugins/mp3extractor.c:149
-msgid "Humour"
-msgstr "Umor"
+#~ msgid "Humour"
+#~ msgstr "Umor"
 
-#: src/plugins/mp3extractor.c:150
-msgid "Speech"
-msgstr "Discurs"
+#~ msgid "Speech"
+#~ msgstr "Discurs"
 
-#: src/plugins/mp3extractor.c:151
-msgid "Chanson"
-msgstr "Chanson"
+#~ msgid "Chanson"
+#~ msgstr "Chanson"
 
-#: src/plugins/mp3extractor.c:152
-msgid "Opera"
-msgstr "Oper�"
+#~ msgid "Opera"
+#~ msgstr "Oper�"
 
-#: src/plugins/mp3extractor.c:153
-msgid "Chamber Music"
-msgstr "Muzic� de camer�"
+#~ msgid "Chamber Music"
+#~ msgstr "Muzic� de camer�"
 
-#: src/plugins/mp3extractor.c:154
-msgid "Sonata"
-msgstr "Sonet"
+#~ msgid "Sonata"
+#~ msgstr "Sonet"
 
-#: src/plugins/mp3extractor.c:155
-msgid "Symphony"
-msgstr "Simfonie"
+#~ msgid "Symphony"
+#~ msgstr "Simfonie"
 
-#: src/plugins/mp3extractor.c:156
-msgid "Booty Bass"
-msgstr "Booty Bass"
+#~ msgid "Booty Bass"
+#~ msgstr "Booty Bass"
 
-#: src/plugins/mp3extractor.c:157
-msgid "Primus"
-msgstr "Primus"
+#~ msgid "Primus"
+#~ msgstr "Primus"
 
-#: src/plugins/mp3extractor.c:158
-msgid "Porn Groove"
-msgstr "Porn Groove"
+#~ msgid "Porn Groove"
+#~ msgstr "Porn Groove"
 
-#: src/plugins/mp3extractor.c:159
-msgid "Satire"
-msgstr "Satire"
+#~ msgid "Satire"
+#~ msgstr "Satire"
 
-#: src/plugins/mp3extractor.c:160
-msgid "Slow Jam"
-msgstr "Slow Jam"
+#~ msgid "Slow Jam"
+#~ msgstr "Slow Jam"
 
-#: src/plugins/mp3extractor.c:161
-msgid "Club"
-msgstr "Club"
+#~ msgid "Club"
+#~ msgstr "Club"
 
-#: src/plugins/mp3extractor.c:162
-msgid "Tango"
-msgstr "Tango"
+#~ msgid "Tango"
+#~ msgstr "Tango"
 
-#: src/plugins/mp3extractor.c:163
-msgid "Samba"
-msgstr "Samba"
+#~ msgid "Samba"
+#~ msgstr "Samba"
 
-#: src/plugins/mp3extractor.c:164
-msgid "Folklore"
-msgstr "Folklore"
+#~ msgid "Folklore"
+#~ msgstr "Folklore"
 
-#: src/plugins/mp3extractor.c:165
-msgid "Ballad"
-msgstr "Ballad"
+#~ msgid "Ballad"
+#~ msgstr "Ballad"
 
-#: src/plugins/mp3extractor.c:166
-msgid "Power Ballad"
-msgstr "Power Ballad"
+#~ msgid "Power Ballad"
+#~ msgstr "Power Ballad"
 
-#: src/plugins/mp3extractor.c:167
-msgid "Rhythmic Soul"
-msgstr "Rhythmic Soul"
+#~ msgid "Rhythmic Soul"
+#~ msgstr "Rhythmic Soul"
 
-#: src/plugins/mp3extractor.c:168
-msgid "Freestyle"
-msgstr "Freestyle"
+#~ msgid "Freestyle"
+#~ msgstr "Freestyle"
 
-#: src/plugins/mp3extractor.c:169
-msgid "Duet"
-msgstr "Duet"
+#~ msgid "Duet"
+#~ msgstr "Duet"
 
-#: src/plugins/mp3extractor.c:170
-msgid "Punk Rock"
-msgstr "Punk Rock"
+#~ msgid "Punk Rock"
+#~ msgstr "Punk Rock"
 
-#: src/plugins/mp3extractor.c:171
-msgid "Drum Solo"
-msgstr "Drum Solo"
+#~ msgid "Drum Solo"
+#~ msgstr "Drum Solo"
 
-#: src/plugins/mp3extractor.c:172
-msgid "A Cappella"
-msgstr "A Cappella"
+#~ msgid "A Cappella"
+#~ msgstr "A Cappella"
 
-#: src/plugins/mp3extractor.c:173
-msgid "Euro-House"
-msgstr "Euro-House"
+#~ msgid "Euro-House"
+#~ msgstr "Euro-House"
 
-#: src/plugins/mp3extractor.c:174
-msgid "Dance Hall"
-msgstr "Dance Hall"
+#~ msgid "Dance Hall"
+#~ msgstr "Dance Hall"
 
-#: src/plugins/mp3extractor.c:175
-msgid "Goa"
-msgstr "Goa"
+#~ msgid "Goa"
+#~ msgstr "Goa"
 
-#: src/plugins/mp3extractor.c:176
-msgid "Drum & Bass"
-msgstr "Drum & Bass"
+#~ msgid "Drum & Bass"
+#~ msgstr "Drum & Bass"
 
-#: src/plugins/mp3extractor.c:177
-msgid "Club-House"
-msgstr "Club-House"
+#~ msgid "Club-House"
+#~ msgstr "Club-House"
 
-#: src/plugins/mp3extractor.c:178
-msgid "Hardcore"
-msgstr "Hardcore"
+#~ msgid "Hardcore"
+#~ msgstr "Hardcore"
 
-#: src/plugins/mp3extractor.c:179
-msgid "Terror"
-msgstr "Terror"
+#~ msgid "Terror"
+#~ msgstr "Terror"
 
-#: src/plugins/mp3extractor.c:180
-msgid "Indie"
-msgstr "Indie"
+#~ msgid "Indie"
+#~ msgstr "Indie"
 
-#: src/plugins/mp3extractor.c:181
-msgid "BritPop"
-msgstr "BritPop"
+#~ msgid "BritPop"
+#~ msgstr "BritPop"
 
-#: src/plugins/mp3extractor.c:182
-msgid "Negerpunk"
-msgstr "Negerpunk"
+#~ msgid "Negerpunk"
+#~ msgstr "Negerpunk"
 
-#: src/plugins/mp3extractor.c:183
-msgid "Polsk Punk"
-msgstr "Polsk Punk"
+#~ msgid "Polsk Punk"
+#~ msgstr "Polsk Punk"
 
-#: src/plugins/mp3extractor.c:184
-msgid "Beat"
-msgstr "Beat"
+#~ msgid "Beat"
+#~ msgstr "Beat"
 
-#: src/plugins/mp3extractor.c:185
-msgid "Christian Gangsta Rap"
-msgstr "Christian Gangsta Rap"
+#~ msgid "Christian Gangsta Rap"
+#~ msgstr "Christian Gangsta Rap"
 
-#: src/plugins/mp3extractor.c:186
-msgid "Heavy Metal"
-msgstr "Heavy Metal"
+#~ msgid "Heavy Metal"
+#~ msgstr "Heavy Metal"
 
-#: src/plugins/mp3extractor.c:187
-msgid "Black Metal"
-msgstr "Black Metal"
+#~ msgid "Black Metal"
+#~ msgstr "Black Metal"
 
-#: src/plugins/mp3extractor.c:188
-msgid "Crossover"
-msgstr "Crossover"
+#~ msgid "Crossover"
+#~ msgstr "Crossover"
 
-#: src/plugins/mp3extractor.c:189
-msgid "Contemporary Christian"
-msgstr "Contemporary Christian"
+#~ msgid "Contemporary Christian"
+#~ msgstr "Contemporary Christian"
 
-#: src/plugins/mp3extractor.c:190
-msgid "Christian Rock"
-msgstr "Christian Rock"
+#~ msgid "Christian Rock"
+#~ msgstr "Christian Rock"
 
-#: src/plugins/mp3extractor.c:191
-msgid "Merengue"
-msgstr "Merengue"
+#~ msgid "Merengue"
+#~ msgstr "Merengue"
 
-#: src/plugins/mp3extractor.c:192
-msgid "Salsa"
-msgstr "Salsa"
+#~ msgid "Salsa"
+#~ msgstr "Salsa"
 
-#: src/plugins/mp3extractor.c:193
-msgid "Thrash Metal"
-msgstr "Thrash Metal"
+#~ msgid "Thrash Metal"
+#~ msgstr "Thrash Metal"
 
-#: src/plugins/mp3extractor.c:194
-msgid "Anime"
-msgstr "Anime"
+#~ msgid "Anime"
+#~ msgstr "Anime"
 
-#: src/plugins/mp3extractor.c:195
-msgid "JPop"
-msgstr "JPop"
+#~ msgid "JPop"
+#~ msgstr "JPop"
 
-#: src/plugins/mp3extractor.c:196
-msgid "Synthpop"
-msgstr "Synthpop"
+#~ msgid "Synthpop"
+#~ msgstr "Synthpop"
 
-#: src/plugins/mp3extractor.c:427
-msgid "(variable bps)"
-msgstr "(bps variabil)"
+#~ msgid "(variable bps)"
+#~ msgstr "(bps variabil)"
 
-#: src/main/getopt.c:681
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: op�iunea `%s' este ambigu�\n"
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#: src/main/getopt.c:706
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `--%s' nu permite un argument\n"
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s: op�iunea `--%s' nu permite un argument\n"
 
-#: src/main/getopt.c:712
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `%c%s' nu permite un argument\n"
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s: op�iunea `%c%s' nu permite un argument\n"
 
-#: src/main/getopt.c:729 src/main/getopt.c:900
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: op�iunea `%s' necesit� un argument\n"
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s: op�iunea `%s' necesit� un argument\n"
 
-#: src/main/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: op�iune nerecunoscut� `--%s'\n"
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s: op�iune nerecunoscut� `--%s'\n"
 
-#: src/main/getopt.c:762
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: op�iune nerecunoscut� `%c%s'\n"
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s: op�iune nerecunoscut� `%c%s'\n"
 
-#: src/main/getopt.c:788
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: op�iune ilegal� -- %c\n"
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s: op�iune ilegal� -- %c\n"
 
-#: src/main/getopt.c:790
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: op�iune ilegal� -- %c\n"
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s: op�iune ilegal� -- %c\n"
 
-#: src/main/getopt.c:819 src/main/getopt.c:949
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: op�iunea necesit� un argument -- %c\n"
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s: op�iunea necesit� un argument -- %c\n"
 
-#: src/main/getopt.c:867
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: op�iunea `-W %s' este ambigu�\n"
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s: op�iunea `-W %s' este ambigu�\n"
 
-#: src/main/getopt.c:885
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: op�iunea `-W %s' nu permite un argument\n"
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s: op�iunea `-W %s' nu permite un argument\n"
 
-#: src/main/extract.c:49
-#, c-format
-msgid ""
-"Usage: %s\n"
-"%s\n"
-"\n"
-msgstr ""
-"Folosire: %s\n"
-"%s\n"
-"\n"
+#~ msgid ""
+#~ "Usage: %s\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Folosire: %s\n"
+#~ "%s\n"
+#~ "\n"
 
-#: src/main/extract.c:52
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-"Argumentele obligatorii pentru op�iunile lungi sunt obligatorii �i pentru "
-"op�iunile scurte.\n"
+#~ msgid ""
+#~ "Arguments mandatory for long options are also mandatory for short "
+#~ "options.\n"
+#~ msgstr ""
+#~ "Argumentele obligatorii pentru op�iunile lungi sunt obligatorii �i pentru "
+#~ "op�iunile scurte.\n"
 
-#: src/main/extract.c:126
-msgid "do not remove any duplicates"
-msgstr "nu �ndep�rta nici un duplicat"
+#~ msgid "do not remove any duplicates"
+#~ msgstr "nu �ndep�rta nici un duplicat"
 
-#: src/main/extract.c:128
-msgid "print output in bibtex format"
-msgstr "afi�eaz� ie�irea �n format bibtex"
+#~ msgid "print output in bibtex format"
+#~ msgstr "afi�eaz� ie�irea �n format bibtex"
 
-#: src/main/extract.c:130
-msgid ""
-"use the generic plaintext extractor for the language with the 2-letter "
-"language code LANG"
-msgstr ""
-"folose�te extractorul text-simplu generic pentru limba cu codul de limb� din "
-"2 litere LANG"
+#~ msgid ""
+#~ "use the generic plaintext extractor for the language with the 2-letter "
+#~ "language code LANG"
+#~ msgstr ""
+#~ "folose�te extractorul text-simplu generic pentru limba cu codul de limb� "
+#~ "din 2 litere LANG"
 
-#: src/main/extract.c:132
-msgid "remove duplicates only if types match"
-msgstr "�ndep�rteaz� duplicatele numai dac� tipul este acela�i"
+#~ msgid "remove duplicates only if types match"
+#~ msgstr "�ndep�rteaz� duplicatele numai dac� tipul este acela�i"
 
-#: src/main/extract.c:134
-msgid "use the filename as a keyword (loads filename-extractor plugin)"
-msgstr ""
-"folose�te numele de fi�ier ca �i cuv�nt cheie (�ncarc� plugin nume_fi�ier-"
-"extractor)"
+#~ msgid "use the filename as a keyword (loads filename-extractor plugin)"
+#~ msgstr ""
+#~ "folose�te numele de fi�ier ca �i cuv�nt cheie (�ncarc� plugin nume_fi�ier-"
+#~ "extractor)"
 
-#: src/main/extract.c:136
-msgid "print this help"
-msgstr "afi�eaz� acest mesaj de ajutor"
+#~ msgid "print this help"
+#~ msgstr "afi�eaz� acest mesaj de ajutor"
 
-#: src/main/extract.c:138
-msgid "compute hash using the given ALGORITHM (currently sha1 or md5)"
-msgstr ""
-"calculeaz� tabela de dispersie (hash) folosind ALGORITM-ul dat (curent sha1 "
-"sau md5)"
+#~ msgid "compute hash using the given ALGORITHM (currently sha1 or md5)"
+#~ msgstr ""
+#~ "calculeaz� tabela de dispersie (hash) folosind ALGORITM-ul dat (curent "
+#~ "sha1 sau md5)"
 
-#: src/main/extract.c:140
-msgid "load an extractor plugin named LIBRARY"
-msgstr "�ncarc� un plugin extractor numit LIBR�RIE"
+#~ msgid "load an extractor plugin named LIBRARY"
+#~ msgstr "�ncarc� un plugin extractor numit LIBR�RIE"
 
-#: src/main/extract.c:142
-msgid "list all keyword types"
-msgstr "listeaz� toate tipurile de cuvinte cheie"
+#~ msgid "list all keyword types"
+#~ msgstr "listeaz� toate tipurile de cuvinte cheie"
 
-#: src/main/extract.c:144
-msgid "do not use the default set of extractor plugins"
-msgstr "nu folosi setul implicit de plugin-uri extractor"
+#~ msgid "do not use the default set of extractor plugins"
+#~ msgstr "nu folosi setul implicit de plugin-uri extractor"
 
-#: src/main/extract.c:146
-msgid "print only keywords of the given TYPE (use -L to get a list)"
-msgstr ""
-"afi�eaz� numai cuvintele cheie pentru TIP-ul dat (folose�te -L pentru a "
-"ob�ine o list�"
+#~ msgid "print only keywords of the given TYPE (use -L to get a list)"
+#~ msgstr ""
+#~ "afi�eaz� numai cuvintele cheie pentru TIP-ul dat (folose�te -L pentru a "
+#~ "ob�ine o list�"
 
-#: src/main/extract.c:148
-msgid "remove duplicates even if keyword types do not match"
-msgstr ""
-"�ndep�rteaz� duplicatele chiar dac� tipurile cuvintelor cheie nu sunt "
-"acelea�i"
+#~ msgid "remove duplicates even if keyword types do not match"
+#~ msgstr ""
+#~ "�ndep�rteaz� duplicatele chiar dac� tipurile cuvintelor cheie nu sunt "
+#~ "acelea�i"
 
-#: src/main/extract.c:150
-msgid "use keyword splitting (loads split-extractor plugin)"
-msgstr ""
-"folose�te spargere dup� cuvinte cheie (�ncarc� plugin-ul split-extractor)"
+#~ msgid "use keyword splitting (loads split-extractor plugin)"
+#~ msgstr ""
+#~ "folose�te spargere dup� cuvinte cheie (�ncarc� plugin-ul split-extractor)"
 
-#: src/main/extract.c:152
-msgid "print the version number"
-msgstr "afi�eaz� num�rul versiunii"
+#~ msgid "print the version number"
+#~ msgstr "afi�eaz� num�rul versiunii"
 
-#: src/main/extract.c:154
-msgid "be verbose"
-msgstr "fi vorb�re�"
+#~ msgid "be verbose"
+#~ msgstr "fi vorb�re�"
 
-#: src/main/extract.c:156
-msgid "do not print keywords of the given TYPE"
-msgstr "nu afi�a cuvinte cheie de TIP-ul dat"
+#~ msgid "do not print keywords of the given TYPE"
+#~ msgstr "nu afi�a cuvinte cheie de TIP-ul dat"
 
-#: src/main/extract.c:159
-msgid "extract [OPTIONS] [FILENAME]*"
-msgstr "extract [OP�IUNI] [NUME_FI�IER]*"
+#~ msgid "extract [OPTIONS] [FILENAME]*"
+#~ msgstr "extract [OP�IUNI] [NUME_FI�IER]*"
 
-#: src/main/extract.c:160
-msgid "Extract metadata from files."
-msgstr "Extrage metadata din fi�iere."
+#~ msgid "Extract metadata from files."
+#~ msgstr "Extrage metadata din fi�iere."
 
-#: src/main/extract.c:198 src/main/extractor.c:875
-#, c-format
-msgid "%s - (binary)\n"
-msgstr "%s - (binar)\n"
+#~ msgid "%s - (binary)\n"
+#~ msgstr "%s - (binar)\n"
 
-#: src/main/extract.c:204 src/main/extractor.c:880
-#, c-format
-msgid "INVALID TYPE - %s\n"
-msgstr "TIP INVALID - %s\n"
+#~ msgid "INVALID TYPE - %s\n"
+#~ msgstr "TIP INVALID - %s\n"
 
-#: src/main/extract.c:270 src/main/extractor.c:40
-msgid "title"
-msgstr "titlu"
+#~ msgid "title"
+#~ msgstr "titlu"
 
-#: src/main/extract.c:272 src/main/extractor.c:38
-msgid "filename"
-msgstr "nume_fi�ier"
+#~ msgid "filename"
+#~ msgstr "nume_fi�ier"
 
-#: src/main/extract.c:277 src/main/extractor.c:41
-msgid "author"
-msgstr "autor"
+#~ msgid "author"
+#~ msgstr "autor"
 
-#: src/main/extract.c:281 src/main/extractor.c:43
-msgid "description"
-msgstr "descriere"
+#~ msgid "description"
+#~ msgstr "descriere"
 
-#: src/main/extract.c:283 src/main/extractor.c:55
-msgid "keywords"
-msgstr "cuvinte cheie"
+#~ msgid "keywords"
+#~ msgstr "cuvinte cheie"
 
-#: src/main/extract.c:285 src/main/extractor.c:44
-msgid "comment"
-msgstr "comentariu"
+#~ msgid "comment"
+#~ msgstr "comentariu"
 
-#: src/main/extract.c:289 src/main/extractor.c:45
-msgid "date"
-msgstr "data"
+#~ msgid "date"
+#~ msgstr "data"
 
-#: src/main/extract.c:291 src/main/extractor.c:67
-msgid "creation date"
-msgstr "data cre�rii"
+#~ msgid "creation date"
+#~ msgstr "data cre�rii"
 
-#: src/main/extract.c:319 src/main/extractor.c:46
-msgid "publisher"
-msgstr "publicist"
+#~ msgid "publisher"
+#~ msgstr "publicist"
 
-#: src/main/extract.c:323 src/main/extractor.c:52
-msgid "organization"
-msgstr "organiza�ie"
+#~ msgid "organization"
+#~ msgstr "organiza�ie"
 
-#: src/main/extract.c:327 src/main/extractor.c:54
-msgid "subject"
-msgstr "subiect"
+#~ msgid "subject"
+#~ msgstr "subiect"
 
-#: src/main/extract.c:331 src/main/extractor.c:71
-msgid "page count"
-msgstr "num�r de pagini"
+#~ msgid "page count"
+#~ msgstr "num�r de pagini"
 
-#: src/main/extract.c:473
-#, c-format
-msgid "You must specify an argument for the `%s' option (option ignored).\n"
-msgstr ""
-"Trebuie s� specifica�i un argument pentru op�iunea `%s' (op�iune ignorat�).\n"
+#~ msgid "You must specify an argument for the `%s' option (option ignored).\n"
+#~ msgstr ""
+#~ "Trebuie s� specifica�i un argument pentru op�iunea `%s' (op�iune "
+#~ "ignorat�).\n"
 
-#: src/main/extract.c:540
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Folosi�i --help pentru a ob�ine o list� de op�iuni.\n"
+#~ msgid "Use --help to get a list of options.\n"
+#~ msgstr "Folosi�i --help pentru a ob�ine o list� de op�iuni.\n"
 
-#: src/main/extract.c:599
-#, c-format
-msgid "%% BiBTeX file\n"
-msgstr "%% BiBTeX file\n"
+#~ msgid "%% BiBTeX file\n"
+#~ msgstr "%% BiBTeX file\n"
 
-#: src/main/extract.c:606
-#, c-format
-msgid "Keywords for file %s:\n"
-msgstr "Cuvinte cheie pentru fi�ier %s:\n"
+#~ msgid "Keywords for file %s:\n"
+#~ msgstr "Cuvinte cheie pentru fi�ier %s:\n"
 
-#: src/main/extractor.c:37
-msgid "unknown"
-msgstr "necunoscut"
+#~ msgid "unknown"
+#~ msgstr "necunoscut"
 
-#: src/main/extractor.c:39
-msgid "mimetype"
-msgstr "mimetype"
+#~ msgid "mimetype"
+#~ msgstr "mimetype"
 
-#: src/main/extractor.c:42
-msgid "artist"
-msgstr "artist"
+#~ msgid "artist"
+#~ msgstr "artist"
 
-#: src/main/extractor.c:47
-msgid "language"
-msgstr "limb�"
+#~ msgid "language"
+#~ msgstr "limb�"
 
-#: src/main/extractor.c:48
-msgid "album"
-msgstr "album"
+#~ msgid "album"
+#~ msgstr "album"
 
-#: src/main/extractor.c:49
-msgid "genre"
-msgstr "gen"
+#~ msgid "genre"
+#~ msgstr "gen"
 
-#: src/main/extractor.c:50
-msgid "location"
-msgstr "loca�ie"
+#~ msgid "location"
+#~ msgstr "loca�ie"
 
-#: src/main/extractor.c:51
-msgid "version"
-msgstr "versiune"
+#~ msgid "version"
+#~ msgstr "versiune"
 
-#: src/main/extractor.c:53
-msgid "copyright"
-msgstr "copyright"
+#~ msgid "copyright"
+#~ msgstr "copyright"
 
-#: src/main/extractor.c:56
-msgid "contributor"
-msgstr "contribuitor"
+#~ msgid "contributor"
+#~ msgstr "contribuitor"
 
-#: src/main/extractor.c:57
-msgid "resource-type"
-msgstr "tip-resurs�"
+#~ msgid "resource-type"
+#~ msgstr "tip-resurs�"
 
-#: src/main/extractor.c:58
-msgid "format"
-msgstr "format"
+#~ msgid "format"
+#~ msgstr "format"
 
-#: src/main/extractor.c:59
-msgid "resource-identifier"
-msgstr "identificator-resurs�"
+#~ msgid "resource-identifier"
+#~ msgstr "identificator-resurs�"
 
-#: src/main/extractor.c:60
-msgid "source"
-msgstr "surs�"
+#~ msgid "source"
+#~ msgstr "surs�"
 
-#: src/main/extractor.c:61
-msgid "relation"
-msgstr "rela�ie"
+#~ msgid "relation"
+#~ msgstr "rela�ie"
 
-#: src/main/extractor.c:62
-msgid "coverage"
-msgstr "acoperire"
+#~ msgid "coverage"
+#~ msgstr "acoperire"
 
-#: src/main/extractor.c:63
-msgid "software"
-msgstr "software"
+#~ msgid "software"
+#~ msgstr "software"
 
-#: src/main/extractor.c:64
-msgid "disclaimer"
-msgstr "repudiere"
+#~ msgid "disclaimer"
+#~ msgstr "repudiere"
 
-#: src/main/extractor.c:65
-msgid "warning"
-msgstr "avertisment"
+#~ msgid "warning"
+#~ msgstr "avertisment"
 
-#: src/main/extractor.c:66
-msgid "translated"
-msgstr "tradus"
+#~ msgid "translated"
+#~ msgstr "tradus"
 
-#: src/main/extractor.c:68
-msgid "modification date"
-msgstr "data modific�rii"
+#~ msgid "modification date"
+#~ msgstr "data modific�rii"
 
-#: src/main/extractor.c:69
-msgid "creator"
-msgstr "creator"
+#~ msgid "creator"
+#~ msgstr "creator"
 
-#: src/main/extractor.c:70
-msgid "producer"
-msgstr "produc�tor"
+#~ msgid "producer"
+#~ msgstr "produc�tor"
 
-#: src/main/extractor.c:72
-msgid "page orientation"
-msgstr "orientare pagin�"
+#~ msgid "page orientation"
+#~ msgstr "orientare pagin�"
 
-#: src/main/extractor.c:73
-msgid "paper size"
-msgstr "dimensiune pagina"
+#~ msgid "paper size"
+#~ msgstr "dimensiune pagina"
 
-#: src/main/extractor.c:74
-msgid "used fonts"
-msgstr "fonturi folosite"
+#~ msgid "used fonts"
+#~ msgstr "fonturi folosite"
 
-#: src/main/extractor.c:75
-msgid "page order"
-msgstr "ordine pagini"
+#~ msgid "page order"
+#~ msgstr "ordine pagini"
 
-#: src/main/extractor.c:76
-msgid "created for"
-msgstr "creat pentru"
+#~ msgid "created for"
+#~ msgstr "creat pentru"
 
-#: src/main/extractor.c:77
-msgid "magnification"
-msgstr "m�rire"
+#~ msgid "magnification"
+#~ msgstr "m�rire"
 
-#: src/main/extractor.c:78
-msgid "release"
-msgstr "release"
+#~ msgid "release"
+#~ msgstr "release"
 
-#: src/main/extractor.c:79
-msgid "group"
-msgstr "grup"
+#~ msgid "group"
+#~ msgstr "grup"
 
-#: src/main/extractor.c:80
-msgid "size"
-msgstr "m�rime"
+#~ msgid "size"
+#~ msgstr "m�rime"
 
-#: src/main/extractor.c:81
-msgid "summary"
-msgstr "cuprins"
+#~ msgid "summary"
+#~ msgstr "cuprins"
 
-#: src/main/extractor.c:82
-msgid "packager"
-msgstr "�mpachetator"
+#~ msgid "packager"
+#~ msgstr "�mpachetator"
 
-#: src/main/extractor.c:83
-msgid "vendor"
-msgstr "v�nz�tor"
+#~ msgid "vendor"
+#~ msgstr "v�nz�tor"
 
-#: src/main/extractor.c:84
-msgid "license"
-msgstr "licen��"
+#~ msgid "license"
+#~ msgstr "licen��"
 
-#: src/main/extractor.c:85
-msgid "distribution"
-msgstr "distribu�ie"
+#~ msgid "distribution"
+#~ msgstr "distribu�ie"
 
-#: src/main/extractor.c:86
-msgid "build-host"
-msgstr "gazd�-contruit"
+#~ msgid "build-host"
+#~ msgstr "gazd�-contruit"
 
-#: src/main/extractor.c:87
-msgid "os"
-msgstr "sistem operare"
+#~ msgid "os"
+#~ msgstr "sistem operare"
 
-#: src/main/extractor.c:88
-msgid "dependency"
-msgstr "dependin�e"
+#~ msgid "dependency"
+#~ msgstr "dependin�e"
 
-#: src/main/extractor.c:89
-msgid "MD4"
-msgstr "MD4"
+#~ msgid "MD4"
+#~ msgstr "MD4"
 
-#: src/main/extractor.c:90
-msgid "MD5"
-msgstr "MD5"
+#~ msgid "MD5"
+#~ msgstr "MD5"
 
-#: src/main/extractor.c:91
-msgid "SHA-0"
-msgstr "SHA-0"
+#~ msgid "SHA-0"
+#~ msgstr "SHA-0"
 
-#: src/main/extractor.c:92
-msgid "SHA-1"
-msgstr "SHA-1"
+#~ msgid "SHA-1"
+#~ msgstr "SHA-1"
 
-#: src/main/extractor.c:93
-msgid "RipeMD160"
-msgstr "RipeMD160"
+#~ msgid "RipeMD160"
+#~ msgstr "RipeMD160"
 
-#: src/main/extractor.c:94
-msgid "resolution"
-msgstr "rezolu�ie"
+#~ msgid "resolution"
+#~ msgstr "rezolu�ie"
 
-#: src/main/extractor.c:95
-msgid "category"
-msgstr "categorie"
+#~ msgid "category"
+#~ msgstr "categorie"
 
-#: src/main/extractor.c:96
-msgid "book title"
-msgstr "titlu de carte"
+#~ msgid "book title"
+#~ msgstr "titlu de carte"
 
-#: src/main/extractor.c:97
-msgid "priority"
-msgstr "prioritate"
+#~ msgid "priority"
+#~ msgstr "prioritate"
 
-#: src/main/extractor.c:98
-msgid "conflicts"
-msgstr "conflicte"
+#~ msgid "conflicts"
+#~ msgstr "conflicte"
 
-#: src/main/extractor.c:99
-msgid "replaces"
-msgstr "�nlocuie�te"
+#~ msgid "replaces"
+#~ msgstr "�nlocuie�te"
 
-#: src/main/extractor.c:100
-msgid "provides"
-msgstr "furnizeaz�"
+#~ msgid "provides"
+#~ msgstr "furnizeaz�"
 
-#: src/main/extractor.c:101
-msgid "conductor"
-msgstr "conduc�tor"
+#~ msgid "conductor"
+#~ msgstr "conduc�tor"
 
-#: src/main/extractor.c:102
-msgid "interpreter"
-msgstr "interpret(�)"
+#~ msgid "interpreter"
+#~ msgstr "interpret(�)"
 
-#: src/main/extractor.c:103
-msgid "owner"
-msgstr "proprietar"
+#~ msgid "owner"
+#~ msgstr "proprietar"
 
-#: src/main/extractor.c:104
-msgid "lyrics"
-msgstr "versuri"
+#~ msgid "lyrics"
+#~ msgstr "versuri"
 
-#: src/main/extractor.c:105
-msgid "media type"
-msgstr "tipul media"
+#~ msgid "media type"
+#~ msgstr "tipul media"
 
-#: src/main/extractor.c:106
-msgid "contact"
-msgstr "contact"
+#~ msgid "contact"
+#~ msgstr "contact"
 
-#: src/main/extractor.c:107
-msgid "binary thumbnail data"
-msgstr "data thumbnail binar"
+#~ msgid "binary thumbnail data"
+#~ msgstr "data thumbnail binar"
 
-#: src/main/extractor.c:108
 #, fuzzy
-msgid "publication date"
-msgstr "data cre�rii"
+#~ msgid "publication date"
+#~ msgstr "data cre�rii"
 
-#: src/main/extractor.c:109
-msgid "camera make"
-msgstr ""
-
-#: src/main/extractor.c:110
-msgid "camera model"
-msgstr ""
-
-#: src/main/extractor.c:111
-msgid "exposure"
-msgstr ""
-
-#: src/main/extractor.c:112
-msgid "aperture"
-msgstr ""
-
-#: src/main/extractor.c:113
-msgid "exposure bias"
-msgstr ""
-
-#: src/main/extractor.c:114
-msgid "flash"
-msgstr ""
-
-#: src/main/extractor.c:115
-msgid "flash bias"
-msgstr ""
-
-#: src/main/extractor.c:116
-msgid "focal length"
-msgstr ""
-
-#: src/main/extractor.c:117
-msgid "focal length (35mm equivalent)"
-msgstr ""
-
-#: src/main/extractor.c:118
-msgid "iso speed"
-msgstr ""
-
-#: src/main/extractor.c:119
-msgid "exposure mode"
-msgstr ""
-
-#: src/main/extractor.c:120
-msgid "metering mode"
-msgstr ""
-
-#: src/main/extractor.c:121
-msgid "macro mode"
-msgstr ""
-
-#: src/main/extractor.c:122
-msgid "image quality"
-msgstr ""
-
-#: src/main/extractor.c:123
-msgid "white balance"
-msgstr ""
-
-#: src/main/extractor.c:124
 #, fuzzy
-msgid "orientation"
-msgstr "orientare pagin�"
+#~ msgid "orientation"
+#~ msgstr "orientare pagin�"
 
-#: src/main/extractor.c:218
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "ini�ializare mecanismului de plugin a e�uat: %s!\n"
+#~ msgid "Initialization of plugin mechanism failed: %s!\n"
+#~ msgstr "ini�ializare mecanismului de plugin a e�uat: %s!\n"
 
-#: src/main/extractor.c:365
-#, 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 ""
-"Rezolvarea simbolului `%s' �n biblioteca `%s' a e�uat, a�a c� am �ncercat '%"
-"s', dar �i acesta a e�uat.  Erorile sunt: `%s' �i `%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 ""
+#~ "Rezolvarea simbolului `%s' �n biblioteca `%s' a e�uat, a�a c� am �ncercat "
+#~ "'%s', dar �i acesta a e�uat.  Erorile sunt: `%s' �i `%s'.\n"
 
-#: src/main/extractor.c:394
-#, c-format
-msgid "Loading `%s' plugin failed: %s\n"
-msgstr "�nc�rcarea plugin-ului `%s' a e�uat: %s\n"
+#~ msgid "Loading `%s' plugin failed: %s\n"
+#~ msgstr "�nc�rcarea plugin-ului `%s' a e�uat: %s\n"
 
-#: src/main/extractor.c:599
-#, c-format
-msgid "Unloading plugin `%s' failed!\n"
-msgstr "Desc�rcarea plugin-ului `%s' a e�uat!\n"
+#~ msgid "Unloading plugin `%s' failed!\n"
+#~ msgstr "Desc�rcarea plugin-ului `%s' a e�uat!\n"
 
 #~ msgid "No error"
 #~ msgstr "Ni o eroare"

Modified: Extractor/po/rw.po
===================================================================
--- Extractor/po/rw.po  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/po/rw.po  2005-09-05 13:48:39 UTC (rev 2064)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: libextractor 0.4.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-08-26 22:35-0700\n"
+"POT-Creation-Date: 2005-09-04 02:59-0700\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -34,7 +34,7 @@
 msgid "Binary RPM %d.%d"
 msgstr ""
 
-#: src/plugins/printable/dictionary-builder.c:52
+#: src/plugins/printable/dictionary-builder.c:50
 #, fuzzy, c-format
 msgid ""
 "Please provide the name of the language you are building\n"
@@ -42,19 +42,19 @@
 msgstr "i Izina: Bya i Ururimi Inkoranyamagambo kugirango Urugero"
 
 # basctl/source\basicide\basidesh.src:RID_STR_ERROROPENSTORAGE.text
-#: src/plugins/printable/dictionary-builder.c:65
+#: src/plugins/printable/dictionary-builder.c:63
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Hari ikibazo mu gufungura dosiye"
 
-#: src/plugins/printable/dictionary-builder.c:73
+#: src/plugins/printable/dictionary-builder.c:71
 #, c-format
 msgid ""
 "Error allocating: %s\n"
 "."
 msgstr ""
 
-#: src/plugins/printable/dictionary-builder.c:85
+#: src/plugins/printable/dictionary-builder.c:83
 #, fuzzy, c-format
 msgid "Increase ALLOCSIZE (in %s).\n"
 msgstr "in"
@@ -101,11 +101,11 @@
 msgid "Kernel routines"
 msgstr ""
 
-#: src/plugins/wavextractor.c:113 src/plugins/mp3extractor.c:426
+#: src/plugins/wavextractor.c:113
 msgid "mono"
 msgstr ""
 
-#: src/plugins/wavextractor.c:113 src/plugins/mp3extractor.c:426
+#: src/plugins/wavextractor.c:113
 msgid "stereo"
 msgstr ""
 
@@ -114,845 +114,216 @@
 msgid "Fatal: could not allocate (%s at %s:%d).\n"
 msgstr "OYA ku"
 
-#: src/plugins/jpegextractor.c:178
-#, fuzzy, c-format
-msgid "%ux%u dots per inch"
-msgstr "%ux%uUtudomo Inci"
+#, fuzzy
+#~ msgid "%ux%u dots per inch"
+#~ msgstr "%ux%uUtudomo Inci"
 
-#: src/plugins/jpegextractor.c:188
-#, fuzzy, c-format
-msgid "%ux%u dots per cm"
-msgstr "%ux%uUtudomo cm"
+#, fuzzy
+#~ msgid "%ux%u dots per cm"
+#~ msgstr "%ux%uUtudomo cm"
 
-#: src/plugins/jpegextractor.c:198
-#, fuzzy, c-format
-msgid "%ux%u dots per inch?"
-msgstr "%ux%uUtudomo Inci"
+#, fuzzy
+#~ msgid "%ux%u dots per inch?"
+#~ msgstr "%ux%uUtudomo Inci"
 
-#: src/plugins/riffextractor.c:167
-#, c-format
-msgid "codec: %s, %u fps, %u ms"
-msgstr ""
+#~ msgid "Country"
+#~ msgstr "Igihugu"
 
-#: src/plugins/mp3extractor.c:49
-msgid "Blues"
-msgstr ""
+#~ msgid "Metal"
+#~ msgstr "Icyuma"
 
-#: src/plugins/mp3extractor.c:50
-msgid "Classic Rock"
-msgstr ""
+#~ msgid "Other"
+#~ msgstr "Ikindi"
 
-#: src/plugins/mp3extractor.c:51
-msgid "Country"
-msgstr "Igihugu"
+#~ msgid "Space"
+#~ msgstr "Umwanya"
 
-#: src/plugins/mp3extractor.c:52
-msgid "Dance"
-msgstr ""
+#~ msgid "Gothic"
+#~ msgstr "Ikinyagotike"
 
-#: src/plugins/mp3extractor.c:53
-msgid "Disco"
-msgstr ""
+#~ msgid "Electronic"
+#~ msgstr "elegitoroniki"
 
-#: src/plugins/mp3extractor.c:54
-msgid "Funk"
-msgstr ""
+#~ msgid "Latin"
+#~ msgstr "Ikiratini"
 
-#: src/plugins/mp3extractor.c:55
-msgid "Grunge"
-msgstr ""
+#, fuzzy
+#~ msgid "A Cappella"
+#~ msgstr "A"
 
-#: src/plugins/mp3extractor.c:56
-msgid "Hip-Hop"
-msgstr ""
+#, fuzzy
+#~ msgid "(variable bps)"
+#~ msgstr "(IMPINDURAGACIRO"
 
-#: src/plugins/mp3extractor.c:57
-msgid "Jazz"
-msgstr ""
+#, fuzzy
+#~ msgid "%s: option `%s' is ambiguous\n"
+#~ msgstr "%s:Ihitamo ni"
 
-#: src/plugins/mp3extractor.c:58
-msgid "Metal"
-msgstr "Icyuma"
+#, fuzzy
+#~ msgid "%s: option `--%s' doesn't allow an argument\n"
+#~ msgstr "%s:Ihitamo Kwemerera"
 
-#: src/plugins/mp3extractor.c:59
-msgid "New Age"
-msgstr ""
+#, fuzzy
+#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
+#~ msgstr "%s:Ihitamo Kwemerera"
 
-#: src/plugins/mp3extractor.c:60
-msgid "Oldies"
-msgstr ""
+#, fuzzy
+#~ msgid "%s: option `%s' requires an argument\n"
+#~ msgstr "%s:Ihitamo"
 
-#: src/plugins/mp3extractor.c:61
-msgid "Other"
-msgstr "Ikindi"
+#, fuzzy
+#~ msgid "%s: unrecognized option `--%s'\n"
+#~ msgstr "%s:Ihitamo"
 
-#: src/plugins/mp3extractor.c:62
-msgid "Pop"
-msgstr ""
+#, fuzzy
+#~ msgid "%s: unrecognized option `%c%s'\n"
+#~ msgstr "%s:Ihitamo"
 
-#: src/plugins/mp3extractor.c:63
-msgid "R&B"
-msgstr ""
+#, fuzzy
+#~ msgid "%s: illegal option -- %c\n"
+#~ msgstr "%s:Ihitamo"
 
-#: src/plugins/mp3extractor.c:64
-msgid "Rap"
-msgstr ""
+#, fuzzy
+#~ msgid "%s: invalid option -- %c\n"
+#~ msgstr "%s:Sibyo Ihitamo"
 
-#: src/plugins/mp3extractor.c:65
-msgid "Reggae"
-msgstr ""
+#, fuzzy
+#~ msgid "%s: option requires an argument -- %c\n"
+#~ msgstr "%s:Ihitamo"
 
-#: src/plugins/mp3extractor.c:66
-msgid "Rock"
-msgstr ""
+#, fuzzy
+#~ msgid "%s: option `-W %s' is ambiguous\n"
+#~ msgstr "%s:Ihitamo ni"
 
-#: src/plugins/mp3extractor.c:67
-msgid "Techno"
-msgstr ""
+#, fuzzy
+#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
+#~ msgstr "%s:Ihitamo Kwemerera"
 
-#: src/plugins/mp3extractor.c:68
-msgid "Industrial"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr "Ikoresha:"
 
-#: src/plugins/mp3extractor.c:69
-msgid "Alternative"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:70
-msgid "Ska"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:71
-msgid "Death Metal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:72
-msgid "Pranks"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:73
-msgid "Soundtrack"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:74
-msgid "Euro-Techno"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:75
-msgid "Ambient"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:76
-msgid "Trip-Hop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:77
-msgid "Vocal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:78
-msgid "Jazz+Funk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:79
-msgid "Fusion"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:80
-msgid "Trance"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:81
-msgid "Classical"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:82
-msgid "Instrumental"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:83
-msgid "Acid"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:84
-msgid "House"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:85
-msgid "Game"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:86
-msgid "Sound Clip"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:87
-msgid "Gospel"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:88
-msgid "Noise"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:89
-msgid "Alt. Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:90
-msgid "Bass"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:91
-msgid "Soul"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:92
-msgid "Punk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:93
-msgid "Space"
-msgstr "Umwanya"
-
-#: src/plugins/mp3extractor.c:94
-msgid "Meditative"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:95
-msgid "Instrumental Pop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:96
-msgid "Instrumental Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:97
-msgid "Ethnic"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:98
-msgid "Gothic"
-msgstr "Ikinyagotike"
-
-#: src/plugins/mp3extractor.c:99
-msgid "Darkwave"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:100
-msgid "Techno-Industrial"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:101
-msgid "Electronic"
-msgstr "elegitoroniki"
-
-#: src/plugins/mp3extractor.c:102
-msgid "Pop-Folk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:103
-msgid "Eurodance"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:104
-msgid "Dream"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:105
-msgid "Southern Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:106
-msgid "Comedy"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:107
-msgid "Cult"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:108
-msgid "Gangsta Rap"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:109
-msgid "Top 40"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:110
-msgid "Christian Rap"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:111
-msgid "Pop/Funk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:112
-msgid "Jungle"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:113
-msgid "Native American"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:114
-msgid "Cabaret"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:115
-msgid "New Wave"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:116
-msgid "Psychedelic"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:117
-msgid "Rave"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:118
-msgid "Showtunes"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:119
-msgid "Trailer"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:120
-msgid "Lo-Fi"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:121
-msgid "Tribal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:122
-msgid "Acid Punk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:123
-msgid "Acid Jazz"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:124
-msgid "Polka"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:125
-msgid "Retro"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:126
-msgid "Musical"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:127
-msgid "Rock & Roll"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:128
-msgid "Hard Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:129
-msgid "Folk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:130
-msgid "Folk/Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:131
-msgid "National Folk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:132
-msgid "Swing"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:133
-msgid "Fast-Fusion"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:134
-msgid "Bebob"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:135
-msgid "Latin"
-msgstr "Ikiratini"
-
-#: src/plugins/mp3extractor.c:136
-msgid "Revival"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:137
-msgid "Celtic"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:138
-msgid "Bluegrass"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:139
-msgid "Avantgarde"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:140
-msgid "Gothic Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:141
-msgid "Progressive Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:142
-msgid "Psychedelic Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:143
-msgid "Symphonic Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:144
-msgid "Slow Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:145
-msgid "Big Band"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:146
-msgid "Chorus"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:147
-msgid "Easy Listening"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:148
-msgid "Acoustic"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:149
-msgid "Humour"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:150
-msgid "Speech"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:151
-msgid "Chanson"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:152
-msgid "Opera"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:153
-msgid "Chamber Music"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:154
-msgid "Sonata"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:155
-msgid "Symphony"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:156
-msgid "Booty Bass"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:157
-msgid "Primus"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:158
-msgid "Porn Groove"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:159
-msgid "Satire"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:160
-msgid "Slow Jam"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:161
-msgid "Club"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:162
-msgid "Tango"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:163
-msgid "Samba"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:164
-msgid "Folklore"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:165
-msgid "Ballad"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:166
-msgid "Power Ballad"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:167
-msgid "Rhythmic Soul"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:168
-msgid "Freestyle"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:169
-msgid "Duet"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:170
-msgid "Punk Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:171
-msgid "Drum Solo"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:172
 #, fuzzy
-msgid "A Cappella"
-msgstr "A"
+#~ msgid ""
+#~ "Arguments mandatory for long options are also mandatory for short "
+#~ "options.\n"
+#~ msgstr "kugirango Amahitamo kugirango Amahitamo"
 
-#: src/plugins/mp3extractor.c:173
-msgid "Euro-House"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:174
-msgid "Dance Hall"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:175
-msgid "Goa"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:176
-msgid "Drum & Bass"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:177
-msgid "Club-House"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:178
-msgid "Hardcore"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:179
-msgid "Terror"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:180
-msgid "Indie"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:181
-msgid "BritPop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:182
-msgid "Negerpunk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:183
-msgid "Polsk Punk"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:184
-msgid "Beat"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:185
-msgid "Christian Gangsta Rap"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:186
-msgid "Heavy Metal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:187
-msgid "Black Metal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:188
-msgid "Crossover"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:189
-msgid "Contemporary Christian"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:190
-msgid "Christian Rock"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:191
-msgid "Merengue"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:192
-msgid "Salsa"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:193
-msgid "Thrash Metal"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:194
-msgid "Anime"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:195
-msgid "JPop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:196
-msgid "Synthpop"
-msgstr ""
-
-#: src/plugins/mp3extractor.c:427
 #, fuzzy
-msgid "(variable bps)"
-msgstr "(IMPINDURAGACIRO"
+#~ msgid "do not remove any duplicates"
+#~ msgstr "OYA Gukuraho..."
 
-#: src/main/getopt.c:681
-#, fuzzy, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s:Ihitamo ni"
-
-#: src/main/getopt.c:706
-#, fuzzy, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s:Ihitamo Kwemerera"
-
-#: src/main/getopt.c:712
-#, fuzzy, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s:Ihitamo Kwemerera"
-
-#: src/main/getopt.c:729 src/main/getopt.c:900
-#, fuzzy, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s:Ihitamo"
-
-#: src/main/getopt.c:758
-#, fuzzy, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s:Ihitamo"
-
-#: src/main/getopt.c:762
-#, fuzzy, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s:Ihitamo"
-
-#: src/main/getopt.c:788
-#, fuzzy, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s:Ihitamo"
-
-#: src/main/getopt.c:790
-#, fuzzy, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s:Sibyo Ihitamo"
-
-#: src/main/getopt.c:819 src/main/getopt.c:949
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s:Ihitamo"
-
-#: src/main/getopt.c:867
-#, fuzzy, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s:Ihitamo ni"
-
-#: src/main/getopt.c:885
-#, fuzzy, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s:Ihitamo Kwemerera"
-
-#: src/main/extract.c:49
-#, fuzzy, c-format
-msgid ""
-"Usage: %s\n"
-"%s\n"
-"\n"
-msgstr "Ikoresha:"
-
-#: src/main/extract.c:52
-#, 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:126
 #, fuzzy
-msgid "do not remove any duplicates"
-msgstr "OYA Gukuraho..."
+#~ msgid "print output in bibtex format"
+#~ msgstr "Gucapa Ibisohoka in Imiterere"
 
-#: src/main/extract.c:128
 #, fuzzy
-msgid "print output in bibtex format"
-msgstr "Gucapa Ibisohoka in Imiterere"
+#~ msgid ""
+#~ "use the generic plaintext extractor for the language with the 2-letter "
+#~ "language code LANG"
+#~ msgstr ""
+#~ "Gukoresha i Gifitanye isano kugirango i Ururimi Na: i 2. Ibaruwa... "
+#~ "Ururimi ITEGEKONGENGA"
 
-#: src/main/extract.c:130
 #, fuzzy
-msgid ""
-"use the generic plaintext extractor for the language with the 2-letter "
-"language code LANG"
-msgstr ""
-"Gukoresha i Gifitanye isano kugirango i Ururimi Na: i 2. Ibaruwa... Ururimi "
-"ITEGEKONGENGA"
+#~ msgid "remove duplicates only if types match"
+#~ msgstr "Gukuraho... NIBA BIHUYE"
 
-#: src/main/extract.c:132
 #, fuzzy
-msgid "remove duplicates only if types match"
-msgstr "Gukuraho... NIBA BIHUYE"
+#~ msgid "use the filename as a keyword (loads filename-extractor plugin)"
+#~ msgstr "Gukoresha i Izina ry'idosiye: Nka a Ijambo- banze Izina ry'idosiye:"
 
-#: src/main/extract.c:134
 #, fuzzy
-msgid "use the filename as a keyword (loads filename-extractor plugin)"
-msgstr "Gukoresha i Izina ry'idosiye: Nka a Ijambo- banze Izina ry'idosiye:"
+#~ msgid "print this help"
+#~ msgstr "Gucapa iyi Ifashayobora"
 
-#: src/main/extract.c:136
 #, fuzzy
-msgid "print this help"
-msgstr "Gucapa iyi Ifashayobora"
+#~ msgid "compute hash using the given ALGORITHM (currently sha1 or md5)"
+#~ msgstr "ikoresha i Cyangwa"
 
-#: src/main/extract.c:138
 #, fuzzy
-msgid "compute hash using the given ALGORITHM (currently sha1 or md5)"
-msgstr "ikoresha i Cyangwa"
+#~ msgid "load an extractor plugin named LIBRARY"
+#~ msgstr "Ibirimo"
 
-#: src/main/extract.c:140
 #, fuzzy
-msgid "load an extractor plugin named LIBRARY"
-msgstr "Ibirimo"
+#~ msgid "list all keyword types"
+#~ msgstr "Urutonde Byose Ijambo- banze"
 
-#: src/main/extract.c:142
 #, fuzzy
-msgid "list all keyword types"
-msgstr "Urutonde Byose Ijambo- banze"
+#~ msgid "do not use the default set of extractor plugins"
+#~ msgstr "OYA Gukoresha i Mburabuzi Gushyiraho Bya"
 
-#: src/main/extract.c:144
 #, fuzzy
-msgid "do not use the default set of extractor plugins"
-msgstr "OYA Gukoresha i Mburabuzi Gushyiraho Bya"
+#~ 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:146
 #, 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"
+#~ msgid "remove duplicates even if keyword types do not match"
+#~ msgstr "Gukuraho... ATARIIGIHARWE NIBA Ijambo- banze OYA BIHUYE"
 
-#: src/main/extract.c:148
 #, fuzzy
-msgid "remove duplicates even if keyword types do not match"
-msgstr "Gukuraho... ATARIIGIHARWE NIBA Ijambo- banze OYA BIHUYE"
+#~ msgid "use keyword splitting (loads split-extractor plugin)"
+#~ msgstr "Gukoresha Ijambo- banze Gutandukanya"
 
-#: src/main/extract.c:150
 #, fuzzy
-msgid "use keyword splitting (loads split-extractor plugin)"
-msgstr "Gukoresha Ijambo- banze Gutandukanya"
+#~ msgid "print the version number"
+#~ msgstr "Gucapa i Verisiyo Umubare"
 
-#: src/main/extract.c:152
 #, fuzzy
-msgid "print the version number"
-msgstr "Gucapa i Verisiyo Umubare"
+#~ msgid "do not print keywords of the given TYPE"
+#~ msgstr "OYA Gucapa Amagambo fatizo Bya i"
 
-#: src/main/extract.c:154
-msgid "be verbose"
-msgstr ""
-
-#: src/main/extract.c:156
 #, fuzzy
-msgid "do not print keywords of the given TYPE"
-msgstr "OYA Gucapa Amagambo fatizo Bya i"
+#~ msgid "Extract metadata from files."
+#~ msgstr "Bivuye Idosiye"
 
-#: src/main/extract.c:159
-msgid "extract [OPTIONS] [FILENAME]*"
-msgstr ""
-
-#: src/main/extract.c:160
 #, fuzzy
-msgid "Extract metadata from files."
-msgstr "Bivuye Idosiye"
+#~ msgid "%s - (binary)\n"
+#~ msgstr "%s-(Nyabibiri"
 
-#: src/main/extract.c:198 src/main/extractor.c:875
-#, fuzzy, c-format
-msgid "%s - (binary)\n"
-msgstr "%s-(Nyabibiri"
+#~ msgid "title"
+#~ msgstr "umutwe"
 
-#: src/main/extract.c:204 src/main/extractor.c:880
-#, c-format
-msgid "INVALID TYPE - %s\n"
-msgstr ""
-
-#: src/main/extract.c:270 src/main/extractor.c:40
-msgid "title"
-msgstr "umutwe"
-
-#: src/main/extract.c:272 src/main/extractor.c:38
 #, fuzzy
-msgid "filename"
-msgstr "Izina ry'idosiye"
+#~ msgid "filename"
+#~ msgstr "Izina ry'idosiye"
 
 # 
sc/source\ui\miscdlgs\acredlin.src:RID_POPUP_CHANGES.SC_SUB_SORT.SC_SORT_AUTHOR.text
-#: src/main/extract.c:277 src/main/extractor.c:41
 #, fuzzy
-msgid "author"
-msgstr "Umwanditsi"
+#~ msgid "author"
+#~ msgstr "Umwanditsi"
 
-#: src/main/extract.c:281 src/main/extractor.c:43
-msgid "description"
-msgstr "Isobanuramiterere"
+#~ msgid "description"
+#~ msgstr "Isobanuramiterere"
 
 # sfx2/source\dialog\dinfdlg.src:TP_DOCINFODESC.FT_KEYWORDS.text
-#: src/main/extract.c:283 src/main/extractor.c:55
 #, fuzzy
-msgid "keywords"
-msgstr "Amagambo fatizo"
+#~ msgid "keywords"
+#~ msgstr "Amagambo fatizo"
 
 # padmin/source\padialog.src:RID_TXT_TESTPAGE_COMMENT.text
-#: src/main/extract.c:285 src/main/extractor.c:44
 #, fuzzy
-msgid "comment"
-msgstr "Icyo wongeraho"
+#~ msgid "comment"
+#~ msgstr "Icyo wongeraho"
 
-#: src/main/extract.c:289 src/main/extractor.c:45
-msgid "date"
-msgstr "Itariki"
+#~ msgid "date"
+#~ msgstr "Itariki"
 
 # setup2/source\ui\app.src:FT_INSTINFO_MKDIR.text
-#: src/main/extract.c:291 src/main/extractor.c:67
 #, fuzzy
-msgid "creation date"
-msgstr "Irema ry'itariki"
+#~ msgid "creation date"
+#~ msgstr "Irema ry'itariki"
 
-#: src/main/extract.c:319 src/main/extractor.c:46
 #, fuzzy
-msgid "publisher"
-msgstr "Uwasohoye inyandiko"
+#~ msgid "publisher"
+#~ msgstr "Uwasohoye inyandiko"
 
-#: src/main/extract.c:323 src/main/extractor.c:52
 #, fuzzy
-msgid "organization"
-msgstr "Ihuzagahunda"
+#~ msgid "organization"
+#~ msgstr "Ihuzagahunda"
 
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Agenda.Save.DocInfoSubject.text
@@ -964,256 +335,146 @@
 # 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Fax.Save.DocInfoSubject.text
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Memo.Save.DocInfoSubject.text
-#: src/main/extract.c:327 src/main/extractor.c:54
-msgid "subject"
-msgstr "Ikivugwaho"
+#~ msgid "subject"
+#~ msgstr "Ikivugwaho"
 
 # sw/source\ui\inc\swmn.hrc:_MN_INS.MN_SUB_FIELD.FN_INSERT_FLD_PGCOUNT.text
-#: src/main/extract.c:331 src/main/extractor.c:71
 #, fuzzy
-msgid "page count"
-msgstr "Kubara amapaje"
+#~ msgid "page count"
+#~ msgstr "Kubara amapaje"
 
-#: src/main/extract.c:473
-#, fuzzy, c-format
-msgid "You must specify an argument for the `%s' option (option ignored).\n"
-msgstr "kugirango i Ihitamo Ihitamo"
+#, fuzzy
+#~ msgid "You must specify an argument for the `%s' option (option ignored).\n"
+#~ msgstr "kugirango i Ihitamo Ihitamo"
 
-#: src/main/extract.c:540
-#, fuzzy, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
+#, fuzzy
+#~ msgid "Use --help to get a list of options.\n"
+#~ msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
 
-#: src/main/extract.c:599
-#, c-format
-msgid "%% BiBTeX file\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Keywords for file %s:\n"
+#~ msgstr "kugirango IDOSIYE"
 
-#: src/main/extract.c:606
-#, fuzzy, c-format
-msgid "Keywords for file %s:\n"
-msgstr "kugirango IDOSIYE"
+#~ msgid "unknown"
+#~ msgstr "itazwi"
 
-#: src/main/extractor.c:37
-msgid "unknown"
-msgstr "itazwi"
-
-#: src/main/extractor.c:39
-msgid "mimetype"
-msgstr ""
-
-#: src/main/extractor.c:42
 #, fuzzy
-msgid "artist"
-msgstr "Umuhanzi"
+#~ msgid "artist"
+#~ msgstr "Umuhanzi"
 
 # sc/source\ui\src\sortdlg.src:RID_SCPAGE_SORT_OPTIONS.FT_LANGUAGE.text
-#: src/main/extractor.c:47
 #, fuzzy
-msgid "language"
-msgstr "Ururimi"
+#~ msgid "language"
+#~ msgstr "Ururimi"
 
-#: src/main/extractor.c:48
-msgid "album"
-msgstr ""
+#~ msgid "location"
+#~ msgstr "Inturo"
 
-#: src/main/extractor.c:49
-msgid "genre"
-msgstr ""
-
-#: src/main/extractor.c:50
-msgid "location"
-msgstr "Inturo"
-
 # goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.GRP_VERSION.text
-#: src/main/extractor.c:51
 #, fuzzy
-msgid "version"
-msgstr "Verisiyo"
+#~ msgid "version"
+#~ msgstr "Verisiyo"
 
-#: src/main/extractor.c:53
 #, fuzzy
-msgid "copyright"
-msgstr "Uburenganzira bw'umuhimbyi"
+#~ msgid "copyright"
+#~ msgstr "Uburenganzira bw'umuhimbyi"
 
-#: src/main/extractor.c:56
-msgid "contributor"
-msgstr ""
-
-#: src/main/extractor.c:57
 #, fuzzy
-msgid "resource-type"
-msgstr "Ubwoko"
+#~ msgid "resource-type"
+#~ msgstr "Ubwoko"
 
-#: src/main/extractor.c:58
 #, fuzzy
-msgid "format"
-msgstr "Imiterere"
+#~ msgid "format"
+#~ msgstr "Imiterere"
 
-#: src/main/extractor.c:59
 #, fuzzy
-msgid "resource-identifier"
-msgstr "Ikiranga"
+#~ msgid "resource-identifier"
+#~ msgstr "Ikiranga"
 
-#: src/main/extractor.c:60
 #, fuzzy
-msgid "source"
-msgstr "Inkomoko"
+#~ msgid "source"
+#~ msgstr "Inkomoko"
 
 # 5033
-#: src/main/extractor.c:61
 #, fuzzy
-msgid "relation"
-msgstr "Isano"
+#~ msgid "relation"
+#~ msgstr "Isano"
 
-#: src/main/extractor.c:62
-msgid "coverage"
-msgstr ""
-
-#: src/main/extractor.c:63
-msgid "software"
-msgstr ""
-
-#: src/main/extractor.c:64
-msgid "disclaimer"
-msgstr ""
-
-#: src/main/extractor.c:65
 #, fuzzy
-msgid "warning"
-msgstr "Iburira"
+#~ msgid "warning"
+#~ msgstr "Iburira"
 
-#: src/main/extractor.c:66
-msgid "translated"
-msgstr ""
-
 # 3880
-#: src/main/extractor.c:68
 #, fuzzy
-msgid "modification date"
-msgstr "itariki y'ihindura"
+#~ msgid "modification date"
+#~ msgstr "itariki y'ihindura"
 
-#: src/main/extractor.c:69
-msgid "creator"
-msgstr ""
-
-#: src/main/extractor.c:70
 #, fuzzy
-msgid "producer"
-msgstr "Umwanditsi"
+#~ msgid "producer"
+#~ msgstr "Umwanditsi"
 
-#: src/main/extractor.c:72
 #, fuzzy
-msgid "page orientation"
-msgstr "Ipaji Icyerekezo"
+#~ msgid "page orientation"
+#~ msgstr "Ipaji Icyerekezo"
 
 # padmin/source\rtsetup.src:RID_RTS_PAPERPAGE.RID_RTS_PAPER_PAPER_TXT.text
-#: src/main/extractor.c:73
 #, fuzzy
-msgid "paper size"
-msgstr "Ingano y'urupapuro"
+#~ msgid "paper size"
+#~ msgstr "Ingano y'urupapuro"
 
-#: src/main/extractor.c:74
 #, fuzzy
-msgid "used fonts"
-msgstr "Imyandikire"
+#~ msgid "used fonts"
+#~ msgstr "Imyandikire"
 
 # sc/source\ui\pagedlg\pagedlg.src:RID_SCPAGE_TABLE.FL_PAGEDIR.text
-#: src/main/extractor.c:75
 #, fuzzy
-msgid "page order"
-msgstr "Ikurikirana rya paji"
+#~ msgid "page order"
+#~ msgstr "Ikurikirana rya paji"
 
-#: src/main/extractor.c:76
 #, fuzzy
-msgid "created for"
-msgstr "Byaremwe kugirango"
+#~ msgid "created for"
+#~ msgstr "Byaremwe kugirango"
 
-#: src/main/extractor.c:77
-msgid "magnification"
-msgstr ""
-
-#: src/main/extractor.c:78
-msgid "release"
-msgstr ""
-
 # #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
 # sc/source\ui\src\globstr.src:RID_GLOBSTR.STR_UNDO_MAKEOUTLINE.text
 # #-#-#-#-#  sc.pot (PACKAGE VERSION)  #-#-#-#-#
 # sc/source\ui\src\miscdlgs.src:RID_SCDLG_GROUP.text
-#: src/main/extractor.c:79
 #, fuzzy
-msgid "group"
-msgstr "Itsinda"
+#~ msgid "group"
+#~ msgstr "Itsinda"
 
-#: src/main/extractor.c:80
-msgid "size"
-msgstr "ingano"
+#~ msgid "size"
+#~ msgstr "ingano"
 
-#: src/main/extractor.c:81
 #, fuzzy
-msgid "summary"
-msgstr "Inshamake"
+#~ msgid "summary"
+#~ msgstr "Inshamake"
 
-#: src/main/extractor.c:82
-msgid "packager"
-msgstr ""
-
-#: src/main/extractor.c:83
 #, fuzzy
-msgid "vendor"
-msgstr "Umucuruzi"
+#~ msgid "vendor"
+#~ msgstr "Umucuruzi"
 
-#: src/main/extractor.c:84
-msgid "license"
-msgstr ""
-
 # svx/source\dialog\dstribut.src:RID_SVXPAGE_DISTRIBUTE.text
-#: src/main/extractor.c:85
 #, fuzzy
-msgid "distribution"
-msgstr "Ikwirakwiza"
+#~ msgid "distribution"
+#~ msgstr "Ikwirakwiza"
 
-#: src/main/extractor.c:86
 #, fuzzy
-msgid "build-host"
-msgstr "Ubuturo"
+#~ msgid "build-host"
+#~ msgstr "Ubuturo"
 
-#: src/main/extractor.c:87
-msgid "os"
-msgstr ""
-
-#: src/main/extractor.c:88
-msgid "dependency"
-msgstr ""
-
-#: src/main/extractor.c:89
-msgid "MD4"
-msgstr ""
-
-#: src/main/extractor.c:90
-msgid "MD5"
-msgstr ""
-
-#: src/main/extractor.c:91
 #, fuzzy
-msgid "SHA-0"
-msgstr "0"
+#~ msgid "SHA-0"
+#~ msgstr "0"
 
-#: src/main/extractor.c:92
 #, fuzzy
-msgid "SHA-1"
-msgstr "1."
+#~ msgid "SHA-1"
+#~ msgstr "1."
 
-#: src/main/extractor.c:93
-msgid "RipeMD160"
-msgstr ""
-
 # 
officecfg/registry\schema\org\openoffice\Office\Common.xcs:....Filter.Graphic.Export.BMP.Resolution.text
-#: src/main/extractor.c:94
 #, fuzzy
-msgid "resolution"
-msgstr "Imikemurire"
+#~ msgid "resolution"
+#~ msgstr "Imikemurire"
 
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Table.Settings.Category.text
@@ -1235,53 +496,21 @@
 # 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Impress.Settings.Category.text
 # #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
 # 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.OLEMisc.Settings.Category.text
-#: src/main/extractor.c:95
 #, fuzzy
-msgid "category"
-msgstr "Icyiciro"
+#~ msgid "category"
+#~ msgstr "Icyiciro"
 
-#: src/main/extractor.c:96
 #, fuzzy
-msgid "book title"
-msgstr "Umutwe w'igitabo"
+#~ msgid "book title"
+#~ msgstr "Umutwe w'igitabo"
 
 # sw/source\ui\wizard\wizmmdlg.src:DLG_WIZARD_MM.DLG_MM2_Edit_Elem1.text
-#: src/main/extractor.c:97
-msgid "priority"
-msgstr "Icyihutirwa"
+#~ msgid "priority"
+#~ msgstr "Icyihutirwa"
 
-#: src/main/extractor.c:98
-msgid "conflicts"
-msgstr ""
-
-#: src/main/extractor.c:99
-msgid "replaces"
-msgstr ""
-
-#: src/main/extractor.c:100
-msgid "provides"
-msgstr ""
-
-#: src/main/extractor.c:101
-msgid "conductor"
-msgstr ""
-
-#: src/main/extractor.c:102
-msgid "interpreter"
-msgstr ""
-
-#: src/main/extractor.c:103
-msgid "owner"
-msgstr ""
-
-#: src/main/extractor.c:104
-msgid "lyrics"
-msgstr ""
-
-#: src/main/extractor.c:105
 #, fuzzy
-msgid "media type"
-msgstr "Ibitangazamakuru Ubwoko"
+#~ msgid "media type"
+#~ msgstr "Ibitangazamakuru Ubwoko"
 
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -1320,109 +549,41 @@
 #
 # ***** END LICENSE BLOCK *****
 # Box Headings
-#: src/main/extractor.c:106
 #, fuzzy
-msgid "contact"
-msgstr "Umuntu"
+#~ msgid "contact"
+#~ msgstr "Umuntu"
 
-#: src/main/extractor.c:107
 #, fuzzy
-msgid "binary thumbnail data"
-msgstr "Nyabibiri Ibyatanzwe"
+#~ msgid "binary thumbnail data"
+#~ msgstr "Nyabibiri Ibyatanzwe"
 
 # setup2/source\ui\app.src:FT_INSTINFO_MKDIR.text
-#: src/main/extractor.c:108
 #, fuzzy
-msgid "publication date"
-msgstr "Irema ry'itariki"
+#~ msgid "publication date"
+#~ msgstr "Irema ry'itariki"
 
-#: src/main/extractor.c:109
-msgid "camera make"
-msgstr ""
+#, fuzzy
+#~ msgid "orientation"
+#~ msgstr "Ipaji Icyerekezo"
 
-#: src/main/extractor.c:110
-msgid "camera model"
-msgstr ""
+#, fuzzy
+#~ msgid "Initialization of plugin mechanism failed: %s!\n"
+#~ msgstr "Bya Byanze"
 
-#: src/main/extractor.c:111
-msgid "exposure"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
+#~ "failed also.  Errors are: `%s' and `%s'.\n"
+#~ msgstr "IKIMENYETSO in Isomero Byanze Byanze Na"
 
-#: src/main/extractor.c:112
-msgid "aperture"
-msgstr ""
+#, fuzzy
+#~ msgid "Loading `%s' plugin failed: %s\n"
+#~ msgstr "Byanze"
 
-#: src/main/extractor.c:113
-msgid "exposure bias"
-msgstr ""
-
-#: src/main/extractor.c:114
-msgid "flash"
-msgstr ""
-
-#: src/main/extractor.c:115
-msgid "flash bias"
-msgstr ""
-
-#: src/main/extractor.c:116
-msgid "focal length"
-msgstr ""
-
-#: src/main/extractor.c:117
-msgid "focal length (35mm equivalent)"
-msgstr ""
-
-#: src/main/extractor.c:118
-msgid "iso speed"
-msgstr ""
-
-#: src/main/extractor.c:119
-msgid "exposure mode"
-msgstr ""
-
-#: src/main/extractor.c:120
-msgid "metering mode"
-msgstr ""
-
-#: src/main/extractor.c:121
-msgid "macro mode"
-msgstr ""
-
-#: src/main/extractor.c:122
-msgid "image quality"
-msgstr ""
-
-#: src/main/extractor.c:123
-msgid "white balance"
-msgstr ""
-
-#: src/main/extractor.c:124
 #, fuzzy
-msgid "orientation"
-msgstr "Ipaji Icyerekezo"
+#~ msgid "Unloading plugin `%s' failed!\n"
+#~ msgstr "Byanze"
 
-#: src/main/extractor.c:218
-#, fuzzy, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Bya Byanze"
-
-#: src/main/extractor.c:365
-#, fuzzy, 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 "IKIMENYETSO in Isomero Byanze Byanze Na"
-
-#: src/main/extractor.c:394
-#, fuzzy, c-format
-msgid "Loading `%s' plugin failed: %s\n"
-msgstr "Byanze"
-
-#: src/main/extractor.c:599
-#, fuzzy, c-format
-msgid "Unloading plugin `%s' failed!\n"
-msgstr "Byanze"
-
 #~ msgid "No error"
 #~ msgstr "Nta kosa"
 

Modified: Extractor/src/include/extractor.h
===================================================================
--- Extractor/src/include/extractor.h   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/include/extractor.h   2005-09-05 13:48:39 UTC (rev 2064)
@@ -29,7 +29,7 @@
  * 0.2.6-1 => 0x00020601
  * 4.5.2-0 => 0x04050200
  */
-#define EXTRACTOR_VERSION 0x00050400
+#define EXTRACTOR_VERSION 0x00050401
 
 #include <stdio.h>
 

Added: Extractor/src/plugins/ASF_SYMBOLS
===================================================================
--- Extractor/src/plugins/ASF_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/ASF_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_asf_extract

Added: Extractor/src/plugins/DEB_SYMBOLS
===================================================================
--- Extractor/src/plugins/DEB_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/DEB_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_deb_extract

Added: Extractor/src/plugins/DVI_SYMBOLS
===================================================================
--- Extractor/src/plugins/DVI_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/DVI_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_dvi_extract

Added: Extractor/src/plugins/ELF_SYMBOLS
===================================================================
--- Extractor/src/plugins/ELF_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/ELF_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_elf_extract

Added: Extractor/src/plugins/FILENAME_SYMBOLS
===================================================================
--- Extractor/src/plugins/FILENAME_SYMBOLS      2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/FILENAME_SYMBOLS      2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_filename_extract

Added: Extractor/src/plugins/GIF_SYMBOLS
===================================================================
--- Extractor/src/plugins/GIF_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/GIF_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_gif_extract

Added: Extractor/src/plugins/HTML_SYMBOLS
===================================================================
--- Extractor/src/plugins/HTML_SYMBOLS  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/HTML_SYMBOLS  2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_html_extract

Added: Extractor/src/plugins/ID3V23_SYMBOLS
===================================================================
--- Extractor/src/plugins/ID3V23_SYMBOLS        2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/ID3V23_SYMBOLS        2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_id3v23_extract

Added: Extractor/src/plugins/ID3V24_SYMBOLS
===================================================================
--- Extractor/src/plugins/ID3V24_SYMBOLS        2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/ID3V24_SYMBOLS        2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_id3v24_extract

Added: Extractor/src/plugins/ID3V2_SYMBOLS
===================================================================
--- Extractor/src/plugins/ID3V2_SYMBOLS 2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/ID3V2_SYMBOLS 2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_id3v2_extract

Added: Extractor/src/plugins/JPEG_SYMBOLS
===================================================================
--- Extractor/src/plugins/JPEG_SYMBOLS  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/JPEG_SYMBOLS  2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_jpeg_extract

Added: Extractor/src/plugins/LOWER_SYMBOLS
===================================================================
--- Extractor/src/plugins/LOWER_SYMBOLS 2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/LOWER_SYMBOLS 2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_lower_extract

Added: Extractor/src/plugins/MAN_SYMBOLS
===================================================================
--- Extractor/src/plugins/MAN_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/MAN_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_man_extract

Added: Extractor/src/plugins/MIME_SYMBOLS
===================================================================
--- Extractor/src/plugins/MIME_SYMBOLS  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/MIME_SYMBOLS  2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_mime_extract

Added: Extractor/src/plugins/MP3_SYMBOLS
===================================================================
--- Extractor/src/plugins/MP3_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/MP3_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_mp3_extract

Added: Extractor/src/plugins/MPEG_SYMBOLS
===================================================================
--- Extractor/src/plugins/MPEG_SYMBOLS  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/MPEG_SYMBOLS  2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_mpeg_extract

Modified: Extractor/src/plugins/Makefile.am
===================================================================
--- Extractor/src/plugins/Makefile.am   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/Makefile.am   2005-09-05 13:48:39 UTC (rev 2064)
@@ -3,6 +3,36 @@
 # install plugins under:
 plugindir = $(libdir)/libextractor
 
+EXTRA_DIST = \
+  ASF_SYMBOLS \
+  DEB_SYMBOLS \
+  DVI_SYMBOLS \
+  ELF_SYMBOLS \
+  FILENAME_SYMBOLS \
+  GIF_SYMBOLS \
+  HTML_SYMBOLS \
+  ID3V2_SYMBOLS \
+  ID3V23_SYMBOLS \
+  ID3V24_SYMBOLS \
+  JPEG_SYMBOLS \
+  LOWER_SYMBOLS \
+  MAN_SYMBOLS \
+  MIME_SYMBOLS \
+  MP3_SYMBOLS \
+  MPEG_SYMBOLS \
+  OGG_SYMBOLS \
+  PNG_SYMBOLS \
+  PS_SYMBOLS \
+  QT_SYMBOLS \
+  REAL_SYMBOLS \
+  RIFF_SYMBOLS \
+  SPLIT_SYMBOLS \
+  TAR_SYMBOLS \
+  TIFF_SYMBOLS \
+  TRANSLIT_SYMBOLS \
+  WAV_SYMBOLS \
+  ZIP_SYMBOLS 
+
 LIBS = \
  @LTLIBINTL@ @LIBS@
 
@@ -23,7 +53,7 @@
 
 SUBDIRS = . oo $(printdir) hash $(oledir) rpm pdf $(thumbdir) $(exiv2dir)
 
-PLUGINFLAGS = -export-dynamic -avoid-version -module 
+PLUGINFLAGS = -Wl,-s -Wl,-Bsymbolic -avoid-version -module -no-undefined
 
 
 if HAVE_VORBISFILE
@@ -39,40 +69,40 @@
 endif
 
 plugin_LTLIBRARIES = \
-  libextractor_id3v24.la \
-  libextractor_id3v23.la \
-  libextractor_tar.la \
+  libextractor_asf.la \
   libextractor_deb.la \
-  libextractor_man.la \
-  libextractor_wav.la \
+  libextractor_dvi.la \
   libextractor_elf.la \
-  libextractor_asf.la \
-  libextractor_dvi.la \
+  libextractor_filename.la \
+  libextractor_gif.la \
+  libextractor_html.la \
   libextractor_id3v2.la \
+  libextractor_id3v24.la \
+  libextractor_id3v23.la \
   libextractor_jpeg.la \
-  libextractor_html.la \
+  libextractor_lower.la \
+  libextractor_man.la \
+  libextractor_mime.la \
+  libextractor_mp3.la \
+  libextractor_mpeg.la \
+  $(extraogg) \
   libextractor_png.la \
-  libextractor_gif.la \
-  libextractor_tiff.la \
+  libextractor_ps.la \
+  $(extraqt) \
   libextractor_real.la \
-  libextractor_filename.la \
+  libextractor_riff.la \
   libextractor_split.la \
-  libextractor_mp3.la \
-  libextractor_mime.la \
-  libextractor_riff.la \
-  libextractor_mpeg.la \
-  libextractor_ps.la \
-  libextractor_zip.la \
-  libextractor_lower.la \
+  libextractor_tar.la \
+  libextractor_tiff.la \
   libextractor_translit.la \
-  $(extraqt) \
-  $(extraogg) 
+  libextractor_wav.la \
+  libextractor_zip.la 
 
 if HAVE_VORBISFILE
 libextractor_ogg_la_SOURCES = \
   oggextractor.c
 libextractor_ogg_la_LDFLAGS = \
- -lvorbisfile $(vorbisflag) $(PLUGINFLAGS)
+ -lvorbisfile $(vorbisflag) $(PLUGINFLAGS)  -Wl,--retain-symbols-file 
-Wl,OGG_SYMBOLS
 endif
 
 noinst_LTLIBRARIES = \
@@ -82,7 +112,9 @@
 
 if HAVE_ZLIB
 libextractor_qt_la_LDFLAGS = \
-  -lz $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,QT_SYMBOLS
+libextractor_qt_la_LIBADD = \
+  -lz
 libextractor_qt_la_SOURCES = \
   qtextractor.c 
 endif
@@ -91,80 +123,82 @@
   psextractor.c
 libextractor_ps_la_LDFLAGS = \
   $(top_builddir)/src/main/libextractor.la \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,PS_SYMBOLS
 
 libextractor_wav_la_SOURCES = \
   wavextractor.c
 libextractor_wav_la_LDFLAGS = \
-  $(PLUGINFLAGS) 
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,WAV_SYMBOLS
 
 libextractor_mp3_la_SOURCES = \
   mp3extractor.c 
 libextractor_mp3_la_LDFLAGS = \
-  $(PLUGINFLAGS) 
+  $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,MP3_SYMBOLS
 libextractor_mp3_la_LIBADD = \
-  libconvert.la
+  libconvert.la  
 
 libextractor_id3v2_la_SOURCES = \
   id3v2extractor.c 
 libextractor_id3v2_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,ID3V2_SYMBOLS
 libextractor_id3v2_la_LIBADD = \
   libconvert.la
 
 libextractor_id3v23_la_SOURCES = \
   id3v23extractor.c 
 libextractor_id3v23_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,ID3V23_SYMBOLS
 libextractor_id3v23_la_LIBADD = \
-  libconvert.la
+  libconvert.la 
 
 libextractor_id3v24_la_SOURCES = \
   id3v24extractor.c 
 libextractor_id3v24_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,ID3V24_SYMBOLS
 libextractor_id3v24_la_LIBADD = \
   libconvert.la
 
 libextractor_dvi_la_SOURCES = \
   dviextractor.c 
 libextractor_dvi_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,DVI_SYMBOLS
 
 libextractor_asf_la_SOURCES = \
   asfextractor.c 
 libextractor_asf_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,ASF_SYMBOLS
 
 libextractor_tar_la_SOURCES = \
   tarextractor.c 
 libextractor_tar_la_LDFLAGS = \
-  $(PLUGINFLAGS) -lz \
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,TAR_SYMBOLS
+libextractor_tar_la_LIBADD = \
+  -lz \
   $(top_builddir)/src/main/libextractor.la
 
 libextractor_lower_la_SOURCES = \
   lowerextractor.c
 libextractor_lower_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,LOWER_SYMBOLS
 
 libextractor_gif_la_SOURCES = \
   gifextractor.c 
 libextractor_gif_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,GIF_SYMBOLS
 libextractor_gif_la_LIBADD = \
   libpack.la
 
 libextractor_tiff_la_SOURCES = \
   tiffextractor.c 
 libextractor_tiff_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,TIFF_SYMBOLS
 libextractor_tiff_la_LIBADD = \
   libpack.la
 
 libextractor_elf_la_SOURCES = \
   elfextractor.c 
 libextractor_elf_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,ELF_SYMBOLS
 libextractor_elf_la_LIBADD = \
   libpack.la
 
@@ -182,77 +216,85 @@
   zipextractor.c
 libextractor_zip_la_LDFLAGS = \
   $(top_builddir)/src/main/libextractor.la \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,ZIP_SYMBOLS
 
 libextractor_jpeg_la_SOURCES = \
   jpegextractor.c 
 libextractor_jpeg_la_LDFLAGS = \
-  $(PLUGINFLAGS) 
+  $(PLUGINFLAGS)   -Wl,--retain-symbols-file -Wl,JPEG_SYMBOLS
 
 libextractor_html_la_SOURCES = \
   htmlextractor.c 
 libextractor_html_la_LDFLAGS = \
   $(top_builddir)/src/main/libextractor.la \
-  $(PLUGINFLAGS) 
+  $(PLUGINFLAGS)   -Wl,--retain-symbols-file -Wl,HTML_SYMBOLS
 
 libextractor_real_la_SOURCES = \
   realextractor.c 
 libextractor_real_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,REAL_SYMBOLS
 
 libextractor_mime_la_SOURCES = \
   mimeextractor.c 
 libextractor_mime_la_LDFLAGS = \
   $(top_builddir)/src/main/libextractor.la \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,MIME_SYMBOLS
 
 libextractor_mpeg_la_SOURCES = \
   mpegextractor.c 
 libextractor_mpeg_la_LDFLAGS = \
   $(top_builddir)/src/main/libextractor.la \
-  $(PLUGINFLAGS) -lm
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,MPEG_SYMBOLS 
+libextractor_mpeg_la_LIBADD = \
+  -lm
 
 libextractor_man_la_SOURCES = \
   manextractor.c 
 libextractor_man_la_LDFLAGS = \
   $(top_builddir)/src/main/libextractor.la \
-  $(PLUGINFLAGS) -lz 
+  $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,MAN_SYMBOLS 
+libextractor_man_la_LIBADD = \
+  -lz 
 
 libextractor_deb_la_SOURCES = \
   debextractor.c 
 libextractor_deb_la_LDFLAGS = \
   $(top_builddir)/src/main/libextractor.la \
-  $(PLUGINFLAGS) -lz -lpthread
+  $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,DEB_SYMBOLS 
+libextractor_deb_la_LIBADD = \
+  -lz
 
 libextractor_riff_la_SOURCES = \
   riffextractor.c 
 libextractor_riff_la_LDFLAGS = \
-  $(top_builddir)/src/main/libextractor.la -lm \
-  $(PLUGINFLAGS) 
+  $(top_builddir)/src/main/libextractor.la \
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,RIFF_SYMBOLS 
+libextractor_riff_la_LIBADD = \
+  -lm 
 
 libextractor_png_la_SOURCES = \
   pngextractor.c
 libextractor_png_la_LDFLAGS = \
   $(top_builddir)/src/main/libextractor.la \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,PNG_SYMBOLS 
 libextractor_png_la_LIBADD = \
   libconvert.la -lz
 
 libextractor_filename_la_SOURCES = \
   filenameextractor.c 
 libextractor_filename_la_LDFLAGS = \
-  $(PLUGINFLAGS) \
-  $(top_builddir)/src/main/libextractor.la
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,FILENAME_SYMBOLS 
 libextractor_filename_la_LIBADD = \
+  $(top_builddir)/src/main/libextractor.la \
   libconvert.la
 
 libextractor_split_la_SOURCES = \
   splitextractor.c 
 libextractor_split_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,SPLIT_SYMBOLS 
 
 libextractor_translit_la_SOURCES = \
   translitextractor.c 
 libextractor_translit_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+  $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,TRANSLIT_SYMBOLS 
 

Added: Extractor/src/plugins/OGG_SYMBOLS
===================================================================
--- Extractor/src/plugins/OGG_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/OGG_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_ogg_extract

Added: Extractor/src/plugins/PNG_SYMBOLS
===================================================================
--- Extractor/src/plugins/PNG_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/PNG_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_png_extract

Added: Extractor/src/plugins/QT_SYMBOLS
===================================================================
--- Extractor/src/plugins/QT_SYMBOLS    2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/QT_SYMBOLS    2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_qt_extract

Added: Extractor/src/plugins/REAL_SYMBOLS
===================================================================
--- Extractor/src/plugins/REAL_SYMBOLS  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/REAL_SYMBOLS  2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_real_extract

Added: Extractor/src/plugins/RIFF_SYMBOLS
===================================================================
--- Extractor/src/plugins/RIFF_SYMBOLS  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/RIFF_SYMBOLS  2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_riff_extract

Added: Extractor/src/plugins/SPLIT_SYMBOLS
===================================================================
--- Extractor/src/plugins/SPLIT_SYMBOLS 2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/SPLIT_SYMBOLS 2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_split_extract

Added: Extractor/src/plugins/TAR_SYMBOLS
===================================================================
--- Extractor/src/plugins/TAR_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/TAR_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_tar_extract

Added: Extractor/src/plugins/TIFF_SYMBOLS
===================================================================
--- Extractor/src/plugins/TIFF_SYMBOLS  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/TIFF_SYMBOLS  2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_tiff_extract

Added: Extractor/src/plugins/TRANSLIT_SYMBOLS
===================================================================
--- Extractor/src/plugins/TRANSLIT_SYMBOLS      2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/TRANSLIT_SYMBOLS      2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_translit_extract

Added: Extractor/src/plugins/WAV_SYMBOLS
===================================================================
--- Extractor/src/plugins/WAV_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/WAV_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_wav_extract

Added: Extractor/src/plugins/ZIP_SYMBOLS
===================================================================
--- Extractor/src/plugins/ZIP_SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/ZIP_SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_zip_extract

Modified: Extractor/src/plugins/debextractor.c
===================================================================
--- Extractor/src/plugins/debextractor.c        2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/debextractor.c        2005-09-05 13:48:39 UTC (rev 
2064)
@@ -219,33 +219,14 @@
   return prev;
 }
 
-
 #define MAX_CONTROL_SIZE (1024 * 1024)
 
-typedef struct {
-  int fd;
-  const char * buf;
-  size_t size;
-} WTC;
+static voidpf Emalloc(voidpf opaque, uInt items, uInt size) {
+  return malloc(size * items);
+}
 
-void * writeThread(void * arg) {
-  size_t pos;
-  int ret;
-  WTC * wtc = (WTC*) arg;
-
-  pos = 0;
-  while (pos < wtc->size) {
-    ret = write(wtc->fd,
-               &wtc->buf[pos],
-               wtc->size - pos);
-    if (ret == -1) {
-      close(wtc->fd);
-      return strerror(errno);
-    }
-    pos += ret;
-  }
-  close(wtc->fd);
-  return NULL;
+static void Efree(voidpf opaque, voidpf ptr) {
+  free(ptr);
 }
 
 /**
@@ -259,52 +240,46 @@
   gzFile gzf;
   int fdes[2];
   char * buf;
-  WTC wtc;
-  pthread_t pt;
   void * error;
+  z_stream strm;
 
   bufSize = data[size-4] + 256 * data[size-3] + 65536 * data[size-2] + 
256*65536 * data[size-1];
   if (bufSize > MAX_CONTROL_SIZE)
     return prev;
 
-  if (0 != PIPE(fdes))
-    return prev;
-  wtc.fd = fdes[1];
-  wtc.size = size;
-  wtc.buf = data;
-  if (0 != pthread_create(&pt, NULL, &writeThread, &wtc)) {
-    close(fdes[0]);
-    close(fdes[1]);
-    return prev;
-  }
-  gzf = gzdopen(fdes[0], "rb");
-  if (gzf == NULL) {
-    close(fdes[0]);
-    close(fdes[1]);
-    pthread_join(pt, &error);
-    return prev;
-  }
-  buf = malloc(bufSize);
-  if (buf == NULL) {
-    gzclose(gzf);
-    close(fdes[1]);
-    pthread_join(pt, &error);
-    return prev;
-  }
-  if (bufSize != gzread(gzf, buf, bufSize)) {
+  memset(&strm,
+        0,
+        sizeof(z_stream));
+
+  strm.next_in = (char*) data;
+  strm.avail_in = size;
+  strm.total_in = 0;
+  strm.zalloc = &Emalloc;
+  strm.zfree = &Efree;
+  strm.opaque = NULL;
+
+  if (Z_OK == inflateInit2(&strm,
+                          15 + 32)) {
+    buf = malloc(bufSize);
+    if (buf == NULL) {
+      inflateEnd(&strm);
+      return prev;
+    }
+    strm.next_out = buf;
+    strm.avail_out = bufSize;
+    inflate(&strm,
+           Z_FINISH);
+    if (strm.total_out > 0) {
+      prev = processControlTar(buf,
+                              strm.total_out,
+                              prev);
+      inflateEnd(&strm);
+      free(buf);
+      return prev;
+    }
     free(buf);
-    gzclose(gzf);
-    close(fdes[1]);
-    pthread_join(pt, &error);
-    return prev;
+    inflateEnd(&strm);
   }
-  close(fdes[1]);
-  pthread_join(pt, &error);
-  gzclose(gzf);
-  prev = processControlTar(buf,
-                          bufSize,
-                          prev);
-  free(buf);
   return prev;
 }
 

Modified: Extractor/src/plugins/exiv2/Makefile.am
===================================================================
--- Extractor/src/plugins/exiv2/Makefile.am     2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/exiv2/Makefile.am     2005-09-05 13:48:39 UTC (rev 
2064)
@@ -1,5 +1,7 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
+EXTRA_DIST = SYMBOLS
+
 # install plugins under:
 plugindir = $(libdir)/libextractor
 
@@ -11,12 +13,14 @@
 plugin_LTLIBRARIES = \
  libextractor_exiv2.la
 
-PLUGINFLAGS = -export-dynamic -avoid-version -module -no-undefined
+PLUGINFLAGS = -Wl,-Bsymbolic -avoid-version -module -no-undefined 
 
+
 libextractor_exiv2_la_LINK = \
   /bin/sh ../../../libtool --mode=link $(CXXLD) -o libextractor_exiv2.la
 libextractor_exiv2_la_LDFLAGS = \
-  $(PLUGINFLAGS) $(XTRA_CPPLIBS) -lpthread
+  $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,SYMBOLS  \
+  $(XTRA_CPPLIBS) -lpthread
 libextractor_exiv2_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la -lpthread
 

Added: Extractor/src/plugins/exiv2/SYMBOLS
===================================================================
--- Extractor/src/plugins/exiv2/SYMBOLS 2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/exiv2/SYMBOLS 2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_exiv2_extract

Added: Extractor/src/plugins/ole2/SYMBOLS
===================================================================
--- Extractor/src/plugins/ole2/SYMBOLS  2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/ole2/SYMBOLS  2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_ole2_extract

Modified: Extractor/src/plugins/pdf/Makefile.am
===================================================================
--- Extractor/src/plugins/pdf/Makefile.am       2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/pdf/Makefile.am       2005-09-05 13:48:39 UTC (rev 
2064)
@@ -11,12 +11,13 @@
 plugin_LTLIBRARIES = \
  libextractor_pdf.la
 
-PLUGINFLAGS = -export-dynamic -avoid-version -module -no-undefined
+PLUGINFLAGS = -Wl,-Bsymbolic -avoid-version -module -no-undefined
 
 libextractor_pdf_la_LINK = \
   /bin/sh ../../../libtool --mode=link $(CXXLD) -o libextractor_pdf.la
 libextractor_pdf_la_LDFLAGS = \
-  $(PLUGINFLAGS) $(XTRA_CPPLIBS)
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,SYMBOLS \
+  $(XTRA_CPPLIBS)
 libextractor_pdf_la_LIBADD = \
   $(top_builddir)/src/main/libextractor.la \
   $(top_builddir)/src/plugins/libconvert.la \
@@ -53,6 +54,7 @@
 CXXFLAGS = -O0
 
 EXTRA_DIST = \
+ SYMBOLS \
  darwin.lt.rb \
  aconf.h \
  aconf2.h \

Added: Extractor/src/plugins/pdf/SYMBOLS
===================================================================
--- Extractor/src/plugins/pdf/SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/pdf/SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_pdf_extract
\ No newline at end of file

Added: Extractor/src/plugins/printable/DA_SYMBOLS
===================================================================
--- Extractor/src/plugins/printable/DA_SYMBOLS  2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/printable/DA_SYMBOLS  2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_da_extract

Added: Extractor/src/plugins/printable/DE_SYMBOLS
===================================================================
--- Extractor/src/plugins/printable/DE_SYMBOLS  2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/printable/DE_SYMBOLS  2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_de_extract

Added: Extractor/src/plugins/printable/EN_SYMBOLS
===================================================================
--- Extractor/src/plugins/printable/EN_SYMBOLS  2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/printable/EN_SYMBOLS  2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_en_extract

Added: Extractor/src/plugins/printable/ES_SYMBOLS
===================================================================
--- Extractor/src/plugins/printable/ES_SYMBOLS  2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/printable/ES_SYMBOLS  2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_es_extract

Added: Extractor/src/plugins/printable/IT_SYMBOLS
===================================================================
--- Extractor/src/plugins/printable/IT_SYMBOLS  2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/printable/IT_SYMBOLS  2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_it_extract

Modified: Extractor/src/plugins/printable/Makefile.am
===================================================================
--- Extractor/src/plugins/printable/Makefile.am 2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/printable/Makefile.am 2005-09-05 13:48:39 UTC (rev 
2064)
@@ -8,10 +8,17 @@
 
 noinst_PROGRAMS = dictionary-builder
 
-noinst_LTLIBRARIES = libcommon.la
-
 EXTRA_DIST = \
- en.txt de.txt es.txt da.txt no.txt it.txt peXX.c printableextractor.c 
+ en.txt de.txt es.txt da.txt no.txt it.txt \
+ peXX.c \
+ printableextractor.c \
+ bloomfilter.c bloomfilter.h \
+ DA_SYMBOLS \
+ DE_SYMBOLS \
+ EN_SYMBOLS \
+ ES_SYMBOLS \
+ IT_SYMBOLS \
+ NO_SYMBOLS 
 
 CLEANFILES = en.c de.c es.c da.c no.c it.c peen.c pede.c pees.c peda.c peit.c
 
@@ -55,58 +62,46 @@
 
 
 PLUGINFLAGS = \
-  -export-dynamic -avoid-version -module 
+  -Wl,-Bsymbolic -avoid-version -module -no-undefined
 libextractor_printable_en_la_LIBADD = \
-  libcommon.la \
   $(top_builddir)/src/main/libextractor.la
 libextractor_printable_it_la_LIBADD = \
-  libcommon.la \
   $(top_builddir)/src/main/libextractor.la
 libextractor_printable_da_la_LIBADD = \
-  libcommon.la \
   $(top_builddir)/src/main/libextractor.la
 libextractor_printable_de_la_LIBADD = \
-  libcommon.la \
   $(top_builddir)/src/main/libextractor.la
 libextractor_printable_es_la_LIBADD = \
-  libcommon.la \
   $(top_builddir)/src/main/libextractor.la
 libextractor_printable_no_la_LIBADD = \
-  libcommon.la \
   $(top_builddir)/src/main/libextractor.la
 
-libcommon_la_SOURCES = \
-  bloomfilter.c \
-  bloomfilter.h \
-  sha1.h \
-  sha1.c   
-
 libextractor_printable_en_la_SOURCES = \
   en.c peen.c
 libextractor_printable_en_la_LDFLAGS = \
-  $(PLUGINFLAGS)
+ $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,EN_SYMBOLS 
 
 libextractor_printable_es_la_SOURCES = \
   es.c pees.c
 libextractor_printable_es_la_LDFLAGS = \
- $(PLUGINFLAGS)
+ $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,ES_SYMBOLS 
 
 libextractor_printable_de_la_SOURCES = \
   de.c pede.c
 libextractor_printable_de_la_LDFLAGS = \
- $(PLUGINFLAGS)
+ $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,DE_SYMBOLS 
 
 libextractor_printable_it_la_SOURCES = \
   it.c peit.c
 libextractor_printable_it_la_LDFLAGS = \
- $(PLUGINFLAGS)
+ $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,IT_SYMBOLS 
 
 libextractor_printable_da_la_SOURCES = \
   da.c peda.c
 libextractor_printable_da_la_LDFLAGS = \
- $(PLUGINFLAGS)
+ $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,DA_SYMBOLS 
 
 libextractor_printable_no_la_SOURCES = \
   no.c peno.c
 libextractor_printable_no_la_LDFLAGS = \
- $(PLUGINFLAGS)
+ $(PLUGINFLAGS) -Wl,--retain-symbols-file -Wl,NO_SYMBOLS 

Added: Extractor/src/plugins/printable/NO_SYMBOLS
===================================================================
--- Extractor/src/plugins/printable/NO_SYMBOLS  2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/printable/NO_SYMBOLS  2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_no_extract

Modified: Extractor/src/plugins/printable/bloomfilter.c
===================================================================
--- Extractor/src/plugins/printable/bloomfilter.c       2005-09-05 13:24:30 UTC 
(rev 2063)
+++ Extractor/src/plugins/printable/bloomfilter.c       2005-09-05 13:48:39 UTC 
(rev 2064)
@@ -35,10 +35,284 @@
  * @author Christian Grothoff
  */
 
-#include "platform.h"
 #include "bloomfilter.h"
 
+struct sha1_context
+{
+    unsigned int total[2];
+    unsigned int state[5];
+    unsigned char buffer[64];
+};
 
+#define GET_UINT32(n,b,i)                                       \
+{                                                               \
+    (n) = (unsigned int) ((unsigned char *) b)[(i)+3]                         \
+      | (((unsigned int) ((unsigned char *) b)[(i)+2]) <<  8)                 \
+      | (((unsigned int) ((unsigned char *) b)[(i)+1]) << 16)                 \
+      | (((unsigned int) ((unsigned char *) b)[(i)]  ) << 24);                \
+}
+
+#define PUT_UINT32(n,b,i)                                       \
+{                                                               \
+    (((unsigned char *) b)[(i)+3]) = (unsigned char) (((n)      ) & 0xFF);     
 \
+    (((unsigned char *) b)[(i)+2]) = (unsigned char) (((n) >>  8) & 0xFF);     
 \
+    (((unsigned char *) b)[(i)+1]) = (unsigned char) (((n) >> 16) & 0xFF);     
 \
+    (((unsigned char *) b)[(i)]  ) = (unsigned char) (((n) >> 24) & 0xFF);     
 \
+}
+
+static void sha1_starts( struct sha1_context *ctx )
+{
+    ctx->total[0] = 0;
+    ctx->total[1] = 0;
+    ctx->state[0] = 0x67452301;
+    ctx->state[1] = 0xEFCDAB89;
+    ctx->state[2] = 0x98BADCFE;
+    ctx->state[3] = 0x10325476;
+    ctx->state[4] = 0xC3D2E1F0;
+}
+
+static void sha1_process( struct sha1_context *ctx, const unsigned char 
data[64] )
+{
+    unsigned int temp, A, B, C, D, E, W[16];
+
+    GET_UINT32( W[0],  data,  0 );
+    GET_UINT32( W[1],  data,  4 );
+    GET_UINT32( W[2],  data,  8 );
+    GET_UINT32( W[3],  data, 12 );
+    GET_UINT32( W[4],  data, 16 );
+    GET_UINT32( W[5],  data, 20 );
+    GET_UINT32( W[6],  data, 24 );
+    GET_UINT32( W[7],  data, 28 );
+    GET_UINT32( W[8],  data, 32 );
+    GET_UINT32( W[9],  data, 36 );
+    GET_UINT32( W[10], data, 40 );
+    GET_UINT32( W[11], data, 44 );
+    GET_UINT32( W[12], data, 48 );
+    GET_UINT32( W[13], data, 52 );
+    GET_UINT32( W[14], data, 56 );
+    GET_UINT32( W[15], data, 60 );
+
+#define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
+
+#define R(t)                                            \
+(                                                       \
+    temp = W[(t -  3) & 0x0F] ^ W[(t - 8) & 0x0F] ^     \
+           W[(t - 14) & 0x0F] ^ W[ t      & 0x0F],      \
+    ( W[t & 0x0F] = S(temp,1) )                         \
+)
+
+#define P(a,b,c,d,e,x)                                  \
+{                                                       \
+    e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);        \
+}
+
+    A = ctx->state[0];
+    B = ctx->state[1];
+    C = ctx->state[2];
+    D = ctx->state[3];
+    E = ctx->state[4];
+
+#define F(x,y,z) (z ^ (x & (y ^ z)))
+#define K 0x5A827999
+
+    P( A, B, C, D, E, W[0]  );
+    P( E, A, B, C, D, W[1]  );
+    P( D, E, A, B, C, W[2]  );
+    P( C, D, E, A, B, W[3]  );
+    P( B, C, D, E, A, W[4]  );
+    P( A, B, C, D, E, W[5]  );
+    P( E, A, B, C, D, W[6]  );
+    P( D, E, A, B, C, W[7]  );
+    P( C, D, E, A, B, W[8]  );
+    P( B, C, D, E, A, W[9]  );
+    P( A, B, C, D, E, W[10] );
+    P( E, A, B, C, D, W[11] );
+    P( D, E, A, B, C, W[12] );
+    P( C, D, E, A, B, W[13] );
+    P( B, C, D, E, A, W[14] );
+    P( A, B, C, D, E, W[15] );
+    P( E, A, B, C, D, R(16) );
+    P( D, E, A, B, C, R(17) );
+    P( C, D, E, A, B, R(18) );
+    P( B, C, D, E, A, R(19) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) (x ^ y ^ z)
+#define K 0x6ED9EBA1
+
+    P( A, B, C, D, E, R(20) );
+    P( E, A, B, C, D, R(21) );
+    P( D, E, A, B, C, R(22) );
+    P( C, D, E, A, B, R(23) );
+    P( B, C, D, E, A, R(24) );
+    P( A, B, C, D, E, R(25) );
+    P( E, A, B, C, D, R(26) );
+    P( D, E, A, B, C, R(27) );
+    P( C, D, E, A, B, R(28) );
+    P( B, C, D, E, A, R(29) );
+    P( A, B, C, D, E, R(30) );
+    P( E, A, B, C, D, R(31) );
+    P( D, E, A, B, C, R(32) );
+    P( C, D, E, A, B, R(33) );
+    P( B, C, D, E, A, R(34) );
+    P( A, B, C, D, E, R(35) );
+    P( E, A, B, C, D, R(36) );
+    P( D, E, A, B, C, R(37) );
+    P( C, D, E, A, B, R(38) );
+    P( B, C, D, E, A, R(39) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) ((x & y) | (z & (x | y)))
+#define K 0x8F1BBCDC
+
+    P( A, B, C, D, E, R(40) );
+    P( E, A, B, C, D, R(41) );
+    P( D, E, A, B, C, R(42) );
+    P( C, D, E, A, B, R(43) );
+    P( B, C, D, E, A, R(44) );
+    P( A, B, C, D, E, R(45) );
+    P( E, A, B, C, D, R(46) );
+    P( D, E, A, B, C, R(47) );
+    P( C, D, E, A, B, R(48) );
+    P( B, C, D, E, A, R(49) );
+    P( A, B, C, D, E, R(50) );
+    P( E, A, B, C, D, R(51) );
+    P( D, E, A, B, C, R(52) );
+    P( C, D, E, A, B, R(53) );
+    P( B, C, D, E, A, R(54) );
+    P( A, B, C, D, E, R(55) );
+    P( E, A, B, C, D, R(56) );
+    P( D, E, A, B, C, R(57) );
+    P( C, D, E, A, B, R(58) );
+    P( B, C, D, E, A, R(59) );
+
+#undef K
+#undef F
+
+#define F(x,y,z) (x ^ y ^ z)
+#define K 0xCA62C1D6
+
+    P( A, B, C, D, E, R(60) );
+    P( E, A, B, C, D, R(61) );
+    P( D, E, A, B, C, R(62) );
+    P( C, D, E, A, B, R(63) );
+    P( B, C, D, E, A, R(64) );
+    P( A, B, C, D, E, R(65) );
+    P( E, A, B, C, D, R(66) );
+    P( D, E, A, B, C, R(67) );
+    P( C, D, E, A, B, R(68) );
+    P( B, C, D, E, A, R(69) );
+    P( A, B, C, D, E, R(70) );
+    P( E, A, B, C, D, R(71) );
+    P( D, E, A, B, C, R(72) );
+    P( C, D, E, A, B, R(73) );
+    P( B, C, D, E, A, R(74) );
+    P( A, B, C, D, E, R(75) );
+    P( E, A, B, C, D, R(76) );
+    P( D, E, A, B, C, R(77) );
+    P( C, D, E, A, B, R(78) );
+    P( B, C, D, E, A, R(79) );
+
+#undef K
+#undef F
+
+    ctx->state[0] += A;
+    ctx->state[1] += B;
+    ctx->state[2] += C;
+    ctx->state[3] += D;
+    ctx->state[4] += E;
+}
+
+static void sha1_update(struct sha1_context *ctx,
+                       const unsigned char *input, unsigned int length )
+{
+    unsigned int left, fill;
+
+    if( ! length ) return;
+
+    left = ( ctx->total[0] >> 3 ) & 0x3F;
+    fill = 64 - left;
+
+    ctx->total[0] += length <<  3;
+    ctx->total[1] += length >> 29;
+
+    ctx->total[0] &= 0xFFFFFFFF;
+    ctx->total[1] += ctx->total[0] < ( length << 3 );
+
+    if( left && length >= fill )
+    {
+        memcpy( (void *) (ctx->buffer + left), (void *) input, fill );
+        sha1_process( ctx, ctx->buffer );
+        length -= fill;
+        input  += fill;
+        left = 0;
+    }
+
+    while( length >= 64 )
+    {
+        sha1_process( ctx, input );
+        length -= 64;
+        input  += 64;
+    }
+
+    if( length )
+    {
+        memcpy( (void *) (ctx->buffer + left), (void *) input, length );
+    }
+}
+
+static unsigned char sha1_padding[64] =
+{
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+static void sha1_finish( struct sha1_context *ctx, unsigned char digest[20] )
+{
+    unsigned int last, padn;
+    unsigned char msglen[8];
+
+    PUT_UINT32( ctx->total[1], msglen, 0 );
+    PUT_UINT32( ctx->total[0], msglen, 4 );
+
+    last = ( ctx->total[0] >> 3 ) & 0x3F;
+    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
+
+    sha1_update( ctx, sha1_padding, padn );
+    sha1_update( ctx, msglen, 8 );
+
+    PUT_UINT32( ctx->state[0], digest,  0 );
+    PUT_UINT32( ctx->state[1], digest,  4 );
+    PUT_UINT32( ctx->state[2], digest,  8 );
+    PUT_UINT32( ctx->state[3], digest, 12 );
+    PUT_UINT32( ctx->state[4], digest, 16 );
+}
+
+void static hash(const void * data,
+                int size,
+                HashCode160 * hc) {
+  struct sha1_context ctx;
+
+  sha1_starts( &ctx );
+  sha1_update( &ctx,
+              data,
+              size);
+
+  sha1_finish( &ctx, hc->data );
+}
+
+
+
+
+
+
+
 /**
  * Sets a bit active in the bitArray. Increment bit-specific
  * usage counter on disk only if below 4bit max (==15).
@@ -170,7 +444,7 @@
  * @param bf the filter
  * @return 1 if the element is in the filter, 0 if not
  */
-int testBloomfilter(Bloomfilter * bf,
+static int testBloomfilter(Bloomfilter * bf,
                    HashCode160 * e) {
   int res;
 
@@ -190,7 +464,7 @@
  * @param bf the filter
  * @param e the element
  */
-void addToBloomfilter(Bloomfilter * bf,
+static void addToBloomfilter(Bloomfilter * bf,
                      HashCode160 * e) {
 
   if (NULL == bf)

Modified: Extractor/src/plugins/printable/bloomfilter.h
===================================================================
--- Extractor/src/plugins/printable/bloomfilter.h       2005-09-05 13:24:30 UTC 
(rev 2063)
+++ Extractor/src/plugins/printable/bloomfilter.h       2005-09-05 13:48:39 UTC 
(rev 2064)
@@ -25,7 +25,9 @@
 #ifndef BLOOMFILTER_H
 #define BLOOMFILTER_H
 
-#include "sha1.h"
+typedef struct {
+  char data[20];
+} HashCode160;
 
 typedef struct {
   /** How many bits we set for each stored element */
@@ -36,21 +38,4 @@
   unsigned int bitArraySize;
 } Bloomfilter;
 
-/**
- * Test if an element is in the filter.
- * @param e the element
- * @param bf the filter
- * @return YES if the element is in the filter, NO if not
- */
-int testBloomfilter(Bloomfilter * bf,
-                   HashCode160 * e);
-
-/**
- * Add an element to the filter
- * @param bf the filter
- * @param e the element
- */
-void addToBloomfilter(Bloomfilter * bf,
-                     HashCode160 * e);
-
 #endif

Modified: Extractor/src/plugins/printable/dictionary-builder.c
===================================================================
--- Extractor/src/plugins/printable/dictionary-builder.c        2005-09-05 
13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/printable/dictionary-builder.c        2005-09-05 
13:48:39 UTC (rev 2064)
@@ -28,8 +28,6 @@
 
 #include "platform.h"
 #include "bloomfilter.h"
-
-#include "sha1.c"
 #include "bloomfilter.c"
 
 #define ADDR_PER_ELEMENT 46

Modified: Extractor/src/plugins/printable/printableextractor.c
===================================================================
--- Extractor/src/plugins/printable/printableextractor.c        2005-09-05 
13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/printable/printableextractor.c        2005-09-05 
13:48:39 UTC (rev 2064)
@@ -30,7 +30,7 @@
 
 #include "platform.h"
 #include "extractor.h"
-#include "bloomfilter.h"
+#include "bloomfilter.c"
 
 extern Bloomfilter FILTER_NAME;
 
@@ -358,6 +358,7 @@
   "image/png",
   "image/x-png",
   "audio/real",
+  "audio/mp3",
   "audio/mpeg",
   "application/x-gzip",
   "application/x-dpkg",
@@ -377,6 +378,7 @@
   "application/ogg",
   "video/real",
   "video/asf",
+  "video/mpeg",
   "video/quicktime",
   NULL,
 };

Modified: Extractor/src/plugins/printable/sha1.c
===================================================================
--- Extractor/src/plugins/printable/sha1.c      2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/printable/sha1.c      2005-09-05 13:48:39 UTC (rev 
2064)
@@ -7,372 +7,4 @@
 #include "platform.h"
 #include "sha1.h"
 
-struct sha1_context
-{
-    unsigned int total[2];
-    unsigned int state[5];
-    unsigned char buffer[64];
-};
-
-#define GET_UINT32(n,b,i)                                       \
-{                                                               \
-    (n) = (unsigned int) ((unsigned char *) b)[(i)+3]                         \
-      | (((unsigned int) ((unsigned char *) b)[(i)+2]) <<  8)                 \
-      | (((unsigned int) ((unsigned char *) b)[(i)+1]) << 16)                 \
-      | (((unsigned int) ((unsigned char *) b)[(i)]  ) << 24);                \
-}
-
-#define PUT_UINT32(n,b,i)                                       \
-{                                                               \
-    (((unsigned char *) b)[(i)+3]) = (unsigned char) (((n)      ) & 0xFF);     
 \
-    (((unsigned char *) b)[(i)+2]) = (unsigned char) (((n) >>  8) & 0xFF);     
 \
-    (((unsigned char *) b)[(i)+1]) = (unsigned char) (((n) >> 16) & 0xFF);     
 \
-    (((unsigned char *) b)[(i)]  ) = (unsigned char) (((n) >> 24) & 0xFF);     
 \
-}
-
-static void sha1_starts( struct sha1_context *ctx )
-{
-    ctx->total[0] = 0;
-    ctx->total[1] = 0;
-    ctx->state[0] = 0x67452301;
-    ctx->state[1] = 0xEFCDAB89;
-    ctx->state[2] = 0x98BADCFE;
-    ctx->state[3] = 0x10325476;
-    ctx->state[4] = 0xC3D2E1F0;
-}
-
-static void sha1_process( struct sha1_context *ctx, unsigned char data[64] )
-{
-    unsigned int temp, A, B, C, D, E, W[16];
-
-    GET_UINT32( W[0],  data,  0 );
-    GET_UINT32( W[1],  data,  4 );
-    GET_UINT32( W[2],  data,  8 );
-    GET_UINT32( W[3],  data, 12 );
-    GET_UINT32( W[4],  data, 16 );
-    GET_UINT32( W[5],  data, 20 );
-    GET_UINT32( W[6],  data, 24 );
-    GET_UINT32( W[7],  data, 28 );
-    GET_UINT32( W[8],  data, 32 );
-    GET_UINT32( W[9],  data, 36 );
-    GET_UINT32( W[10], data, 40 );
-    GET_UINT32( W[11], data, 44 );
-    GET_UINT32( W[12], data, 48 );
-    GET_UINT32( W[13], data, 52 );
-    GET_UINT32( W[14], data, 56 );
-    GET_UINT32( W[15], data, 60 );
-
-#define S(x,n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n)))
-
-#define R(t)                                            \
-(                                                       \
-    temp = W[(t -  3) & 0x0F] ^ W[(t - 8) & 0x0F] ^     \
-           W[(t - 14) & 0x0F] ^ W[ t      & 0x0F],      \
-    ( W[t & 0x0F] = S(temp,1) )                         \
-)
-
-#define P(a,b,c,d,e,x)                                  \
-{                                                       \
-    e += S(a,5) + F(b,c,d) + K + x; b = S(b,30);        \
-}
-
-    A = ctx->state[0];
-    B = ctx->state[1];
-    C = ctx->state[2];
-    D = ctx->state[3];
-    E = ctx->state[4];
-
-#define F(x,y,z) (z ^ (x & (y ^ z)))
-#define K 0x5A827999
-
-    P( A, B, C, D, E, W[0]  );
-    P( E, A, B, C, D, W[1]  );
-    P( D, E, A, B, C, W[2]  );
-    P( C, D, E, A, B, W[3]  );
-    P( B, C, D, E, A, W[4]  );
-    P( A, B, C, D, E, W[5]  );
-    P( E, A, B, C, D, W[6]  );
-    P( D, E, A, B, C, W[7]  );
-    P( C, D, E, A, B, W[8]  );
-    P( B, C, D, E, A, W[9]  );
-    P( A, B, C, D, E, W[10] );
-    P( E, A, B, C, D, W[11] );
-    P( D, E, A, B, C, W[12] );
-    P( C, D, E, A, B, W[13] );
-    P( B, C, D, E, A, W[14] );
-    P( A, B, C, D, E, W[15] );
-    P( E, A, B, C, D, R(16) );
-    P( D, E, A, B, C, R(17) );
-    P( C, D, E, A, B, R(18) );
-    P( B, C, D, E, A, R(19) );
-
-#undef K
-#undef F
-
-#define F(x,y,z) (x ^ y ^ z)
-#define K 0x6ED9EBA1
-
-    P( A, B, C, D, E, R(20) );
-    P( E, A, B, C, D, R(21) );
-    P( D, E, A, B, C, R(22) );
-    P( C, D, E, A, B, R(23) );
-    P( B, C, D, E, A, R(24) );
-    P( A, B, C, D, E, R(25) );
-    P( E, A, B, C, D, R(26) );
-    P( D, E, A, B, C, R(27) );
-    P( C, D, E, A, B, R(28) );
-    P( B, C, D, E, A, R(29) );
-    P( A, B, C, D, E, R(30) );
-    P( E, A, B, C, D, R(31) );
-    P( D, E, A, B, C, R(32) );
-    P( C, D, E, A, B, R(33) );
-    P( B, C, D, E, A, R(34) );
-    P( A, B, C, D, E, R(35) );
-    P( E, A, B, C, D, R(36) );
-    P( D, E, A, B, C, R(37) );
-    P( C, D, E, A, B, R(38) );
-    P( B, C, D, E, A, R(39) );
-
-#undef K
-#undef F
-
-#define F(x,y,z) ((x & y) | (z & (x | y)))
-#define K 0x8F1BBCDC
-
-    P( A, B, C, D, E, R(40) );
-    P( E, A, B, C, D, R(41) );
-    P( D, E, A, B, C, R(42) );
-    P( C, D, E, A, B, R(43) );
-    P( B, C, D, E, A, R(44) );
-    P( A, B, C, D, E, R(45) );
-    P( E, A, B, C, D, R(46) );
-    P( D, E, A, B, C, R(47) );
-    P( C, D, E, A, B, R(48) );
-    P( B, C, D, E, A, R(49) );
-    P( A, B, C, D, E, R(50) );
-    P( E, A, B, C, D, R(51) );
-    P( D, E, A, B, C, R(52) );
-    P( C, D, E, A, B, R(53) );
-    P( B, C, D, E, A, R(54) );
-    P( A, B, C, D, E, R(55) );
-    P( E, A, B, C, D, R(56) );
-    P( D, E, A, B, C, R(57) );
-    P( C, D, E, A, B, R(58) );
-    P( B, C, D, E, A, R(59) );
-
-#undef K
-#undef F
-
-#define F(x,y,z) (x ^ y ^ z)
-#define K 0xCA62C1D6
-
-    P( A, B, C, D, E, R(60) );
-    P( E, A, B, C, D, R(61) );
-    P( D, E, A, B, C, R(62) );
-    P( C, D, E, A, B, R(63) );
-    P( B, C, D, E, A, R(64) );
-    P( A, B, C, D, E, R(65) );
-    P( E, A, B, C, D, R(66) );
-    P( D, E, A, B, C, R(67) );
-    P( C, D, E, A, B, R(68) );
-    P( B, C, D, E, A, R(69) );
-    P( A, B, C, D, E, R(70) );
-    P( E, A, B, C, D, R(71) );
-    P( D, E, A, B, C, R(72) );
-    P( C, D, E, A, B, R(73) );
-    P( B, C, D, E, A, R(74) );
-    P( A, B, C, D, E, R(75) );
-    P( E, A, B, C, D, R(76) );
-    P( D, E, A, B, C, R(77) );
-    P( C, D, E, A, B, R(78) );
-    P( B, C, D, E, A, R(79) );
-
-#undef K
-#undef F
-
-    ctx->state[0] += A;
-    ctx->state[1] += B;
-    ctx->state[2] += C;
-    ctx->state[3] += D;
-    ctx->state[4] += E;
-}
-
-static void sha1_update( struct sha1_context *ctx, unsigned char *input, 
unsigned int length )
-{
-    unsigned int left, fill;
-
-    if( ! length ) return;
-
-    left = ( ctx->total[0] >> 3 ) & 0x3F;
-    fill = 64 - left;
-
-    ctx->total[0] += length <<  3;
-    ctx->total[1] += length >> 29;
-
-    ctx->total[0] &= 0xFFFFFFFF;
-    ctx->total[1] += ctx->total[0] < ( length << 3 );
-
-    if( left && length >= fill )
-    {
-        memcpy( (void *) (ctx->buffer + left), (void *) input, fill );
-        sha1_process( ctx, ctx->buffer );
-        length -= fill;
-        input  += fill;
-        left = 0;
-    }
-
-    while( length >= 64 )
-    {
-        sha1_process( ctx, input );
-        length -= 64;
-        input  += 64;
-    }
-
-    if( length )
-    {
-        memcpy( (void *) (ctx->buffer + left), (void *) input, length );
-    }
-}
-
-static unsigned char sha1_padding[64] =
-{
- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static void sha1_finish( struct sha1_context *ctx, unsigned char digest[20] )
-{
-    unsigned int last, padn;
-    unsigned char msglen[8];
-
-    PUT_UINT32( ctx->total[1], msglen, 0 );
-    PUT_UINT32( ctx->total[0], msglen, 4 );
-
-    last = ( ctx->total[0] >> 3 ) & 0x3F;
-    padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last );
-
-    sha1_update( ctx, sha1_padding, padn );
-    sha1_update( ctx, msglen, 8 );
-
-    PUT_UINT32( ctx->state[0], digest,  0 );
-    PUT_UINT32( ctx->state[1], digest,  4 );
-    PUT_UINT32( ctx->state[2], digest,  8 );
-    PUT_UINT32( ctx->state[3], digest, 12 );
-    PUT_UINT32( ctx->state[4], digest, 16 );
-}
-
-void hash(void * data,
-         int size,
-         HashCode160 * hc) {
-  struct sha1_context ctx;
-
-  sha1_starts( &ctx );
-  sha1_update( &ctx,
-              data,
-              size);
-
-  sha1_finish( &ctx, hc->data );
-}
-
-#ifdef TEST
-
-#include <stdlib.h>
-#include <stdio.h>
-
-/*
- * those are the standard FIPS 180-1 test vectors
- */
-
-static char *msg[] =
-{
-    "abc",
-    "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-    NULL
-};
-
-static char *val[] =
-{
-    "a9993e364706816aba3e25717850c26c9cd0d89d",
-    "84983e441c3bd26ebaae4aa1f95129e5e54670f1",
-    "34aa973cd4c4daa4f61eeb2bdbad27316534016f"
-};
-
-int main( int argc, char *argv[] )
-{
-    FILE *f;
-    int i, j;
-    char output[41];
-    struct sha1_context ctx;
-    unsigned char sha1sum[20], buffer[1000];
-
-    if( argc < 2 )
-    {
-        for( i = 0; i < 3; i++ )
-        {
-            sha1_starts( &ctx );
-
-            if( i < 2 )
-            {
-                sha1_update( &ctx, (unsigned char *) msg[i], strlen( msg[i] ) 
);
-            }
-            else
-            {
-                memset( buffer, 'a', 1000 );
-
-                for( j = 0; j < 1000; j++ )
-                {
-                    sha1_update( &ctx, (unsigned char *) buffer, 1000 );
-                }
-            }
-
-            sha1_finish( &ctx, sha1sum );
-
-            for( j = 0; j < 20; j++ )
-            {
-                sprintf( output + j * 2, "%02x", sha1sum[j] );
-            }
-
-            printf( "test %d ", i + 1 );
-
-            if( ! memcmp( output, val[i], 40 ) )
-            {
-                printf( "passed\n" );
-            }
-            else
-            {
-                printf( "failed\n" );
-                return( 1 );
-            }
-        }
-    }
-    else
-    {
-        if( ! ( f = fopen( argv[1], "rb" ) ) )
-        {
-            perror( "fopen" );
-            return( 1 );
-        }
-
-        sha1_starts( &ctx );
-
-        while( ( i = fread( buffer, 1, sizeof( buffer ), f ) ) > 0 )
-        {
-            sha1_update( &ctx, buffer, i );
-        }
-
-        sha1_finish( &ctx, sha1sum );
-
-        for( j = 0; j < 20; j++ )
-        {
-            printf( "%02x", sha1sum[j] );
-        }
-
-        printf( "  %s\n", argv[1] );
-    }
-
-    return( 0 );
-}
-
 #endif

Modified: Extractor/src/plugins/printable/sha1.h
===================================================================
--- Extractor/src/plugins/printable/sha1.h      2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/printable/sha1.h      2005-09-05 13:48:39 UTC (rev 
2064)
@@ -21,10 +21,6 @@
 #ifndef SHA1_H
 #define SHA1_H
 
-typedef struct {
-  char data[20];
-} HashCode160;
-
 void hash(void * data,
          int size,
          HashCode160 * hc);

Modified: Extractor/src/plugins/rpm/Makefile.am
===================================================================
--- Extractor/src/plugins/rpm/Makefile.am       2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/rpm/Makefile.am       2005-09-05 13:48:39 UTC (rev 
2064)
@@ -1,5 +1,7 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
+EXTRA_DIST = SYMBOLS
+
 # install plugins under:
 plugindir = $(libdir)/libextractor
 
@@ -15,9 +17,10 @@
 plugin_LTLIBRARIES = \
  libextractor_rpm.la
 
-PLUGINFLAGS = -export-dynamic -avoid-version -module
+PLUGINFLAGS = -Wl,-Bsymbolic -avoid-version -module -no-undefined
 
 libextractor_rpm_la_SOURCES = \
  rpmextractor.c
 libextractor_rpm_la_LDFLAGS = \
- $(PLUGINFLAGS) $(WINFLAGS)
+ $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,SYMBOLS \
+ $(WINFLAGS)

Added: Extractor/src/plugins/rpm/SYMBOLS
===================================================================
--- Extractor/src/plugins/rpm/SYMBOLS   2005-09-05 13:24:30 UTC (rev 2063)
+++ Extractor/src/plugins/rpm/SYMBOLS   2005-09-05 13:48:39 UTC (rev 2064)
@@ -0,0 +1 @@
+libextractor_rpm_extract
\ No newline at end of file

Modified: Extractor/src/plugins/thumbnail/Makefile.am
===================================================================
--- Extractor/src/plugins/thumbnail/Makefile.am 2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/thumbnail/Makefile.am 2005-09-05 13:48:39 UTC (rev 
2064)
@@ -2,6 +2,8 @@
   -I$(top_srcdir)/src/include \
   @GTK_CFLAGS@ 
 
+EXTRA_DIST = SYMBOLS
+
 LIBS = \
  @LTLIBINTL@ @LIBS@
 
@@ -21,6 +23,6 @@
   $(LIBADD) -lgobject-2.0 @GTK_LIBS@ \
   $(top_builddir)/src/main/libextractor.la 
 libextractor_thumbnail_la_LDFLAGS = \
-  $(PLUGINFLAGS) 
+  $(PLUGINFLAGS)  -Wl,--retain-symbols-file -Wl,SYMBOLS 
 libextractor_thumbnail_la_SOURCES = \
   thumbnailextractor.c

Added: Extractor/src/plugins/thumbnail/SYMBOLS
===================================================================
--- Extractor/src/plugins/thumbnail/SYMBOLS     2005-09-05 13:24:30 UTC (rev 
2063)
+++ Extractor/src/plugins/thumbnail/SYMBOLS     2005-09-05 13:48:39 UTC (rev 
2064)
@@ -0,0 +1 @@
+libextractor_thumbnail_extract
\ No newline at end of file
reply via email to
[Prev in Thread] Current Thread [Next in Thread]