diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-01-13 15:34:11 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-01-13 15:34:11 +0000 |
commit | 6b6b11e3598c79c015a010fae5a35cee000a8dd8 (patch) | |
tree | 1bdc293113ec10af06a3b458f9d0340d6cf54a80 | |
parent | 7e93648c27b64f01990b7f4ff10ce48d2b397c39 (diff) | |
download | libextractor-6b6b11e3598c79c015a010fae5a35cee000a8dd8.tar.gz libextractor-6b6b11e3598c79c015a010fae5a35cee000a8dd8.zip |
updates
-rw-r--r-- | configure.ac | 44 | ||||
-rw-r--r-- | po/de.po | 12 | ||||
-rw-r--r-- | po/fr.po | 12 | ||||
-rw-r--r-- | po/ga.po | 12 | ||||
-rw-r--r-- | po/libextractor.pot | 12 | ||||
-rw-r--r-- | po/nl.po | 12 | ||||
-rw-r--r-- | po/ro.po | 12 | ||||
-rw-r--r-- | po/rw.po | 12 | ||||
-rw-r--r-- | po/sv.po | 12 | ||||
-rw-r--r-- | po/vi.po | 12 | ||||
-rw-r--r-- | src/main/Makefile.am | 31 | ||||
-rw-r--r-- | src/main/extract.c | 1 |
12 files changed, 77 insertions, 107 deletions
diff --git a/configure.ac b/configure.ac index 80e1a7f..128d0fa 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -221,6 +221,26 @@ AC_CHECK_LIB(poppler, _ZTI9MemStream, | |||
221 | AM_CONDITIONAL(HAVE_POPPLER, false))], | 221 | AM_CONDITIONAL(HAVE_POPPLER, false))], |
222 | AM_CONDITIONAL(HAVE_POPPLER, false)) | 222 | AM_CONDITIONAL(HAVE_POPPLER, false)) |
223 | 223 | ||
224 | AC_MSG_CHECKING(for ImageFactory::iptcData in -lexiv2) | ||
225 | AC_LANG_PUSH(C++) | ||
226 | SAVED_LDFLAGS=$LDFLAGS | ||
227 | LDFLAGS="$LDFLAGS -lexiv2" | ||
228 | AC_LINK_IFELSE( | ||
229 | [AC_LANG_PROGRAM([[#include <iostream> | ||
230 | #include <exiv2/exif.hpp> | ||
231 | #include <exiv2/image.hpp> | ||
232 | #include <exiv2/futils.hpp>]], | ||
233 | [[Exiv2::Image *foo = NULL; foo->iptcData(); ]])], | ||
234 | [AC_MSG_RESULT(yes) | ||
235 | AM_CONDITIONAL(HAVE_EXIV2, true) | ||
236 | AC_DEFINE(HAVE_EXIV2,1,[Have exifData in libexiv2])], | ||
237 | [AC_MSG_RESULT(no) | ||
238 | AM_CONDITIONAL(HAVE_EXIV2, false)]) | ||
239 | LDFLAGS=$SAVED_LDFLAGS | ||
240 | AC_LANG_POP(C++) | ||
241 | |||
242 | |||
243 | |||
224 | AC_MSG_CHECKING(for getPDFMajorVersion in -lpoppler) | 244 | AC_MSG_CHECKING(for getPDFMajorVersion in -lpoppler) |
225 | AC_LANG_PUSH(C++) | 245 | AC_LANG_PUSH(C++) |
226 | SAVED_LDFLAGS=$LDFLAGS | 246 | SAVED_LDFLAGS=$LDFLAGS |
@@ -329,7 +349,6 @@ else | |||
329 | fi | 349 | fi |
330 | 350 | ||
331 | # check for all C++ dependencies... | 351 | # check for all C++ dependencies... |
332 | exiv2=0 | ||
333 | qt=0 | 352 | qt=0 |
334 | qt4=0 | 353 | qt4=0 |
335 | 354 | ||
@@ -423,22 +442,6 @@ QT_LDFLAGS=$LDFLAGS | |||
423 | LDFLAGS=$SAVED_LDFLAGS | 442 | LDFLAGS=$SAVED_LDFLAGS |
424 | CPPFLAGS=$SAVED_CPPFLAGS | 443 | CPPFLAGS=$SAVED_CPPFLAGS |
425 | 444 | ||
426 | exiv2=1 | ||
427 | AC_MSG_CHECKING([whether to enable exiv2 extractor]) | ||
428 | AC_ARG_ENABLE(exiv2, | ||
429 | [AC_HELP_STRING([--enable-exiv2],[Enable exiv2 support]) | ||
430 | AC_HELP_STRING([--disable-exiv2],[Disable exiv2 support])], | ||
431 | [case "$enableval" in | ||
432 | no) AC_MSG_RESULT(no) | ||
433 | exiv2=0 | ||
434 | ;; | ||
435 | *) AC_MSG_RESULT(yes) | ||
436 | exiv2=1 | ||
437 | ;; | ||
438 | esac], | ||
439 | [ AC_MSG_RESULT(yes) | ||
440 | exiv2=1]) | ||
441 | AC_LANG_POP([C++]) | ||
442 | # end C++ checks | 445 | # end C++ checks |
443 | fi | 446 | fi |
444 | 447 | ||
@@ -465,11 +468,10 @@ fi | |||
465 | AM_CONDITIONAL(HAVE_QT_SVG, test x$qt_svg != x0) | 468 | AM_CONDITIONAL(HAVE_QT_SVG, test x$qt_svg != x0) |
466 | AM_CONDITIONAL(HAVE_QT_SVG4, test x$qt_svg4 != x0) | 469 | AM_CONDITIONAL(HAVE_QT_SVG4, test x$qt_svg4 != x0) |
467 | 470 | ||
468 | AM_CONDITIONAL(HAVE_EXIV2, test x$exiv2 != x0) | ||
469 | AC_DEFINE_UNQUOTED([HAVE_EXIV2], $exiv2, [We use EXIV2]) | ||
470 | |||
471 | ABI_GSF | 471 | ABI_GSF |
472 | 472 | ||
473 | AM_CONDITIONAL(WITH_GSF, test "x$have_gsf" = "xtrue") | ||
474 | |||
473 | # produce new line | 475 | # produce new line |
474 | echo "" | 476 | echo "" |
475 | AC_CHECK_LIB(gsf-1, gsf_init, AC_DEFINE(HAVE_GSF_INIT,1,[gsf_init supported])) | 477 | AC_CHECK_LIB(gsf-1, gsf_init, AC_DEFINE(HAVE_GSF_INIT,1,[gsf_init supported])) |
@@ -572,7 +574,7 @@ then | |||
572 | AC_MSG_ERROR([FATAL: zlib not found (headers not installed?)]) | 574 | AC_MSG_ERROR([FATAL: zlib not found (headers not installed?)]) |
573 | fi | 575 | fi |
574 | 576 | ||
575 | if test "x$exiv2" = "x0" | 577 | if test "x$HAVE_EXIV2" = "x#" |
576 | then | 578 | then |
577 | AC_MSG_NOTICE([NOTICE: exiv2 disabled]) | 579 | AC_MSG_NOTICE([NOTICE: exiv2 disabled]) |
578 | fi | 580 | fi |
@@ -8,7 +8,7 @@ msgid "" | |||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: libextractor 0.5.14\n" | 9 | "Project-Id-Version: libextractor 0.5.14\n" |
10 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" | 10 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" |
11 | "POT-Creation-Date: 2010-01-13 15:34+0100\n" | 11 | "POT-Creation-Date: 2010-01-13 15:36+0100\n" |
12 | "PO-Revision-Date: 2007-03-23 23:16+0100\n" | 12 | "PO-Revision-Date: 2007-03-23 23:16+0100\n" |
13 | "Last-Translator: Nils Durner <durner@gnunet.org>\n" | 13 | "Last-Translator: Nils Durner <durner@gnunet.org>\n" |
14 | "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" | 14 | "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" |
@@ -985,29 +985,29 @@ msgstr "" | |||
985 | msgid "%s - (binary, %u bytes)\n" | 985 | msgid "%s - (binary, %u bytes)\n" |
986 | msgstr "%s - (binär)\n" | 986 | msgstr "%s - (binär)\n" |
987 | 987 | ||
988 | #: src/main/extract.c:604 src/main/extract.c:614 | 988 | #: src/main/extract.c:603 src/main/extract.c:613 |
989 | #, c-format | 989 | #, c-format |
990 | msgid "" | 990 | msgid "" |
991 | "Illegal combination of options, cannot combine multiple styles of printing.\n" | 991 | "Illegal combination of options, cannot combine multiple styles of printing.\n" |
992 | msgstr "" | 992 | msgstr "" |
993 | 993 | ||
994 | #: src/main/extract.c:641 | 994 | #: src/main/extract.c:640 |
995 | #, c-format | 995 | #, c-format |
996 | msgid "You must specify an argument for the `%s' option (option ignored).\n" | 996 | msgid "You must specify an argument for the `%s' option (option ignored).\n" |
997 | msgstr "" | 997 | msgstr "" |
998 | "Sie müssen ein Argument für die Option »%s« angeben (Option wird ignoriert).\n" | 998 | "Sie müssen ein Argument für die Option »%s« angeben (Option wird ignoriert).\n" |
999 | 999 | ||
1000 | #: src/main/extract.c:706 | 1000 | #: src/main/extract.c:705 |
1001 | #, c-format | 1001 | #, c-format |
1002 | msgid "Use --help to get a list of options.\n" | 1002 | msgid "Use --help to get a list of options.\n" |
1003 | msgstr "Verwenden Sie --help, um eine Liste aller Optionen zu sehen.\n" | 1003 | msgstr "Verwenden Sie --help, um eine Liste aller Optionen zu sehen.\n" |
1004 | 1004 | ||
1005 | #: src/main/extract.c:738 | 1005 | #: src/main/extract.c:737 |
1006 | #, c-format | 1006 | #, c-format |
1007 | msgid "%% BiBTeX file\n" | 1007 | msgid "%% BiBTeX file\n" |
1008 | msgstr "%% BibTeX Datei\n" | 1008 | msgstr "%% BibTeX Datei\n" |
1009 | 1009 | ||
1010 | #: src/main/extract.c:745 | 1010 | #: src/main/extract.c:744 |
1011 | #, c-format | 1011 | #, c-format |
1012 | msgid "Keywords for file %s:\n" | 1012 | msgid "Keywords for file %s:\n" |
1013 | msgstr "Schlüsserwörter für die Datei %s:\n" | 1013 | msgstr "Schlüsserwörter für die Datei %s:\n" |
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: libextractor-0.5.20a\n" | 8 | "Project-Id-Version: libextractor-0.5.20a\n" |
9 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" | 9 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" |
10 | "POT-Creation-Date: 2010-01-13 15:34+0100\n" | 10 | "POT-Creation-Date: 2010-01-13 15:36+0100\n" |
11 | "PO-Revision-Date: 2008-08-24 19:08+0100\n" | 11 | "PO-Revision-Date: 2008-08-24 19:08+0100\n" |
12 | "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n" | 12 | "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n" |
13 | "Language-Team: French <traduc@traduc.org>\n" | 13 | "Language-Team: French <traduc@traduc.org>\n" |
@@ -1007,28 +1007,28 @@ msgstr "" | |||
1007 | msgid "%s - (binary, %u bytes)\n" | 1007 | msgid "%s - (binary, %u bytes)\n" |
1008 | msgstr "%s - (binaire)\n" | 1008 | msgstr "%s - (binaire)\n" |
1009 | 1009 | ||
1010 | #: src/main/extract.c:604 src/main/extract.c:614 | 1010 | #: src/main/extract.c:603 src/main/extract.c:613 |
1011 | #, c-format | 1011 | #, c-format |
1012 | msgid "" | 1012 | msgid "" |
1013 | "Illegal combination of options, cannot combine multiple styles of printing.\n" | 1013 | "Illegal combination of options, cannot combine multiple styles of printing.\n" |
1014 | msgstr "" | 1014 | msgstr "" |
1015 | 1015 | ||
1016 | #: src/main/extract.c:641 | 1016 | #: src/main/extract.c:640 |
1017 | #, c-format | 1017 | #, c-format |
1018 | msgid "You must specify an argument for the `%s' option (option ignored).\n" | 1018 | msgid "You must specify an argument for the `%s' option (option ignored).\n" |
1019 | msgstr "Vous devez préciser un argument pour l'option `%s' (option ignorée).\n" | 1019 | msgstr "Vous devez préciser un argument pour l'option `%s' (option ignorée).\n" |
1020 | 1020 | ||
1021 | #: src/main/extract.c:706 | 1021 | #: src/main/extract.c:705 |
1022 | #, c-format | 1022 | #, c-format |
1023 | msgid "Use --help to get a list of options.\n" | 1023 | msgid "Use --help to get a list of options.\n" |
1024 | msgstr "Utilisez --help pour obtenir une liste d'options.\n" | 1024 | msgstr "Utilisez --help pour obtenir une liste d'options.\n" |
1025 | 1025 | ||
1026 | #: src/main/extract.c:738 | 1026 | #: src/main/extract.c:737 |
1027 | #, c-format | 1027 | #, c-format |
1028 | msgid "%% BiBTeX file\n" | 1028 | msgid "%% BiBTeX file\n" |
1029 | msgstr "%% fichier BiBTeX\n" | 1029 | msgstr "%% fichier BiBTeX\n" |
1030 | 1030 | ||
1031 | #: src/main/extract.c:745 | 1031 | #: src/main/extract.c:744 |
1032 | #, c-format | 1032 | #, c-format |
1033 | msgid "Keywords for file %s:\n" | 1033 | msgid "Keywords for file %s:\n" |
1034 | msgstr "Mots-clés pour le fichier %s:\n" | 1034 | msgstr "Mots-clés pour le fichier %s:\n" |
@@ -6,7 +6,7 @@ msgid "" | |||
6 | msgstr "" | 6 | msgstr "" |
7 | "Project-Id-Version: libextractor 0.5.20\n" | 7 | "Project-Id-Version: libextractor 0.5.20\n" |
8 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" | 8 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" |
9 | "POT-Creation-Date: 2010-01-13 15:34+0100\n" | 9 | "POT-Creation-Date: 2010-01-13 15:36+0100\n" |
10 | "PO-Revision-Date: 2008-03-21 20:46-0700\n" | 10 | "PO-Revision-Date: 2008-03-21 20:46-0700\n" |
11 | "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n" | 11 | "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n" |
12 | "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" | 12 | "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" |
@@ -983,29 +983,29 @@ msgstr "" | |||
983 | msgid "%s - (binary, %u bytes)\n" | 983 | msgid "%s - (binary, %u bytes)\n" |
984 | msgstr "%s - (dnrtha)\n" | 984 | msgstr "%s - (dnrtha)\n" |
985 | 985 | ||
986 | #: src/main/extract.c:604 src/main/extract.c:614 | 986 | #: src/main/extract.c:603 src/main/extract.c:613 |
987 | #, c-format | 987 | #, c-format |
988 | msgid "" | 988 | msgid "" |
989 | "Illegal combination of options, cannot combine multiple styles of printing.\n" | 989 | "Illegal combination of options, cannot combine multiple styles of printing.\n" |
990 | msgstr "" | 990 | msgstr "" |
991 | 991 | ||
992 | #: src/main/extract.c:641 | 992 | #: src/main/extract.c:640 |
993 | #, c-format | 993 | #, c-format |
994 | msgid "You must specify an argument for the `%s' option (option ignored).\n" | 994 | msgid "You must specify an argument for the `%s' option (option ignored).\n" |
995 | msgstr "" | 995 | msgstr "" |
996 | "N mr duit argint a thabhairt i ndiaidh na rogha `%s' ( ligean thart).\n" | 996 | "N mr duit argint a thabhairt i ndiaidh na rogha `%s' ( ligean thart).\n" |
997 | 997 | ||
998 | #: src/main/extract.c:706 | 998 | #: src/main/extract.c:705 |
999 | #, c-format | 999 | #, c-format |
1000 | msgid "Use --help to get a list of options.\n" | 1000 | msgid "Use --help to get a list of options.\n" |
1001 | msgstr "Bain sid as '--help' le haghaidh nos m roghanna.\n" | 1001 | msgstr "Bain sid as '--help' le haghaidh nos m roghanna.\n" |
1002 | 1002 | ||
1003 | #: src/main/extract.c:738 | 1003 | #: src/main/extract.c:737 |
1004 | #, c-format | 1004 | #, c-format |
1005 | msgid "%% BiBTeX file\n" | 1005 | msgid "%% BiBTeX file\n" |
1006 | msgstr "%% Comhad BiBTeX\n" | 1006 | msgstr "%% Comhad BiBTeX\n" |
1007 | 1007 | ||
1008 | #: src/main/extract.c:745 | 1008 | #: src/main/extract.c:744 |
1009 | #, c-format | 1009 | #, c-format |
1010 | msgid "Keywords for file %s:\n" | 1010 | msgid "Keywords for file %s:\n" |
1011 | msgstr "Lorgfhocail do chomhad %s:\n" | 1011 | msgstr "Lorgfhocail do chomhad %s:\n" |
diff --git a/po/libextractor.pot b/po/libextractor.pot index 37e3cfa..873b0e1 100644 --- a/po/libextractor.pot +++ b/po/libextractor.pot | |||
@@ -8,7 +8,7 @@ msgid "" | |||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: PACKAGE VERSION\n" | 9 | "Project-Id-Version: PACKAGE VERSION\n" |
10 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" | 10 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" |
11 | "POT-Creation-Date: 2010-01-13 15:34+0100\n" | 11 | "POT-Creation-Date: 2010-01-13 15:36+0100\n" |
12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
@@ -971,28 +971,28 @@ msgstr "" | |||
971 | msgid "%s - (binary, %u bytes)\n" | 971 | msgid "%s - (binary, %u bytes)\n" |
972 | msgstr "" | 972 | msgstr "" |
973 | 973 | ||
974 | #: src/main/extract.c:604 src/main/extract.c:614 | 974 | #: src/main/extract.c:603 src/main/extract.c:613 |
975 | #, c-format | 975 | #, c-format |
976 | msgid "" | 976 | msgid "" |
977 | "Illegal combination of options, cannot combine multiple styles of printing.\n" | 977 | "Illegal combination of options, cannot combine multiple styles of printing.\n" |
978 | msgstr "" | 978 | msgstr "" |
979 | 979 | ||
980 | #: src/main/extract.c:641 | 980 | #: src/main/extract.c:640 |
981 | #, c-format | 981 | #, c-format |
982 | msgid "You must specify an argument for the `%s' option (option ignored).\n" | 982 | msgid "You must specify an argument for the `%s' option (option ignored).\n" |
983 | msgstr "" | 983 | msgstr "" |
984 | 984 | ||
985 | #: src/main/extract.c:706 | 985 | #: src/main/extract.c:705 |
986 | #, c-format | 986 | #, c-format |
987 | msgid "Use --help to get a list of options.\n" | 987 | msgid "Use --help to get a list of options.\n" |
988 | msgstr "" | 988 | msgstr "" |
989 | 989 | ||
990 | #: src/main/extract.c:738 | 990 | #: src/main/extract.c:737 |
991 | #, c-format | 991 | #, c-format |
992 | msgid "%% BiBTeX file\n" | 992 | msgid "%% BiBTeX file\n" |
993 | msgstr "" | 993 | msgstr "" |
994 | 994 | ||
995 | #: src/main/extract.c:745 | 995 | #: src/main/extract.c:744 |
996 | #, c-format | 996 | #, c-format |
997 | msgid "Keywords for file %s:\n" | 997 | msgid "Keywords for file %s:\n" |
998 | msgstr "" | 998 | msgstr "" |
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: libextractor-0.5.20a\n" | 8 | "Project-Id-Version: libextractor-0.5.20a\n" |
9 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" | 9 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" |
10 | "POT-Creation-Date: 2010-01-13 15:34+0100\n" | 10 | "POT-Creation-Date: 2010-01-13 15:36+0100\n" |
11 | "PO-Revision-Date: 2009-03-08 16:59+0100\n" | 11 | "PO-Revision-Date: 2009-03-08 16:59+0100\n" |
12 | "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n" | 12 | "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n" |
13 | "Language-Team: Dutch <vertaling@vrijschrift.org>\n" | 13 | "Language-Team: Dutch <vertaling@vrijschrift.org>\n" |
@@ -985,28 +985,28 @@ msgstr "" | |||
985 | msgid "%s - (binary, %u bytes)\n" | 985 | msgid "%s - (binary, %u bytes)\n" |
986 | msgstr "%s - (binair)\n" | 986 | msgstr "%s - (binair)\n" |
987 | 987 | ||
988 | #: src/main/extract.c:604 src/main/extract.c:614 | 988 | #: src/main/extract.c:603 src/main/extract.c:613 |
989 | #, c-format | 989 | #, c-format |
990 | msgid "" | 990 | msgid "" |
991 | "Illegal combination of options, cannot combine multiple styles of printing.\n" | 991 | "Illegal combination of options, cannot combine multiple styles of printing.\n" |
992 | msgstr "" | 992 | msgstr "" |
993 | 993 | ||
994 | #: src/main/extract.c:641 | 994 | #: src/main/extract.c:640 |
995 | #, c-format | 995 | #, c-format |
996 | msgid "You must specify an argument for the `%s' option (option ignored).\n" | 996 | msgid "You must specify an argument for the `%s' option (option ignored).\n" |
997 | msgstr "Optie '%s' vereist een argument -- optie is genegeerd.\n" | 997 | msgstr "Optie '%s' vereist een argument -- optie is genegeerd.\n" |
998 | 998 | ||
999 | #: src/main/extract.c:706 | 999 | #: src/main/extract.c:705 |
1000 | #, c-format | 1000 | #, c-format |
1001 | msgid "Use --help to get a list of options.\n" | 1001 | msgid "Use --help to get a list of options.\n" |
1002 | msgstr "Gebruik '--help' voor een lijst met mogelijke opties.\n" | 1002 | msgstr "Gebruik '--help' voor een lijst met mogelijke opties.\n" |
1003 | 1003 | ||
1004 | #: src/main/extract.c:738 | 1004 | #: src/main/extract.c:737 |
1005 | #, c-format | 1005 | #, c-format |
1006 | msgid "%% BiBTeX file\n" | 1006 | msgid "%% BiBTeX file\n" |
1007 | msgstr "%% BiBTeX-bestand\n" | 1007 | msgstr "%% BiBTeX-bestand\n" |
1008 | 1008 | ||
1009 | #: src/main/extract.c:745 | 1009 | #: src/main/extract.c:744 |
1010 | #, c-format | 1010 | #, c-format |
1011 | msgid "Keywords for file %s:\n" | 1011 | msgid "Keywords for file %s:\n" |
1012 | msgstr "Trefwoorden voor bestand %s:\n" | 1012 | msgstr "Trefwoorden voor bestand %s:\n" |
@@ -9,7 +9,7 @@ msgid "" | |||
9 | msgstr "" | 9 | msgstr "" |
10 | "Project-Id-Version: libextractor 0.5.3\n" | 10 | "Project-Id-Version: libextractor 0.5.3\n" |
11 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" | 11 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" |
12 | "POT-Creation-Date: 2010-01-13 15:34+0100\n" | 12 | "POT-Creation-Date: 2010-01-13 15:36+0100\n" |
13 | "PO-Revision-Date: 2005-08-16 12:00-0500\n" | 13 | "PO-Revision-Date: 2005-08-16 12:00-0500\n" |
14 | "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n" | 14 | "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n" |
15 | "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" | 15 | "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" |
@@ -986,29 +986,29 @@ msgstr "" | |||
986 | msgid "%s - (binary, %u bytes)\n" | 986 | msgid "%s - (binary, %u bytes)\n" |
987 | msgstr "%s - (binar)\n" | 987 | msgstr "%s - (binar)\n" |
988 | 988 | ||
989 | #: src/main/extract.c:604 src/main/extract.c:614 | 989 | #: src/main/extract.c:603 src/main/extract.c:613 |
990 | #, c-format | 990 | #, c-format |
991 | msgid "" | 991 | msgid "" |
992 | "Illegal combination of options, cannot combine multiple styles of printing.\n" | 992 | "Illegal combination of options, cannot combine multiple styles of printing.\n" |
993 | msgstr "" | 993 | msgstr "" |
994 | 994 | ||
995 | #: src/main/extract.c:641 | 995 | #: src/main/extract.c:640 |
996 | #, fuzzy, c-format | 996 | #, fuzzy, c-format |
997 | msgid "You must specify an argument for the `%s' option (option ignored).\n" | 997 | msgid "You must specify an argument for the `%s' option (option ignored).\n" |
998 | msgstr "" | 998 | msgstr "" |
999 | "Trebuie s specificai un argument pentru opiunea '%s' (opiune ignorat).\n" | 999 | "Trebuie s specificai un argument pentru opiunea '%s' (opiune ignorat).\n" |
1000 | 1000 | ||
1001 | #: src/main/extract.c:706 | 1001 | #: src/main/extract.c:705 |
1002 | #, c-format | 1002 | #, c-format |
1003 | msgid "Use --help to get a list of options.\n" | 1003 | msgid "Use --help to get a list of options.\n" |
1004 | msgstr "Folosii --help pentru a obine o list de opiuni.\n" | 1004 | msgstr "Folosii --help pentru a obine o list de opiuni.\n" |
1005 | 1005 | ||
1006 | #: src/main/extract.c:738 | 1006 | #: src/main/extract.c:737 |
1007 | #, c-format | 1007 | #, c-format |
1008 | msgid "%% BiBTeX file\n" | 1008 | msgid "%% BiBTeX file\n" |
1009 | msgstr "%% BiBTeX file\n" | 1009 | msgstr "%% BiBTeX file\n" |
1010 | 1010 | ||
1011 | #: src/main/extract.c:745 | 1011 | #: src/main/extract.c:744 |
1012 | #, c-format | 1012 | #, c-format |
1013 | msgid "Keywords for file %s:\n" | 1013 | msgid "Keywords for file %s:\n" |
1014 | msgstr "Cuvinte cheie pentru fiier %s:\n" | 1014 | msgstr "Cuvinte cheie pentru fiier %s:\n" |
@@ -16,7 +16,7 @@ msgid "" | |||
16 | msgstr "" | 16 | msgstr "" |
17 | "Project-Id-Version: libextractor 0.4.2\n" | 17 | "Project-Id-Version: libextractor 0.4.2\n" |
18 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" | 18 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" |
19 | "POT-Creation-Date: 2010-01-13 15:34+0100\n" | 19 | "POT-Creation-Date: 2010-01-13 15:36+0100\n" |
20 | "PO-Revision-Date: 2005-04-04 10:55-0700\n" | 20 | "PO-Revision-Date: 2005-04-04 10:55-0700\n" |
21 | "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n" | 21 | "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n" |
22 | "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" | 22 | "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" |
@@ -1050,28 +1050,28 @@ msgstr "" | |||
1050 | msgid "%s - (binary, %u bytes)\n" | 1050 | msgid "%s - (binary, %u bytes)\n" |
1051 | msgstr "%s-(Nyabibiri" | 1051 | msgstr "%s-(Nyabibiri" |
1052 | 1052 | ||
1053 | #: src/main/extract.c:604 src/main/extract.c:614 | 1053 | #: src/main/extract.c:603 src/main/extract.c:613 |
1054 | #, c-format | 1054 | #, c-format |
1055 | msgid "" | 1055 | msgid "" |
1056 | "Illegal combination of options, cannot combine multiple styles of printing.\n" | 1056 | "Illegal combination of options, cannot combine multiple styles of printing.\n" |
1057 | msgstr "" | 1057 | msgstr "" |
1058 | 1058 | ||
1059 | #: src/main/extract.c:641 | 1059 | #: src/main/extract.c:640 |
1060 | #, fuzzy, c-format | 1060 | #, fuzzy, c-format |
1061 | msgid "You must specify an argument for the `%s' option (option ignored).\n" | 1061 | msgid "You must specify an argument for the `%s' option (option ignored).\n" |
1062 | msgstr "kugirango i Ihitamo Ihitamo" | 1062 | msgstr "kugirango i Ihitamo Ihitamo" |
1063 | 1063 | ||
1064 | #: src/main/extract.c:706 | 1064 | #: src/main/extract.c:705 |
1065 | #, fuzzy, c-format | 1065 | #, fuzzy, c-format |
1066 | msgid "Use --help to get a list of options.\n" | 1066 | msgid "Use --help to get a list of options.\n" |
1067 | msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo" | 1067 | msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo" |
1068 | 1068 | ||
1069 | #: src/main/extract.c:738 | 1069 | #: src/main/extract.c:737 |
1070 | #, c-format | 1070 | #, c-format |
1071 | msgid "%% BiBTeX file\n" | 1071 | msgid "%% BiBTeX file\n" |
1072 | msgstr "" | 1072 | msgstr "" |
1073 | 1073 | ||
1074 | #: src/main/extract.c:745 | 1074 | #: src/main/extract.c:744 |
1075 | #, fuzzy, c-format | 1075 | #, fuzzy, c-format |
1076 | msgid "Keywords for file %s:\n" | 1076 | msgid "Keywords for file %s:\n" |
1077 | msgstr "kugirango IDOSIYE" | 1077 | msgstr "kugirango IDOSIYE" |
@@ -7,7 +7,7 @@ msgid "" | |||
7 | msgstr "" | 7 | msgstr "" |
8 | "Project-Id-Version: libextractor 0.5.22\n" | 8 | "Project-Id-Version: libextractor 0.5.22\n" |
9 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" | 9 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" |
10 | "POT-Creation-Date: 2010-01-13 15:34+0100\n" | 10 | "POT-Creation-Date: 2010-01-13 15:36+0100\n" |
11 | "PO-Revision-Date: 2009-05-12 17:45+0100\n" | 11 | "PO-Revision-Date: 2009-05-12 17:45+0100\n" |
12 | "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" | 12 | "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" |
13 | "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" | 13 | "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" |
@@ -979,28 +979,28 @@ msgstr "" | |||
979 | msgid "%s - (binary, %u bytes)\n" | 979 | msgid "%s - (binary, %u bytes)\n" |
980 | msgstr "%s - (binär)\n" | 980 | msgstr "%s - (binär)\n" |
981 | 981 | ||
982 | #: src/main/extract.c:604 src/main/extract.c:614 | 982 | #: src/main/extract.c:603 src/main/extract.c:613 |
983 | #, c-format | 983 | #, c-format |
984 | msgid "" | 984 | msgid "" |
985 | "Illegal combination of options, cannot combine multiple styles of printing.\n" | 985 | "Illegal combination of options, cannot combine multiple styles of printing.\n" |
986 | msgstr "" | 986 | msgstr "" |
987 | 987 | ||
988 | #: src/main/extract.c:641 | 988 | #: src/main/extract.c:640 |
989 | #, c-format | 989 | #, c-format |
990 | msgid "You must specify an argument for the `%s' option (option ignored).\n" | 990 | msgid "You must specify an argument for the `%s' option (option ignored).\n" |
991 | msgstr "Du måste ange ett argument för flaggan \"%s\" (flagga ignoreras).\n" | 991 | msgstr "Du måste ange ett argument för flaggan \"%s\" (flagga ignoreras).\n" |
992 | 992 | ||
993 | #: src/main/extract.c:706 | 993 | #: src/main/extract.c:705 |
994 | #, c-format | 994 | #, c-format |
995 | msgid "Use --help to get a list of options.\n" | 995 | msgid "Use --help to get a list of options.\n" |
996 | msgstr "Använd --help för att få en lista på flaggor.\n" | 996 | msgstr "Använd --help för att få en lista på flaggor.\n" |
997 | 997 | ||
998 | #: src/main/extract.c:738 | 998 | #: src/main/extract.c:737 |
999 | #, c-format | 999 | #, c-format |
1000 | msgid "%% BiBTeX file\n" | 1000 | msgid "%% BiBTeX file\n" |
1001 | msgstr "%% BiBTeX-fil\n" | 1001 | msgstr "%% BiBTeX-fil\n" |
1002 | 1002 | ||
1003 | #: src/main/extract.c:745 | 1003 | #: src/main/extract.c:744 |
1004 | #, c-format | 1004 | #, c-format |
1005 | msgid "Keywords for file %s:\n" | 1005 | msgid "Keywords for file %s:\n" |
1006 | msgstr "Nyckelord för filen %s:\n" | 1006 | msgstr "Nyckelord för filen %s:\n" |
@@ -8,7 +8,7 @@ msgid "" | |||
8 | msgstr "" | 8 | msgstr "" |
9 | "Project-Id-Version: libextractor 0.5.22\n" | 9 | "Project-Id-Version: libextractor 0.5.22\n" |
10 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" | 10 | "Report-Msgid-Bugs-To: libextractor@gnu.org\n" |
11 | "POT-Creation-Date: 2010-01-13 15:34+0100\n" | 11 | "POT-Creation-Date: 2010-01-13 15:36+0100\n" |
12 | "PO-Revision-Date: 2009-05-12 22:57+0930\n" | 12 | "PO-Revision-Date: 2009-05-12 22:57+0930\n" |
13 | "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" | 13 | "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" |
14 | "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" | 14 | "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" |
@@ -986,29 +986,29 @@ msgstr "" | |||
986 | msgid "%s - (binary, %u bytes)\n" | 986 | msgid "%s - (binary, %u bytes)\n" |
987 | msgstr "%s - (nhị phân)\n" | 987 | msgstr "%s - (nhị phân)\n" |
988 | 988 | ||
989 | #: src/main/extract.c:604 src/main/extract.c:614 | 989 | #: src/main/extract.c:603 src/main/extract.c:613 |
990 | #, c-format | 990 | #, c-format |
991 | msgid "" | 991 | msgid "" |
992 | "Illegal combination of options, cannot combine multiple styles of printing.\n" | 992 | "Illegal combination of options, cannot combine multiple styles of printing.\n" |
993 | msgstr "" | 993 | msgstr "" |
994 | 994 | ||
995 | #: src/main/extract.c:641 | 995 | #: src/main/extract.c:640 |
996 | #, c-format | 996 | #, c-format |
997 | msgid "You must specify an argument for the `%s' option (option ignored).\n" | 997 | msgid "You must specify an argument for the `%s' option (option ignored).\n" |
998 | msgstr "Bạn phải ghi rõ một đối số cho tùy chọn « %s » (tùy chọn bị bỏ qua).\n" | 998 | msgstr "Bạn phải ghi rõ một đối số cho tùy chọn « %s » (tùy chọn bị bỏ qua).\n" |
999 | 999 | ||
1000 | #: src/main/extract.c:706 | 1000 | #: src/main/extract.c:705 |
1001 | #, c-format | 1001 | #, c-format |
1002 | msgid "Use --help to get a list of options.\n" | 1002 | msgid "Use --help to get a list of options.\n" |
1003 | msgstr "" | 1003 | msgstr "" |
1004 | "Hãy sử dụng lệnh « --help » (trợ giúp) để xem một danh sách các tùy chọn.\n" | 1004 | "Hãy sử dụng lệnh « --help » (trợ giúp) để xem một danh sách các tùy chọn.\n" |
1005 | 1005 | ||
1006 | #: src/main/extract.c:738 | 1006 | #: src/main/extract.c:737 |
1007 | #, c-format | 1007 | #, c-format |
1008 | msgid "%% BiBTeX file\n" | 1008 | msgid "%% BiBTeX file\n" |
1009 | msgstr "%% tập tin BiBTeX\n" | 1009 | msgstr "%% tập tin BiBTeX\n" |
1010 | 1010 | ||
1011 | #: src/main/extract.c:745 | 1011 | #: src/main/extract.c:744 |
1012 | #, c-format | 1012 | #, c-format |
1013 | msgid "Keywords for file %s:\n" | 1013 | msgid "Keywords for file %s:\n" |
1014 | msgstr "Từ khoá cho tập tin %s:\n" | 1014 | msgstr "Từ khoá cho tập tin %s:\n" |
diff --git a/src/main/Makefile.am b/src/main/Makefile.am index ecdd46a..2ba0d0a 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am | |||
@@ -46,10 +46,6 @@ extract_SOURCES = \ | |||
46 | getopt1.c | 46 | getopt1.c |
47 | 47 | ||
48 | 48 | ||
49 | |||
50 | |||
51 | ELIBDIR = $(libdir) | ||
52 | |||
53 | LDADD = \ | 49 | LDADD = \ |
54 | $(top_builddir)/src/main/libextractor.la | 50 | $(top_builddir)/src/main/libextractor.la |
55 | 51 | ||
@@ -65,12 +61,6 @@ check_PROGRAMS = \ | |||
65 | test_plugin_loading \ | 61 | test_plugin_loading \ |
66 | test_plugin_load_multi | 62 | test_plugin_load_multi |
67 | 63 | ||
68 | nocheck = \ | ||
69 | mt_plugintest1 \ | ||
70 | mt_plugintest2 \ | ||
71 | mt_extracttest1 \ | ||
72 | mt_extracttest2 | ||
73 | |||
74 | TESTS = $(check_PROGRAMS) $(fuzz_tests) | 64 | TESTS = $(check_PROGRAMS) $(fuzz_tests) |
75 | 65 | ||
76 | test_trivial_SOURCES = \ | 66 | test_trivial_SOURCES = \ |
@@ -82,24 +72,3 @@ test_plugin_loading_SOURCES = \ | |||
82 | test_plugin_load_multi_SOURCES = \ | 72 | test_plugin_load_multi_SOURCES = \ |
83 | test_plugin_load_multi.c | 73 | test_plugin_load_multi.c |
84 | 74 | ||
85 | mt_plugintest1_SOURCES = \ | ||
86 | mt_plugintest1.c | ||
87 | mt_plugintest1_LDFLAGS = \ | ||
88 | -lpthread | ||
89 | |||
90 | mt_plugintest2_SOURCES = \ | ||
91 | mt_plugintest2.c | ||
92 | mt_plugintest2_LDFLAGS = \ | ||
93 | -lpthread | ||
94 | |||
95 | mt_extracttest1_SOURCES = \ | ||
96 | mt_extracttest1.c | ||
97 | mt_extracttest1_LDFLAGS = \ | ||
98 | -lpthread | ||
99 | |||
100 | mt_extracttest2_SOURCES = \ | ||
101 | mt_extracttest2.c | ||
102 | mt_extracttest2_LDFLAGS = \ | ||
103 | -lpthread | ||
104 | |||
105 | |||
diff --git a/src/main/extract.c b/src/main/extract.c index df7358c..f1fbc9a 100644 --- a/src/main/extract.c +++ b/src/main/extract.c | |||
@@ -554,7 +554,6 @@ main (int argc, char *argv[]) | |||
554 | int defaultAll = YES; | 554 | int defaultAll = YES; |
555 | int bibtex = NO; | 555 | int bibtex = NO; |
556 | int grepfriendly = NO; | 556 | int grepfriendly = NO; |
557 | char * name; | ||
558 | int ret = 0; | 557 | int ret = 0; |
559 | EXTRACTOR_MetaDataProcessor processor = NULL; | 558 | EXTRACTOR_MetaDataProcessor processor = NULL; |
560 | 559 | ||