gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r3372 - in Extractor: . po src/include src/main


From: grothoff
Subject: [GNUnet-SVN] r3372 - in Extractor: . po src/include src/main
Date: Wed, 6 Sep 2006 13:27:00 -0700 (PDT)

Author: grothoff
Date: 2006-09-06 13:26:52 -0700 (Wed, 06 Sep 2006)
New Revision: 3372

Modified:
   Extractor/ChangeLog
   Extractor/README
   Extractor/configure.ac
   Extractor/po/de.po
   Extractor/po/ga.po
   Extractor/po/libextractor.pot
   Extractor/po/ro.po
   Extractor/po/rw.po
   Extractor/po/sv.po
   Extractor/po/vi.po
   Extractor/src/include/extractor.h
   Extractor/src/main/Makefile.am
   Extractor/src/main/extractor.c
Log:
making LE relocateable, releasing 0.5.15.

Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/ChangeLog 2006-09-06 20:26:52 UTC (rev 3372)
@@ -1,5 +1,8 @@
 Wed Sep  6 13:38:55 PDT 2006
        Added tIME support to PNG extractor.  Bugfixes in PDF extractors.
+       Made libextractor relocateable (plugin path no longer hardwired
+       into binary, using various tricks instead to find path).
+       Translation updates.  Releasing libextractor 0.5.15.
 
 Wed May 17 02:05:37 PDT 2006
         Switched mpegextractor to use libmpeg2 (improves correctness,

Modified: Extractor/README
===================================================================
--- Extractor/README    2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/README    2006-09-06 20:26:52 UTC (rev 3372)
@@ -84,3 +84,17 @@
 broken C++ compilers), you have to manually disable exiv2 by passing
 "--disable-exiv2" to "configure" in order to avoid compilation
 problems.
+
+
+If libextractor fails to find the plugins, a possible method of last
+resort is to set the environment variable LIBEXTRACTOR_PREFIX to the
+parent of the directory where the plugins are installed (i.e., if the
+plugins are in "/foo/bar/lib/libextractor/*.so", set the variable to
+"/foo/bar/lib").  This should not be needed if "extract" is in
+"/foo/bar/bin/extract" and "/foo/bar/bin" is in the PATH, if you are
+running Linux and "libextractor.so" is in
+"/foo/bar/lib/libextractor.so", or if you are on linux and the binary
+using libextractor resides in "/foo/bar/bin", or if you are under
+Windows and "GetModuleFileName" returns "/foo/bar/bin".  If none of
+these common circumstances apply, you may have to set the environment
+variable.

Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac      2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/configure.ac      2006-09-06 20:26:52 UTC (rev 3372)
@@ -1,8 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
-AC_INIT([libextractor], [0.5.14], address@hidden)
+AC_INIT([libextractor], [0.5.15], address@hidden)
 AC_REVISION($Revision: 1.67 $)
-AM_INIT_AUTOMAKE([libextractor], [0.5.14])
+AM_INIT_AUTOMAKE([libextractor], [0.5.15])
 AM_CONFIG_HEADER(src/include/config.h)
 
 AH_TOP([#define _GNU_SOURCE  1])

Modified: Extractor/po/de.po
===================================================================
--- Extractor/po/de.po  2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/po/de.po  2006-09-06 20:26:52 UTC (rev 3372)
@@ -1,18 +1,18 @@
 # German translations for libextractor package
-# Copyright © 2004, 2005 Free Software Foundation, Inc.
+# Copyright © 2004, 2005, 2006 Free Software Foundation, Inc.
 # Copyright © 2004 Christian Grothoff
 # This file is distributed under the same license as the libextractor package.
-# Karl Eichwalder <address@hidden>, 2004, 2005.
+# Karl Eichwalder <address@hidden>, 2004, 2005, 2006.
 # Christian Grothoff <address@hidden>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libextractor 0.5.6a\n"
+"Project-Id-Version: libextractor 0.5.14\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-17 00:53-0700\n"
-"PO-Revision-Date: 2005-09-22 10:07+0200\n"
+"POT-Creation-Date: 2006-09-06 14:22-0700\n"
+"PO-Revision-Date: 2006-05-20 20:02+0200\n"
 "Last-Translator: Karl Eichwalder <address@hidden>\n"
-"Language-Team: German <address@hidden>\n"
+"Language-Team: German <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -118,12 +118,12 @@
 msgid "Extract metadata from files."
 msgstr "Metadaten aus den Dateien extrahieren."
 
-#: src/main/extract.c:198 src/main/extractor.c:1149
+#: src/main/extract.c:198 src/main/extractor.c:1387
 #, c-format
 msgid "%s - (binary)\n"
 msgstr "%s - (binär)\n"
 
-#: src/main/extract.c:204 src/main/extractor.c:1154
+#: src/main/extract.c:204 src/main/extractor.c:1392
 #, c-format
 msgid "INVALID TYPE - %s\n"
 msgstr "UNGÜLTIGE ART - %s\n"
@@ -247,20 +247,22 @@
 msgstr "Format"
 
 #: src/main/extractor.c:66
+#, fuzzy
 msgid "resource-identifier"
-msgstr "Ressourcen Identifikation"
+msgstr "Art der Ressource"
 
 #: src/main/extractor.c:67
 msgid "source"
 msgstr "Quelle"
 
 #: src/main/extractor.c:68
+#, fuzzy
 msgid "relation"
-msgstr "Relation"
+msgstr "Auflösung"
 
 #: src/main/extractor.c:69
 msgid "coverage"
-msgstr "Inhalt"
+msgstr ""
 
 #: src/main/extractor.c:70
 msgid "software"
@@ -336,7 +338,7 @@
 
 #: src/main/extractor.c:90
 msgid "vendor"
-msgstr ""
+msgstr "Anbieter"
 
 #: src/main/extractor.c:91
 msgid "license"
@@ -352,7 +354,7 @@
 
 #: src/main/extractor.c:94
 msgid "operating system"
-msgstr ""
+msgstr "Betriebssystem"
 
 #: src/main/extractor.c:95
 msgid "dependency"
@@ -396,19 +398,21 @@
 
 #: src/main/extractor.c:105
 msgid "conflicts"
-msgstr "Konflikte"
+msgstr "in Konflikt mit"
 
 #: src/main/extractor.c:106
 msgid "replaces"
 msgstr "Ersatz für"
 
 #: src/main/extractor.c:107
+#, fuzzy
 msgid "provides"
-msgstr "stellt bereit"
+msgstr "Hersteller"
 
 #: src/main/extractor.c:108
+#, fuzzy
 msgid "conductor"
-msgstr "Leitung"
+msgstr "Beiträger"
 
 #: src/main/extractor.c:109
 msgid "interpreter"
@@ -444,11 +448,11 @@
 
 #: src/main/extractor.c:117
 msgid "camera model"
-msgstr "Kameramodell"
+msgstr "Kamera-Modell"
 
 #: src/main/extractor.c:118
 msgid "exposure"
-msgstr "Belichtung"
+msgstr ""
 
 #: src/main/extractor.c:119
 msgid "aperture"
@@ -468,7 +472,7 @@
 
 #: src/main/extractor.c:123
 msgid "focal length"
-msgstr "Brennweite"
+msgstr ""
 
 #: src/main/extractor.c:124
 msgid "focal length (35mm equivalent)"
@@ -488,7 +492,7 @@
 
 #: src/main/extractor.c:128
 msgid "macro mode"
-msgstr "Makromodus"
+msgstr "Makro-Modus"
 
 #: src/main/extractor.c:129
 msgid "image quality"
@@ -496,11 +500,11 @@
 
 #: src/main/extractor.c:130
 msgid "white balance"
-msgstr ""
+msgstr "Weißabgleich"
 
 #: src/main/extractor.c:131
 msgid "orientation"
-msgstr "Seitenausrichtung"
+msgstr "Ausrichtung"
 
 #: src/main/extractor.c:132
 msgid "template"
@@ -508,7 +512,7 @@
 
 #: src/main/extractor.c:133
 msgid "split"
-msgstr "spalten"
+msgstr ""
 
 #: src/main/extractor.c:134
 msgid "product version"
@@ -516,11 +520,11 @@
 
 #: src/main/extractor.c:135
 msgid "last saved by"
-msgstr "zuletzt gesichert von"
+msgstr "zuletzt gespeichert von"
 
 #: src/main/extractor.c:136
 msgid "last printed"
-msgstr "zuletzt ausgedruckt am"
+msgstr "zuletzt gedruckt"
 
 #: src/main/extractor.c:137
 msgid "word count"
@@ -536,7 +540,7 @@
 
 #: src/main/extractor.c:140
 msgid "thumbnails"
-msgstr "Vorschauen"
+msgstr ""
 
 #: src/main/extractor.c:141
 msgid "security"
@@ -544,7 +548,7 @@
 
 #: src/main/extractor.c:142
 msgid "created by software"
-msgstr "erstellt mit Software"
+msgstr "erstellt mit der Software"
 
 #: src/main/extractor.c:143
 msgid "modified by software"
@@ -552,7 +556,7 @@
 
 #: src/main/extractor.c:144
 msgid "revision history"
-msgstr ""
+msgstr "Versionsgeschichte"
 
 #: src/main/extractor.c:145
 msgid "lower case conversion"
@@ -563,24 +567,21 @@
 msgstr ""
 
 #: src/main/extractor.c:147
-#, fuzzy
 msgid "generator"
-msgstr "Ersteller"
+msgstr "Erzeuger"
 
 #: src/main/extractor.c:148
-#, fuzzy
 msgid "character set"
-msgstr "Zeichenanzahl"
+msgstr "Zeichensatz"
 
 #: src/main/extractor.c:149
 #, fuzzy
 msgid "line count"
-msgstr "Seitenanzahl"
+msgstr "Zeilenanzahl"
 
 #: src/main/extractor.c:150
-#, fuzzy
 msgid "paragraph count"
-msgstr "Seitenanzahl"
+msgstr "Absatzanzahl"
 
 #: src/main/extractor.c:151
 msgid "editing cycles"
@@ -602,43 +603,40 @@
 msgstr "Ersteller"
 
 #: src/main/extractor.c:155
-#, fuzzy
 msgid "duration"
-msgstr "Relation"
+msgstr "Dauer"
 
 #: src/main/extractor.c:156
-#, fuzzy
 msgid "information"
-msgstr "Format"
+msgstr "Information"
 
 #: src/main/extractor.c:157
-#, fuzzy
 msgid "full name"
-msgstr "Dateiname"
+msgstr "vollständiger Name"
 
 #: src/main/extractor.c:158
 #, fuzzy
 msgid "chapter"
 msgstr "Kategorie"
 
-#: src/main/extractor.c:253
+#: src/main/extractor.c:496
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin-Mechanismus' ist fehlgeschlagen: %s.\n"
 
-#: src/main/extractor.c:402
+#: src/main/extractor.c:640
 #, 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:431
+#: src/main/extractor.c:669
 #, c-format
 msgid "Loading `%s' plugin failed: %s\n"
 msgstr "Laden des »%s«-Plugins ist fehlgeschlagen: %s\n"
 
-#: src/main/extractor.c:636
+#: src/main/extractor.c:874
 #, c-format
 msgid "Unloading plugin `%s' failed!\n"
 msgstr "Entladen des »%s«-Plugins ist fehlgeschlagen!\n"
@@ -763,7 +761,7 @@
 
 #: src/plugins/mp3extractor.c:52
 msgid "Dance"
-msgstr "Tanz"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:53
 msgid "Disco"
@@ -826,38 +824,43 @@
 msgstr "Techno"
 
 #: src/plugins/mp3extractor.c:68
+#, fuzzy
 msgid "Industrial"
-msgstr "Industriell"
+msgstr "Instrumental"
 
 #: src/plugins/mp3extractor.c:69
 msgid "Alternative"
-msgstr "Alternativ"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:70
 msgid "Ska"
 msgstr "Ska"
 
 #: src/plugins/mp3extractor.c:71
+#, fuzzy
 msgid "Death Metal"
-msgstr "Death Metal"
+msgstr "Metal"
 
 #: src/plugins/mp3extractor.c:72
+#, fuzzy
 msgid "Pranks"
-msgstr ""
+msgstr "Punk"
 
 #: src/plugins/mp3extractor.c:73
 msgid "Soundtrack"
 msgstr "Filmmusik (Soundtrack)"
 
 #: src/plugins/mp3extractor.c:74
+#, fuzzy
 msgid "Euro-Techno"
-msgstr "Euro-Techno"
+msgstr "Techno"
 
 #: src/plugins/mp3extractor.c:75
 msgid "Ambient"
-msgstr "Ambient"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:76
+#, fuzzy
 msgid "Trip-Hop"
 msgstr "Hip-Hop"
 
@@ -875,11 +878,11 @@
 
 #: src/plugins/mp3extractor.c:80
 msgid "Trance"
-msgstr "Trance"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:81
 msgid "Classical"
-msgstr "Klassisch"
+msgstr "Klassik"
 
 #: src/plugins/mp3extractor.c:82
 msgid "Instrumental"
@@ -911,11 +914,11 @@
 
 #: src/plugins/mp3extractor.c:89
 msgid "Alt. Rock"
-msgstr "Alternativ Rock"
+msgstr "Alt. Rock"
 
 #: src/plugins/mp3extractor.c:90
 msgid "Bass"
-msgstr "Bass"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:91
 msgid "Soul"
@@ -926,24 +929,29 @@
 msgstr "Punk"
 
 #: src/plugins/mp3extractor.c:93
+#, fuzzy
 msgid "Space"
-msgstr "Weltraum"
+msgstr "Paket-Ersteller"
 
 #: src/plugins/mp3extractor.c:94
+#, fuzzy
 msgid "Meditative"
-msgstr "Meditation"
+msgstr "Medien-Art"
 
 #: src/plugins/mp3extractor.c:95
+#, fuzzy
 msgid "Instrumental Pop"
-msgstr "Instrumentaler Pop"
+msgstr "Instrumental"
 
 #: src/plugins/mp3extractor.c:96
+#, fuzzy
 msgid "Instrumental Rock"
-msgstr "Instrumentaler Rock"
+msgstr "Instrumental"
 
 #: src/plugins/mp3extractor.c:97
+#, fuzzy
 msgid "Ethnic"
-msgstr "Ethnisch"
+msgstr "Gothic"
 
 #: src/plugins/mp3extractor.c:98
 msgid "Gothic"
@@ -959,15 +967,16 @@
 
 #: src/plugins/mp3extractor.c:101
 msgid "Electronic"
-msgstr "Elektronik"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:102
+#, fuzzy
 msgid "Pop-Folk"
-msgstr "Pop-Volksmusik"
+msgstr "Folk"
 
 #: src/plugins/mp3extractor.c:103
 msgid "Eurodance"
-msgstr "Eurodance"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:104
 msgid "Dream"
@@ -983,7 +992,7 @@
 
 #: src/plugins/mp3extractor.c:107
 msgid "Cult"
-msgstr "Kult"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:108
 msgid "Gangsta Rap"
@@ -1042,12 +1051,14 @@
 msgstr ""
 
 #: src/plugins/mp3extractor.c:122
+#, fuzzy
 msgid "Acid Punk"
-msgstr "Acid Punk"
+msgstr "Punk"
 
 #: src/plugins/mp3extractor.c:123
+#, fuzzy
 msgid "Acid Jazz"
-msgstr "Acid Jazz"
+msgstr "Jazz"
 
 #: src/plugins/mp3extractor.c:124
 msgid "Polka"
@@ -1086,8 +1097,9 @@
 msgstr "Swing"
 
 #: src/plugins/mp3extractor.c:133
+#, fuzzy
 msgid "Fast-Fusion"
-msgstr "Schnelle Fusion"
+msgstr "Fusion"
 
 #: src/plugins/mp3extractor.c:134
 msgid "Bebob"
@@ -1103,19 +1115,21 @@
 
 #: src/plugins/mp3extractor.c:137
 msgid "Celtic"
-msgstr "Keltisch"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:138
+#, fuzzy
 msgid "Bluegrass"
-msgstr ""
+msgstr "Blues"
 
 #: src/plugins/mp3extractor.c:139
 msgid "Avantgarde"
 msgstr "Avantgarde"
 
 #: src/plugins/mp3extractor.c:140
+#, fuzzy
 msgid "Gothic Rock"
-msgstr "Gothischer Rock"
+msgstr "Gothic"
 
 #: src/plugins/mp3extractor.c:141
 msgid "Progressive Rock"
@@ -1126,12 +1140,14 @@
 msgstr ""
 
 #: src/plugins/mp3extractor.c:143
+#, fuzzy
 msgid "Symphonic Rock"
-msgstr "Rocksymphonie"
+msgstr "Symphonie"
 
 #: src/plugins/mp3extractor.c:144
+#, fuzzy
 msgid "Slow Rock"
-msgstr "Langsamer Rock"
+msgstr "Rock"
 
 #: src/plugins/mp3extractor.c:145
 msgid "Big Band"
@@ -1227,27 +1243,29 @@
 
 #: src/plugins/mp3extractor.c:168
 msgid "Freestyle"
-msgstr ""
+msgstr "Freestyle"
 
 #: src/plugins/mp3extractor.c:169
 msgid "Duet"
-msgstr "Duett"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:170
+#, fuzzy
 msgid "Punk Rock"
-msgstr "Punk Rock"
+msgstr "Rock"
 
 #: src/plugins/mp3extractor.c:171
 msgid "Drum Solo"
-msgstr "Trommel Solo"
+msgstr ""
 
 #: src/plugins/mp3extractor.c:172
 msgid "A Cappella"
 msgstr "A cappella"
 
 #: src/plugins/mp3extractor.c:173
+#, fuzzy
 msgid "Euro-House"
-msgstr "Euro-House"
+msgstr "House"
 
 #: src/plugins/mp3extractor.c:174
 msgid "Dance Hall"
@@ -1262,24 +1280,27 @@
 msgstr ""
 
 #: src/plugins/mp3extractor.c:177
+#, fuzzy
 msgid "Club-House"
-msgstr "Club-House"
+msgstr "House"
 
 #: src/plugins/mp3extractor.c:178
 msgid "Hardcore"
 msgstr ""
 
 #: src/plugins/mp3extractor.c:179
+#, fuzzy
 msgid "Terror"
-msgstr ""
+msgstr "Kein Fehler"
 
 #: src/plugins/mp3extractor.c:180
 msgid "Indie"
 msgstr ""
 
 #: src/plugins/mp3extractor.c:181
+#, fuzzy
 msgid "BritPop"
-msgstr "Britischer Pop"
+msgstr "Pop"
 
 #: src/plugins/mp3extractor.c:182
 msgid "Negerpunk"
@@ -1298,12 +1319,14 @@
 msgstr ""
 
 #: src/plugins/mp3extractor.c:186
+#, fuzzy
 msgid "Heavy Metal"
-msgstr "Heavy Metal"
+msgstr "Metal"
 
 #: src/plugins/mp3extractor.c:187
+#, fuzzy
 msgid "Black Metal"
-msgstr "Black Metal"
+msgstr "Metal"
 
 #: src/plugins/mp3extractor.c:188
 msgid "Crossover"
@@ -1334,8 +1357,9 @@
 msgstr ""
 
 #: src/plugins/mp3extractor.c:195
+#, fuzzy
 msgid "JPop"
-msgstr ""
+msgstr "Pop"
 
 #: src/plugins/mp3extractor.c:196
 msgid "Synthpop"
@@ -1359,27 +1383,27 @@
 
 #: src/plugins/ole2/ole2extractor.c:265
 msgid "Traditional Chinese"
-msgstr "Traditionelles Chinesisch"
+msgstr ""
 
 #: src/plugins/ole2/ole2extractor.c:267
 msgid "Simplified Chinese"
-msgstr "Vereinfachtes Chinesisch"
+msgstr ""
 
 #: src/plugins/ole2/ole2extractor.c:275
 msgid "Swiss German"
-msgstr "Schweizerdeutsch"
+msgstr ""
 
 #: src/plugins/ole2/ole2extractor.c:279
 msgid "U.S. English"
-msgstr "Amerikanisches Englisch"
+msgstr ""
 
 #: src/plugins/ole2/ole2extractor.c:281
 msgid "U.K. English"
-msgstr "Britisches Englisch"
+msgstr ""
 
 #: src/plugins/ole2/ole2extractor.c:283
 msgid "Australian English"
-msgstr "Australisches Englisch"
+msgstr ""
 
 #: src/plugins/ole2/ole2extractor.c:285
 msgid "Castilian Spanish"
@@ -1387,7 +1411,7 @@
 
 #: src/plugins/ole2/ole2extractor.c:287
 msgid "Mexican Spanish"
-msgstr "Mexikanisches Spanisch"
+msgstr ""
 
 #: src/plugins/ole2/ole2extractor.c:293
 msgid "Belgian French"
@@ -1478,56 +1502,5 @@
 msgid "Binary RPM %d.%d"
 msgstr "Binäres RPM %d.%d"
 
-#~ msgid "os"
-#~ msgstr "Betriebssystem"
-
-#~ msgid "Greek"
-#~ msgstr "Griechisch"
-
-#~ msgid "Arabic"
-#~ msgstr "Arabisch"
-
-#~ msgid "Bulgarian"
-#~ msgstr "Bulgarisch"
-
-#~ msgid "German"
-#~ msgstr "Deutsch"
-
-#~ msgid "Finnish"
-#~ msgstr "Finnisch"
-
-#~ msgid "Icelandic"
-#~ msgstr "Islandisch"
-
-#~ msgid "Japanese"
-#~ msgstr "Japanisch"
-
-#~ msgid "Korean"
-#~ msgstr "Koreanisch"
-
-#~ msgid "Polish"
-#~ msgstr "Polisch"
-
-#~ msgid "Brazilian Portuguese"
-#~ msgstr "Brasillianisches Portiguisisch"
-
-#~ msgid "Portuguese"
-#~ msgstr "Portuguisisch"
-
-#~ msgid "Russian"
-#~ msgstr "Russisch"
-
-#~ msgid "Albanian"
-#~ msgstr "Albanisch"
-
-#~ msgid "Swedish"
-#~ msgstr "Schwedisch"
-
-#~ msgid "Lithuanian"
-#~ msgstr "Litauisch"
-
-#~ msgid "Please provide a list of klp files as arguments.\n"
-#~ msgstr "Geben Sie eine Liste der klp-Dateien als Argument an.\n"
-
 #~ msgid "Fatal: could not allocate (%s at %s:%d).\n"
 #~ msgstr "Fatal: Allokieren nicht möglich (%s bei %s:%d).\n"

Modified: Extractor/po/ga.po
===================================================================
--- Extractor/po/ga.po  2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/po/ga.po  2006-09-06 20:26:52 UTC (rev 3372)
@@ -1,13 +1,13 @@
 # Irish translations for libextractor
 # Copyright (C) 2005 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libextractor package.
-# Kevin Patrick Scannell <address@hidden>, 2005.
+# Kevin Patrick Scannell <address@hidden>, 2005, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: libextractor 0.5.7\n"
+"Project-Id-Version: libextractor 0.5.14\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-17 00:53-0700\n"
-"PO-Revision-Date: 2005-11-15 00:46-0700\n"
+"POT-Creation-Date: 2006-09-06 14:22-0700\n"
+"PO-Revision-Date: 2006-05-22 20:46-0700\n"
 "Last-Translator: Kevin Patrick Scannell <address@hidden>\n"
 "Language-Team: Irish <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -114,12 +114,12 @@
 msgid "Extract metadata from files."
 msgstr "Bain meiteashonra� as comhaid."
 
-#: src/main/extract.c:198 src/main/extractor.c:1149
+#: src/main/extract.c:198 src/main/extractor.c:1387
 #, c-format
 msgid "%s - (binary)\n"
 msgstr "%s - (d�n�rtha)\n"
 
-#: src/main/extract.c:204 src/main/extractor.c:1154
+#: src/main/extract.c:204 src/main/extractor.c:1392
 #, c-format
 msgid "INVALID TYPE - %s\n"
 msgstr "CINE�L NEAMHBHAIL� - %s\n"
@@ -347,7 +347,7 @@
 
 #: src/main/extractor.c:94
 msgid "operating system"
-msgstr ""
+msgstr "c�ras oibri�ch�in"
 
 #: src/main/extractor.c:95
 msgid "dependency"
@@ -503,129 +503,114 @@
 
 #: src/main/extractor.c:133
 msgid "split"
-msgstr ""
+msgstr "roinn"
 
 #: src/main/extractor.c:134
-#, fuzzy
 msgid "product version"
-msgstr "t�irgeoir"
+msgstr "leagan an t�irge"
 
 #: src/main/extractor.c:135
 msgid "last saved by"
-msgstr ""
+msgstr "s�bh�ilte is d�ana� ag"
 
 #: src/main/extractor.c:136
 msgid "last printed"
-msgstr ""
+msgstr "priont�ilte"
 
 #: src/main/extractor.c:137
-#, fuzzy
 msgid "word count"
-msgstr "l�on na leathanach"
+msgstr "l�on na bhfocal"
 
 #: src/main/extractor.c:138
-#, fuzzy
 msgid "character count"
-msgstr "l�on na leathanach"
+msgstr "l�on na gcarachtar"
 
 #: src/main/extractor.c:139
 msgid "total editing time"
-msgstr ""
+msgstr "am ioml�n eagair"
 
 #: src/main/extractor.c:140
 msgid "thumbnails"
-msgstr ""
+msgstr "mionsamhlacha"
 
 #: src/main/extractor.c:141
 msgid "security"
-msgstr ""
+msgstr "sl�nd�il"
 
 #: src/main/extractor.c:142
-#, fuzzy
 msgid "created by software"
-msgstr "cruthaithe ar son"
+msgstr "cruthaithe ag bogearra�"
 
 #: src/main/extractor.c:143
 msgid "modified by software"
-msgstr ""
+msgstr "mionathraithe ag bogearra�"
 
 #: src/main/extractor.c:144
 msgid "revision history"
-msgstr ""
+msgstr "stair leasaithe"
 
 #: src/main/extractor.c:145
 msgid "lower case conversion"
-msgstr ""
+msgstr "tiont� go c�s �ochtair"
 
 #: src/main/extractor.c:146
 msgid "company"
-msgstr ""
+msgstr "comhlacht"
 
 #: src/main/extractor.c:147
-#, fuzzy
 msgid "generator"
-msgstr "cruthaitheoir"
+msgstr "ginead�ir"
 
 #: src/main/extractor.c:148
-#, fuzzy
 msgid "character set"
-msgstr "l�on na leathanach"
+msgstr "tacar carachtar"
 
 #: src/main/extractor.c:149
-#, fuzzy
 msgid "line count"
-msgstr "l�on na leathanach"
+msgstr "l�on na l�nte"
 
 #: src/main/extractor.c:150
-#, fuzzy
 msgid "paragraph count"
-msgstr "l�on na leathanach"
+msgstr "l�on na n-alt"
 
 #: src/main/extractor.c:151
 msgid "editing cycles"
-msgstr ""
+msgstr "timthriallta eagarth�ireachta"
 
 #: src/main/extractor.c:152
-#, fuzzy
 msgid "scale"
-msgstr "Ceolra"
+msgstr "sc�la"
 
 #: src/main/extractor.c:153
-#, fuzzy
 msgid "manager"
-msgstr "pac�isteoir"
+msgstr "bainisteoir"
 
 #: src/main/extractor.c:154
-#, fuzzy
 msgid "director"
-msgstr "cruthaitheoir"
+msgstr "sti�rth�ir"
 
 #: src/main/extractor.c:155
-#, fuzzy
 msgid "duration"
-msgstr "gaol"
+msgstr "achar"
 
 #: src/main/extractor.c:156
-#, fuzzy
 msgid "information"
-msgstr "form�id"
+msgstr "eolas"
 
 #: src/main/extractor.c:157
-#, fuzzy
 msgid "full name"
-msgstr "comhadainm"
+msgstr "ainm ioml�n"
 
 #: src/main/extractor.c:158
-#, fuzzy
 msgid "chapter"
-msgstr "catag�ir"
+msgstr "caibidil"
 
-#: src/main/extractor.c:253
+#: src/main/extractor.c:496
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Theip ar th�s� meicn�ocht na mbreise�n: %s!\n"
 
-#: src/main/extractor.c:402
+#: src/main/extractor.c:640
 #, c-format
 msgid ""
 "Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -635,12 +620,12 @@
 "bhain m� triail as `%s', ach theip ar an cheann sin freisin.  Na hearr�id�: `"
 "%s' agus `%s'.\n"
 
-#: src/main/extractor.c:431
+#: src/main/extractor.c:669
 #, c-format
 msgid "Loading `%s' plugin failed: %s\n"
 msgstr "Theip ar lucht� an bhreise�in `%s': %s\n"
 
-#: src/main/extractor.c:636
+#: src/main/extractor.c:874
 #, c-format
 msgid "Unloading plugin `%s' failed!\n"
 msgstr "Theip ar dh�lucht� an bhreise�in `%s'!\n"
@@ -745,7 +730,7 @@
 
 #: src/plugins/manextractor.c:180
 msgid "System management commands"
-msgstr "Orduithe bainist�ochta an ch�rais"
+msgstr "Orduithe bainisteoireacht an ch�rais"
 
 #: src/plugins/manextractor.c:185
 msgid "Kernel routines"
@@ -1358,84 +1343,84 @@
 
 #: src/plugins/ole2/ole2extractor.c:257
 msgid "No Proofing"
-msgstr ""
+msgstr "Gan Phrofadh"
 
 #: src/plugins/ole2/ole2extractor.c:265
 msgid "Traditional Chinese"
-msgstr ""
+msgstr "S�nis Traidisi�nta"
 
 #: src/plugins/ole2/ole2extractor.c:267
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "S�nis Simplithe"
 
 #: src/plugins/ole2/ole2extractor.c:275
 msgid "Swiss German"
-msgstr ""
+msgstr "Gearm�inis Eilv�iseach"
 
 #: src/plugins/ole2/ole2extractor.c:279
 msgid "U.S. English"
-msgstr ""
+msgstr "B�arla S.A.M."
 
 #: src/plugins/ole2/ole2extractor.c:281
 msgid "U.K. English"
-msgstr ""
+msgstr "B�arla Sasanach"
 
 #: src/plugins/ole2/ole2extractor.c:283
 msgid "Australian English"
-msgstr ""
+msgstr "B�arla Astr�lach"
 
 #: src/plugins/ole2/ole2extractor.c:285
 msgid "Castilian Spanish"
-msgstr ""
+msgstr "Sp�innis Chaist�leach"
 
 #: src/plugins/ole2/ole2extractor.c:287
 msgid "Mexican Spanish"
-msgstr ""
+msgstr "Sp�innis Mheicsiceach"
 
 #: src/plugins/ole2/ole2extractor.c:293
 msgid "Belgian French"
-msgstr ""
+msgstr "Fraincis Bheilgeach"
 
 #: src/plugins/ole2/ole2extractor.c:295
 msgid "Canadian French"
-msgstr ""
+msgstr "Fraincis Cheanadach"
 
 #: src/plugins/ole2/ole2extractor.c:297
 msgid "Swiss French"
-msgstr ""
+msgstr "Fraincis Eilv�iseach"
 
 #: src/plugins/ole2/ole2extractor.c:307
 msgid "Swiss Italian"
-msgstr ""
+msgstr "Iod�ilis Eilv�iseach"
 
 #: src/plugins/ole2/ole2extractor.c:315
 msgid "Belgian Dutch"
-msgstr ""
+msgstr "Ollainnis Bheilgeach"
 
 #: src/plugins/ole2/ole2extractor.c:317
 msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Ioruais Bokm�l"
 
 #: src/plugins/ole2/ole2extractor.c:327
 msgid "Rhaeto-Romanic"
-msgstr ""
+msgstr "Raeta-R�m�insis"
 
 #: src/plugins/ole2/ole2extractor.c:333
 msgid "Croato-Serbian (Latin)"
-msgstr ""
+msgstr "Seirbea-Chr�itis (Laidineach)"
 
 #: src/plugins/ole2/ole2extractor.c:335
 msgid "Serbo-Croatian (Cyrillic)"
-msgstr ""
+msgstr "Seirbea-Chr�itis (Coireallach)"
 
 #: src/plugins/ole2/ole2extractor.c:363
 msgid "Farsi"
-msgstr ""
+msgstr "Fairsis"
 
 #: src/plugins/ole2/ole2extractor.c:423
 #, c-format
 msgid "Revision #%u: Author '%s' worked on '%s'"
-msgstr ""
+msgstr "Leas� #%u: D'oibrigh �dar '%s' ar '%s'"
 
 #: src/plugins/printable/dictionary-builder.c:97
 #, c-format
@@ -1484,6 +1469,126 @@
 #~ msgid "os"
 #~ msgstr "c�ras"
 
+#~ msgid "Arabic"
+#~ msgstr "Araibis"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bulg�iris"
+
+#~ msgid "Catalan"
+#~ msgstr "Catal�inis"
+
+#~ msgid "Czech"
+#~ msgstr "Seicis"
+
+#~ msgid "Danish"
+#~ msgstr "Danmhairgis"
+
+#~ msgid "German"
+#~ msgstr "Gearm�inis"
+
+#~ msgid "Greek"
+#~ msgstr "Gr�igis"
+
+#~ msgid "Finnish"
+#~ msgstr "Fionlainnis"
+
+#~ msgid "French"
+#~ msgstr "Fraincis"
+
+#~ msgid "Hebrew"
+#~ msgstr "Eabhrais"
+
+#~ msgid "Hungarian"
+#~ msgstr "Ung�iris"
+
+#~ msgid "Icelandic"
+#~ msgstr "�oslainnis"
+
+#~ msgid "Italian"
+#~ msgstr "Iod�ilis"
+
+#~ msgid "Japanese"
+#~ msgstr "Seap�inis"
+
+#~ msgid "Korean"
+#~ msgstr "C�ir�is"
+
+#~ msgid "Dutch"
+#~ msgstr "Ollainnis"
+
+#~ msgid "Norwegian - Nynorsk"
+#~ msgstr "Ioruais - Nynorsk"
+
+#~ msgid "Polish"
+#~ msgstr "Polainnis"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Portaing�ilis na Brasa�le"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portaing�ilis"
+
+#~ msgid "Romanian"
+#~ msgstr "R�m�inis"
+
+#~ msgid "Russian"
+#~ msgstr "R�isis"
+
+#~ msgid "Slovak"
+#~ msgstr "Sl�vaicis"
+
+#~ msgid "Albanian"
+#~ msgstr "Alb�inis"
+
+#~ msgid "Swedish"
+#~ msgstr "Sualainnis"
+
+#~ msgid "Thai"
+#~ msgstr "T�alainnis"
+
+#~ msgid "Turkish"
+#~ msgstr "Tuircis"
+
+#~ msgid "Urdu"
+#~ msgstr "Urdais"
+
+#~ msgid "Bahasa"
+#~ msgstr "Indin�isis"
+
+#~ msgid "Ukrainian"
+#~ msgstr "�cr�inis"
+
+#~ msgid "Byelorussian"
+#~ msgstr "Bealar�isis"
+
+#~ msgid "Slovenian"
+#~ msgstr "Sl�iv�inis"
+
+#~ msgid "Estonian"
+#~ msgstr "East�inis"
+
+#~ msgid "Latvian"
+#~ msgstr "Laitvis"
+
+#~ msgid "Lithuanian"
+#~ msgstr "Liotu�inis"
+
+#~ msgid "Basque"
+#~ msgstr "Bascais"
+
+#~ msgid "Macedonian"
+#~ msgstr "Macad�inis"
+
+#~ msgid "Afrikaans"
+#~ msgstr "Afrac�inis"
+
+#~ msgid "Malaysian"
+#~ msgstr "Malaeis"
+
+#~ msgid "%s (Build %s)"
+#~ msgstr "%s (T�g�il %s)"
+
 #~ msgid "Please provide a list of klp files as arguments.\n"
 #~ msgstr "Tabhair uait liosta de chomhaid klp mar arg�int�, le do thoil.\n"
 

Modified: Extractor/po/libextractor.pot
===================================================================
--- Extractor/po/libextractor.pot       2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/po/libextractor.pot       2006-09-06 20:26:52 UTC (rev 3372)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-17 00:53-0700\n"
+"POT-Creation-Date: 2006-09-06 14:22-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"
@@ -104,12 +104,12 @@
 msgid "Extract metadata from files."
 msgstr ""
 
-#: src/main/extract.c:198 src/main/extractor.c:1149
+#: src/main/extract.c:198 src/main/extractor.c:1387
 #, c-format
 msgid "%s - (binary)\n"
 msgstr ""
 
-#: src/main/extract.c:204 src/main/extractor.c:1154
+#: src/main/extract.c:204 src/main/extractor.c:1392
 #, c-format
 msgid "INVALID TYPE - %s\n"
 msgstr ""
@@ -594,24 +594,24 @@
 msgid "chapter"
 msgstr ""
 
-#: src/main/extractor.c:253
+#: src/main/extractor.c:496
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/main/extractor.c:402
+#: src/main/extractor.c:640
 #, 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:431
+#: src/main/extractor.c:669
 #, c-format
 msgid "Loading `%s' plugin failed: %s\n"
 msgstr ""
 
-#: src/main/extractor.c:636
+#: src/main/extractor.c:874
 #, c-format
 msgid "Unloading plugin `%s' failed!\n"
 msgstr ""

Modified: Extractor/po/ro.po
===================================================================
--- Extractor/po/ro.po  2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/po/ro.po  2006-09-06 20:26:52 UTC (rev 3372)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libextractor 0.5.3\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-17 00:53-0700\n"
+"POT-Creation-Date: 2006-09-06 14:22-0700\n"
 "PO-Revision-Date: 2005-08-16 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <address@hidden>\n"
 "Language-Team: Romanian <address@hidden>\n"
@@ -122,12 +122,12 @@
 msgid "Extract metadata from files."
 msgstr "Extrage metadata din fi�iere."
 
-#: src/main/extract.c:198 src/main/extractor.c:1149
+#: src/main/extract.c:198 src/main/extractor.c:1387
 #, c-format
 msgid "%s - (binary)\n"
 msgstr "%s - (binar)\n"
 
-#: src/main/extract.c:204 src/main/extractor.c:1154
+#: src/main/extract.c:204 src/main/extractor.c:1392
 #, c-format
 msgid "INVALID TYPE - %s\n"
 msgstr "TIP INVALID - %s\n"
@@ -576,9 +576,8 @@
 msgstr "creator"
 
 #: src/main/extractor.c:148
-#, fuzzy
 msgid "character set"
-msgstr "num�r de pagini"
+msgstr ""
 
 #: src/main/extractor.c:149
 #, fuzzy
@@ -629,12 +628,12 @@
 msgid "chapter"
 msgstr "categorie"
 
-#: src/main/extractor.c:253
+#: src/main/extractor.c:496
 #, 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:402
+#: src/main/extractor.c:640
 #, fuzzy, c-format
 msgid ""
 "Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -643,12 +642,12 @@
 "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:431
+#: src/main/extractor.c:669
 #, 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:636
+#: src/main/extractor.c:874
 #, fuzzy, c-format
 msgid "Unloading plugin `%s' failed!\n"
 msgstr "Desc�rcarea plugin-ului '%s' a e�uat!\n"
@@ -1488,12 +1487,12 @@
 msgid "Binary RPM %d.%d"
 msgstr "Binar RPM %d.%d"
 
-#~ msgid "os"
-#~ msgstr "sistem operare"
-
 #~ msgid "Fatal: could not allocate (%s at %s:%d).\n"
 #~ msgstr "Fatal: nu am putut aloca (%s la %s:%d).\n"
 
+#~ msgid "os"
+#~ msgstr "sistem operare"
+
 #~ msgid "No error"
 #~ msgstr "Nici o eroare"
 

Modified: Extractor/po/rw.po
===================================================================
--- Extractor/po/rw.po  2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/po/rw.po  2006-09-06 20:26:52 UTC (rev 3372)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: libextractor 0.4.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-17 00:53-0700\n"
+"POT-Creation-Date: 2006-09-06 14:22-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"
@@ -130,12 +130,12 @@
 msgid "Extract metadata from files."
 msgstr "Bivuye Idosiye"
 
-#: src/main/extract.c:198 src/main/extractor.c:1149
+#: src/main/extract.c:198 src/main/extractor.c:1387
 #, fuzzy, c-format
 msgid "%s - (binary)\n"
 msgstr "%s-(Nyabibiri"
 
-#: src/main/extract.c:204 src/main/extractor.c:1154
+#: src/main/extract.c:204 src/main/extractor.c:1392
 #, c-format
 msgid "INVALID TYPE - %s\n"
 msgstr ""
@@ -708,11 +708,9 @@
 msgid "generator"
 msgstr ""
 
-# sw/source\ui\inc\swmn.hrc:_MN_INS.MN_SUB_FIELD.FN_INSERT_FLD_PGCOUNT.text
 #: src/main/extractor.c:148
-#, fuzzy
 msgid "character set"
-msgstr "Kubara amapaje"
+msgstr ""
 
 # sw/source\ui\inc\swmn.hrc:_MN_INS.MN_SUB_FIELD.FN_INSERT_FLD_PGCOUNT.text
 #: src/main/extractor.c:149
@@ -786,24 +784,24 @@
 msgid "chapter"
 msgstr "Icyiciro"
 
-#: src/main/extractor.c:253
+#: src/main/extractor.c:496
 #, fuzzy, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Bya Byanze"
 
-#: src/main/extractor.c:402
+#: src/main/extractor.c:640
 #, 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:431
+#: src/main/extractor.c:669
 #, fuzzy, c-format
 msgid "Loading `%s' plugin failed: %s\n"
 msgstr "Byanze"
 
-#: src/main/extractor.c:636
+#: src/main/extractor.c:874
 #, fuzzy, c-format
 msgid "Unloading plugin `%s' failed!\n"
 msgstr "Byanze"

Modified: Extractor/po/sv.po
===================================================================
--- Extractor/po/sv.po  2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/po/sv.po  2006-09-06 20:26:52 UTC (rev 3372)
@@ -1,14 +1,14 @@
 # Swedish translation of libextractor
-# Copyright (C) 2005 Free Software Foundation, Inc.
+# Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libextractor package.
-# Daniel Nylander <address@hidden>, 2005
+# Daniel Nylander <address@hidden>, 2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libextractor 0.5.7\n"
+"Project-Id-Version: libextractor 0.5.14\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-17 00:53-0700\n"
-"PO-Revision-Date: 2005-12-27 09:21+0100\n"
+"POT-Creation-Date: 2006-09-06 14:22-0700\n"
+"PO-Revision-Date: 2006-05-23 22:17+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -110,12 +110,12 @@
 msgid "Extract metadata from files."
 msgstr "Plocka ut metadata från filer."
 
-#: src/main/extract.c:198 src/main/extractor.c:1149
+#: src/main/extract.c:198 src/main/extractor.c:1387
 #, c-format
 msgid "%s - (binary)\n"
 msgstr "%s - (binär)\n"
 
-#: src/main/extract.c:204 src/main/extractor.c:1154
+#: src/main/extract.c:204 src/main/extractor.c:1392
 #, c-format
 msgid "INVALID TYPE - %s\n"
 msgstr "OGILTIG TYP - %s\n"
@@ -154,7 +154,7 @@
 
 #: src/main/extract.c:319 src/main/extractor.c:53
 msgid "publisher"
-msgstr "publiserad av"
+msgstr "publicerad av"
 
 #: src/main/extract.c:323 src/main/extractor.c:59
 msgid "organization"
@@ -342,7 +342,7 @@
 
 #: src/main/extractor.c:94
 msgid "operating system"
-msgstr ""
+msgstr "operativsystem"
 
 #: src/main/extractor.c:95
 msgid "dependency"
@@ -399,7 +399,7 @@
 # Osäker!
 #: src/main/extractor.c:108
 msgid "conductor"
-msgstr "Dirigent"
+msgstr "dirigent"
 
 #: src/main/extractor.c:109
 msgid "interpreter"
@@ -440,23 +440,25 @@
 
 #: src/main/extractor.c:118
 msgid "exposure"
-msgstr ""
+msgstr "exponering"
 
 #: src/main/extractor.c:119
 msgid "aperture"
-msgstr ""
+msgstr "bländare"
 
+# Kallas även för slutartid
 #: src/main/extractor.c:120
 msgid "exposure bias"
-msgstr ""
+msgstr "exponeringskompensation"
 
 #: src/main/extractor.c:121
 msgid "flash"
 msgstr "blixt"
 
+# Hjälp! Är detta rätt?
 #: src/main/extractor.c:122
 msgid "flash bias"
-msgstr ""
+msgstr "blixttidskompensation"
 
 #: src/main/extractor.c:123
 msgid "focal length"
@@ -484,7 +486,7 @@
 
 #: src/main/extractor.c:129
 msgid "image quality"
-msgstr "bildkvalite"
+msgstr "bildkvalitet"
 
 #: src/main/extractor.c:130
 msgid "white balance"
@@ -498,131 +500,118 @@
 msgid "template"
 msgstr "mall"
 
+# Hjälp! En grovgissning.
 #: src/main/extractor.c:133
 msgid "split"
-msgstr ""
+msgstr "delning"
 
 #: src/main/extractor.c:134
-#, fuzzy
 msgid "product version"
-msgstr "producent"
+msgstr "produktversion"
 
 #: src/main/extractor.c:135
 msgid "last saved by"
-msgstr ""
+msgstr "senast sparad av"
 
 #: src/main/extractor.c:136
 msgid "last printed"
-msgstr ""
+msgstr "senast utskriven"
 
 #: src/main/extractor.c:137
-#, fuzzy
 msgid "word count"
-msgstr "sidantal"
+msgstr "antal ord"
 
 #: src/main/extractor.c:138
-#, fuzzy
 msgid "character count"
-msgstr "sidantal"
+msgstr "teckenantal"
 
 #: src/main/extractor.c:139
 msgid "total editing time"
-msgstr ""
+msgstr "total redigeringstid"
 
 #: src/main/extractor.c:140
 msgid "thumbnails"
-msgstr ""
+msgstr "miniatyrbilder"
 
 #: src/main/extractor.c:141
 msgid "security"
-msgstr ""
+msgstr "säkerhet"
 
 #: src/main/extractor.c:142
-#, fuzzy
 msgid "created by software"
-msgstr "skapad för"
+msgstr "skapad med programvaran"
 
 #: src/main/extractor.c:143
 msgid "modified by software"
-msgstr ""
+msgstr "ändrad av programvaran"
 
 #: src/main/extractor.c:144
 msgid "revision history"
-msgstr ""
+msgstr "revisionshistorik"
 
 #: src/main/extractor.c:145
 msgid "lower case conversion"
-msgstr ""
+msgstr "gemenkonvertering"
 
 #: src/main/extractor.c:146
 msgid "company"
-msgstr ""
+msgstr "företag"
 
 #: src/main/extractor.c:147
-#, fuzzy
 msgid "generator"
 msgstr "skapare"
 
 #: src/main/extractor.c:148
-#, fuzzy
 msgid "character set"
-msgstr "sidantal"
+msgstr "teckenuppsättning"
 
 #: src/main/extractor.c:149
-#, fuzzy
 msgid "line count"
-msgstr "sidantal"
+msgstr "radantal"
 
 #: src/main/extractor.c:150
-#, fuzzy
 msgid "paragraph count"
-msgstr "sidantal"
+msgstr "antal stycken"
 
 #: src/main/extractor.c:151
 msgid "editing cycles"
-msgstr ""
+msgstr "redigeringscykler"
 
 #: src/main/extractor.c:152
-#, fuzzy
 msgid "scale"
-msgstr "Musikal"
+msgstr "skala"
 
 #: src/main/extractor.c:153
-#, fuzzy
 msgid "manager"
-msgstr "paketerare"
+msgstr "ansvarig"
 
 #: src/main/extractor.c:154
-#, fuzzy
 msgid "director"
-msgstr "skapare"
+msgstr "regissör"
 
+# Detta rör sig om film och musik annars skulle det vara Varaktighet
 #: src/main/extractor.c:155
-#, fuzzy
 msgid "duration"
-msgstr "relation"
+msgstr "speltid"
 
 #: src/main/extractor.c:156
-#, fuzzy
 msgid "information"
-msgstr "format"
+msgstr "information"
 
 #: src/main/extractor.c:157
-#, fuzzy
 msgid "full name"
-msgstr "filnamn"
+msgstr "fullständigt namn"
 
 #: src/main/extractor.c:158
-#, fuzzy
 msgid "chapter"
-msgstr "kategori"
+msgstr "kapitel"
 
-#: src/main/extractor.c:253
+#: src/main/extractor.c:496
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/main/extractor.c:402
+#: src/main/extractor.c:640
 #, c-format
 msgid ""
 "Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -631,12 +620,12 @@
 "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:431
+#: src/main/extractor.c:669
 #, c-format
 msgid "Loading `%s' plugin failed: %s\n"
 msgstr "Inläsning av instick \"%s\" misslyckades: %s\n"
 
-#: src/main/extractor.c:636
+#: src/main/extractor.c:874
 #, c-format
 msgid "Unloading plugin `%s' failed!\n"
 msgstr "Urläsning av instick \"%s\" misslyckades!\n"
@@ -699,17 +688,17 @@
 #: src/plugins/jpegextractor.c:178
 #, c-format
 msgid "%ux%u dots per inch"
-msgstr "%ux%u punkter per tum"
+msgstr "%u×%u punkter per tum"
 
 #: src/plugins/jpegextractor.c:188
 #, c-format
 msgid "%ux%u dots per cm"
-msgstr "%ux%u punkter per cm"
+msgstr "%u×%u punkter per cm"
 
 #: src/plugins/jpegextractor.c:198
 #, c-format
 msgid "%ux%u dots per inch?"
-msgstr "%ux%u punkter per tum?"
+msgstr "%u×%u punkter per tum?"
 
 #: src/plugins/manextractor.c:145
 msgid "Commands"
@@ -1101,7 +1090,7 @@
 
 #: src/plugins/mp3extractor.c:137
 msgid "Celtic"
-msgstr "Celtic"
+msgstr "Keltisk"
 
 #: src/plugins/mp3extractor.c:138
 msgid "Bluegrass"
@@ -1113,15 +1102,15 @@
 
 #: src/plugins/mp3extractor.c:140
 msgid "Gothic Rock"
-msgstr "Gothic Rock"
+msgstr "Gothisk rock"
 
 #: src/plugins/mp3extractor.c:141
 msgid "Progressive Rock"
-msgstr "Progressiv Rock"
+msgstr "Progressiv rock"
 
 #: src/plugins/mp3extractor.c:142
 msgid "Psychedelic Rock"
-msgstr "Psychedelisk Rock"
+msgstr "Psykedelisk rock"
 
 #: src/plugins/mp3extractor.c:143
 msgid "Symphonic Rock"
@@ -1237,11 +1226,11 @@
 
 #: src/plugins/mp3extractor.c:171
 msgid "Drum Solo"
-msgstr "Drum Solo"
+msgstr "Trumsolo"
 
 #: src/plugins/mp3extractor.c:172
 msgid "A Cappella"
-msgstr "A Cappella"
+msgstr "A cappella"
 
 #: src/plugins/mp3extractor.c:173
 msgid "Euro-House"
@@ -1351,86 +1340,88 @@
 msgid "(variable bps)"
 msgstr "(variabel bithastighet)"
 
+# Hjälp! Rätt översättning?
 #: src/plugins/ole2/ole2extractor.c:257
 msgid "No Proofing"
-msgstr ""
+msgstr "Ingen korrekturläsning"
 
 #: src/plugins/ole2/ole2extractor.c:265
 msgid "Traditional Chinese"
-msgstr ""
+msgstr "Traditionell kinesiska"
 
 #: src/plugins/ole2/ole2extractor.c:267
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "Förenklad kinesiska"
 
 #: src/plugins/ole2/ole2extractor.c:275
 msgid "Swiss German"
-msgstr ""
+msgstr "Schweizisk tyska"
 
 #: src/plugins/ole2/ole2extractor.c:279
 msgid "U.S. English"
-msgstr ""
+msgstr "Amerikansk engelska"
 
 #: src/plugins/ole2/ole2extractor.c:281
 msgid "U.K. English"
-msgstr ""
+msgstr "Brittisk engelska"
 
 #: src/plugins/ole2/ole2extractor.c:283
 msgid "Australian English"
-msgstr ""
+msgstr "Australisk engelska"
 
 #: src/plugins/ole2/ole2extractor.c:285
 msgid "Castilian Spanish"
-msgstr ""
+msgstr "Kastiliansk spanska"
 
 #: src/plugins/ole2/ole2extractor.c:287
 msgid "Mexican Spanish"
-msgstr ""
+msgstr "Mexikansk spanska"
 
 #: src/plugins/ole2/ole2extractor.c:293
 msgid "Belgian French"
-msgstr ""
+msgstr "Belgisk franska"
 
 #: src/plugins/ole2/ole2extractor.c:295
 msgid "Canadian French"
-msgstr ""
+msgstr "Kanadensisk franska"
 
 #: src/plugins/ole2/ole2extractor.c:297
 msgid "Swiss French"
-msgstr ""
+msgstr "Schweizisk franska"
 
 #: src/plugins/ole2/ole2extractor.c:307
 msgid "Swiss Italian"
-msgstr ""
+msgstr "Schweizisk italienska"
 
 #: src/plugins/ole2/ole2extractor.c:315
 msgid "Belgian Dutch"
-msgstr ""
+msgstr "Belgisk holländska"
 
 #: src/plugins/ole2/ole2extractor.c:317
 msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Norska (Bokmål)"
 
+# Hjälp! Detta är tydligen danska stavningen. Vad är den svenska?
 #: src/plugins/ole2/ole2extractor.c:327
 msgid "Rhaeto-Romanic"
-msgstr ""
+msgstr "Rätoromanska"
 
 #: src/plugins/ole2/ole2extractor.c:333
 msgid "Croato-Serbian (Latin)"
-msgstr ""
+msgstr "Kroatoserbiska (Latin)"
 
 #: src/plugins/ole2/ole2extractor.c:335
 msgid "Serbo-Croatian (Cyrillic)"
-msgstr ""
+msgstr "Serbokroatiska (Kyrillisk)"
 
 #: src/plugins/ole2/ole2extractor.c:363
 msgid "Farsi"
-msgstr ""
+msgstr "Farsi"
 
 #: src/plugins/ole2/ole2extractor.c:423
 #, c-format
 msgid "Revision #%u: Author '%s' worked on '%s'"
-msgstr ""
+msgstr "Revision %u: Upphovsmannen \"%s\" arbetade på \"%s\""
 
 #: src/plugins/printable/dictionary-builder.c:97
 #, c-format
@@ -1464,7 +1455,7 @@
 #: src/plugins/riffextractor.c:167
 #, c-format
 msgid "codec: %s, %u fps, %u ms"
-msgstr "kodare: %s, %u bilder/sek, %u ms"
+msgstr "kodek: %s, %u bilder/s, %u ms"
 
 #: src/plugins/rpm/rpmextractor.c:3048
 #, c-format
@@ -1476,8 +1467,8 @@
 msgid "Binary RPM %d.%d"
 msgstr "Binär RPM %d.%d"
 
-#~ msgid "os"
-#~ msgstr "operativsystem"
-
 #~ msgid "Please provide a list of klp files as arguments.\n"
 #~ msgstr "Vänligen ange en lista av klp-filer som argument.\n"
+
+#~ msgid "os"
+#~ msgstr "operativsystem"

Modified: Extractor/po/vi.po
===================================================================
--- Extractor/po/vi.po  2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/po/vi.po  2006-09-06 20:26:52 UTC (rev 3372)
@@ -1,22 +1,21 @@
-# Vietnamese translation for Lib. Extractor.
-# Copyright © 2004, 2005, 2006 Free Software Foundation, Inc.
-# Copyright © 2004, 2005, 2006 Christian Grothoff
-# This file is distributed under the same license as the libextractor package.
-# Clytie Siddall <address@hidden>, 2005, 2006.
+# Vietnamese translation for LibExtractor.
+# Copyright © 2006 Free Software Foundation, Inc.
+# Copyright © 2006 Christian Grothoff
+# Clytie Siddall <address@hidden>, 2005-2006.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: libextractor-0.5.7\n"
+"Project-Id-Version: libextractor 0.5.14\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-17 00:53-0700\n"
-"PO-Revision-Date: 2006-01-11 13:24+1030\n"
+"POT-Creation-Date: 2006-09-06 14:22-0700\n"
+"PO-Revision-Date: 2006-05-23 17:58+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
-"X-Generator: LocFactoryEditor 1.6b23\n"
+"X-Generator: LocFactoryEditor 1.6b36\n"
 
 #: src/main/extract.c:49
 #, c-format
@@ -60,8 +59,8 @@
 #: 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ừ khóa (thì tải bộ cầm phít « filename-extractor "
-"» [rút tên tập tin])"
+"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 "print this help"
@@ -77,25 +76,25 @@
 
 #: src/main/extract.c:142
 msgid "list all keyword types"
-msgstr "liệt kê mọi kiểu từ khóa"
+msgstr "liệt kê mọi kiểu từ khoá"
 
 #: src/main/extract.c:144
 msgid "do not use the default set of extractor plugins"
-msgstr "đừng dùng bộ trình cầm phít rút mặc định"
+msgstr "đừng dùng bộ trình rút mặc định"
 
 #: src/main/extract.c:146
 msgid "print only keywords of the given TYPE (use -L to get a list)"
 msgstr ""
-"hiển thị chỉ từ khóa KIỂU (TYPE) đã cho thôi (dùng « -L » để xem danh sách)"
+"hiển thị chỉ từ khoá KIỂU (TYPE) đã cho thôi (dùng « -L » để xem danh sách)"
 
 #: src/main/extract.c:148
 msgid "remove duplicates even if keyword types do not match"
-msgstr "gỡ bỏ bản sao thậm chí nếu kiểu từ khóa không khớp"
+msgstr "gỡ bỏ bản sao thậm chí nếu kiểu từ khoá không khớp"
 
 #: src/main/extract.c:150
 msgid "use keyword splitting (loads split-extractor plugin)"
 msgstr ""
-"dùng khả năng xẻ từ khóa (thì tải bộ cầm phít « split-extractor » [rút xẻ])"
+"dùng khả năng xẻ từ khoá (thì tải bổ sung « split-extractor » [rút xẻ])"
 
 #: src/main/extract.c:152
 msgid "print the version number"
@@ -107,7 +106,7 @@
 
 #: src/main/extract.c:156
 msgid "do not print keywords of the given TYPE"
-msgstr "đừng hiển thị từ khóa KIỂU (TYPE) đã cho"
+msgstr "đừng hiển thị từ khoá KIỂU (TYPE) đã cho"
 
 #: src/main/extract.c:159
 msgid "extract [OPTIONS] [FILENAME]*"
@@ -119,19 +118,19 @@
 msgid "Extract metadata from files."
 msgstr "Rút siêu dữ liệu ra tập tin."
 
-#: src/main/extract.c:198 src/main/extractor.c:1149
+#: src/main/extract.c:198 src/main/extractor.c:1387
 #, c-format
 msgid "%s - (binary)\n"
 msgstr "%s - (nhị phân)\n"
 
-#: src/main/extract.c:204 src/main/extractor.c:1154
+#: src/main/extract.c:204 src/main/extractor.c:1392
 #, c-format
 msgid "INVALID TYPE - %s\n"
 msgstr "KIỂU KHÔNG HỢP LỆ — %s\n"
 
 #: src/main/extract.c:270 src/main/extractor.c:47
 msgid "title"
-msgstr "tựa đề"
+msgstr "tựa"
 
 #: src/main/extract.c:272 src/main/extractor.c:45
 msgid "filename"
@@ -147,7 +146,7 @@
 
 #: src/main/extract.c:283 src/main/extractor.c:62
 msgid "keywords"
-msgstr "từ khóa"
+msgstr "từ khoá"
 
 #: src/main/extract.c:285 src/main/extractor.c:51
 msgid "comment"
@@ -196,11 +195,11 @@
 #: src/main/extract.c:621
 #, c-format
 msgid "Keywords for file %s:\n"
-msgstr "Từ khóa cho tập tin %s:\n"
+msgstr "Từ khoá cho tập tin %s:\n"
 
 #: src/main/extractor.c:44
 msgid "unknown"
-msgstr "không biết"
+msgstr "không rõ"
 
 #: src/main/extractor.c:46
 msgid "mimetype"
@@ -224,7 +223,7 @@
 
 #: src/main/extractor.c:57
 msgid "location"
-msgstr "đía điểm"
+msgstr "địa điểm"
 
 #: src/main/extractor.c:58
 msgid "version"
@@ -296,7 +295,7 @@
 
 #: src/main/extractor.c:80
 msgid "paper size"
-msgstr "kích cỡ giấy"
+msgstr "cỡ giấy"
 
 #: src/main/extractor.c:81
 msgid "used fonts"
@@ -340,7 +339,7 @@
 
 #: src/main/extractor.c:91
 msgid "license"
-msgstr "quyền"
+msgstr "quyền phép"
 
 #: src/main/extractor.c:92
 msgid "distribution"
@@ -348,11 +347,11 @@
 
 #: src/main/extractor.c:93
 msgid "build-host"
-msgstr "máy hỗ trợ xây dụng"
+msgstr "máy hỗ trợ xây dựng"
 
 #: src/main/extractor.c:94
 msgid "operating system"
-msgstr ""
+msgstr "hệ điều hành"
 
 #: src/main/extractor.c:95
 msgid "dependency"
@@ -421,7 +420,7 @@
 
 #: src/main/extractor.c:110
 msgid "owner"
-msgstr "người sở hữu"
+msgstr "sở hữu"
 
 #: src/main/extractor.c:111
 msgid "lyrics"
@@ -433,7 +432,7 @@
 
 #: src/main/extractor.c:113
 msgid "contact"
-msgstr "liên hệ"
+msgstr "liên lạc"
 
 #: src/main/extractor.c:114
 msgid "binary thumbnail data"
@@ -513,146 +512,131 @@
 
 #: src/main/extractor.c:133
 msgid "split"
-msgstr ""
+msgstr "phần"
 
 #: src/main/extractor.c:134
-#, fuzzy
 msgid "product version"
-msgstr "người cung cấp"
+msgstr "phiên bản sản phẩm"
 
 #: src/main/extractor.c:135
 msgid "last saved by"
-msgstr ""
+msgstr "lưu cuối cùng bởi"
 
 #: src/main/extractor.c:136
 msgid "last printed"
-msgstr ""
+msgstr "in cuối cùng"
 
 #: src/main/extractor.c:137
-#, fuzzy
 msgid "word count"
-msgstr "tổng số trang"
+msgstr "tổng số từ"
 
 #: src/main/extractor.c:138
-#, fuzzy
 msgid "character count"
-msgstr "tổng số trang"
+msgstr "tổng số ký tự"
 
 #: src/main/extractor.c:139
 msgid "total editing time"
-msgstr ""
+msgstr "tổng thời gian sửa"
 
 #: src/main/extractor.c:140
 msgid "thumbnails"
-msgstr ""
+msgstr "hình thu nhỏ"
 
 #: src/main/extractor.c:141
 msgid "security"
-msgstr ""
+msgstr "giấy chứng khoán"
 
 #: src/main/extractor.c:142
-#, fuzzy
 msgid "created by software"
-msgstr "tạo cho"
+msgstr "bị phần mềm tạo"
 
 #: src/main/extractor.c:143
 msgid "modified by software"
-msgstr ""
+msgstr "bị phần mềm sửa đổi"
 
 #: src/main/extractor.c:144
 msgid "revision history"
-msgstr ""
+msgstr "lược sử sửa đổi"
 
 #: src/main/extractor.c:145
 msgid "lower case conversion"
-msgstr ""
+msgstr "chuyển đổi sang chữ hoa"
 
 #: src/main/extractor.c:146
 msgid "company"
-msgstr ""
+msgstr "công ty"
 
 #: src/main/extractor.c:147
-#, fuzzy
 msgid "generator"
-msgstr "người tạo"
+msgstr "bộ tạo ra"
 
 #: src/main/extractor.c:148
-#, fuzzy
 msgid "character set"
-msgstr "tổng số trang"
+msgstr "bộ ký tự"
 
 #: src/main/extractor.c:149
-#, fuzzy
 msgid "line count"
-msgstr "tổng số trang"
+msgstr "số đếm trang"
 
 #: src/main/extractor.c:150
-#, fuzzy
 msgid "paragraph count"
-msgstr "tổng số trang"
+msgstr "số đếm đoạn văn"
 
 #: src/main/extractor.c:151
 msgid "editing cycles"
-msgstr ""
+msgstr "chu kỳ hiệu chỉnh"
 
 #: src/main/extractor.c:152
-#, fuzzy
 msgid "scale"
-msgstr "Kịch nhạc"
+msgstr "tỷ lệ"
 
 #: src/main/extractor.c:153
-#, fuzzy
 msgid "manager"
-msgstr "nhà đóng gói"
+msgstr "nhà quản lý"
 
 #: src/main/extractor.c:154
-#, fuzzy
 msgid "director"
-msgstr "người tạo"
+msgstr "giám đốc"
 
 #: src/main/extractor.c:155
-#, fuzzy
 msgid "duration"
-msgstr "liên quan"
+msgstr "thời lượng"
 
 #: src/main/extractor.c:156
-#, fuzzy
 msgid "information"
-msgstr "định dạng"
+msgstr "thông tin"
 
 #: src/main/extractor.c:157
-#, fuzzy
 msgid "full name"
-msgstr "tên tập tin"
+msgstr "họ tên"
 
 #: src/main/extractor.c:158
-#, fuzzy
 msgid "chapter"
-msgstr "phân loại"
+msgstr "chương"
 
-#: src/main/extractor.c:253
+#: src/main/extractor.c:496
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Việc khởi động cơ chế cầm phít bị lỗi: %s\n"
 
-#: src/main/extractor.c:402
+#: src/main/extractor.c:640
 #, 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 », "
+"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:431
+#: src/main/extractor.c:669
 #, c-format
 msgid "Loading `%s' plugin failed: %s\n"
-msgstr "Việc tải bộ cầm phít « %s » bị lỗi: %s\n"
+msgstr "Việc tải bổ sung « %s » bị lỗi: %s\n"
 
-#: src/main/extractor.c:636
+#: src/main/extractor.c:874
 #, c-format
 msgid "Unloading plugin `%s' failed!\n"
-msgstr "Việc bỏ tải bộ cầm phít « %s » bị lỗi.\n"
+msgstr "Việc bỏ tải bổ sung « %s » bị lỗi.\n"
 
 #: src/main/getopt.c:681
 #, c-format
@@ -734,7 +718,7 @@
 
 #: src/plugins/manextractor.c:155
 msgid "Library calls"
-msgstr "Cuộc gọi thư viên"
+msgstr "Cuộc gọi thư viện"
 
 #: src/plugins/manextractor.c:160
 msgid "Special files"
@@ -742,7 +726,7 @@
 
 #: src/plugins/manextractor.c:165
 msgid "File formats and conventions"
-msgstr "Khuôn dạng tập tin và quy ước"
+msgstr "Khuôn dang tập tin và quy ước"
 
 #: src/plugins/manextractor.c:170
 msgid "Games"
@@ -770,7 +754,7 @@
 
 #: src/plugins/mp3extractor.c:51
 msgid "Country"
-msgstr "Đồng quê"
+msgstr "Quốc gia"
 
 #: src/plugins/mp3extractor.c:52
 msgid "Dance"
@@ -982,7 +966,7 @@
 
 #: src/plugins/mp3extractor.c:104
 msgid "Dream"
-msgstr "Mơ mộng "
+msgstr "Mơ mộng"
 
 #: src/plugins/mp3extractor.c:105
 msgid "Southern Rock"
@@ -1366,84 +1350,84 @@
 
 #: src/plugins/ole2/ole2extractor.c:257
 msgid "No Proofing"
-msgstr ""
+msgstr "Đừng bắt lỗi"
 
 #: src/plugins/ole2/ole2extractor.c:265
 msgid "Traditional Chinese"
-msgstr ""
+msgstr "Tiếng Hoa truyền thống"
 
 #: src/plugins/ole2/ole2extractor.c:267
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "Tiếng Hoa giản thể"
 
 #: src/plugins/ole2/ole2extractor.c:275
 msgid "Swiss German"
-msgstr ""
+msgstr "Đức Thụy Sĩ"
 
 #: src/plugins/ole2/ole2extractor.c:279
 msgid "U.S. English"
-msgstr ""
+msgstr "Tiếng Anh (Mỹ)"
 
 #: src/plugins/ole2/ole2extractor.c:281
 msgid "U.K. English"
-msgstr ""
+msgstr "Tiếng Anh (Quốc Anh)"
 
 #: src/plugins/ole2/ole2extractor.c:283
 msgid "Australian English"
-msgstr ""
+msgstr "Tiếng Anh (Úc)"
 
 #: src/plugins/ole2/ole2extractor.c:285
 msgid "Castilian Spanish"
-msgstr ""
+msgstr "Tây Ban Nha (Căt-tín)"
 
 #: src/plugins/ole2/ole2extractor.c:287
 msgid "Mexican Spanish"
-msgstr ""
+msgstr "Tây Ban Nha (Mê-hi-cô)"
 
 #: src/plugins/ole2/ole2extractor.c:293
 msgid "Belgian French"
-msgstr ""
+msgstr "Pháp (Bỉ)"
 
 #: src/plugins/ole2/ole2extractor.c:295
 msgid "Canadian French"
-msgstr ""
+msgstr "Pháp (Ca-na-đa)"
 
 #: src/plugins/ole2/ole2extractor.c:297
 msgid "Swiss French"
-msgstr ""
+msgstr "Pháp (Thuỵ sĩ)"
 
 #: src/plugins/ole2/ole2extractor.c:307
 msgid "Swiss Italian"
-msgstr ""
+msgstr "Ý (Thuỵ sĩ)"
 
 #: src/plugins/ole2/ole2extractor.c:315
 msgid "Belgian Dutch"
-msgstr ""
+msgstr "Hoà Lan (Bỉ)"
 
 #: src/plugins/ole2/ole2extractor.c:317
 msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Na Uy (Bóc-măn)"
 
 #: src/plugins/ole2/ole2extractor.c:327
 msgid "Rhaeto-Romanic"
-msgstr ""
+msgstr "Rai-tô-Rô-ma-ni"
 
 #: src/plugins/ole2/ole2extractor.c:333
 msgid "Croato-Serbian (Latin)"
-msgstr ""
+msgstr "Xéc-bi Cợ-rô-a-ti-a (La-tinh)"
 
 #: src/plugins/ole2/ole2extractor.c:335
 msgid "Serbo-Croatian (Cyrillic)"
-msgstr ""
+msgstr "Xéc-bi Cợ-rô-a-ti-a (Ki-rin)"
 
 #: src/plugins/ole2/ole2extractor.c:363
 msgid "Farsi"
-msgstr ""
+msgstr "Pha-xi"
 
 #: src/plugins/ole2/ole2extractor.c:423
 #, c-format
 msgid "Revision #%u: Author '%s' worked on '%s'"
-msgstr ""
+msgstr "Bản sửa đổi #%u: Tác giả « %s » đã làm việc « %s »."
 
 #: src/plugins/printable/dictionary-builder.c:97
 #, c-format
@@ -1451,7 +1435,7 @@
 "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"
+"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:110
 #: src/plugins/printable/dictionary-builder.c:166
@@ -1491,6 +1475,126 @@
 #~ msgid "os"
 #~ msgstr "hệ điều hành"
 
+#~ msgid "Arabic"
+#~ msgstr "Ả Rập"
+
+#~ msgid "Bulgarian"
+#~ msgstr "Bảo-gia-lơi"
+
+#~ msgid "Catalan"
+#~ msgstr "Ca-ta-lan"
+
+#~ msgid "Czech"
+#~ msgstr "Séc"
+
+#~ msgid "Danish"
+#~ msgstr "Đan Mạch"
+
+#~ msgid "German"
+#~ msgstr "Đức"
+
+#~ msgid "Greek"
+#~ msgstr "Hy Lạp"
+
+#~ msgid "Finnish"
+#~ msgstr "Phần-lan"
+
+#~ msgid "French"
+#~ msgstr "Pháp"
+
+#~ msgid "Hebrew"
+#~ msgstr "Do Thái"
+
+#~ msgid "Hungarian"
+#~ msgstr "Hung-gia-lợi"
+
+#~ msgid "Icelandic"
+#~ msgstr "Băng đảo"
+
+#~ msgid "Italian"
+#~ msgstr "Ý"
+
+#~ msgid "Japanese"
+#~ msgstr "Nhật Bản"
+
+#~ msgid "Korean"
+#~ msgstr "Triều Tiên"
+
+#~ msgid "Dutch"
+#~ msgstr "Hoà-lan"
+
+#~ msgid "Norwegian - Nynorsk"
+#~ msgstr "Na Uy (Ny-noa-x-kh)"
+
+#~ msgid "Polish"
+#~ msgstr "Ba Lan"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "Bồ Đào Nha của Bra-xin"
+
+#~ msgid "Portuguese"
+#~ msgstr "Bồ Đào Nha"
+
+#~ msgid "Romanian"
+#~ msgstr "Lỗ-má-ni"
+
+#~ msgid "Russian"
+#~ msgstr "Nga"
+
+#~ msgid "Slovak"
+#~ msgstr "Xlô-vác"
+
+#~ msgid "Albanian"
+#~ msgstr "An-ba-ni"
+
+#~ msgid "Swedish"
+#~ msgstr "Thuỵ Điển"
+
+#~ msgid "Thai"
+#~ msgstr "Thái"
+
+#~ msgid "Turkish"
+#~ msgstr "Thổ Nhĩ Kỳ"
+
+#~ msgid "Urdu"
+#~ msgstr "Ơ-đu"
+
+#~ msgid "Bahasa"
+#~ msgstr "Ba-ha-xa"
+
+#~ msgid "Ukrainian"
+#~ msgstr "U-cợ-rainh"
+
+#~ msgid "Byelorussian"
+#~ msgstr "Bie-lo-ru-xi"
+
+#~ msgid "Slovenian"
+#~ msgstr "Xlô-ven"
+
+#~ msgid "Estonian"
+#~ msgstr "Et-tô-ni-a"
+
+#~ msgid "Latvian"
+#~ msgstr "Lát-vi-a"
+
+#~ msgid "Lithuanian"
+#~ msgstr "Li-tu-a-ni"
+
+#~ msgid "Basque"
+#~ msgstr "Bax-quợ"
+
+#~ msgid "Macedonian"
+#~ msgstr "Ma-xê-đô-ni"
+
+#~ msgid "Afrikaans"
+#~ msgstr "Hoà-lan Nam Phi"
+
+#~ msgid "Malaysian"
+#~ msgstr "Ma-lay-xi-a"
+
+#~ msgid "%s (Build %s)"
+#~ msgstr "%s (Bản xây dựng %s)"
+
 #~ msgid "Please provide a list of klp files as arguments.\n"
 #~ msgstr "Hãy cung cấp danh sách các tập tin kiểu « klp » dạng đối số.\n"
 

Modified: Extractor/src/include/extractor.h
===================================================================
--- Extractor/src/include/extractor.h   2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/src/include/extractor.h   2006-09-06 20:26:52 UTC (rev 3372)
@@ -32,7 +32,7 @@
  * 0.2.6-1 => 0x00020601
  * 4.5.2-0 => 0x04050200
  */
-#define EXTRACTOR_VERSION 0x00051300
+#define EXTRACTOR_VERSION 0x00051500
 
 #include <stdio.h>
 

Modified: Extractor/src/main/Makefile.am
===================================================================
--- Extractor/src/main/Makefile.am      2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/src/main/Makefile.am      2006-09-06 20:26:52 UTC (rev 3372)
@@ -13,9 +13,6 @@
 
 bin_PROGRAMS = extract
 
-AM_CFLAGS = \
-  -DPLUGIN_PATH="\"${plugindir}\""
-
 extract_LDADD = \
   $(top_builddir)/src/main/libextractor.la 
 

Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c      2006-09-06 19:42:46 UTC (rev 3371)
+++ Extractor/src/main/extractor.c      2006-09-06 20:26:52 UTC (rev 3372)
@@ -232,13 +232,257 @@
   return DEFAULT_LIBRARIES;
 }
 
+/* determine installation path */
+
+static char * cut_bin(char * in) {
+  size_t p;
+
+  if (in == NULL)
+    return NULL;
+  p = strlen(in);
+  if (p > 4) {
+    if ( (in[p-1] == '/') ||
+        (in[p-1] == '\\') )
+      in[--p] = '\0';
+    if (0 == strcmp(&in[p-3],
+                   "bin")) {
+      in[p-3] = '\0';
+      p -= 3;
+    }
+  }
+  return in;
+}
+
+static char * cut_lib(char * in) {
+  size_t p;
+
+  if (in == NULL)
+    return NULL;
+  p = strlen(in);
+  if (p > 4) {
+    if ( (in[p-1] == '/') ||
+        (in[p-1] == '\\') )
+      in[--p] = '\0';
+    if (0 == strcmp(&in[p-3],
+                   "lib")) {
+      in[p-3] = '\0';
+      p -= 3;
+    }
+  }
+  return in;
+}
+
+
+#if LINUX
+/**
+ * Try to determine path by reading /proc/PID/exe or
+ * /proc/PID/maps.
+ *
+ * Note that this may fail if LE is installed in one directory
+ * and the binary linking against it sits elsewhere.
+ */
+static char * 
+get_path_from_proc_exe() {
+  char fn[64];
+  char line[1024];
+  char dir[1024];
+  char * lnk;
+  size_t size;
+  FILE * f;
+
+  snprintf(fn, 
+          64,
+          "/proc/%u/maps",
+          getpid());
+  f = fopen(fn, "r");
+  if (f != NULL) {
+    while (NULL != fgets(line, 1024, f)) {
+      if ( (1 == sscanf(line,
+                       "%*x-%*x %*c%*c%*c%*c %*x %*2u:%*2u %*u%*[ ]%s",
+                       dir)) &&
+          (NULL != strstr(dir,
+                          "libextractor")) ) {
+       strstr(dir, "libextractor")[0] = '\0';
+       fclose(f);
+       return cut_lib(strdup(dir));
+      }      
+    }
+  }
+  fclose(f);
+  snprintf(fn, 
+          64,
+          "/proc/%u/exe",
+          getpid());
+  lnk = malloc(1024);
+  size = readlink(fn, lnk, 1023);
+  if ( (size == 0) || (size >= 1024) ) {
+    free(lnk);
+    return NULL;
+  }
+  lnk[size] = '\0';
+  while ( (lnk[size] != '/') &&
+         (size > 0) )
+    size--;
+  if ( (size < 4) ||
+       (lnk[size-4] != '/') ) {
+    /* not installed in "/bin/" -- binary path probably useless */
+    free(lnk);
+    return NULL;
+  }
+  lnk[size] = '\0';
+  return cut_bin(lnk);
+}
+#endif
+
+#if WINDOWS
+/**
+ * Try to determine path with win32-specific function
+ */
+static char * get_path_from_module_filename() {
+  char * path;
+  char * idx;
+  
+  path = MALLOC(4097);
+  GetModuleFileName(NULL, path, 4096);
+  idx = path + strlen(idx);
+  while ( (idx > path) && 
+         (path != '\\') &&
+         (path != '/') )
+    idx++;
+  *idx = '\0';
+  return cut_bin(path);  
+}
+#endif
+
+/**
+ * This may also fail -- for example, if extract
+ * is not also installed.
+ */
+static char * 
+get_path_from_PATH() {
+  struct stat sbuf;
+  char * path;
+  char * pos;
+  char * end;
+  char * buf;
+  const char * p;
+  size_t size;
+
+  p = getenv("PATH");
+  if (p == NULL)
+    return NULL;
+  path = strdup(p); /* because we write on it */
+  buf = malloc(strlen(path) + 20);
+  size = strlen(path);
+  pos = path;
+
+  while (NULL != (end = strchr(pos, ':'))) {
+    *end = '\0';
+    sprintf(buf, "%s/%s", pos, "extract");
+    if (0 == stat(buf, &sbuf)) {
+      pos = strdup(pos);
+      free(buf);
+      free(path);
+      return cut_bin(pos);
+    }
+    pos = end + 1;
+  }
+  sprintf(buf, "%s/%s", pos, "extract");
+  if (0 == stat(buf, &sbuf)) {
+    pos = strdup(pos);
+    free(buf);
+    free(path);
+    return cut_bin(pos);
+  }
+  free(buf);
+  free(path);
+  return NULL;
+}
+
+static char * 
+get_path_from_ENV_PREFIX() {
+  const char * p;
+
+  p = getenv("LIBEXTRACTOR_PREFIX");
+  if (p != NULL)
+    return cut_bin(cut_lib(strdup(p)));
+  return NULL;
+}
+
+/*
+ * @brief get the path to the plugin directory
+ * @return a pointer to the dir path (to be freed by the caller)
+ */
+static char * os_get_installation_path() {
+  size_t n;
+  char * tmp;
+  char * lpref;
+  char * pexe;
+  char * modu;
+  char * path;  
+
+  lpref = get_path_from_ENV_PREFIX();
+#if LINUX
+  pexe = get_path_from_proc_exe();
+#else
+  pexe = NULL;
+#endif
+#if WINDOWS
+  modu = get_path_from_module_filename();
+#else
+  modu = NULL;
+#endif
+  path = get_path_from_PATH();
+  n = 1;
+  if (lpref != NULL)
+    n += strlen(lpref) + strlen("/lib/libextractor/:");
+  if (pexe != NULL)
+    n += strlen(pexe) + strlen("/lib/libextractor/:");
+  if (modu != NULL)
+    n += strlen(modu) + strlen("/lib/libextractor/:");
+  if (path != NULL)
+    n += strlen(path) + strlen("/lib/libextractor/:");
+  tmp = malloc(n);
+  tmp[0] = '\0';
+  if (lpref != NULL) {
+    strcat(tmp, lpref);
+    strcat(tmp, "/lib/libextractor/:");
+    free(lpref);
+  }
+  if (pexe != NULL) {
+    strcat(tmp, pexe);
+    strcat(tmp, "/lib/libextractor/:");
+    free(pexe);
+  }
+  if (modu != NULL) {
+    strcat(tmp, modu);
+    strcat(tmp, "/lib/libextractor/:");
+    free(modu);
+  }
+  if (path != NULL) {
+    strcat(tmp, path);
+    strcat(tmp, "/lib/libextractor/:");
+    free(path);
+  }
+  if (strlen(tmp) > 0)
+    tmp[strlen(tmp)-1] = '\0';
+  if (strlen(tmp) == 0) {
+    free(tmp);
+    return NULL;
+  }
+  return tmp;
+}
+
+
 /* ************library initialization ***************** */
 
 static char * old_dlsearchpath = NULL;
 
 /* using libtool, needs init! */
-void __attribute__ ((constructor)) le_ltdl_init(void) {
+void __attribute__ ((constructor)) le_ltdl_init() {
   int err;
+  const char * opath;
+  char * path;
 
 #if ENABLE_NLS
   setlocale(LC_ALL, "");
@@ -246,33 +490,28 @@
   BINDTEXTDOMAIN("iso-639", ISOLOCALEDIR); /* used by wordextractor */
 #endif
   err = lt_dlinit ();
-  if (err > 0)
-    {
+  if (err > 0) {
 #if DEBUG
-      fprintf(stderr,
-             _("Initialization of plugin mechanism failed: %s!\n"),
-             lt_dlerror());
+    fprintf(stderr,
+           _("Initialization of plugin mechanism failed: %s!\n"),
+           lt_dlerror());
 #endif
-      return;
-    }
-  if (lt_dlgetsearchpath() != NULL)
-    old_dlsearchpath = strdup(lt_dlgetsearchpath());
-  if (lt_dlgetsearchpath () == NULL)
-    lt_dladdsearchdir ("/usr/lib/libextractor");
-  else if (strstr (lt_dlgetsearchpath (), "/usr/lib/libextractor") == NULL)
-    lt_dladdsearchdir ("/usr/lib/libextractor");
-  if (strstr (lt_dlgetsearchpath (), "/usr/local/lib/libextractor") == NULL)
-    lt_dladdsearchdir ("/usr/local/lib/libextractor");
-#ifdef PLUGIN_PATH
-  if (strstr (lt_dlgetsearchpath (), PLUGIN_PATH) == NULL)
-    lt_dladdsearchdir (PLUGIN_PATH);
-#endif
+    return;
+  }
+  opath = lt_dlgetsearchpath();
+  if (opath != NULL)
+    old_dlsearchpath = strdup(opath);
+  path = os_get_installation_path();
+  if (path != NULL) {
+    lt_dlsetsearchpath(path);
+    free(path);  
+  }
 #ifdef MINGW
   InitWinEnv();
 #endif
 }
 
-void __attribute__ ((destructor)) le_ltdl_fini(void) {
+void __attribute__ ((destructor)) le_ltdl_fini() {
   lt_dlsetsearchpath(old_dlsearchpath);
   if (old_dlsearchpath != NULL) {
     free(old_dlsearchpath);
@@ -281,7 +520,6 @@
 #ifdef MINGW
   ShutdownWinEnv();
 #endif
-
   lt_dlexit ();
 }
 





reply via email to

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