gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r6759 - in Extractor: . doc po src/plugins/pdf


From: gnunet
Subject: [GNUnet-SVN] r6759 - in Extractor: . doc po src/plugins/pdf
Date: Fri, 25 Apr 2008 08:50:36 -0600 (MDT)

Author: grothoff
Date: 2008-04-25 08:50:36 -0600 (Fri, 25 Apr 2008)
New Revision: 6759

Modified:
   Extractor/ChangeLog
   Extractor/configure.ac
   Extractor/doc/version.texi
   Extractor/po/de.po
   Extractor/po/ga.po
   Extractor/po/nl.po
   Extractor/po/ro.po
   Extractor/po/sv.po
   Extractor/po/vi.po
   Extractor/src/plugins/pdf/Object.h
Log:
There was a vulnerability in xpdf code found - CVE-2008-1693. --- Pavol RUSNAK

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2008-04-25 14:50:17 UTC (rev 6758)
+++ Extractor/ChangeLog 2008-04-25 14:50:36 UTC (rev 6759)
@@ -1,3 +1,7 @@
+Fri Apr 25 08:29:29 MDT 2008
+        Fixed security issues in XPDF-based PDF extractor.
+        Releasing libextractor 0.5.20b.
+
 Mon Mar 21 00:00:52 MDT 2008
        Releasing libextractor 0.5.20a.
 

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2008-04-25 14:50:17 UTC (rev 6758)
+++ Extractor/configure.ac      2008-04-25 14:50:36 UTC (rev 6759)
@@ -1,8 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
-AC_INIT([libextractor], [0.5.20], address@hidden)
+AC_INIT([libextractor], [0.5.20b], address@hidden)
 AC_REVISION($Revision: 1.67 $)
-AM_INIT_AUTOMAKE([libextractor], [0.5.20])
+AM_INIT_AUTOMAKE([libextractor], [0.5.20b])
 AM_CONFIG_HEADER(src/include/config.h)
 
 AH_TOP([#define _GNU_SOURCE  1])

Modified: Extractor/doc/version.texi
===================================================================
--- Extractor/doc/version.texi  2008-04-25 14:50:17 UTC (rev 6758)
+++ Extractor/doc/version.texi  2008-04-25 14:50:36 UTC (rev 6759)
@@ -1,4 +1,4 @@
address@hidden UPDATED 14 June 2007
address@hidden UPDATED 9 June 2007
 @set UPDATED-MONTH June 2007
address@hidden EDITION 0.5.20
address@hidden VERSION 0.5.20
address@hidden EDITION 0.5.20b
address@hidden VERSION 0.5.20b

Modified: Extractor/po/de.po
===================================================================
--- Extractor/po/de.po  2008-04-25 14:50:17 UTC (rev 6758)
+++ Extractor/po/de.po  2008-04-25 14:50:36 UTC (rev 6759)
@@ -184,8 +184,7 @@
 #, c-format
 msgid "You must specify an argument for the `%s' option (option ignored).\n"
 msgstr ""
-"Sie müssen ein Argument für die Option »%s« angeben (Option wird "
-"ignoriert).\n"
+"Sie müssen ein Argument für die Option »%s« angeben (Option wird 
ignoriert).\n"
 
 #: src/main/extract.c:607
 #, c-format

Modified: Extractor/po/ga.po
===================================================================
--- Extractor/po/ga.po  2008-04-25 14:50:17 UTC (rev 6758)
+++ Extractor/po/ga.po  2008-04-25 14:50:36 UTC (rev 6759)
@@ -27,8 +27,11 @@
 
 #: src/main/extract.c:52
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
-msgstr "Is riachtanach le rogha ghearr aon arg�int at� riachtanach leis an 
rogha fhada.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Is riachtanach le rogha ghearr aon arg�int at� riachtanach leis an rogha "
+"fhada.\n"
 
 #: src/main/extract.c:126
 msgid "do not remove any duplicates"
@@ -39,8 +42,12 @@
 msgstr "priont�il aschur i bhform�id bibtex"
 
 #: src/main/extract.c:130
-msgid "use the generic plaintext extractor for the language with the 2-letter 
language code LANG"
-msgstr "�s�id an t-asbhainteoir ginear�lta t�acs le haghaidh na teanga leis an 
ch�d LANG de r�ir ISO-639-1"
+msgid ""
+"use the generic plaintext extractor for the language with the 2-letter "
+"language code LANG"
+msgstr ""
+"�s�id an t-asbhainteoir ginear�lta t�acs le haghaidh na teanga leis an ch�d "
+"LANG de r�ir ISO-639-1"
 
 #: src/main/extract.c:132
 msgid "remove duplicates only if types match"
@@ -48,11 +55,14 @@
 
 #: src/main/extract.c:134
 msgid "use the filename as a keyword (loads filename-extractor plugin)"
-msgstr "�s�id an comhadainm mar lorgfhocal (lucht�far breise�n asbhainteora na 
gcomhadainmneacha)"
+msgstr ""
+"�s�id an comhadainm mar lorgfhocal (lucht�far breise�n asbhainteora na "
+"gcomhadainmneacha)"
 
 #: src/main/extract.c:136
 msgid "produce grep-friendly output (all results on one line per file)"
-msgstr "aschur is f�idir pr�ise�il le grep (gach toradh ar l�ne amh�in sa 
chomhad)"
+msgstr ""
+"aschur is f�idir pr�ise�il le grep (gach toradh ar l�ne amh�in sa chomhad)"
 
 #: src/main/extract.c:138
 msgid "print this help"
@@ -76,7 +86,9 @@
 
 #: src/main/extract.c:148
 msgid "print only keywords of the given TYPE (use -L to get a list)"
-msgstr "n� taispe�in ach lorgfhocail den CHINE�L tugtha (�s�id -L chun liosta 
a fh�il)"
+msgstr ""
+"n� taispe�in ach lorgfhocail den CHINE�L tugtha (�s�id -L chun liosta a "
+"fh�il)"
 
 #: src/main/extract.c:150
 msgid "remove duplicates even if keyword types do not match"
@@ -84,7 +96,8 @@
 
 #: src/main/extract.c:152
 msgid "use keyword splitting (loads split-extractor plugin)"
-msgstr "�s�id scoilteadh lorgfhocal (lucht�far an breise�n asbhainteora 
scoilte)"
+msgstr ""
+"�s�id scoilteadh lorgfhocal (lucht�far an breise�n asbhainteora scoilte)"
 
 #: src/main/extract.c:154
 msgid "print the version number"
@@ -167,7 +180,8 @@
 #: src/main/extract.c:537
 #, c-format
 msgid "You must specify an argument for the `%s' option (option ignored).\n"
-msgstr "N� m�r duit arg�int a thabhairt i ndiaidh na rogha `%s' (� ligean 
thart).\n"
+msgstr ""
+"N� m�r duit arg�int a thabhairt i ndiaidh na rogha `%s' (� ligean thart).\n"
 
 #: src/main/extract.c:607
 #, c-format
@@ -683,8 +697,13 @@
 
 #: src/main/extractor.c:752
 #, 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 "N�orbh fh�idir siombail `%s' a r�iteach i leabharlann `%s'.  D� bhr� 
sin, bhain m� triail as `%s', ach theip ar an cheann sin freisin.  Na 
hearr�id�: `%s' agus `%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 ""
+"N�orbh fh�idir siombail `%s' a r�iteach i leabharlann `%s'.  D� bhr� sin, "
+"bhain m� triail as `%s', ach theip ar an cheann sin freisin.  Na hearr�id�: `"
+"%s' agus `%s'.\n"
 
 #: src/main/extractor.c:781
 #, c-format

Modified: Extractor/po/nl.po
===================================================================
--- Extractor/po/nl.po  2008-04-25 14:50:17 UTC (rev 6758)
+++ Extractor/po/nl.po  2008-04-25 14:50:36 UTC (rev 6759)
@@ -30,8 +30,11 @@
 
 #: src/main/extract.c:52
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
-msgstr "Argumenten die verplicht zijn voor lange opties zijn dat ook voor 
korte opties.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Argumenten die verplicht zijn voor lange opties zijn dat ook voor korte "
+"opties.\n"
 
 #: src/main/extract.c:126
 msgid "do not remove any duplicates"
@@ -42,7 +45,9 @@
 msgstr ""
 
 #: src/main/extract.c:130
-msgid "use the generic plaintext extractor for the language with the 2-letter 
language code LANG"
+msgid ""
+"use the generic plaintext extractor for the language with the 2-letter "
+"language code LANG"
 msgstr "de gewone-tekst-extractor voor deze (tweelettercode) taal gebruiken"
 
 #: src/main/extract.c:132
@@ -686,7 +691,9 @@
 
 #: src/main/extractor.c:752
 #, c-format
-msgid "Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that 
failed also.  Errors are: `%s' and `%s'.\n"
+msgid ""
+"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
+"failed also.  Errors are: `%s' and `%s'.\n"
 msgstr ""
 
 #: src/main/extractor.c:781

Modified: Extractor/po/ro.po
===================================================================
--- Extractor/po/ro.po  2008-04-25 14:50:17 UTC (rev 6758)
+++ Extractor/po/ro.po  2008-04-25 14:50:36 UTC (rev 6759)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libextractor 0.5.3\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-08-13 18:55-0700\n"
+"POT-Creation-Date: 2008-03-20 23:53-0600\n"
 "PO-Revision-Date: 2005-08-16 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <address@hidden>\n"
 "Language-Team: Romanian <address@hidden>\n"
@@ -18,1254 +18,1592 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/plugins/rpm/rpmextractor.c:3048
+#: src/main/extract.c:49
 #, c-format
-msgid "Source RPM %d.%d"
-msgstr "Surs� RPM %d.%d"
+msgid ""
+"Usage: %s\n"
+"%s\n"
+"\n"
+msgstr ""
+"Folosire: %s\n"
+"%s\n"
+"\n"
 
-#: src/plugins/rpm/rpmextractor.c:3053
+#: src/main/extract.c:52
 #, c-format
-msgid "Binary RPM %d.%d"
-msgstr "Binar RPM %d.%d"
+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/plugins/printable/dictionary-builder.c:52
-#, c-format
+#: src/main/extract.c:126
+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"
+
+#: src/main/extract.c:130
 msgid ""
-"Please provide the name of the language you are building\n"
-"a dictionary for.  For example:\n"
+"use the generic plaintext extractor for the language with the 2-letter "
+"language code LANG"
 msgstr ""
-"V� rug�m furniza�i numele limbii pentru care contrui�i\n"
-"un dic�ionar.  De exemplu:\n"
+"folose�te extractorul text-simplu generic pentru limba cu codul de limb� din "
+"2 litere LANG"
 
-#: src/plugins/printable/dictionary-builder.c:65
+#: src/main/extract.c:132
+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)"
+
+#: src/main/extract.c:136
+msgid "produce grep-friendly output (all results on one line per file)"
+msgstr ""
+
+#: src/main/extract.c:138
+msgid "print this help"
+msgstr "afi�eaz� acest mesaj de ajutor"
+
+#: src/main/extract.c:140
+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:142
+msgid "load an extractor plugin named LIBRARY"
+msgstr "�ncarc� un plugin extractor numit LIBR�RIE"
+
+#: src/main/extract.c:144
+msgid "list all keyword types"
+msgstr "listeaz� toate tipurile de cuvinte cheie"
+
+#: src/main/extract.c:146
+msgid "do not use the default set of extractor plugins"
+msgstr "nu folosi setul implicit de plugin-uri extractor"
+
+#: src/main/extract.c:148
+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:150
+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:152
+msgid "use keyword splitting (loads split-extractor plugin)"
+msgstr ""
+"folose�te spargere dup� cuvinte cheie (�ncarc� plugin-ul split-extractor)"
+
+#: src/main/extract.c:154
+msgid "print the version number"
+msgstr "afi�eaz� num�rul versiunii"
+
+#: src/main/extract.c:156
+msgid "be verbose"
+msgstr "fi vorb�re�"
+
+#: src/main/extract.c:158
+msgid "do not print keywords of the given TYPE"
+msgstr "nu afi�a cuvinte cheie de TIP-ul dat"
+
+#: src/main/extract.c:161
+msgid "extract [OPTIONS] [FILENAME]*"
+msgstr "extract [OP�IUNI] [NUME_FI�IER]*"
+
+#: src/main/extract.c:162
+msgid "Extract metadata from files."
+msgstr "Extrage metadata din fi�iere."
+
+#: src/main/extract.c:190 src/main/extractor.c:1513
 #, c-format
-msgid "Error opening file '%s': %s\n"
-msgstr "Eroare deschidere fi�ier '%s': %s\n"
+msgid "%s - (binary)\n"
+msgstr "%s - (binar)\n"
 
-#: src/plugins/printable/dictionary-builder.c:73
+#: src/main/extract.c:201 src/main/extractor.c:1518
 #, c-format
+msgid "INVALID TYPE - %s\n"
+msgstr "TIP INVALID - %s\n"
+
+#: src/main/extract.c:320 src/main/extractor.c:47
+msgid "title"
+msgstr "titlu"
+
+#: src/main/extract.c:322 src/main/extractor.c:45
+msgid "filename"
+msgstr "nume_fi�ier"
+
+#: src/main/extract.c:327 src/main/extractor.c:48
+msgid "author"
+msgstr "autor"
+
+#: src/main/extract.c:331 src/main/extractor.c:50
+msgid "description"
+msgstr "descriere"
+
+#: src/main/extract.c:333 src/main/extractor.c:62
+msgid "keywords"
+msgstr "cuvinte cheie"
+
+#: src/main/extract.c:335 src/main/extractor.c:51
+msgid "comment"
+msgstr "comentariu"
+
+#: src/main/extract.c:339 src/main/extractor.c:52
+msgid "date"
+msgstr "data"
+
+#: src/main/extract.c:341 src/main/extractor.c:74
+msgid "creation date"
+msgstr "data cre�rii"
+
+#: src/main/extract.c:369 src/main/extractor.c:53
+msgid "publisher"
+msgstr "publicist"
+
+#: src/main/extract.c:373 src/main/extractor.c:59
+msgid "organization"
+msgstr "organiza�ie"
+
+#: src/main/extract.c:377 src/main/extractor.c:61
+msgid "subject"
+msgstr "subiect"
+
+#: src/main/extract.c:381 src/main/extractor.c:78
+msgid "page count"
+msgstr "num�r de pagini"
+
+#: src/main/extract.c:537
+#, fuzzy, 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"
+
+#: src/main/extract.c:607
+#, 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"
+
+#: src/main/extract.c:663
+#, c-format
+msgid "%% BiBTeX file\n"
+msgstr "%% BiBTeX file\n"
+
+#: src/main/extract.c:683
+#, c-format
+msgid "Keywords for file %s:\n"
+msgstr "Cuvinte cheie pentru fi�ier %s:\n"
+
+#: src/main/extractor.c:44
+msgid "unknown"
+msgstr "necunoscut"
+
+#: src/main/extractor.c:46
+msgid "mimetype"
+msgstr "mimetype"
+
+#: src/main/extractor.c:49
+msgid "artist"
+msgstr "artist"
+
+#: src/main/extractor.c:54
+msgid "language"
+msgstr "limb�"
+
+#: src/main/extractor.c:55
+msgid "album"
+msgstr "album"
+
+#: src/main/extractor.c:56
+msgid "genre"
+msgstr "gen"
+
+#: src/main/extractor.c:57
+msgid "location"
+msgstr "loca�ie"
+
+#: src/main/extractor.c:58
+msgid "version"
+msgstr "versiune"
+
+#: src/main/extractor.c:60
+msgid "copyright"
+msgstr "copyright"
+
+#: src/main/extractor.c:63
+msgid "contributor"
+msgstr "contribuitor"
+
+#: src/main/extractor.c:64
+msgid "resource-type"
+msgstr "tip-resurs�"
+
+#: src/main/extractor.c:65
+msgid "format"
+msgstr "format"
+
+#: src/main/extractor.c:66
+msgid "resource-identifier"
+msgstr "identificator-resurs�"
+
+#: src/main/extractor.c:67
+msgid "source"
+msgstr "surs�"
+
+#: src/main/extractor.c:68
+msgid "relation"
+msgstr "rela�ie"
+
+#: src/main/extractor.c:69
+msgid "coverage"
+msgstr "acoperire"
+
+#: src/main/extractor.c:70
+msgid "software"
+msgstr "software"
+
+#: src/main/extractor.c:71
+msgid "disclaimer"
+msgstr "repudiere"
+
+#: src/main/extractor.c:72
+msgid "warning"
+msgstr "avertisment"
+
+#: src/main/extractor.c:73
+msgid "translated"
+msgstr "tradus"
+
+#: src/main/extractor.c:75
+msgid "modification date"
+msgstr "data modific�rii"
+
+#: src/main/extractor.c:76
+msgid "creator"
+msgstr "creator"
+
+#: src/main/extractor.c:77
+msgid "producer"
+msgstr "produc�tor"
+
+#: src/main/extractor.c:79
+msgid "page orientation"
+msgstr "orientare pagin�"
+
+#: src/main/extractor.c:80
+msgid "paper size"
+msgstr "dimensiune pagina"
+
+#: src/main/extractor.c:81
+msgid "used fonts"
+msgstr "fonturi folosite"
+
+#: src/main/extractor.c:82
+msgid "page order"
+msgstr "ordine pagini"
+
+#: src/main/extractor.c:83
+msgid "created for"
+msgstr "creat pentru"
+
+#: src/main/extractor.c:84
+msgid "magnification"
+msgstr "m�rire"
+
+#: src/main/extractor.c:85
+msgid "release"
+msgstr "release"
+
+#: src/main/extractor.c:86
+msgid "group"
+msgstr "grup"
+
+#: src/main/extractor.c:87
+msgid "size"
+msgstr "m�rime"
+
+#: src/main/extractor.c:88
+msgid "summary"
+msgstr "cuprins"
+
+#: src/main/extractor.c:89
+msgid "packager"
+msgstr "�mpachetator"
+
+#: src/main/extractor.c:90
+msgid "vendor"
+msgstr "v�nz�tor"
+
+#: src/main/extractor.c:91
+msgid "license"
+msgstr "licen��"
+
+#: src/main/extractor.c:92
+msgid "distribution"
+msgstr "distribu�ie"
+
+#: src/main/extractor.c:93
+msgid "build-host"
+msgstr "gazd�-contruit"
+
+#: src/main/extractor.c:94
+msgid "operating system"
+msgstr ""
+
+#: src/main/extractor.c:95
+msgid "dependency"
+msgstr "dependin�e"
+
+#: src/main/extractor.c:96
+msgid "MD4"
+msgstr "MD4"
+
+#: src/main/extractor.c:97
+msgid "MD5"
+msgstr "MD5"
+
+#: src/main/extractor.c:98
+msgid "SHA-0"
+msgstr "SHA-0"
+
+#: src/main/extractor.c:99
+msgid "SHA-1"
+msgstr "SHA-1"
+
+#: src/main/extractor.c:100
+msgid "RipeMD160"
+msgstr "RipeMD160"
+
+#: src/main/extractor.c:101
+msgid "resolution"
+msgstr "rezolu�ie"
+
+#: src/main/extractor.c:102
+msgid "category"
+msgstr "categorie"
+
+#: src/main/extractor.c:103
+msgid "book title"
+msgstr "titlu de carte"
+
+#: src/main/extractor.c:104
+msgid "priority"
+msgstr "prioritate"
+
+#: src/main/extractor.c:105
+msgid "conflicts"
+msgstr "conflicte"
+
+#: src/main/extractor.c:106
+msgid "replaces"
+msgstr "�nlocuie�te"
+
+#: src/main/extractor.c:107
+msgid "provides"
+msgstr "furnizeaz�"
+
+#: src/main/extractor.c:108
+msgid "conductor"
+msgstr "conduc�tor"
+
+#: src/main/extractor.c:109
+msgid "interpreter"
+msgstr "interpret(�)"
+
+#: src/main/extractor.c:110
+msgid "owner"
+msgstr "proprietar"
+
+#: src/main/extractor.c:111
+msgid "lyrics"
+msgstr "versuri"
+
+#: src/main/extractor.c:112
+msgid "media type"
+msgstr "tipul media"
+
+#: src/main/extractor.c:113
+msgid "contact"
+msgstr "contact"
+
+#: src/main/extractor.c:114
+msgid "binary thumbnail data"
+msgstr "data thumbnail binar"
+
+#: src/main/extractor.c:115
+msgid "publication date"
+msgstr "data public�rii"
+
+#: src/main/extractor.c:116
+msgid "camera make"
+msgstr "produc�tor"
+
+#: src/main/extractor.c:117
+msgid "camera model"
+msgstr "model de camer�"
+
+#: src/main/extractor.c:118
+msgid "exposure"
+msgstr "expunere"
+
+#: src/main/extractor.c:119
+msgid "aperture"
+msgstr "apertur�"
+
+#: src/main/extractor.c:120
+msgid "exposure bias"
+msgstr "predilec�ie expunere"
+
+#: src/main/extractor.c:121
+msgid "flash"
+msgstr "bli�"
+
+#: src/main/extractor.c:122
+msgid "flash bias"
+msgstr "predilec�ie bli�"
+
+#: src/main/extractor.c:123
+msgid "focal length"
+msgstr "lungime focal�"
+
+#: src/main/extractor.c:124
+msgid "focal length (35mm equivalent)"
+msgstr "lungime focal� (echivalent 35mm)"
+
+#: src/main/extractor.c:125
+msgid "iso speed"
+msgstr "valoare iso"
+
+#: src/main/extractor.c:126
+msgid "exposure mode"
+msgstr "mod expunere"
+
+#: src/main/extractor.c:127
+msgid "metering mode"
+msgstr "mod de m�surare"
+
+#: src/main/extractor.c:128
+msgid "macro mode"
+msgstr "mod macro"
+
+#: src/main/extractor.c:129
+msgid "image quality"
+msgstr "calitate imagine"
+
+#: src/main/extractor.c:130
+msgid "white balance"
+msgstr "balan�� alb"
+
+#: src/main/extractor.c:131
+msgid "orientation"
+msgstr "orientare"
+
+#: src/main/extractor.c:132
+#, fuzzy
+msgid "template"
+msgstr "�nlocuie�te"
+
+#: src/main/extractor.c:133
+msgid "split"
+msgstr ""
+
+#: src/main/extractor.c:134
+#, fuzzy
+msgid "product version"
+msgstr "produc�tor"
+
+#: src/main/extractor.c:135
+msgid "last saved by"
+msgstr ""
+
+#: src/main/extractor.c:136
+msgid "last printed"
+msgstr ""
+
+#: src/main/extractor.c:137
+#, fuzzy
+msgid "word count"
+msgstr "num�r de pagini"
+
+#: src/main/extractor.c:138
+#, fuzzy
+msgid "character count"
+msgstr "num�r de pagini"
+
+#: src/main/extractor.c:139
+msgid "total editing time"
+msgstr ""
+
+#: src/main/extractor.c:140
+msgid "thumbnails"
+msgstr ""
+
+#: src/main/extractor.c:141
+msgid "security"
+msgstr ""
+
+#: src/main/extractor.c:142
+#, fuzzy
+msgid "created by software"
+msgstr "creat pentru"
+
+#: src/main/extractor.c:143
+msgid "modified by software"
+msgstr ""
+
+#: src/main/extractor.c:144
+msgid "revision history"
+msgstr ""
+
+#: src/main/extractor.c:145
+msgid "lower case conversion"
+msgstr ""
+
+#: src/main/extractor.c:146
+msgid "company"
+msgstr ""
+
+#: src/main/extractor.c:147
+#, fuzzy
+msgid "generator"
+msgstr "creator"
+
+#: src/main/extractor.c:148
+msgid "character set"
+msgstr ""
+
+#: src/main/extractor.c:149
+#, fuzzy
+msgid "line count"
+msgstr "num�r de pagini"
+
+#: src/main/extractor.c:150
+#, fuzzy
+msgid "paragraph count"
+msgstr "num�r de pagini"
+
+#: src/main/extractor.c:151
+msgid "editing cycles"
+msgstr ""
+
+#: src/main/extractor.c:152
+#, fuzzy
+msgid "scale"
+msgstr "Musical"
+
+#: src/main/extractor.c:153
+#, fuzzy
+msgid "manager"
+msgstr "limb�"
+
+#: src/main/extractor.c:154
+#, fuzzy
+msgid "director"
+msgstr "Este un director"
+
+#: src/main/extractor.c:155
+#, fuzzy
+msgid "duration"
+msgstr "rela�ie"
+
+#: src/main/extractor.c:156
+#, fuzzy
+msgid "information"
+msgstr "format"
+
+#: src/main/extractor.c:157
+#, fuzzy
+msgid "full name"
+msgstr "nume_fi�ier"
+
+#: src/main/extractor.c:158
+#, fuzzy
+msgid "chapter"
+msgstr "categorie"
+
+#: src/main/extractor.c:159
+msgid "year"
+msgstr ""
+
+#: src/main/extractor.c:160
+msgid "link"
+msgstr ""
+
+#: src/main/extractor.c:161
+#, fuzzy
+msgid "music CD identifier"
+msgstr "identificator-resurs�"
+
+#: src/main/extractor.c:162
+#, fuzzy
+msgid "play counter"
+msgstr "num�r de pagini"
+
+#: src/main/extractor.c:163
+msgid "popularity meter"
+msgstr ""
+
+#: src/main/extractor.c:164
+msgid "content type"
+msgstr ""
+
+#: src/main/extractor.c:165
+msgid "encoded by"
+msgstr ""
+
+#: src/main/extractor.c:166
+#, fuzzy
+msgid "time"
+msgstr "Anime"
+
+#: src/main/extractor.c:167
+msgid "musician credits list"
+msgstr ""
+
+#: src/main/extractor.c:168
+#, fuzzy
+msgid "mood"
+msgstr "mono"
+
+#: src/main/extractor.c:169
+#, fuzzy
+msgid "format version"
+msgstr "versiune"
+
+#: src/main/extractor.c:170
+msgid "television system"
+msgstr ""
+
+#: src/main/extractor.c:171
+#, fuzzy
+msgid "song count"
+msgstr "num�r de pagini"
+
+#: src/main/extractor.c:172
+msgid "starting song"
+msgstr ""
+
+#: src/main/extractor.c:173
+#, fuzzy
+msgid "hardware dependency"
+msgstr "dependin�e"
+
+#: src/main/extractor.c:174
+#, fuzzy
+msgid "ripper"
+msgstr "Trailer"
+
+#: src/main/extractor.c:175
+#, fuzzy
+msgid "filesize"
+msgstr "m�rime"
+
+#: src/main/extractor.c:176
+msgid "track number"
+msgstr ""
+
+#: src/main/extractor.c:177
+msgid "international standard recording code"
+msgstr ""
+
+#: src/main/extractor.c:178
+#, fuzzy
+msgid "disc number"
+msgstr "Num�r de fi�ier incorect"
+
+#: src/main/extractor.c:598
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "ini�ializare mecanismului de plugin a e�uat: %s!\n"
+
+#: src/main/extractor.c:752
+#, fuzzy, c-format
 msgid ""
-"Error allocating: %s\n"
-"."
+"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
+"failed also.  Errors are: `%s' and `%s'.\n"
 msgstr ""
-"Eroare de alocare: %s\n"
-"."
+"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/plugins/printable/dictionary-builder.c:85
+#: src/main/extractor.c:781
+#, fuzzy, c-format
+msgid "Loading `%s' plugin failed: %s\n"
+msgstr "�nc�rcarea plugin-ului '%s' a e�uat: %s\n"
+
+#: src/main/extractor.c:986
+#, fuzzy, c-format
+msgid "Unloading plugin `%s' failed!\n"
+msgstr "Desc�rcarea plugin-ului '%s' a e�uat!\n"
+
+#: src/main/getopt.c:684
 #, c-format
-msgid "Increase ALLOCSIZE (in %s).\n"
-msgstr "Cre�te�i ALLOCSIZE (�n %s).\n"
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: op�iunea `%s' este ambigu�\n"
 
-#: src/plugins/manextractor.c:128
+#: src/main/getopt.c:709
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: op�iunea `--%s' nu permite un argument\n"
+
+#: src/main/getopt.c:715
+#, c-format
+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:732 src/main/getopt.c:903
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: op�iunea `%s' necesit� un argument\n"
+
+#: src/main/getopt.c:761
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: op�iune nerecunoscut� `--%s'\n"
+
+#: src/main/getopt.c:765
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: op�iune nerecunoscut� `%c%s'\n"
+
+#: src/main/getopt.c:791
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: op�iune ilegal� -- %c\n"
+
+#: src/main/getopt.c:793
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: op�iune ilegal� -- %c\n"
+
+#: src/main/getopt.c:822 src/main/getopt.c:952
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: op�iunea necesit� un argument -- %c\n"
+
+#: src/main/getopt.c:870
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: op�iunea `-W %s' este ambigu�\n"
+
+#: src/main/getopt.c:888
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: op�iunea `-W %s' nu permite un argument\n"
+
+#: src/plugins/filenameextractor.c:64
+msgid "GB"
+msgstr ""
+
+#: src/plugins/filenameextractor.c:66
+msgid "MB"
+msgstr ""
+
+#: src/plugins/filenameextractor.c:68
+msgid "KB"
+msgstr ""
+
+#: src/plugins/filenameextractor.c:70
+#, fuzzy
+msgid "Bytes"
+msgstr "Blues"
+
+#: src/plugins/jpegextractor.c:188
+#, c-format
+msgid "%ux%u dots per inch"
+msgstr "%ux%u puncte pe inci (dpi)"
+
+#: src/plugins/jpegextractor.c:196
+#, c-format
+msgid "%ux%u dots per cm"
+msgstr "%ux%u puncte pe cm"
+
+#: src/plugins/jpegextractor.c:204
+#, c-format
+msgid "%ux%u dots per inch?"
+msgstr "%ux%u puncte pe inci?"
+
+#: src/plugins/manextractor.c:150
 msgid "Commands"
 msgstr "Comenzi"
 
-#: src/plugins/manextractor.c:133
+#: src/plugins/manextractor.c:154
 msgid "System calls"
 msgstr "Apeluri sistem"
 
-#: src/plugins/manextractor.c:138
+#: src/plugins/manextractor.c:158
 msgid "Library calls"
 msgstr "Apeluri de bibliotec�"
 
-#: src/plugins/manextractor.c:143
+#: src/plugins/manextractor.c:162
 msgid "Special files"
 msgstr "Fi�iere speciale"
 
-#: src/plugins/manextractor.c:148
+#: src/plugins/manextractor.c:166
 msgid "File formats and conventions"
 msgstr "Formate de fi�iere �i conven�ii"
 
-#: src/plugins/manextractor.c:153
+#: src/plugins/manextractor.c:171
 msgid "Games"
 msgstr "Jocuri"
 
-#: src/plugins/manextractor.c:158
+#: src/plugins/manextractor.c:175
 msgid "Conventions and miscellaneous"
 msgstr "Conven�ii �i diverse"
 
-#: src/plugins/manextractor.c:163
+#: src/plugins/manextractor.c:180
 msgid "System management commands"
 msgstr "Comenzi pentru managementul sistemului"
 
-#: src/plugins/manextractor.c:168
+#: src/plugins/manextractor.c:185
 msgid "Kernel routines"
 msgstr "Proceduri kernel"
 
-#: src/plugins/wavextractor.c:113 src/plugins/mp3extractor.c:426
-msgid "mono"
-msgstr "mono"
-
-#: src/plugins/wavextractor.c:113 src/plugins/mp3extractor.c:426
-msgid "stereo"
-msgstr "stereo"
-
-#: src/plugins/htmlextractor.c:130 src/plugins/htmlextractor.c:928
-#, c-format
-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)"
-
-#: src/plugins/jpegextractor.c:188
-#, c-format
-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?"
-
-#: src/plugins/riffextractor.c:167
-#, c-format
-msgid "codec: %s, %u fps, %u ms"
-msgstr "codec: %s, %u fps, %u ms"
-
-#: src/plugins/mp3extractor.c:49
+#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:30
 msgid "Blues"
 msgstr "Blues"
 
-#: src/plugins/mp3extractor.c:50
+#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:31
 msgid "Classic Rock"
 msgstr "Rock clasic"
 
-#: src/plugins/mp3extractor.c:51
+#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:32
 msgid "Country"
 msgstr "�ar�"
 
-#: src/plugins/mp3extractor.c:52
+#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:33
 msgid "Dance"
 msgstr "Dance"
 
-#: src/plugins/mp3extractor.c:53
+#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:34
 msgid "Disco"
 msgstr "Disco"
 
-#: src/plugins/mp3extractor.c:54
+#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:35
 msgid "Funk"
 msgstr "Funk"
 
-#: src/plugins/mp3extractor.c:55
+#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:36
 msgid "Grunge"
 msgstr "Grunge"
 
-#: src/plugins/mp3extractor.c:56
+#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:37
 msgid "Hip-Hop"
 msgstr "Hip-Hop"
 
-#: src/plugins/mp3extractor.c:57
+#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:38
 msgid "Jazz"
 msgstr "Jazz"
 
-#: src/plugins/mp3extractor.c:58
+#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:39
 msgid "Metal"
 msgstr "Metal"
 
-#: src/plugins/mp3extractor.c:59
+#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:40
 msgid "New Age"
 msgstr "New Age"
 
-#: src/plugins/mp3extractor.c:60
+#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:41
 msgid "Oldies"
 msgstr "Oldies"
 
-#: src/plugins/mp3extractor.c:61
+#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:42
 msgid "Other"
 msgstr "Altele"
 
-#: src/plugins/mp3extractor.c:62
+#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:43
 msgid "Pop"
 msgstr "Pop"
 
-#: src/plugins/mp3extractor.c:63
+#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:44
 msgid "R&B"
 msgstr "R&B"
 
-#: src/plugins/mp3extractor.c:64
+#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:45
 msgid "Rap"
 msgstr "Rap"
 
-#: src/plugins/mp3extractor.c:65
+#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:46
 msgid "Reggae"
 msgstr "Reggae"
 
-#: src/plugins/mp3extractor.c:66
+#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:47
 msgid "Rock"
 msgstr "Rock"
 
-#: src/plugins/mp3extractor.c:67
+#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:48
 msgid "Techno"
 msgstr "Techno"
 
-#: src/plugins/mp3extractor.c:68
+#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:49
 msgid "Industrial"
 msgstr "Industrial"
 
-#: src/plugins/mp3extractor.c:69
+#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:50
 msgid "Alternative"
 msgstr "Alternative"
 
-#: src/plugins/mp3extractor.c:70
+#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:51
 msgid "Ska"
 msgstr "Ska"
 
-#: src/plugins/mp3extractor.c:71
+#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:52
 msgid "Death Metal"
 msgstr "Death Metal"
 
-#: src/plugins/mp3extractor.c:72
+#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:53
 msgid "Pranks"
 msgstr "Pranks"
 
-#: src/plugins/mp3extractor.c:73
+#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:54
 msgid "Soundtrack"
 msgstr "Soundtrack"
 
-#: src/plugins/mp3extractor.c:74
+#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:55
 msgid "Euro-Techno"
 msgstr "Euro-Techno"
 
-#: src/plugins/mp3extractor.c:75
+#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:56
 msgid "Ambient"
 msgstr "Ambient"
 
-#: src/plugins/mp3extractor.c:76
+#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:57
 msgid "Trip-Hop"
 msgstr "Trip-Hop"
 
-#: src/plugins/mp3extractor.c:77
+#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:58
 msgid "Vocal"
 msgstr "Vocal"
 
-#: src/plugins/mp3extractor.c:78
+#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:59
 msgid "Jazz+Funk"
 msgstr "Jazz+Funk"
 
-#: src/plugins/mp3extractor.c:79
+#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:60
 msgid "Fusion"
 msgstr "Fusion"
 
-#: src/plugins/mp3extractor.c:80
+#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:61
 msgid "Trance"
 msgstr "Trance"
 
-#: src/plugins/mp3extractor.c:81
+#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:62
 msgid "Classical"
 msgstr "Clasic�"
 
-#: src/plugins/mp3extractor.c:82
+#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:63
 msgid "Instrumental"
 msgstr "Instrumental"
 
-#: src/plugins/mp3extractor.c:83
+#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:64
 msgid "Acid"
 msgstr "Acid"
 
-#: src/plugins/mp3extractor.c:84
+#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:65
 msgid "House"
 msgstr "House"
 
-#: src/plugins/mp3extractor.c:85
+#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:66
 msgid "Game"
 msgstr "Joc"
 
-#: src/plugins/mp3extractor.c:86
+#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:67
 msgid "Sound Clip"
 msgstr "Clip sonor"
 
-#: src/plugins/mp3extractor.c:87
+#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:68
 msgid "Gospel"
 msgstr "Gospel"
 
-#: src/plugins/mp3extractor.c:88
+#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:69
 msgid "Noise"
 msgstr "Zgomot"
 
-#: src/plugins/mp3extractor.c:89
+#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:70
 msgid "Alt. Rock"
 msgstr "Rock Alternativ"
 
-#: src/plugins/mp3extractor.c:90
+#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:71
 msgid "Bass"
 msgstr "Bass"
 
-#: src/plugins/mp3extractor.c:91
+#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:72
 msgid "Soul"
 msgstr "Soul"
 
-#: src/plugins/mp3extractor.c:92
+#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:73
 msgid "Punk"
 msgstr "Punk"
 
-#: src/plugins/mp3extractor.c:93
+#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:74
 msgid "Space"
 msgstr "Spa�iu"
 
-#: src/plugins/mp3extractor.c:94
+#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:75
 msgid "Meditative"
 msgstr "Meditativ"
 
-#: src/plugins/mp3extractor.c:95
+#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:76
 msgid "Instrumental Pop"
 msgstr "Instrumental Pop"
 
-#: src/plugins/mp3extractor.c:96
+#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:77
 msgid "Instrumental Rock"
 msgstr "Instrumental Rock"
 
-#: src/plugins/mp3extractor.c:97
+#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:78
 msgid "Ethnic"
 msgstr "Ethnic"
 
-#: src/plugins/mp3extractor.c:98
+#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:79
 msgid "Gothic"
 msgstr "Gothic"
 
-#: src/plugins/mp3extractor.c:99
+#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:80
 msgid "Darkwave"
 msgstr "Darkwave"
 
-#: src/plugins/mp3extractor.c:100
+#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:81
 msgid "Techno-Industrial"
 msgstr "Techno-Industrial"
 
-#: src/plugins/mp3extractor.c:101
+#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:82
 msgid "Electronic"
 msgstr "Electronic"
 
-#: src/plugins/mp3extractor.c:102
+#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:83
 msgid "Pop-Folk"
 msgstr "Pop-Folk"
 
-#: src/plugins/mp3extractor.c:103
+#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:84
 msgid "Eurodance"
 msgstr "Eurodance"
 
-#: src/plugins/mp3extractor.c:104
+#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:85
 msgid "Dream"
 msgstr "Dream"
 
-#: src/plugins/mp3extractor.c:105
+#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:86
 msgid "Southern Rock"
 msgstr "Southern Rock"
 
-#: src/plugins/mp3extractor.c:106
+#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:87
 msgid "Comedy"
 msgstr "Comedy"
 
-#: src/plugins/mp3extractor.c:107
+#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:88
 msgid "Cult"
 msgstr "Cult"
 
-#: src/plugins/mp3extractor.c:108
+#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:89
 msgid "Gangsta Rap"
 msgstr "Gangsta Rap"
 
-#: src/plugins/mp3extractor.c:109
+#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:90
 msgid "Top 40"
 msgstr "Top 40"
 
-#: src/plugins/mp3extractor.c:110
+#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:91
 msgid "Christian Rap"
 msgstr "Christian Rap"
 
-#: src/plugins/mp3extractor.c:111
+#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:92
 msgid "Pop/Funk"
 msgstr "Pop/Funk"
 
-#: src/plugins/mp3extractor.c:112
+#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:93
 msgid "Jungle"
 msgstr "Jungle"
 
-#: src/plugins/mp3extractor.c:113
+#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:94
 msgid "Native American"
 msgstr "Native American"
 
-#: src/plugins/mp3extractor.c:114
+#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:95
 msgid "Cabaret"
 msgstr "Cabaret"
 
-#: src/plugins/mp3extractor.c:115
+#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:96
 msgid "New Wave"
 msgstr "New Wave"
 
-#: src/plugins/mp3extractor.c:116
+#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:97
 msgid "Psychedelic"
 msgstr "Psychedelic"
 
-#: src/plugins/mp3extractor.c:117
+#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:98
 msgid "Rave"
 msgstr "Rave"
 
-#: src/plugins/mp3extractor.c:118
+#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:99
 msgid "Showtunes"
 msgstr "Showtunes"
 
-#: src/plugins/mp3extractor.c:119
+#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:100
 msgid "Trailer"
 msgstr "Trailer"
 
-#: src/plugins/mp3extractor.c:120
+#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:101
 msgid "Lo-Fi"
 msgstr "Lo-Fi"
 
-#: src/plugins/mp3extractor.c:121
+#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:102
 msgid "Tribal"
 msgstr "Tribal"
 
-#: src/plugins/mp3extractor.c:122
+#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:103
 msgid "Acid Punk"
 msgstr "Acid Punk"
 
-#: src/plugins/mp3extractor.c:123
+#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:104
 msgid "Acid Jazz"
 msgstr "Acid Jazz"
 
-#: src/plugins/mp3extractor.c:124
+#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:105
 msgid "Polka"
 msgstr "Polka"
 
-#: src/plugins/mp3extractor.c:125
+#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:106
 msgid "Retro"
 msgstr "Retro"
 
-#: src/plugins/mp3extractor.c:126
+#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:107
 msgid "Musical"
 msgstr "Musical"
 
-#: src/plugins/mp3extractor.c:127
+#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:108
 msgid "Rock & Roll"
 msgstr "Rock & Roll"
 
-#: src/plugins/mp3extractor.c:128
+#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:109
 msgid "Hard Rock"
 msgstr "Hard Rock"
 
-#: src/plugins/mp3extractor.c:129
+#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:110
 msgid "Folk"
 msgstr "Folk"
 
-#: src/plugins/mp3extractor.c:130
+#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:111
 msgid "Folk/Rock"
 msgstr "Folk/Rock"
 
-#: src/plugins/mp3extractor.c:131
+#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:112
 msgid "National Folk"
 msgstr "National Folk"
 
-#: src/plugins/mp3extractor.c:132
+#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:113
 msgid "Swing"
 msgstr "Swing"
 
-#: src/plugins/mp3extractor.c:133
+#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:114
 msgid "Fast-Fusion"
 msgstr "Fast-Fusion"
 
-#: src/plugins/mp3extractor.c:134
+#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:115
 msgid "Bebob"
 msgstr "Bebob"
 
-#: src/plugins/mp3extractor.c:135
+#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:116
 msgid "Latin"
 msgstr "Latin"
 
-#: src/plugins/mp3extractor.c:136
+#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:117
 msgid "Revival"
 msgstr "Revival"
 
-#: src/plugins/mp3extractor.c:137
+#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:118
 msgid "Celtic"
 msgstr "Celtic"
 
-#: src/plugins/mp3extractor.c:138
+#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:119
 msgid "Bluegrass"
 msgstr "Bluegrass"
 
-#: src/plugins/mp3extractor.c:139
+#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:120
 msgid "Avantgarde"
 msgstr "Avantgarde"
 
-#: src/plugins/mp3extractor.c:140
+#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:121
 msgid "Gothic Rock"
 msgstr "Gothic Rock"
 
-#: src/plugins/mp3extractor.c:141
+#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:122
 msgid "Progressive Rock"
 msgstr "Progressive Rock"
 
-#: src/plugins/mp3extractor.c:142
+#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:123
 msgid "Psychedelic Rock"
 msgstr "Psychedelic Rock"
 
-#: src/plugins/mp3extractor.c:143
+#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:124
 msgid "Symphonic Rock"
 msgstr "Symphonic Rock"
 
-#: src/plugins/mp3extractor.c:144
+#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:125
 msgid "Slow Rock"
 msgstr "Slow Rock"
 
-#: src/plugins/mp3extractor.c:145
+#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:126
 msgid "Big Band"
 msgstr "Big Band"
 
-#: src/plugins/mp3extractor.c:146
+#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:127
 msgid "Chorus"
 msgstr "Chorus"
 
-#: src/plugins/mp3extractor.c:147
+#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:128
 msgid "Easy Listening"
 msgstr "Easy Listening"
 
-#: src/plugins/mp3extractor.c:148
+#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:129
 msgid "Acoustic"
 msgstr "Acoustic"
 
-#: src/plugins/mp3extractor.c:149
+#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:130
 msgid "Humour"
 msgstr "Umor"
 
-#: src/plugins/mp3extractor.c:150
+#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:131
 msgid "Speech"
 msgstr "Discurs"
 
-#: src/plugins/mp3extractor.c:151
+#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:132
 msgid "Chanson"
 msgstr "Chanson"
 
-#: src/plugins/mp3extractor.c:152
+#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:133
 msgid "Opera"
 msgstr "Oper�"
 
-#: src/plugins/mp3extractor.c:153
+#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:134
 msgid "Chamber Music"
 msgstr "Muzic� de camer�"
 
-#: src/plugins/mp3extractor.c:154
+#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:135
 msgid "Sonata"
 msgstr "Sonet"
 
-#: src/plugins/mp3extractor.c:155
+#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:136
 msgid "Symphony"
 msgstr "Simfonie"
 
-#: src/plugins/mp3extractor.c:156
+#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:137
 msgid "Booty Bass"
 msgstr "Booty Bass"
 
-#: src/plugins/mp3extractor.c:157
+#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:138
 msgid "Primus"
 msgstr "Primus"
 
-#: src/plugins/mp3extractor.c:158
+#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:139
 msgid "Porn Groove"
 msgstr "Porn Groove"
 
-#: src/plugins/mp3extractor.c:159
+#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:140
 msgid "Satire"
 msgstr "Satire"
 
-#: src/plugins/mp3extractor.c:160
+#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:141
 msgid "Slow Jam"
 msgstr "Slow Jam"
 
-#: src/plugins/mp3extractor.c:161
+#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:142
 msgid "Club"
 msgstr "Club"
 
-#: src/plugins/mp3extractor.c:162
+#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:143
 msgid "Tango"
 msgstr "Tango"
 
-#: src/plugins/mp3extractor.c:163
+#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:144
 msgid "Samba"
 msgstr "Samba"
 
-#: src/plugins/mp3extractor.c:164
+#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:145
 msgid "Folklore"
 msgstr "Folklore"
 
-#: src/plugins/mp3extractor.c:165
+#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:146
 msgid "Ballad"
 msgstr "Ballad"
 
-#: src/plugins/mp3extractor.c:166
+#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:147
 msgid "Power Ballad"
 msgstr "Power Ballad"
 
-#: src/plugins/mp3extractor.c:167
+#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:148
 msgid "Rhythmic Soul"
 msgstr "Rhythmic Soul"
 
-#: src/plugins/mp3extractor.c:168
+#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:149
 msgid "Freestyle"
 msgstr "Freestyle"
 
-#: src/plugins/mp3extractor.c:169
+#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:150
 msgid "Duet"
 msgstr "Duet"
 
-#: src/plugins/mp3extractor.c:170
+#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:151
 msgid "Punk Rock"
 msgstr "Punk Rock"
 
-#: src/plugins/mp3extractor.c:171
+#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:152
 msgid "Drum Solo"
 msgstr "Drum Solo"
 
-#: src/plugins/mp3extractor.c:172
+#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:153
 msgid "A Cappella"
 msgstr "A Cappella"
 
-#: src/plugins/mp3extractor.c:173
+#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:154
 msgid "Euro-House"
 msgstr "Euro-House"
 
-#: src/plugins/mp3extractor.c:174
+#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:155
 msgid "Dance Hall"
 msgstr "Dance Hall"
 
-#: src/plugins/mp3extractor.c:175
+#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:156
 msgid "Goa"
 msgstr "Goa"
 
-#: src/plugins/mp3extractor.c:176
+#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:157
 msgid "Drum & Bass"
 msgstr "Drum & Bass"
 
-#: src/plugins/mp3extractor.c:177
+#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:158
 msgid "Club-House"
 msgstr "Club-House"
 
-#: src/plugins/mp3extractor.c:178
+#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:159
 msgid "Hardcore"
 msgstr "Hardcore"
 
-#: src/plugins/mp3extractor.c:179
+#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:160
 msgid "Terror"
 msgstr "Terror"
 
-#: src/plugins/mp3extractor.c:180
+#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:161
 msgid "Indie"
 msgstr "Indie"
 
-#: src/plugins/mp3extractor.c:181
+#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:162
 msgid "BritPop"
 msgstr "BritPop"
 
-#: src/plugins/mp3extractor.c:182
+#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:163
 msgid "Negerpunk"
 msgstr "Negerpunk"
 
-#: src/plugins/mp3extractor.c:183
+#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:164
 msgid "Polsk Punk"
 msgstr "Polsk Punk"
 
-#: src/plugins/mp3extractor.c:184
+#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:165
 msgid "Beat"
 msgstr "Beat"
 
-#: src/plugins/mp3extractor.c:185
+#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:166
 msgid "Christian Gangsta Rap"
 msgstr "Christian Gangsta Rap"
 
-#: src/plugins/mp3extractor.c:186
+#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:167
 msgid "Heavy Metal"
 msgstr "Heavy Metal"
 
-#: src/plugins/mp3extractor.c:187
+#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:168
 msgid "Black Metal"
 msgstr "Black Metal"
 
-#: src/plugins/mp3extractor.c:188
+#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:169
 msgid "Crossover"
 msgstr "Crossover"
 
-#: src/plugins/mp3extractor.c:189
+#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:170
 msgid "Contemporary Christian"
 msgstr "Contemporary Christian"
 
-#: src/plugins/mp3extractor.c:190
+#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:171
 msgid "Christian Rock"
 msgstr "Christian Rock"
 
-#: src/plugins/mp3extractor.c:191
+#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:172
 msgid "Merengue"
 msgstr "Merengue"
 
-#: src/plugins/mp3extractor.c:192
+#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:173
 msgid "Salsa"
 msgstr "Salsa"
 
-#: src/plugins/mp3extractor.c:193
+#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:174
 msgid "Thrash Metal"
 msgstr "Thrash Metal"
 
-#: src/plugins/mp3extractor.c:194
+#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:175
 msgid "Anime"
 msgstr "Anime"
 
-#: src/plugins/mp3extractor.c:195
+#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:176
 msgid "JPop"
 msgstr "JPop"
 
-#: src/plugins/mp3extractor.c:196
+#: src/plugins/mp3extractor.c:198 src/plugins/qtextractor.c:177
 msgid "Synthpop"
 msgstr "Synthpop"
 
-#: src/plugins/mp3extractor.c:427
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
+msgid "stereo"
+msgstr "stereo"
+
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
+msgid "mono"
+msgstr "mono"
+
+#: src/plugins/mp3extractor.c:445
 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"
+#: src/plugins/ole2/ole2extractor.c:252
+msgid "No Proofing"
+msgstr ""
 
-#: 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"
+#: src/plugins/ole2/ole2extractor.c:260
+msgid "Traditional Chinese"
+msgstr ""
 
-#: 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"
+#: src/plugins/ole2/ole2extractor.c:262
+msgid "Simplified Chinese"
+msgstr ""
 
-#: 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"
+#: src/plugins/ole2/ole2extractor.c:270
+msgid "Swiss German"
+msgstr ""
 
-#: src/main/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: op�iune nerecunoscut� `--%s'\n"
+#: src/plugins/ole2/ole2extractor.c:274
+msgid "U.S. English"
+msgstr ""
 
-#: src/main/getopt.c:762
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: op�iune nerecunoscut� `%c%s'\n"
+#: src/plugins/ole2/ole2extractor.c:276
+msgid "U.K. English"
+msgstr ""
 
-#: src/main/getopt.c:788
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: op�iune ilegal� -- %c\n"
+#: src/plugins/ole2/ole2extractor.c:278
+msgid "Australian English"
+msgstr ""
 
-#: src/main/getopt.c:790
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: op�iune ilegal� -- %c\n"
+#: src/plugins/ole2/ole2extractor.c:280
+msgid "Castilian Spanish"
+msgstr ""
 
-#: 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"
+#: src/plugins/ole2/ole2extractor.c:282
+msgid "Mexican Spanish"
+msgstr ""
 
-#: src/main/getopt.c:867
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: op�iunea `-W %s' este ambigu�\n"
+#: src/plugins/ole2/ole2extractor.c:288
+msgid "Belgian French"
+msgstr ""
 
-#: 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"
+#: src/plugins/ole2/ole2extractor.c:290
+msgid "Canadian French"
+msgstr ""
 
-#: src/main/extract.c:49
-#, c-format
-msgid ""
-"Usage: %s\n"
-"%s\n"
-"\n"
+#: src/plugins/ole2/ole2extractor.c:292
+msgid "Swiss French"
 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"
+#: src/plugins/ole2/ole2extractor.c:302
+msgid "Swiss Italian"
+msgstr ""
 
-#: src/main/extract.c:126
-msgid "do not remove any duplicates"
-msgstr "nu �ndep�rta nici un duplicat"
+#: src/plugins/ole2/ole2extractor.c:310
+msgid "Belgian Dutch"
+msgstr ""
 
-#: src/main/extract.c:128
-msgid "print output in bibtex format"
-msgstr "afi�eaz� ie�irea �n format bibtex"
+#: src/plugins/ole2/ole2extractor.c:312
+msgid "Norwegian Bokmal"
+msgstr ""
 
-#: 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"
+#: src/plugins/ole2/ole2extractor.c:322
+msgid "Rhaeto-Romanic"
+msgstr ""
 
-#: src/main/extract.c:132
-msgid "remove duplicates only if types match"
-msgstr "�ndep�rteaz� duplicatele numai dac� tipul este acela�i"
+#: src/plugins/ole2/ole2extractor.c:328
+msgid "Croato-Serbian (Latin)"
+msgstr ""
 
-#: 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)"
+#: src/plugins/ole2/ole2extractor.c:330
+msgid "Serbo-Croatian (Cyrillic)"
+msgstr ""
 
-#: src/main/extract.c:136
-msgid "print this help"
-msgstr "afi�eaz� acest mesaj de ajutor"
+#: src/plugins/ole2/ole2extractor.c:358
+msgid "Farsi"
+msgstr ""
 
-#: 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)"
-
-#: src/main/extract.c:140
-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"
-
-#: src/main/extract.c:144
-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�"
-
-#: 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"
-
-#: 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)"
-
-#: src/main/extract.c:152
-msgid "print the version number"
-msgstr "afi�eaz� num�rul versiunii"
-
-#: src/main/extract.c:154
-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"
-
-#: src/main/extract.c:159
-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."
-
-#: src/main/extract.c:198 src/main/extractor.c:876
+#: src/plugins/ole2/ole2extractor.c:420
 #, c-format
-msgid "%s - (binary)\n"
-msgstr "%s - (binar)\n"
+msgid "Revision #%u: Author '%s' worked on '%s'"
+msgstr ""
 
-#: src/main/extract.c:204 src/main/extractor.c:881
+#: src/plugins/printable/dictionary-builder.c:97
 #, c-format
-msgid "INVALID TYPE - %s\n"
-msgstr "TIP INVALID - %s\n"
+msgid ""
+"Please provide the name of the language you are building\n"
+"a dictionary for.  For example:\n"
+msgstr ""
+"V� rug�m furniza�i numele limbii pentru care contrui�i\n"
+"un dic�ionar.  De exemplu:\n"
 
-#: src/main/extract.c:270 src/main/extractor.c:40
-msgid "title"
-msgstr "titlu"
+#: src/plugins/printable/dictionary-builder.c:111
+#: src/plugins/printable/dictionary-builder.c:165
+#, fuzzy, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "Eroare deschidere fi�ier '%s': %s\n"
 
-#: src/main/extract.c:272 src/main/extractor.c:38
-msgid "filename"
-msgstr "nume_fi�ier"
-
-#: 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 "descriere"
-
-#: src/main/extract.c:283 src/main/extractor.c:55
-msgid "keywords"
-msgstr "cuvinte cheie"
-
-#: src/main/extract.c:285 src/main/extractor.c:44
-msgid "comment"
-msgstr "comentariu"
-
-#: src/main/extract.c:289 src/main/extractor.c:45
-msgid "date"
-msgstr "data"
-
-#: src/main/extract.c:291 src/main/extractor.c:67
-msgid "creation date"
-msgstr "data cre�rii"
-
-#: src/main/extract.c:319 src/main/extractor.c:46
-msgid "publisher"
-msgstr "publicist"
-
-#: src/main/extract.c:323 src/main/extractor.c:52
-msgid "organization"
-msgstr "organiza�ie"
-
-#: src/main/extract.c:327 src/main/extractor.c:54
-msgid "subject"
-msgstr "subiect"
-
-#: src/main/extract.c:331 src/main/extractor.c:71
-msgid "page count"
-msgstr "num�r de pagini"
-
-#: src/main/extract.c:473
+#: src/plugins/printable/dictionary-builder.c:118
 #, 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 ""
+"Error allocating: %s\n"
+"."
+msgstr ""
+"Eroare de alocare: %s\n"
+"."
 
-#: src/main/extract.c:540
+#: src/plugins/printable/dictionary-builder.c:132
 #, 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 "Increase ALLOCSIZE (in %s).\n"
+msgstr "Cre�te�i ALLOCSIZE (�n %s).\n"
 
-#: src/main/extract.c:599
+#: src/plugins/riffextractor.c:151
 #, c-format
-msgid "%% BiBTeX file\n"
-msgstr "%% BiBTeX file\n"
+msgid "codec: %s, %u fps, %u ms"
+msgstr "codec: %s, %u fps, %u ms"
 
-#: src/main/extract.c:606
+#: src/plugins/rpm/rpmextractor.c:3223
 #, c-format
-msgid "Keywords for file %s:\n"
-msgstr "Cuvinte cheie pentru fi�ier %s:\n"
+msgid "Source RPM %d.%d"
+msgstr "Surs� RPM %d.%d"
 
-#: src/main/extractor.c:37
-msgid "unknown"
-msgstr "necunoscut"
-
-#: src/main/extractor.c:39
-msgid "mimetype"
-msgstr "mimetype"
-
-#: src/main/extractor.c:42
-msgid "artist"
-msgstr "artist"
-
-#: src/main/extractor.c:47
-msgid "language"
-msgstr "limb�"
-
-#: src/main/extractor.c:48
-msgid "album"
-msgstr "album"
-
-#: src/main/extractor.c:49
-msgid "genre"
-msgstr "gen"
-
-#: src/main/extractor.c:50
-msgid "location"
-msgstr "loca�ie"
-
-#: src/main/extractor.c:51
-msgid "version"
-msgstr "versiune"
-
-#: src/main/extractor.c:53
-msgid "copyright"
-msgstr "copyright"
-
-#: src/main/extractor.c:56
-msgid "contributor"
-msgstr "contribuitor"
-
-#: src/main/extractor.c:57
-msgid "resource-type"
-msgstr "tip-resurs�"
-
-#: src/main/extractor.c:58
-msgid "format"
-msgstr "format"
-
-#: src/main/extractor.c:59
-msgid "resource-identifier"
-msgstr "identificator-resurs�"
-
-#: src/main/extractor.c:60
-msgid "source"
-msgstr "surs�"
-
-#: src/main/extractor.c:61
-msgid "relation"
-msgstr "rela�ie"
-
-#: src/main/extractor.c:62
-msgid "coverage"
-msgstr "acoperire"
-
-#: src/main/extractor.c:63
-msgid "software"
-msgstr "software"
-
-#: src/main/extractor.c:64
-msgid "disclaimer"
-msgstr "repudiere"
-
-#: src/main/extractor.c:65
-msgid "warning"
-msgstr "avertisment"
-
-#: src/main/extractor.c:66
-msgid "translated"
-msgstr "tradus"
-
-#: src/main/extractor.c:68
-msgid "modification date"
-msgstr "data modific�rii"
-
-#: src/main/extractor.c:69
-msgid "creator"
-msgstr "creator"
-
-#: src/main/extractor.c:70
-msgid "producer"
-msgstr "produc�tor"
-
-#: src/main/extractor.c:72
-msgid "page orientation"
-msgstr "orientare pagin�"
-
-#: src/main/extractor.c:73
-msgid "paper size"
-msgstr "dimensiune pagina"
-
-#: src/main/extractor.c:74
-msgid "used fonts"
-msgstr "fonturi folosite"
-
-#: src/main/extractor.c:75
-msgid "page order"
-msgstr "ordine pagini"
-
-#: src/main/extractor.c:76
-msgid "created for"
-msgstr "creat pentru"
-
-#: src/main/extractor.c:77
-msgid "magnification"
-msgstr "m�rire"
-
-#: src/main/extractor.c:78
-msgid "release"
-msgstr "release"
-
-#: src/main/extractor.c:79
-msgid "group"
-msgstr "grup"
-
-#: src/main/extractor.c:80
-msgid "size"
-msgstr "m�rime"
-
-#: src/main/extractor.c:81
-msgid "summary"
-msgstr "cuprins"
-
-#: src/main/extractor.c:82
-msgid "packager"
-msgstr "�mpachetator"
-
-#: src/main/extractor.c:83
-msgid "vendor"
-msgstr "v�nz�tor"
-
-#: src/main/extractor.c:84
-msgid "license"
-msgstr "licen��"
-
-#: src/main/extractor.c:85
-msgid "distribution"
-msgstr "distribu�ie"
-
-#: src/main/extractor.c:86
-msgid "build-host"
-msgstr "gazd�-contruit"
-
-#: src/main/extractor.c:87
-msgid "os"
-msgstr "sistem operare"
-
-#: src/main/extractor.c:88
-msgid "dependency"
-msgstr "dependin�e"
-
-#: 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 "rezolu�ie"
-
-#: src/main/extractor.c:95
-msgid "category"
-msgstr "categorie"
-
-#: src/main/extractor.c:96
-msgid "book title"
-msgstr "titlu de carte"
-
-#: src/main/extractor.c:97
-msgid "priority"
-msgstr "prioritate"
-
-#: src/main/extractor.c:98
-msgid "conflicts"
-msgstr "conflicte"
-
-#: src/main/extractor.c:99
-msgid "replaces"
-msgstr "�nlocuie�te"
-
-#: src/main/extractor.c:100
-msgid "provides"
-msgstr "furnizeaz�"
-
-#: src/main/extractor.c:101
-msgid "conductor"
-msgstr "conduc�tor"
-
-#: src/main/extractor.c:102
-msgid "interpreter"
-msgstr "interpret(�)"
-
-#: src/main/extractor.c:103
-msgid "owner"
-msgstr "proprietar"
-
-#: src/main/extractor.c:104
-msgid "lyrics"
-msgstr "versuri"
-
-#: src/main/extractor.c:105
-msgid "media type"
-msgstr "tipul media"
-
-#: src/main/extractor.c:106
-msgid "contact"
-msgstr "contact"
-
-#: src/main/extractor.c:107
-msgid "binary thumbnail data"
-msgstr "data thumbnail binar"
-
-#: src/main/extractor.c:108
-msgid "publication date"
-msgstr "data public�rii"
-
-#: src/main/extractor.c:109
-msgid "camera make"
-msgstr "produc�tor"
-
-#: src/main/extractor.c:110
-msgid "camera model"
-msgstr "model de camer�"
-
-#: src/main/extractor.c:111
-msgid "exposure"
-msgstr "expunere"
-
-#: src/main/extractor.c:112
-msgid "aperture"
-msgstr "apertur�"
-
-#: src/main/extractor.c:113
-msgid "exposure bias"
-msgstr "predilec�ie expunere"
-
-#: src/main/extractor.c:114
-msgid "flash"
-msgstr "bli�"
-
-#: src/main/extractor.c:115
-msgid "flash bias"
-msgstr "predilec�ie bli�"
-
-#: src/main/extractor.c:116
-msgid "focal length"
-msgstr "lungime focal�"
-
-#: src/main/extractor.c:117
-msgid "focal length (35mm equivalent)"
-msgstr "lungime focal� (echivalent 35mm)"
-
-#: src/main/extractor.c:118
-msgid "iso speed"
-msgstr "valoare iso"
-
-#: src/main/extractor.c:119
-msgid "exposure mode"
-msgstr "mod expunere"
-
-#: src/main/extractor.c:120
-msgid "metering mode"
-msgstr "mod de m�surare"
-
-#: src/main/extractor.c:121
-msgid "macro mode"
-msgstr "mod macro"
-
-#: src/main/extractor.c:122
-msgid "image quality"
-msgstr "calitate imagine"
-
-#: src/main/extractor.c:123
-msgid "white balance"
-msgstr "balan�� alb"
-
-#: src/main/extractor.c:124
-msgid "orientation"
-msgstr "orientare"
-
-#: src/main/extractor.c:219
+#: src/plugins/rpm/rpmextractor.c:3225
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "ini�ializare mecanismului de plugin a e�uat: %s!\n"
+msgid "Binary RPM %d.%d"
+msgstr "Binar RPM %d.%d"
 
-#: src/main/extractor.c:366
-#, 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 "Fatal: could not allocate (%s at %s:%d).\n"
+#~ msgstr "Fatal: nu am putut aloca (%s la %s:%d).\n"
 
-#: src/main/extractor.c:395
-#, c-format
-msgid "Loading '%s' plugin failed: %s\n"
-msgstr "�nc�rcarea plugin-ului '%s' a e�uat: %s\n"
+#~ msgid "os"
+#~ msgstr "sistem operare"
 
-#: src/main/extractor.c:600
-#, c-format
-msgid "Unloading plugin '%s' failed!\n"
-msgstr "Desc�rcarea plugin-ului '%s' a e�uat!\n"
-
 #~ msgid "No error"
 #~ msgstr "Nici o eroare"
 
@@ -1317,9 +1655,6 @@
 #~ msgid "Exec format error"
 #~ msgstr "Eroare format exec"
 
-#~ msgid "Bad file number"
-#~ msgstr "Num�r de fi�ier incorect"
-
 #~ msgid "No children"
 #~ msgstr "Nici un copil"
 
@@ -1353,9 +1688,6 @@
 #~ msgid "Not a directory"
 #~ msgstr "Nu este un director"
 
-#~ msgid "Is a directory"
-#~ msgstr "Este un director"
-
 #~ msgid "Invalid argument"
 #~ msgstr "Argument invalide"
 

Modified: Extractor/po/sv.po
===================================================================
--- Extractor/po/sv.po  2008-04-25 14:50:17 UTC (rev 6758)
+++ Extractor/po/sv.po  2008-04-25 14:50:36 UTC (rev 6759)
@@ -28,8 +28,11 @@
 
 #: src/main/extract.c:52
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
-msgstr "Argument som är obligatoriska för långa flaggor är också obligatoriska 
för korta flaggor.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
+"korta flaggor.\n"
 
 #: src/main/extract.c:126
 msgid "do not remove any duplicates"
@@ -40,8 +43,11 @@
 msgstr "skriv ut i bibtex-format"
 
 #: src/main/extract.c:130
-msgid "use the generic plaintext extractor for the language with the 2-letter 
language code LANG"
-msgstr "använd den generiska klartextuppackare för språket med 2-bokstavskoden 
i LANG"
+msgid ""
+"use the generic plaintext extractor for the language with the 2-letter "
+"language code LANG"
+msgstr ""
+"använd den generiska klartextuppackare för språket med 2-bokstavskoden i LANG"
 
 #: src/main/extract.c:132
 msgid "remove duplicates only if types match"
@@ -49,7 +55,8 @@
 
 #: src/main/extract.c:134
 msgid "use the filename as a keyword (loads filename-extractor plugin)"
-msgstr "använd filnamnet som ett nyckelord (läser in insticket 
filename-extractor)"
+msgstr ""
+"använd filnamnet som ett nyckelord (läser in insticket filename-extractor)"
 
 #: src/main/extract.c:136
 msgid "produce grep-friendly output (all results on one line per file)"
@@ -690,8 +697,12 @@
 
 #: src/main/extractor.c:752
 #, c-format
-msgid "Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that 
failed also.  Errors are: `%s' and `%s'.\n"
-msgstr "Uppslag av symbol \"%s\" i bibliotek \"%s\" misslyckades så jag 
försökte med \"%s\" men det misslyckades också.  Felen är: \"%s\" och \"%s\".\n"
+msgid ""
+"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
+"failed also.  Errors are: `%s' and `%s'.\n"
+msgstr ""
+"Uppslag av symbol \"%s\" i bibliotek \"%s\" misslyckades så jag försökte med "
+"\"%s\" men det misslyckades också.  Felen är: \"%s\" och \"%s\".\n"
 
 #: src/main/extractor.c:781
 #, c-format

Modified: Extractor/po/vi.po
===================================================================
--- Extractor/po/vi.po  2008-04-25 14:50:17 UTC (rev 6758)
+++ Extractor/po/vi.po  2008-04-25 14:50:36 UTC (rev 6759)
@@ -3,7 +3,7 @@
 # Copyright © 2006 Christian Grothoff
 # This file is distributed under the same license as the libextractor-0.5.20 
package.
 # Clytie Siddall <address@hidden>, 2005-2008.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: libextractor 0.5.20\n"
@@ -31,8 +31,11 @@
 
 #: src/main/extract.c:52
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
-msgstr "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với 
tùy chọn ngắn.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
+"ngắn.\n"
 
 #: src/main/extract.c:126
 msgid "do not remove any duplicates"
@@ -43,8 +46,12 @@
 msgstr "hiển thị dữ liệu xuất có dạng bibtex"
 
 #: src/main/extract.c:130
-msgid "use the generic plaintext extractor for the language with the 2-letter 
language code LANG"
-msgstr "sử dụng trình rút văn bản thuần thuộc giống loại cho ngôn ngữ có mã 
ngôn ngữ bằng hai chữ là LANG"
+msgid ""
+"use the generic plaintext extractor for the language with the 2-letter "
+"language code LANG"
+msgstr ""
+"sử dụng trình rút văn bản thuần thuộc giống loại cho ngôn ngữ có mã ngôn ngữ "
+"bằng hai chữ là LANG"
 
 #: src/main/extract.c:132
 msgid "remove duplicates only if types match"
@@ -52,11 +59,15 @@
 
 #: src/main/extract.c:134
 msgid "use the filename as a keyword (loads filename-extractor plugin)"
-msgstr "dùng tên tập tin là một từ khoá (thì tải bổ sung « filename-extractor 
» [rút tên tập tin])"
+msgstr ""
+"dùng tên tập tin là một từ khoá (thì tải bổ sung « filename-extractor » [rút "
+"tên tập tin])"
 
 #: src/main/extract.c:136
 msgid "produce grep-friendly output (all results on one line per file)"
-msgstr "tạo ra kết xuất thân thiện với grep (mọi kết quả trên cùng dòng của 
mỗi tập tin)"
+msgstr ""
+"tạo ra kết xuất thân thiện với grep (mọi kết quả trên cùng dòng của mỗi tập "
+"tin)"
 
 #: src/main/extract.c:138
 msgid "print this help"
@@ -80,7 +91,8 @@
 
 #: src/main/extract.c:148
 msgid "print only keywords of the given TYPE (use -L to get a list)"
-msgstr "hiển thị chỉ từ khoá KIỂU (TYPE) đã cho thôi (dùng « -L » để xem danh 
sách)"
+msgstr ""
+"hiển thị chỉ từ khoá KIỂU (TYPE) đã cho thôi (dùng « -L » để xem danh sách)"
 
 #: src/main/extract.c:150
 msgid "remove duplicates even if keyword types do not match"
@@ -178,7 +190,8 @@
 #: src/main/extract.c:607
 #, c-format
 msgid "Use --help to get a list of options.\n"
-msgstr "Hãy sử dụng lệnh « --help » (trợ giúp) để xem một danh sách các tùy 
chọn.\n"
+msgstr ""
+"Hãy sử dụng lệnh « --help » (trợ giúp) để xem một danh sách các tùy chọn.\n"
 
 #: src/main/extract.c:663
 #, c-format
@@ -694,8 +707,12 @@
 
 #: src/main/extractor.c:752
 #, c-format
-msgid "Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that 
failed also.  Errors are: `%s' and `%s'.\n"
-msgstr "Việc tháo gỡ ký hiệu « %s » trong thư viện « %s » bị lỗi, thì đã cố « 
%s », nhưng mà nó cũng không thành công. Gặp lỗi « %s » và « %s ».\n"
+msgid ""
+"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
+"failed also.  Errors are: `%s' and `%s'.\n"
+msgstr ""
+"Việc tháo gỡ ký hiệu « %s » trong thư viện « %s » bị lỗi, thì đã cố « %s », "
+"nhưng mà nó cũng không thành công. Gặp lỗi « %s » và « %s ».\n"
 
 #: src/main/extractor.c:781
 #, c-format
@@ -1519,7 +1536,8 @@
 msgid ""
 "Please provide the name of the language you are building\n"
 "a dictionary for.  For example:\n"
-msgstr "Hãy cung cấp tên ngôn ngữ mà bạn đang xây dựng từ điển cho nó. Lấy thí 
dụ :\n"
+msgstr ""
+"Hãy cung cấp tên ngôn ngữ mà bạn đang xây dựng từ điển cho nó. Lấy thí dụ :\n"
 
 #: src/plugins/printable/dictionary-builder.c:111
 #: src/plugins/printable/dictionary-builder.c:165

Modified: Extractor/src/plugins/pdf/Object.h
===================================================================
--- Extractor/src/plugins/pdf/Object.h  2008-04-25 14:50:17 UTC (rev 6758)
+++ Extractor/src/plugins/pdf/Object.h  2008-04-25 14:50:36 UTC (rev 6759)
@@ -68,17 +68,18 @@
 //------------------------------------------------------------------------
 
 #ifdef DEBUG_MEM
-#define initObj(t) ++numAlloc[type = t]
+#define initObj(t) zeroUnion(); ++numAlloc[type = t]
 #else
-#define initObj(t) type = t
+#define initObj(t) zeroUnion(); type = t
 #endif
 
 class Object {
 public:
-
+  // attempt to clear the anonymous union
+  void zeroUnion() { this->name = NULL; }
   // Default constructor.
   Object():
-    type(objNone) {}
+    type(objNone) { zeroUnion(); }
 
   // Initialize an object.
   Object *initBool(GBool boolnA)
@@ -220,16 +221,16 @@
 #include "Array.h"
 
 inline int Object::arrayGetLength()
-  { return array->getLength(); }
+  { if (type != objArray) return 0; return array->getLength(); }
 
 inline void Object::arrayAdd(Object *elem)
-  { array->add(elem); }
+  { if (type == objArray) array->add(elem); }
 
 inline Object *Object::arrayGet(int i, Object *obj)
-  { return array->get(i, obj); }
+  { if (type != objArray) return obj->initNull(); return array->get(i, obj); }
 
 inline Object *Object::arrayGetNF(int i, Object *obj)
-  { return array->getNF(i, obj); }
+  { if (type != objArray) return obj->initNull(); return array->getNF(i, obj); 
}
 
 //------------------------------------------------------------------------
 // Dict accessors.
@@ -238,31 +239,31 @@
 #include "Dict.h"
 
 inline int Object::dictGetLength()
-  { return dict->getLength(); }
+  { if (type != objDict) return 0; return dict->getLength(); }
 
 inline void Object::dictAdd(char *key, Object *val)
-  { dict->add(key, val); }
+  { if (type == objDict) dict->add(key, val); }
 
 inline GBool Object::dictIs(char *dictType)
-  { return dict->is(dictType); }
+  { return (type == objDict) && dict->is(dictType); }
 
 inline GBool Object::isDict(char *dictType)
-  { return type == objDict && dictIs(dictType); }
+  { return (type == objDict) && dictIs(dictType); }
 
 inline Object *Object::dictLookup(char *key, Object *obj)
-  { return dict->lookup(key, obj); }
+  { if (type != objDict) return obj->initNull(); return dict->lookup(key, 
obj); }
 
 inline Object *Object::dictLookupNF(char *key, Object *obj)
-  { return dict->lookupNF(key, obj); }
+  { if (type != objDict) return obj->initNull(); return dict->lookupNF(key, 
obj); }
 
 inline char *Object::dictGetKey(int i)
-  { return dict->getKey(i); }
+  { if (type != objDict) return NULL; return dict->getKey(i); }
 
 inline Object *Object::dictGetVal(int i, Object *obj)
-  { return dict->getVal(i, obj); }
+  { if (type != objDict) return obj->initNull(); return dict->getVal(i, obj); }
 
 inline Object *Object::dictGetValNF(int i, Object *obj)
-  { return dict->getValNF(i, obj); }
+  { if (type != objDict) return obj->initNull(); return dict->getValNF(i, 
obj); }
 
 //------------------------------------------------------------------------
 // Stream accessors.
@@ -271,33 +272,33 @@
 #include "Stream.h"
 
 inline GBool Object::streamIs(char *dictType)
-  { return stream->getDict()->is(dictType); }
+  { return (type == objStream) && stream->getDict()->is(dictType); }
 
 inline GBool Object::isStream(char *dictType)
-  { return type == objStream && streamIs(dictType); }
+  { return (type == objStream) && streamIs(dictType); }
 
 inline void Object::streamReset()
-  { stream->reset(); }
+  { if (type == objStream) stream->reset(); }
 
 inline void Object::streamClose()
-  { stream->close(); }
+  { if (type == objStream) stream->close(); }
 
 inline int Object::streamGetChar()
-  { return stream->getChar(); }
+  { if (type != objStream) return EOF; return stream->getChar(); }
 
 inline int Object::streamLookChar()
-  { return stream->lookChar(); }
+  { if (type != objStream) return EOF; return stream->lookChar(); }
 
 inline char *Object::streamGetLine(char *buf, int size)
-  { return stream->getLine(buf, size); }
+  { if (type != objStream) return NULL; return stream->getLine(buf, size); }
 
 inline Guint Object::streamGetPos()
-  { return stream->getPos(); }
+  { if (type != objStream) return 0; return stream->getPos(); }
 
 inline void Object::streamSetPos(Guint pos, int dir)
-  { stream->setPos(pos, dir); }
+  { if (type == objStream) stream->setPos(pos, dir); }
 
 inline Dict *Object::streamGetDict()
-  { return stream->getDict(); }
+  { if (type != objStream) return NULL; return stream->getDict(); }
 
 #endif





reply via email to

[Prev in Thread] Current Thread [Next in Thread]