aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-11-28 11:56:00 +0000
committerChristian Grothoff <christian@grothoff.org>2011-11-28 11:56:00 +0000
commitc36a9c507db16cea9c29e75420a1452ff5452904 (patch)
treec0e9e7af31d011a768f4297fd801f12ad07a9dac
parent09fea22133b3d8f459feeed87ca09e49b06652a6 (diff)
downloadlibextractor-c36a9c507db16cea9c29e75420a1452ff5452904.tar.gz
libextractor-c36a9c507db16cea9c29e75420a1452ff5452904.zip
making 0.6.3 release
Diffstat
-rw-r--r--ChangeLog61
-rw-r--r--Makefile.am2
-rw-r--r--NEWS3
-rw-r--r--configure.ac4
-rw-r--r--doc/version.texi8
-rw-r--r--m4/Makefile.am1
-rw-r--r--po/de.po85
-rw-r--r--po/fr.po82
-rw-r--r--po/ga.po82
-rw-r--r--po/it.po160
-rw-r--r--po/libextractor.pot77
-rw-r--r--po/nl.po82
-rw-r--r--po/ro.po82
-rw-r--r--po/rw.po82
-rw-r--r--po/sv.po82
-rw-r--r--po/uk.po161
-rw-r--r--po/vi.po80
-rw-r--r--src/include/extractor.h2
-rw-r--r--src/main/Makefile.am2
-rw-r--r--src/main/extractor.c2
-rw-r--r--src/plugins/Makefile.am1
-rw-r--r--src/plugins/asf_extractor.c491
-rw-r--r--src/plugins/flv_extractor.c5
-rw-r--r--src/plugins/id3v24_extractor.c5
-rw-r--r--src/plugins/id3v2_extractor.c3
-rw-r--r--src/plugins/mkv_extractor.c274
-rw-r--r--src/plugins/tar_extractor.c5
-rw-r--r--src/plugins/zip_extractor.c11
28 files changed, 943 insertions, 992 deletions
diff --git a/ChangeLog b/ChangeLog
index f652dba..a3c3bfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
1Mon Nov 28 12:17:42 CET 2011
2 Fixing compiler warnings, cleaning up ASF plugin. Finishing
3 Matroska plugin. -CG
4 Releasing libextractor 0.6.3.
5
1Fri Jul 22 21:46:32 CEST 2011 6Fri Jul 22 21:46:32 CEST 2011
2 Added Ukrainian translation. -CG 7 Added Ukrainian translation. -CG
3 8
@@ -10,10 +15,10 @@ Sun Jun 13 13:15:43 CEST 2010
10Sat Jun 12 22:32:32 CEST 2010 15Sat Jun 12 22:32:32 CEST 2010
11 Fixing various bugs, including some that can cause crashes given 16 Fixing various bugs, including some that can cause crashes given
12 malformed inputs. -CG 17 malformed inputs. -CG
13 18
14Sat Jun 12 16:23:14 CEST 2010 19Sat Jun 12 16:23:14 CEST 2010
15 Only pass 'unsigned char's to 'isspace' and similar functions. -CG 20 Only pass 'unsigned char's to 'isspace' and similar functions. -CG
16 21
17Sun Mar 14 00:09:45 CET 2010 22Sun Mar 14 00:09:45 CET 2010
18 Releasing libextractor 0.6.1. 23 Releasing libextractor 0.6.1.
19 24
@@ -46,7 +51,7 @@ Sun Feb 15 16:57:46 MST 2009
46 51
47Sun Nov 2 20:19:02 MST 2008 52Sun Nov 2 20:19:02 MST 2008
48 Releasing libextractor 0.5.21. 53 Releasing libextractor 0.5.21.
49 54
50Tue Aug 12 04:40:49 EEST 2008 55Tue Aug 12 04:40:49 EEST 2008
51 Added an S3M (Scream Tracker 3 Module) plugin. 56 Added an S3M (Scream Tracker 3 Module) plugin.
52 57
@@ -238,7 +243,7 @@ Fri Mar 24 21:43:43 PST 2006
238 Started re-implementation of PDF support from scratch 243 Started re-implementation of PDF support from scratch
239 (incomplete but working). Improvements to the build 244 (incomplete but working). Improvements to the build
240 system. 245 system.
241 246
242Thu Mar 9 17:46:39 PST 2006 247Thu Mar 9 17:46:39 PST 2006
243 Added support for wordleaker (additional meta-data for 248 Added support for wordleaker (additional meta-data for
244 OLE2 streams). Releasing libextractor 0.5.11. 249 OLE2 streams). Releasing libextractor 0.5.11.
@@ -279,7 +284,7 @@ Sun Dec 4 23:36:00 PST 2005
279 284
280Sat Nov 12 10:50:46 PST 2005 285Sat Nov 12 10:50:46 PST 2005
281 Releasing libextractor 0.5.7. 286 Releasing libextractor 0.5.7.
282 287
283Wed Nov 9 12:51:52 PST 2005 288Wed Nov 9 12:51:52 PST 2005
284 Fix in LE unload code (potential double-free, maybe BSD-specific). 289 Fix in LE unload code (potential double-free, maybe BSD-specific).
285 290
@@ -325,7 +330,7 @@ Fri Sep 16 16:41:04 PDT 2005
325 330
326Thu Sep 15 21:55:19 PDT 2005 331Thu Sep 15 21:55:19 PDT 2005
327 Fixing compiler warnings given by gcc 4.0. 332 Fixing compiler warnings given by gcc 4.0.
328 333
329Thu Sep 15 00:56:51 PDT 2005 334Thu Sep 15 00:56:51 PDT 2005
330 Fixed incorrectly handled integer overflow in png extractor. 335 Fixed incorrectly handled integer overflow in png extractor.
331 336
@@ -376,7 +381,7 @@ Sat Aug 20 21:27:17 PDT 2005
376 381
377Thu Aug 18 21:18:28 PDT 2005 382Thu Aug 18 21:18:28 PDT 2005
378 Made quotations match GNU standards. 383 Made quotations match GNU standards.
379 384
380Sat Aug 13 18:41:02 PDT 2005 385Sat Aug 13 18:41:02 PDT 2005
381 Fixed problems with ole2 extractor. Also removed 386 Fixed problems with ole2 extractor. Also removed
382 requirement for static version of glib (!). 387 requirement for static version of glib (!).
@@ -406,7 +411,7 @@ Mon Jul 4 18:10:14 CEST 2005
406 by default due to bugs). Moved Python and Java 411 by default due to bugs). Moved Python and Java
407 bindings into separate packages. 412 bindings into separate packages.
408 Releasing libextractor 0.5.1. 413 Releasing libextractor 0.5.1.
409 414
410Wed Jun 29 15:37:51 CEST 2005 415Wed Jun 29 15:37:51 CEST 2005
411 Finally found out how to disable building static libs. 416 Finally found out how to disable building static libs.
412 This should cut down compile time and installed size 417 This should cut down compile time and installed size
@@ -416,7 +421,7 @@ Wed Jun 29 15:37:51 CEST 2005
416Sat Jun 18 14:56:38 EST 2005 421Sat Jun 18 14:56:38 EST 2005
417 Fixed a score of compiler warnings and some minor bugs, 422 Fixed a score of compiler warnings and some minor bugs,
418 none of which should have been observable. 423 none of which should have been observable.
419 424
420Sat May 21 13:42:46 EST 2005 425Sat May 21 13:42:46 EST 2005
421 Releasing libextractor 0.5.0. 426 Releasing libextractor 0.5.0.
422 427
@@ -438,7 +443,7 @@ Thu Feb 24 00:32:44 EST 2005
438 443
439Wed Feb 23 22:42:08 EST 2005 444Wed Feb 23 22:42:08 EST 2005
440 Comment tag was not extracted from ID3 tags. Fixed. 445 Comment tag was not extracted from ID3 tags. Fixed.
441 446
442Sun Feb 20 16:36:17 EST 2005 447Sun Feb 20 16:36:17 EST 2005
443 Fixed similar problem in REAL extractor. Added support 448 Fixed similar problem in REAL extractor. Added support
444 for new Helix/Real format to REAL extractor. 449 for new Helix/Real format to REAL extractor.
@@ -510,12 +515,12 @@ Sat Oct 23 13:21:23 EST 2004
510 515
511Fri Oct 22 22:22:28 EST 2004 516Fri Oct 22 22:22:28 EST 2004
512 Fixing memory leak after extensive valgrinding. 517 Fixing memory leak after extensive valgrinding.
513 518
514Fri Oct 22 19:18:38 EST 2004 519Fri Oct 22 19:18:38 EST 2004
515 id3v2.3 and id3v2.4 work. Some bugfixes. 520 id3v2.3 and id3v2.4 work. Some bugfixes.
516 521
517Sun Oct 17 18:12:11 EST 2004 522Sun Oct 17 18:12:11 EST 2004
518 tar and tar.gz work. Releasing libextractor 0.3.9. 523 tar and tar.gz work. Releasing libextractor 0.3.9.
519 524
520Sun Oct 17 17:42:16 EST 2004 525Sun Oct 17 17:42:16 EST 2004
521 deb works. 526 deb works.
@@ -559,17 +564,17 @@ Tue Sep 14 21:25:22 EST 2004
559 to run 720 times on the same 5 MB file passing that file as an 564 to run 720 times on the same 5 MB file passing that file as an
560 argument; the remaining time is pretty much doing 720x mmap and 565 argument; the remaining time is pretty much doing 720x mmap and
561 related system calls). 566 related system calls).
562 567
563Fri Sep 10 22:00:09 EST 2004 568Fri Sep 10 22:00:09 EST 2004
564 Added support for RipeMD-160. 569 Added support for RipeMD-160.
565 570
566Fri Sep 10 19:49:39 EST 2004 571Fri Sep 10 19:49:39 EST 2004
567 Added support for SHA-1 and MD5. Releasing libextractor 0.3.6. 572 Added support for SHA-1 and MD5. Releasing libextractor 0.3.6.
568 573
569Fri Sep 10 10:35:27 EST 2004 574Fri Sep 10 10:35:27 EST 2004
570 Added support for OpenOffice documents (meta.xml in 575 Added support for OpenOffice documents (meta.xml in
571 zip-file). 576 zip-file).
572 577
573Mon Aug 30 23:16:17 IST 2004 578Mon Aug 30 23:16:17 IST 2004
574 Added support for OLE2 (WinWord, Excel, PowerPoint). 579 Added support for OLE2 (WinWord, Excel, PowerPoint).
575 Fixed various bugs (Segfault in elf, leaks in zip and RPM, 580 Fixed various bugs (Segfault in elf, leaks in zip and RPM,
@@ -588,20 +593,20 @@ Wed Jun 23 13:37:02 IST 2004
588 593
589Sun Jun 6 18:42:28 IST 2004 594Sun Jun 6 18:42:28 IST 2004
590 Fixed segfault in qtextractor. 595 Fixed segfault in qtextractor.
591 596
592Mon May 31 18:19:07 EST 2004 597Mon May 31 18:19:07 EST 2004
593 Fixed more minor bugs. Releasing libextractor 0.3.2. 598 Fixed more minor bugs. Releasing libextractor 0.3.2.
594 599
595Mon May 31 17:14:55 EST 2004 600Mon May 31 17:14:55 EST 2004
596 Removed comment extraction from RIFF extractor (format 601 Removed comment extraction from RIFF extractor (format
597 detection is not good enough to avoid garbage for non-RIFF 602 detection is not good enough to avoid garbage for non-RIFF
598 files). Also fixed rare seg-fault in PDF-extractor (xpdf 603 files). Also fixed rare seg-fault in PDF-extractor (xpdf
599 author notified). 604 author notified).
600 605
601Mon May 24 13:40:27 EST 2004 606Mon May 24 13:40:27 EST 2004
602 Changed build system to avoid having an extra library 607 Changed build system to avoid having an extra library
603 (libextractor_util is gone). 608 (libextractor_util is gone).
604 609
605Wed Apr 28 19:28:39 EST 2004 610Wed Apr 28 19:28:39 EST 2004
606 Releasing libextractor 0.3.1. 611 Releasing libextractor 0.3.1.
607 612
@@ -617,7 +622,7 @@ Mon Apr 12 01:30:20 EST 2004
617 methods that are sufficient to build a Java class to 622 methods that are sufficient to build a Java class to
618 access libextractor. The API is still incomplete but 623 access libextractor. The API is still incomplete but
619 already basically functional. Releasing 0.3.0 624 already basically functional. Releasing 0.3.0
620 625
621Sat Apr 10 01:34:04 EST 2004 626Sat Apr 10 01:34:04 EST 2004
622 Added RIFF/AVI extractor based on AVInfo. 627 Added RIFF/AVI extractor based on AVInfo.
623 Fixed memory-leak and potential segfault in zipextractor. 628 Fixed memory-leak and potential segfault in zipextractor.
@@ -625,10 +630,10 @@ Sat Apr 10 01:34:04 EST 2004
625Sat Apr 10 00:30:19 EST 2004 630Sat Apr 10 00:30:19 EST 2004
626 Added MPEG (video) extractor based on AVInfo. Improved 631 Added MPEG (video) extractor based on AVInfo. Improved
627 output of mp3 extractor. 632 output of mp3 extractor.
628 633
629Fri Apr 9 22:58:51 EST 2004 634Fri Apr 9 22:58:51 EST 2004
630 Improved library initialization (and destruction) code. 635 Improved library initialization (and destruction) code.
631 636
632Thu Apr 8 22:25:19 EST 2004 637Thu Apr 8 22:25:19 EST 2004
633 Revisited type signatures adding const where applicable. 638 Revisited type signatures adding const where applicable.
634 Improved formatting of --help for extract. Added some 639 Improved formatting of --help for extract. Added some
@@ -667,7 +672,7 @@ Sun Jun 15 18:05:24 EST 2003
667Sat Apr 19 04:11:14 EST 2003 672Sat Apr 19 04:11:14 EST 2003
668 Fixed missing delete operation in PDF extractor for 673 Fixed missing delete operation in PDF extractor for
669 non-PDF files (caused memory leak and file-handle leak). 674 non-PDF files (caused memory leak and file-handle leak).
670 675
671Thu Apr 10 23:54:17 EST 2003 676Thu Apr 10 23:54:17 EST 2003
672 Fixed segmentation violation in png extractor. 677 Fixed segmentation violation in png extractor.
673 678
@@ -709,7 +714,7 @@ Tue Jan 7 18:31:38 EST 2003
709 714
710Tue Dec 31 15:26:00 EST 2002 715Tue Dec 31 15:26:00 EST 2002
711 Added pdf extractor based on xpdf code. 716 Added pdf extractor based on xpdf code.
712 717
713Tue Dec 17 20:36:13 CET 2002 718Tue Dec 17 20:36:13 CET 2002
714 Added MIME-extractor. 719 Added MIME-extractor.
715 720
@@ -743,14 +748,14 @@ Sun Jun 2 22:49:17 EST 2002
743 Added support for JPEG and HTML. HTML does not 748 Added support for JPEG and HTML. HTML does not
744 support concurrent use, though (inherent problem 749 support concurrent use, though (inherent problem
745 with libhtmlparse). Released v0.0.2. 750 with libhtmlparse). Released v0.0.2.
746 751
747Sat May 25 16:56:59 EST 2002 752Sat May 25 16:56:59 EST 2002
748 Added building of a description from artist, 753 Added building of a description from artist,
749 title and album, fixed bugs. 754 title and album, fixed bugs.
750 755
751Tue May 21 22:24:07 EST 2002 756Tue May 21 22:24:07 EST 2002
752 Added removing of duplicates, splitting keywords, 757 Added removing of duplicates, splitting keywords,
753 extraction of keywords from filenames. 758 extraction of keywords from filenames.
754 759
755Sat May 18 16:33:28 EST 2002 760Sat May 18 16:33:28 EST 2002
756 more convenience methods ('configuration', default 761 more convenience methods ('configuration', default
diff --git a/Makefile.am b/Makefile.am
index bb533aa..88458e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
1SUBDIRS = libltdl m4 po src doc . 1SUBDIRS = libltdl m4 po src doc .
2EXTRA_DIST = config.rpath \ 2EXTRA_DIST = config.rpath \
3 ABOUT-NLS mkinstalldirs install-sh 3 ABOUT-NLS install-sh
4 4
5pkgconfigdatadir = $(libdir)/pkgconfig 5pkgconfigdatadir = $(libdir)/pkgconfig
6pkgconfigdata_DATA = libextractor.pc 6pkgconfigdata_DATA = libextractor.pc
diff --git a/NEWS b/NEWS
index 9df9330..0928d01 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
1Mon Nov 28 12:17:42 CET 2011
2 Added MKV (Matroska) plugin.
3
1Tue Aug 12 04:40:49 EEST 2008 4Tue Aug 12 04:40:49 EEST 2008
2 Added an S3M (Scream Tracker 3 Module) plugin. 5 Added an S3M (Scream Tracker 3 Module) plugin.
3 Added an XM (eXtended Module) plugin. 6 Added an XM (eXtended Module) plugin.
diff --git a/configure.ac b/configure.ac
index 795f3fb..90ac4de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
1# Process this file with autoconf to produce a configure script. 1# Process this file with autoconf to produce a configure script.
2AC_PREREQ(2.61) 2AC_PREREQ(2.61)
3AC_INIT([libextractor], [0.6.2], [bug-libextractor@gnu.org]) 3AC_INIT([libextractor], [0.6.3], [bug-libextractor@gnu.org])
4AM_INIT_AUTOMAKE([libextractor], [0.6.2]) 4AM_INIT_AUTOMAKE([libextractor], [0.6.3])
5AC_CONFIG_HEADERS([config.h]) 5AC_CONFIG_HEADERS([config.h])
6AH_TOP([#define _GNU_SOURCE 1]) 6AH_TOP([#define _GNU_SOURCE 1])
7 7
diff --git a/doc/version.texi b/doc/version.texi
index fafc586..63e8c09 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
1@set UPDATED 31 March 2010 1@set UPDATED 17 May 2010
2@set UPDATED-MONTH March 2010 2@set UPDATED-MONTH May 2010
3@set EDITION 0.6.2 3@set EDITION 0.6.3
4@set VERSION 0.6.2 4@set VERSION 0.6.3
diff --git a/m4/Makefile.am b/m4/Makefile.am
index d492582..562ce60 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -21,7 +21,6 @@ EXTRA_DIST = glibc2.m4 intl.m4 intldir.m4 lock.m4 visibility.m4 \
21 lib-prefix.m4 \ 21 lib-prefix.m4 \
22 longdouble.m4 \ 22 longdouble.m4 \
23 longlong.m4 \ 23 longlong.m4 \
24 mkdirp.m4 \
25 nls.m4 \ 24 nls.m4 \
26 pkg.m4 \ 25 pkg.m4 \
27 po.m4 \ 26 po.m4 \
diff --git a/po/de.po b/po/de.po
index a781add..16fd8ae 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,10 +8,11 @@ msgid ""
8msgstr "" 8msgstr ""
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-06-13 13:15+0200\n" 11"POT-Creation-Date: 2011-11-28 12:53+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"
15"Language: de\n"
15"MIME-Version: 1.0\n" 16"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n" 17"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n" 18"Content-Transfer-Encoding: 8bit\n"
@@ -790,28 +791,28 @@ msgstr ""
790msgid "Layer III" 791msgid "Layer III"
791msgstr "" 792msgstr ""
792 793
793#: src/plugins/mp3_extractor.c:247 794#: src/plugins/mp3_extractor.c:245
794msgid "VBR" 795msgid "VBR"
795msgstr "" 796msgstr ""
796 797
797#: src/plugins/mp3_extractor.c:247 798#: src/plugins/mp3_extractor.c:245
798msgid "CBR" 799msgid "CBR"
799msgstr "" 800msgstr ""
800 801
801#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140 802#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
802msgid "copyright" 803msgid "copyright"
803msgstr "Copyright" 804msgstr "Copyright"
804 805
805#: src/plugins/mp3_extractor.c:250 806#: src/plugins/mp3_extractor.c:248
806#, fuzzy 807#, fuzzy
807msgid "no copyright" 808msgid "no copyright"
808msgstr "Copyright" 809msgstr "Copyright"
809 810
810#: src/plugins/mp3_extractor.c:251 811#: src/plugins/mp3_extractor.c:249
811msgid "original" 812msgid "original"
812msgstr "" 813msgstr ""
813 814
814#: src/plugins/mp3_extractor.c:251 815#: src/plugins/mp3_extractor.c:249
815#, fuzzy 816#, fuzzy
816msgid "copy" 817msgid "copy"
817msgstr "Unternehmen" 818msgstr "Unternehmen"
@@ -891,12 +892,12 @@ msgstr "%s: Option »-W %s« ist mehrdeutig\n"
891msgid "%s: option `-W %s' doesn't allow an argument\n" 892msgid "%s: option `-W %s' doesn't allow an argument\n"
892msgstr "%s: Option »-W %s« erwartet kein Argument\n" 893msgstr "%s: Option »-W %s« erwartet kein Argument\n"
893 894
894#: src/main/extractor.c:2294 895#: src/main/extractor.c:2372
895#, c-format 896#, c-format
896msgid "Initialization of plugin mechanism failed: %s!\n" 897msgid "Initialization of plugin mechanism failed: %s!\n"
897msgstr "Initialisierung des Plugin-Mechanismus' ist fehlgeschlagen: %s.\n" 898msgstr "Initialisierung des Plugin-Mechanismus' ist fehlgeschlagen: %s.\n"
898 899
899#: src/main/extract.c:97 900#: src/main/extract.c:98
900#, c-format 901#, c-format
901msgid "" 902msgid ""
902"Usage: %s\n" 903"Usage: %s\n"
@@ -907,7 +908,7 @@ msgstr ""
907"%s\n" 908"%s\n"
908"\n" 909"\n"
909 910
910#: src/main/extract.c:100 911#: src/main/extract.c:101
911#, c-format 912#, c-format
912msgid "" 913msgid ""
913"Arguments mandatory for long options are also mandatory for short options.\n" 914"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -915,104 +916,105 @@ msgstr ""
915"Argumente, die für lange Optionen notwendig sind, sind ebenfalls für die\n" 916"Argumente, die für lange Optionen notwendig sind, sind ebenfalls für die\n"
916"Optionen in Kurzform notwendig.\n" 917"Optionen in Kurzform notwendig.\n"
917 918
918#: src/main/extract.c:170 919#: src/main/extract.c:171
919msgid "print output in bibtex format" 920msgid "print output in bibtex format"
920msgstr "Ausgabe im BibTeX format" 921msgstr "Ausgabe im BibTeX format"
921 922
922#: src/main/extract.c:172 923#: src/main/extract.c:173
923msgid "produce grep-friendly output (all results on one line per file)" 924msgid "produce grep-friendly output (all results on one line per file)"
924msgstr "" 925msgstr ""
925"grep-freundliche Ausgabe erzeugen (alle Ergebnisse als eine Zeile pro Datei)" 926"grep-freundliche Ausgabe erzeugen (alle Ergebnisse als eine Zeile pro Datei)"
926 927
927#: src/main/extract.c:174 928#: src/main/extract.c:175
928msgid "print this help" 929msgid "print this help"
929msgstr "diese Hilfe anzeigen" 930msgstr "diese Hilfe anzeigen"
930 931
931#: src/main/extract.c:176 932#: src/main/extract.c:177
932msgid "run plugins in-process (simplifies debugging)" 933msgid "run plugins in-process (simplifies debugging)"
933msgstr "" 934msgstr ""
934 935
935#: src/main/extract.c:178 936#: src/main/extract.c:179
936msgid "load an extractor plugin named LIBRARY" 937msgid "load an extractor plugin named LIBRARY"
937msgstr "extractor-Erweiterung mit der Bezeichnung LIBRARY laden" 938msgstr "extractor-Erweiterung mit der Bezeichnung LIBRARY laden"
938 939
939#: src/main/extract.c:180 940#: src/main/extract.c:181
940msgid "list all keyword types" 941msgid "list all keyword types"
941msgstr "alle Arten Schlüsselwörter auflisten" 942msgstr "alle Arten Schlüsselwörter auflisten"
942 943
943#: src/main/extract.c:182 944#: src/main/extract.c:183
944msgid "do not use the default set of extractor plugins" 945msgid "do not use the default set of extractor plugins"
945msgstr "Standardsatz der extractor-Erweiterungen nicht verwenden" 946msgstr "Standardsatz der extractor-Erweiterungen nicht verwenden"
946 947
947#: src/main/extract.c:184 948#: src/main/extract.c:185
948msgid "print only keywords of the given TYPE (use -L to get a list)" 949msgid "print only keywords of the given TYPE (use -L to get a list)"
949msgstr "" 950msgstr ""
950"nur Schlüsselwörter einer bestimmten ART ausgeben (mit -L die Liste anzeigen " 951"nur Schlüsselwörter einer bestimmten ART ausgeben (mit -L die Liste anzeigen "
951"lassen)" 952"lassen)"
952 953
953#: src/main/extract.c:186 954#: src/main/extract.c:187
954msgid "print the version number" 955msgid "print the version number"
955msgstr "die Versionsnummer anzeigen" 956msgstr "die Versionsnummer anzeigen"
956 957
957#: src/main/extract.c:188 958#: src/main/extract.c:189
958msgid "be verbose" 959msgid "be verbose"
959msgstr "viele Informationen ausgeben" 960msgstr "viele Informationen ausgeben"
960 961
961#: src/main/extract.c:190 962#: src/main/extract.c:191
962msgid "do not print keywords of the given TYPE" 963msgid "do not print keywords of the given TYPE"
963msgstr "Schlüsselwörter einer bestimmten ART nicht ausgeben" 964msgstr "Schlüsselwörter einer bestimmten ART nicht ausgeben"
964 965
965#: src/main/extract.c:193 966#: src/main/extract.c:194
966msgid "extract [OPTIONS] [FILENAME]*" 967msgid "extract [OPTIONS] [FILENAME]*"
967msgstr "extract [OPTIONEN] [DATEINAME]*" 968msgstr "extract [OPTIONEN] [DATEINAME]*"
968 969
969#: src/main/extract.c:194 970#: src/main/extract.c:195
970msgid "Extract metadata from files." 971msgid "Extract metadata from files."
971msgstr "Metadaten aus den Dateien extrahieren." 972msgstr "Metadaten aus den Dateien extrahieren."
972 973
973#: src/main/extract.c:235 974#: src/main/extract.c:236
974#, fuzzy, c-format 975#, fuzzy, c-format
975msgid "Found by `%s' plugin:\n" 976msgid "Found by `%s' plugin:\n"
976msgstr "Laden des »%s«-Plugins ist fehlgeschlagen: %s\n" 977msgstr "Laden des »%s«-Plugins ist fehlgeschlagen: %s\n"
977 978
978#: src/main/extract.c:238 src/main/extract.c:319 979#: src/main/extract.c:239 src/main/extract.c:320
979#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68 980#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
980msgid "unknown" 981msgid "unknown"
981msgstr "unbekannt" 982msgstr "unbekannt"
982 983
983#: src/main/extract.c:243 984#: src/main/extract.c:244
984#, c-format 985#, c-format
985msgid "%s - (unknown, %u bytes)\n" 986msgid "%s - (unknown, %u bytes)\n"
986msgstr "" 987msgstr ""
987 988
988#: src/main/extract.c:267 989#: src/main/extract.c:268
989#, fuzzy, c-format 990#, fuzzy, c-format
990msgid "%s - (binary, %u bytes)\n" 991msgid "%s - (binary, %u bytes)\n"
991msgstr "%s - (binär)\n" 992msgstr "%s - (binär)\n"
992 993
993#: src/main/extract.c:600 src/main/extract.c:610 994#: src/main/extract.c:601 src/main/extract.c:611
994#, c-format 995#, c-format
995msgid "" 996msgid ""
996"Illegal combination of options, cannot combine multiple styles of printing.\n" 997"Illegal combination of options, cannot combine multiple styles of printing.\n"
997msgstr "" 998msgstr ""
998 999
999#: src/main/extract.c:637 1000#: src/main/extract.c:638
1000#, c-format 1001#, c-format
1001msgid "You must specify an argument for the `%s' option (option ignored).\n" 1002msgid "You must specify an argument for the `%s' option (option ignored).\n"
1002msgstr "" 1003msgstr ""
1003"Sie müssen ein Argument für die Option »%s« angeben (Option wird ignoriert).\n" 1004"Sie müssen ein Argument für die Option »%s« angeben (Option wird "
1005"ignoriert).\n"
1004 1006
1005#: src/main/extract.c:702 1007#: src/main/extract.c:703
1006#, c-format 1008#, c-format
1007msgid "Use --help to get a list of options.\n" 1009msgid "Use --help to get a list of options.\n"
1008msgstr "Verwenden Sie --help, um eine Liste aller Optionen zu sehen.\n" 1010msgstr "Verwenden Sie --help, um eine Liste aller Optionen zu sehen.\n"
1009 1011
1010#: src/main/extract.c:740 1012#: src/main/extract.c:741
1011#, c-format 1013#, c-format
1012msgid "%% BiBTeX file\n" 1014msgid "%% BiBTeX file\n"
1013msgstr "%% BibTeX Datei\n" 1015msgstr "%% BibTeX Datei\n"
1014 1016
1015#: src/main/extract.c:747 1017#: src/main/extract.c:748
1016#, c-format 1018#, c-format
1017msgid "Keywords for file %s:\n" 1019msgid "Keywords for file %s:\n"
1018msgstr "Schlüsserwörter für die Datei %s:\n" 1020msgstr "Schlüsserwörter für die Datei %s:\n"
@@ -1923,8 +1925,9 @@ msgid "paragraph count"
1923msgstr "Absatzanzahl" 1925msgstr "Absatzanzahl"
1924 1926
1925#: src/main/extractor_metatypes.c:302 1927#: src/main/extractor_metatypes.c:302
1926msgid "number o paragraphs" 1928#, fuzzy
1927msgstr "" 1929msgid "number of paragraphs"
1930msgstr "Änderungszyklen"
1928 1931
1929#: src/main/extractor_metatypes.c:304 1932#: src/main/extractor_metatypes.c:304
1930msgid "word count" 1933msgid "word count"
@@ -2403,7 +2406,17 @@ msgstr "Gruppe"
2403msgid "name of the group or band" 2406msgid "name of the group or band"
2404msgstr "Herausgeber" 2407msgstr "Herausgeber"
2405 2408
2406#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2409#: src/main/extractor_metatypes.c:436
2410#, fuzzy
2411msgid "original filename"
2412msgstr "vollständiger Name"
2413
2414#: src/main/extractor_metatypes.c:437
2415#, fuzzy
2416msgid "name of the original file (reserved for GNUnet)"
2417msgstr "Herausgeber"
2418
2419#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2407#, fuzzy 2420#, fuzzy
2408msgid "last" 2421msgid "last"
2409msgstr "Blitz" 2422msgstr "Blitz"
diff --git a/po/fr.po b/po/fr.po
index 5b7cf76..14a285f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,10 +7,11 @@ msgid ""
7msgstr "" 7msgstr ""
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-06-13 13:15+0200\n" 10"POT-Creation-Date: 2011-11-28 12:53+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"
14"Language: fr\n"
14"MIME-Version: 1.0\n" 15"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 16"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 17"Content-Transfer-Encoding: 8bit\n"
@@ -811,28 +812,28 @@ msgstr ""
811msgid "Layer III" 812msgid "Layer III"
812msgstr "" 813msgstr ""
813 814
814#: src/plugins/mp3_extractor.c:247 815#: src/plugins/mp3_extractor.c:245
815msgid "VBR" 816msgid "VBR"
816msgstr "" 817msgstr ""
817 818
818#: src/plugins/mp3_extractor.c:247 819#: src/plugins/mp3_extractor.c:245
819msgid "CBR" 820msgid "CBR"
820msgstr "" 821msgstr ""
821 822
822#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140 823#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
823msgid "copyright" 824msgid "copyright"
824msgstr "copyright" 825msgstr "copyright"
825 826
826#: src/plugins/mp3_extractor.c:250 827#: src/plugins/mp3_extractor.c:248
827#, fuzzy 828#, fuzzy
828msgid "no copyright" 829msgid "no copyright"
829msgstr "copyright" 830msgstr "copyright"
830 831
831#: src/plugins/mp3_extractor.c:251 832#: src/plugins/mp3_extractor.c:249
832msgid "original" 833msgid "original"
833msgstr "" 834msgstr ""
834 835
835#: src/plugins/mp3_extractor.c:251 836#: src/plugins/mp3_extractor.c:249
836#, fuzzy 837#, fuzzy
837msgid "copy" 838msgid "copy"
838msgstr "société" 839msgstr "société"
@@ -912,12 +913,12 @@ msgstr "%s: l'option `-W %s' est ambiguë\n"
912msgid "%s: option `-W %s' doesn't allow an argument\n" 913msgid "%s: option `-W %s' doesn't allow an argument\n"
913msgstr "%s: l'option `-W %s' ne prend pas d'argument\n" 914msgstr "%s: l'option `-W %s' ne prend pas d'argument\n"
914 915
915#: src/main/extractor.c:2294 916#: src/main/extractor.c:2372
916#, c-format 917#, c-format
917msgid "Initialization of plugin mechanism failed: %s!\n" 918msgid "Initialization of plugin mechanism failed: %s!\n"
918msgstr "Echec de l'initialisation du module %s !\n" 919msgstr "Echec de l'initialisation du module %s !\n"
919 920
920#: src/main/extract.c:97 921#: src/main/extract.c:98
921#, c-format 922#, c-format
922msgid "" 923msgid ""
923"Usage: %s\n" 924"Usage: %s\n"
@@ -928,7 +929,7 @@ msgstr ""
928"%s\n" 929"%s\n"
929"\n" 930"\n"
930 931
931#: src/main/extract.c:100 932#: src/main/extract.c:101
932#, c-format 933#, c-format
933msgid "" 934msgid ""
934"Arguments mandatory for long options are also mandatory for short options.\n" 935"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -936,104 +937,104 @@ msgstr ""
936"Les arguments obligatoires pour les options longues le sont aussi pour les " 937"Les arguments obligatoires pour les options longues le sont aussi pour les "
937"options courtes.\n" 938"options courtes.\n"
938 939
939#: src/main/extract.c:170 940#: src/main/extract.c:171
940msgid "print output in bibtex format" 941msgid "print output in bibtex format"
941msgstr "sortie au format bibtex" 942msgstr "sortie au format bibtex"
942 943
943#: src/main/extract.c:172 944#: src/main/extract.c:173
944msgid "produce grep-friendly output (all results on one line per file)" 945msgid "produce grep-friendly output (all results on one line per file)"
945msgstr "" 946msgstr ""
946"produit une sortie exploitable avec \"grep\" (une ligne contenant tous les " 947"produit une sortie exploitable avec \"grep\" (une ligne contenant tous les "
947"résultats d'un fichier)" 948"résultats d'un fichier)"
948 949
949#: src/main/extract.c:174 950#: src/main/extract.c:175
950msgid "print this help" 951msgid "print this help"
951msgstr "affiche cette aide" 952msgstr "affiche cette aide"
952 953
953#: src/main/extract.c:176 954#: src/main/extract.c:177
954msgid "run plugins in-process (simplifies debugging)" 955msgid "run plugins in-process (simplifies debugging)"
955msgstr "" 956msgstr ""
956 957
957#: src/main/extract.c:178 958#: src/main/extract.c:179
958msgid "load an extractor plugin named LIBRARY" 959msgid "load an extractor plugin named LIBRARY"
959msgstr "charge le module d'extraction nommé LIBRARY" 960msgstr "charge le module d'extraction nommé LIBRARY"
960 961
961#: src/main/extract.c:180 962#: src/main/extract.c:181
962msgid "list all keyword types" 963msgid "list all keyword types"
963msgstr "liste tous les types de mots-clés" 964msgstr "liste tous les types de mots-clés"
964 965
965#: src/main/extract.c:182 966#: src/main/extract.c:183
966msgid "do not use the default set of extractor plugins" 967msgid "do not use the default set of extractor plugins"
967msgstr "ne pas utiliser les modules d'extraction par défaut" 968msgstr "ne pas utiliser les modules d'extraction par défaut"
968 969
969#: src/main/extract.c:184 970#: src/main/extract.c:185
970msgid "print only keywords of the given TYPE (use -L to get a list)" 971msgid "print only keywords of the given TYPE (use -L to get a list)"
971msgstr "" 972msgstr ""
972"affiche seulement les mots-clés du TYPE donné (utiliser -L pour avoir la " 973"affiche seulement les mots-clés du TYPE donné (utiliser -L pour avoir la "
973"liste)" 974"liste)"
974 975
975#: src/main/extract.c:186 976#: src/main/extract.c:187
976msgid "print the version number" 977msgid "print the version number"
977msgstr "affiche le numéro de version" 978msgstr "affiche le numéro de version"
978 979
979#: src/main/extract.c:188 980#: src/main/extract.c:189
980msgid "be verbose" 981msgid "be verbose"
981msgstr "affichage détaillé" 982msgstr "affichage détaillé"
982 983
983#: src/main/extract.c:190 984#: src/main/extract.c:191
984msgid "do not print keywords of the given TYPE" 985msgid "do not print keywords of the given TYPE"
985msgstr "ne pas afficher les mots-clés du TYPE donné" 986msgstr "ne pas afficher les mots-clés du TYPE donné"
986 987
987#: src/main/extract.c:193 988#: src/main/extract.c:194
988msgid "extract [OPTIONS] [FILENAME]*" 989msgid "extract [OPTIONS] [FILENAME]*"
989msgstr "extract [OPTIONS] [FICHIER]*" 990msgstr "extract [OPTIONS] [FICHIER]*"
990 991
991#: src/main/extract.c:194 992#: src/main/extract.c:195
992msgid "Extract metadata from files." 993msgid "Extract metadata from files."
993msgstr "Extraction des métadonnées des fichiers." 994msgstr "Extraction des métadonnées des fichiers."
994 995
995#: src/main/extract.c:235 996#: src/main/extract.c:236
996#, fuzzy, c-format 997#, fuzzy, c-format
997msgid "Found by `%s' plugin:\n" 998msgid "Found by `%s' plugin:\n"
998msgstr "Le chargement du module `%s' a échoué : %s\n" 999msgstr "Le chargement du module `%s' a échoué : %s\n"
999 1000
1000#: src/main/extract.c:238 src/main/extract.c:319 1001#: src/main/extract.c:239 src/main/extract.c:320
1001#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68 1002#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
1002msgid "unknown" 1003msgid "unknown"
1003msgstr "inconnu" 1004msgstr "inconnu"
1004 1005
1005#: src/main/extract.c:243 1006#: src/main/extract.c:244
1006#, c-format 1007#, c-format
1007msgid "%s - (unknown, %u bytes)\n" 1008msgid "%s - (unknown, %u bytes)\n"
1008msgstr "" 1009msgstr ""
1009 1010
1010#: src/main/extract.c:267 1011#: src/main/extract.c:268
1011#, fuzzy, c-format 1012#, fuzzy, c-format
1012msgid "%s - (binary, %u bytes)\n" 1013msgid "%s - (binary, %u bytes)\n"
1013msgstr "%s - (binaire)\n" 1014msgstr "%s - (binaire)\n"
1014 1015
1015#: src/main/extract.c:600 src/main/extract.c:610 1016#: src/main/extract.c:601 src/main/extract.c:611
1016#, c-format 1017#, c-format
1017msgid "" 1018msgid ""
1018"Illegal combination of options, cannot combine multiple styles of printing.\n" 1019"Illegal combination of options, cannot combine multiple styles of printing.\n"
1019msgstr "" 1020msgstr ""
1020 1021
1021#: src/main/extract.c:637 1022#: src/main/extract.c:638
1022#, c-format 1023#, c-format
1023msgid "You must specify an argument for the `%s' option (option ignored).\n" 1024msgid "You must specify an argument for the `%s' option (option ignored).\n"
1024msgstr "Vous devez préciser un argument pour l'option `%s' (option ignorée).\n" 1025msgstr "Vous devez préciser un argument pour l'option `%s' (option ignorée).\n"
1025 1026
1026#: src/main/extract.c:702 1027#: src/main/extract.c:703
1027#, c-format 1028#, c-format
1028msgid "Use --help to get a list of options.\n" 1029msgid "Use --help to get a list of options.\n"
1029msgstr "Utilisez --help pour obtenir une liste d'options.\n" 1030msgstr "Utilisez --help pour obtenir une liste d'options.\n"
1030 1031
1031#: src/main/extract.c:740 1032#: src/main/extract.c:741
1032#, c-format 1033#, c-format
1033msgid "%% BiBTeX file\n" 1034msgid "%% BiBTeX file\n"
1034msgstr "%% fichier BiBTeX\n" 1035msgstr "%% fichier BiBTeX\n"
1035 1036
1036#: src/main/extract.c:747 1037#: src/main/extract.c:748
1037#, c-format 1038#, c-format
1038msgid "Keywords for file %s:\n" 1039msgid "Keywords for file %s:\n"
1039msgstr "Mots-clés pour le fichier %s:\n" 1040msgstr "Mots-clés pour le fichier %s:\n"
@@ -1943,8 +1944,9 @@ msgid "paragraph count"
1943msgstr "nombre de paragraphes" 1944msgstr "nombre de paragraphes"
1944 1945
1945#: src/main/extractor_metatypes.c:302 1946#: src/main/extractor_metatypes.c:302
1946msgid "number o paragraphs" 1947#, fuzzy
1947msgstr "" 1948msgid "number of paragraphs"
1949msgstr "cycles d'édition"
1948 1950
1949#: src/main/extractor_metatypes.c:304 1951#: src/main/extractor_metatypes.c:304
1950msgid "word count" 1952msgid "word count"
@@ -2420,7 +2422,17 @@ msgstr "groupe"
2420msgid "name of the group or band" 2422msgid "name of the group or band"
2421msgstr "éditeur" 2423msgstr "éditeur"
2422 2424
2423#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2425#: src/main/extractor_metatypes.c:436
2426#, fuzzy
2427msgid "original filename"
2428msgstr "nom complet"
2429
2430#: src/main/extractor_metatypes.c:437
2431#, fuzzy
2432msgid "name of the original file (reserved for GNUnet)"
2433msgstr "éditeur"
2434
2435#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2424#, fuzzy 2436#, fuzzy
2425msgid "last" 2437msgid "last"
2426msgstr "flash" 2438msgstr "flash"
diff --git a/po/ga.po b/po/ga.po
index db3d68c..2ed7427 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,10 +6,11 @@ msgid ""
6msgstr "" 6msgstr ""
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-06-13 13:15+0200\n" 9"POT-Creation-Date: 2011-11-28 12:53+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"
13"Language: ga\n"
13"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
14"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
15"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
@@ -788,28 +789,28 @@ msgstr ""
788msgid "Layer III" 789msgid "Layer III"
789msgstr "" 790msgstr ""
790 791
791#: src/plugins/mp3_extractor.c:247 792#: src/plugins/mp3_extractor.c:245
792msgid "VBR" 793msgid "VBR"
793msgstr "" 794msgstr ""
794 795
795#: src/plugins/mp3_extractor.c:247 796#: src/plugins/mp3_extractor.c:245
796msgid "CBR" 797msgid "CBR"
797msgstr "" 798msgstr ""
798 799
799#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140 800#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
800msgid "copyright" 801msgid "copyright"
801msgstr "cóipcheart" 802msgstr "cóipcheart"
802 803
803#: src/plugins/mp3_extractor.c:250 804#: src/plugins/mp3_extractor.c:248
804#, fuzzy 805#, fuzzy
805msgid "no copyright" 806msgid "no copyright"
806msgstr "cóipcheart" 807msgstr "cóipcheart"
807 808
808#: src/plugins/mp3_extractor.c:251 809#: src/plugins/mp3_extractor.c:249
809msgid "original" 810msgid "original"
810msgstr "" 811msgstr ""
811 812
812#: src/plugins/mp3_extractor.c:251 813#: src/plugins/mp3_extractor.c:249
813#, fuzzy 814#, fuzzy
814msgid "copy" 815msgid "copy"
815msgstr "comhlacht" 816msgstr "comhlacht"
@@ -889,12 +890,12 @@ msgstr "%s: Tá an rogha `-W %s' débhríoch\n"
889msgid "%s: option `-W %s' doesn't allow an argument\n" 890msgid "%s: option `-W %s' doesn't allow an argument\n"
890msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n" 891msgstr "%s: ní cheadaítear argóint i ndiaidh na rogha `-W %s'\n"
891 892
892#: src/main/extractor.c:2294 893#: src/main/extractor.c:2372
893#, c-format 894#, c-format
894msgid "Initialization of plugin mechanism failed: %s!\n" 895msgid "Initialization of plugin mechanism failed: %s!\n"
895msgstr "Theip ar thúsú meicníocht na mbreiseán: %s!\n" 896msgstr "Theip ar thúsú meicníocht na mbreiseán: %s!\n"
896 897
897#: src/main/extract.c:97 898#: src/main/extract.c:98
898#, c-format 899#, c-format
899msgid "" 900msgid ""
900"Usage: %s\n" 901"Usage: %s\n"
@@ -905,7 +906,7 @@ msgstr ""
905"%s\n" 906"%s\n"
906"\n" 907"\n"
907 908
908#: src/main/extract.c:100 909#: src/main/extract.c:101
909#, c-format 910#, c-format
910msgid "" 911msgid ""
911"Arguments mandatory for long options are also mandatory for short options.\n" 912"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -913,104 +914,104 @@ msgstr ""
913"Is riachtanach le rogha ghearr aon argóint atá riachtanach leis an rogha " 914"Is riachtanach le rogha ghearr aon argóint atá riachtanach leis an rogha "
914"fhada.\n" 915"fhada.\n"
915 916
916#: src/main/extract.c:170 917#: src/main/extract.c:171
917msgid "print output in bibtex format" 918msgid "print output in bibtex format"
918msgstr "priontáil aschur i bhformáid bibtex" 919msgstr "priontáil aschur i bhformáid bibtex"
919 920
920#: src/main/extract.c:172 921#: src/main/extract.c:173
921msgid "produce grep-friendly output (all results on one line per file)" 922msgid "produce grep-friendly output (all results on one line per file)"
922msgstr "" 923msgstr ""
923"aschur is féidir próiseáil le grep (gach toradh ar líne amháin sa chomhad)" 924"aschur is féidir próiseáil le grep (gach toradh ar líne amháin sa chomhad)"
924 925
925#: src/main/extract.c:174 926#: src/main/extract.c:175
926msgid "print this help" 927msgid "print this help"
927msgstr "taispeáin an chabhair seo" 928msgstr "taispeáin an chabhair seo"
928 929
929#: src/main/extract.c:176 930#: src/main/extract.c:177
930msgid "run plugins in-process (simplifies debugging)" 931msgid "run plugins in-process (simplifies debugging)"
931msgstr "" 932msgstr ""
932 933
933#: src/main/extract.c:178 934#: src/main/extract.c:179
934msgid "load an extractor plugin named LIBRARY" 935msgid "load an extractor plugin named LIBRARY"
935msgstr "luchtaigh breiseán asbhainteora darb ainm LEABHARLANN" 936msgstr "luchtaigh breiseán asbhainteora darb ainm LEABHARLANN"
936 937
937#: src/main/extract.c:180 938#: src/main/extract.c:181
938msgid "list all keyword types" 939msgid "list all keyword types"
939msgstr "taispeáin gach cineál lorgfhocail" 940msgstr "taispeáin gach cineál lorgfhocail"
940 941
941#: src/main/extract.c:182 942#: src/main/extract.c:183
942msgid "do not use the default set of extractor plugins" 943msgid "do not use the default set of extractor plugins"
943msgstr "ná húsáid na breiseáin asbhainteora réamhshocraithe" 944msgstr "ná húsáid na breiseáin asbhainteora réamhshocraithe"
944 945
945#: src/main/extract.c:184 946#: src/main/extract.c:185
946msgid "print only keywords of the given TYPE (use -L to get a list)" 947msgid "print only keywords of the given TYPE (use -L to get a list)"
947msgstr "" 948msgstr ""
948"ná taispeáin ach lorgfhocail den CHINEÁL tugtha (úsáid -L chun liosta a " 949"ná taispeáin ach lorgfhocail den CHINEÁL tugtha (úsáid -L chun liosta a "
949"fháil)" 950"fháil)"
950 951
951#: src/main/extract.c:186 952#: src/main/extract.c:187
952msgid "print the version number" 953msgid "print the version number"
953msgstr "taispeáin an leagan" 954msgstr "taispeáin an leagan"
954 955
955#: src/main/extract.c:188 956#: src/main/extract.c:189
956msgid "be verbose" 957msgid "be verbose"
957msgstr "bí foclach" 958msgstr "bí foclach"
958 959
959#: src/main/extract.c:190 960#: src/main/extract.c:191
960msgid "do not print keywords of the given TYPE" 961msgid "do not print keywords of the given TYPE"
961msgstr "ná taispeáin lorgfhocail den CHINEÁL tugtha" 962msgstr "ná taispeáin lorgfhocail den CHINEÁL tugtha"
962 963
963#: src/main/extract.c:193 964#: src/main/extract.c:194
964msgid "extract [OPTIONS] [FILENAME]*" 965msgid "extract [OPTIONS] [FILENAME]*"
965msgstr "extract [ROGHANNA] [COMHADAINM]*" 966msgstr "extract [ROGHANNA] [COMHADAINM]*"
966 967
967#: src/main/extract.c:194 968#: src/main/extract.c:195
968msgid "Extract metadata from files." 969msgid "Extract metadata from files."
969msgstr "Bain meiteashonraí as comhaid." 970msgstr "Bain meiteashonraí as comhaid."
970 971
971#: src/main/extract.c:235 972#: src/main/extract.c:236
972#, fuzzy, c-format 973#, fuzzy, c-format
973msgid "Found by `%s' plugin:\n" 974msgid "Found by `%s' plugin:\n"
974msgstr "Theip ar luchtú an bhreiseáin `%s': %s\n" 975msgstr "Theip ar luchtú an bhreiseáin `%s': %s\n"
975 976
976#: src/main/extract.c:238 src/main/extract.c:319 977#: src/main/extract.c:239 src/main/extract.c:320
977#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68 978#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
978msgid "unknown" 979msgid "unknown"
979msgstr "anaithnid" 980msgstr "anaithnid"
980 981
981#: src/main/extract.c:243 982#: src/main/extract.c:244
982#, c-format 983#, c-format
983msgid "%s - (unknown, %u bytes)\n" 984msgid "%s - (unknown, %u bytes)\n"
984msgstr "" 985msgstr ""
985 986
986#: src/main/extract.c:267 987#: src/main/extract.c:268
987#, fuzzy, c-format 988#, fuzzy, c-format
988msgid "%s - (binary, %u bytes)\n" 989msgid "%s - (binary, %u bytes)\n"
989msgstr "%s - (dénártha)\n" 990msgstr "%s - (dénártha)\n"
990 991
991#: src/main/extract.c:600 src/main/extract.c:610 992#: src/main/extract.c:601 src/main/extract.c:611
992#, c-format 993#, c-format
993msgid "" 994msgid ""
994"Illegal combination of options, cannot combine multiple styles of printing.\n" 995"Illegal combination of options, cannot combine multiple styles of printing.\n"
995msgstr "" 996msgstr ""
996 997
997#: src/main/extract.c:637 998#: src/main/extract.c:638
998#, c-format 999#, c-format
999msgid "You must specify an argument for the `%s' option (option ignored).\n" 1000msgid "You must specify an argument for the `%s' option (option ignored).\n"
1000msgstr "" 1001msgstr ""
1001"Ní mór duit argóint a thabhairt i ndiaidh na rogha `%s' (á ligean thart).\n" 1002"Ní mór duit argóint a thabhairt i ndiaidh na rogha `%s' (á ligean thart).\n"
1002 1003
1003#: src/main/extract.c:702 1004#: src/main/extract.c:703
1004#, c-format 1005#, c-format
1005msgid "Use --help to get a list of options.\n" 1006msgid "Use --help to get a list of options.\n"
1006msgstr "Bain úsáid as '--help' le haghaidh níos mó roghanna.\n" 1007msgstr "Bain úsáid as '--help' le haghaidh níos mó roghanna.\n"
1007 1008
1008#: src/main/extract.c:740 1009#: src/main/extract.c:741
1009#, c-format 1010#, c-format
1010msgid "%% BiBTeX file\n" 1011msgid "%% BiBTeX file\n"
1011msgstr "%% Comhad BiBTeX\n" 1012msgstr "%% Comhad BiBTeX\n"
1012 1013
1013#: src/main/extract.c:747 1014#: src/main/extract.c:748
1014#, c-format 1015#, c-format
1015msgid "Keywords for file %s:\n" 1016msgid "Keywords for file %s:\n"
1016msgstr "Lorgfhocail do chomhad %s:\n" 1017msgstr "Lorgfhocail do chomhad %s:\n"
@@ -1921,8 +1922,9 @@ msgid "paragraph count"
1921msgstr "líon na n-alt" 1922msgstr "líon na n-alt"
1922 1923
1923#: src/main/extractor_metatypes.c:302 1924#: src/main/extractor_metatypes.c:302
1924msgid "number o paragraphs" 1925#, fuzzy
1925msgstr "" 1926msgid "number of paragraphs"
1927msgstr "timthriallta eagarthóireachta"
1926 1928
1927#: src/main/extractor_metatypes.c:304 1929#: src/main/extractor_metatypes.c:304
1928msgid "word count" 1930msgid "word count"
@@ -2401,7 +2403,17 @@ msgstr "grúpa"
2401msgid "name of the group or band" 2403msgid "name of the group or band"
2402msgstr "foilsitheoir" 2404msgstr "foilsitheoir"
2403 2405
2404#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2406#: src/main/extractor_metatypes.c:436
2407#, fuzzy
2408msgid "original filename"
2409msgstr "ainm iomlán"
2410
2411#: src/main/extractor_metatypes.c:437
2412#, fuzzy
2413msgid "name of the original file (reserved for GNUnet)"
2414msgstr "foilsitheoir"
2415
2416#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2405#, fuzzy 2417#, fuzzy
2406msgid "last" 2418msgid "last"
2407msgstr "splanc" 2419msgstr "splanc"
diff --git a/po/it.po b/po/it.po
index 994b142..b8cf03d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,10 +7,11 @@ msgid ""
7msgstr "" 7msgstr ""
8"Project-Id-Version: libextractor-0.6.0\n" 8"Project-Id-Version: libextractor-0.6.0\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:36+0100\n" 10"POT-Creation-Date: 2011-11-28 12:53+0100\n"
11"PO-Revision-Date: 2010-09-30 23:41+0200\n" 11"PO-Revision-Date: 2010-09-30 23:41+0200\n"
12"Last-Translator: Sergio Zanchetta <primes2h@ubuntu.com>\n" 12"Last-Translator: Sergio Zanchetta <primes2h@ubuntu.com>\n"
13"Language-Team: Italian <tp@lists.linux.it>\n" 13"Language-Team: Italian <tp@lists.linux.it>\n"
14"Language: it\n"
14"MIME-Version: 1.0\n" 15"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 16"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 17"Content-Transfer-Encoding: 8bit\n"
@@ -683,7 +684,7 @@ msgstr ""
683msgid "Farsi" 684msgid "Farsi"
684msgstr "Farsi" 685msgstr "Farsi"
685 686
686#: src/plugins/ole2_extractor.c:462 687#: src/plugins/ole2_extractor.c:471
687#, c-format 688#, c-format
688msgid "Revision #%u: Author '%s' worked on '%s'" 689msgid "Revision #%u: Author '%s' worked on '%s'"
689msgstr "" 690msgstr ""
@@ -696,43 +697,43 @@ msgstr "mono"
696msgid "stereo" 697msgid "stereo"
697msgstr "stereo" 698msgstr "stereo"
698 699
699#: src/plugins/man_extractor.c:156 700#: src/plugins/man_extractor.c:161
700msgid "Commands" 701msgid "Commands"
701msgstr "" 702msgstr ""
702 703
703#: src/plugins/man_extractor.c:160 704#: src/plugins/man_extractor.c:165
704msgid "System calls" 705msgid "System calls"
705msgstr "" 706msgstr ""
706 707
707#: src/plugins/man_extractor.c:164 708#: src/plugins/man_extractor.c:169
708msgid "Library calls" 709msgid "Library calls"
709msgstr "" 710msgstr ""
710 711
711#: src/plugins/man_extractor.c:168 712#: src/plugins/man_extractor.c:173
712msgid "Special files" 713msgid "Special files"
713msgstr "" 714msgstr ""
714 715
715#: src/plugins/man_extractor.c:172 716#: src/plugins/man_extractor.c:177
716msgid "File formats and conventions" 717msgid "File formats and conventions"
717msgstr "" 718msgstr ""
718 719
719#: src/plugins/man_extractor.c:176 720#: src/plugins/man_extractor.c:181
720msgid "Games" 721msgid "Games"
721msgstr "Giochi" 722msgstr "Giochi"
722 723
723#: src/plugins/man_extractor.c:180 724#: src/plugins/man_extractor.c:185
724msgid "Conventions and miscellaneous" 725msgid "Conventions and miscellaneous"
725msgstr "" 726msgstr ""
726 727
727#: src/plugins/man_extractor.c:184 728#: src/plugins/man_extractor.c:189
728msgid "System management commands" 729msgid "System management commands"
729msgstr "" 730msgstr ""
730 731
731#: src/plugins/man_extractor.c:188 732#: src/plugins/man_extractor.c:193
732msgid "Kernel routines" 733msgid "Kernel routines"
733msgstr "Routine del kernel" 734msgstr "Routine del kernel"
734 735
735#: src/plugins/flac_extractor.c:187 736#: src/plugins/flac_extractor.c:192
736#, c-format 737#, c-format
737msgid "%u Hz, %u channels" 738msgid "%u Hz, %u channels"
738msgstr "" 739msgstr ""
@@ -785,27 +786,27 @@ msgstr "Layer II"
785msgid "Layer III" 786msgid "Layer III"
786msgstr "Layer III" 787msgstr "Layer III"
787 788
788#: src/plugins/mp3_extractor.c:248 789#: src/plugins/mp3_extractor.c:245
789msgid "VBR" 790msgid "VBR"
790msgstr "VBR" 791msgstr "VBR"
791 792
792#: src/plugins/mp3_extractor.c:248 793#: src/plugins/mp3_extractor.c:245
793msgid "CBR" 794msgid "CBR"
794msgstr "CBR" 795msgstr "CBR"
795 796
796#: src/plugins/mp3_extractor.c:251 src/main/extractor_metatypes.c:140 797#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
797msgid "copyright" 798msgid "copyright"
798msgstr "copyright" 799msgstr "copyright"
799 800
800#: src/plugins/mp3_extractor.c:251 801#: src/plugins/mp3_extractor.c:248
801msgid "no copyright" 802msgid "no copyright"
802msgstr "nessun copyright" 803msgstr "nessun copyright"
803 804
804#: src/plugins/mp3_extractor.c:252 805#: src/plugins/mp3_extractor.c:249
805msgid "original" 806msgid "original"
806msgstr "originale" 807msgstr "originale"
807 808
808#: src/plugins/mp3_extractor.c:252 809#: src/plugins/mp3_extractor.c:249
809msgid "copy" 810msgid "copy"
810msgstr "copia" 811msgstr "copia"
811 812
@@ -814,17 +815,17 @@ msgstr "copia"
814msgid "codec: %s, %u fps, %u ms" 815msgid "codec: %s, %u fps, %u ms"
815msgstr "codec: %s, %u fps, %u ms" 816msgstr "codec: %s, %u fps, %u ms"
816 817
817#: src/plugins/jpeg_extractor.c:180 818#: src/plugins/jpeg_extractor.c:182
818#, c-format 819#, c-format
819msgid "%ux%u dots per inch" 820msgid "%ux%u dots per inch"
820msgstr "%ux%u punti per pollice" 821msgstr "%ux%u punti per pollice"
821 822
822#: src/plugins/jpeg_extractor.c:195 823#: src/plugins/jpeg_extractor.c:197
823#, c-format 824#, c-format
824msgid "%ux%u dots per cm" 825msgid "%ux%u dots per cm"
825msgstr "%ux%u punti per cm" 826msgstr "%ux%u punti per cm"
826 827
827#: src/plugins/jpeg_extractor.c:210 828#: src/plugins/jpeg_extractor.c:212
828#, c-format 829#, c-format
829msgid "%ux%u dots per inch?" 830msgid "%ux%u dots per inch?"
830msgstr "%ux%u punti per pollice?" 831msgstr "%ux%u punti per pollice?"
@@ -884,12 +885,12 @@ msgstr "%s: l'opzione \"-W %s\" è ambigua\n"
884msgid "%s: option `-W %s' doesn't allow an argument\n" 885msgid "%s: option `-W %s' doesn't allow an argument\n"
885msgstr "%s: l'opzione \"-W %s\" non ammette un argomento\n" 886msgstr "%s: l'opzione \"-W %s\" non ammette un argomento\n"
886 887
887#: src/main/extractor.c:2145 888#: src/main/extractor.c:2372
888#, c-format 889#, c-format
889msgid "Initialization of plugin mechanism failed: %s!\n" 890msgid "Initialization of plugin mechanism failed: %s!\n"
890msgstr "" 891msgstr ""
891 892
892#: src/main/extract.c:97 893#: src/main/extract.c:98
893#, c-format 894#, c-format
894msgid "" 895msgid ""
895"Usage: %s\n" 896"Usage: %s\n"
@@ -900,99 +901,108 @@ msgstr ""
900"%s\n" 901"%s\n"
901"\n" 902"\n"
902 903
903#: src/main/extract.c:100 904#: src/main/extract.c:101
904#, c-format 905#, c-format
905msgid "Arguments mandatory for long options are also mandatory for short options.\n" 906msgid ""
907"Arguments mandatory for long options are also mandatory for short options.\n"
906msgstr "" 908msgstr ""
907 909
908#: src/main/extract.c:174 910#: src/main/extract.c:171
909msgid "print output in bibtex format" 911msgid "print output in bibtex format"
910msgstr "" 912msgstr ""
911 913
912#: src/main/extract.c:176 914#: src/main/extract.c:173
913msgid "produce grep-friendly output (all results on one line per file)" 915msgid "produce grep-friendly output (all results on one line per file)"
914msgstr "" 916msgstr ""
915 917
916#: src/main/extract.c:178 918#: src/main/extract.c:175
917msgid "print this help" 919msgid "print this help"
918msgstr "" 920msgstr ""
919 921
920#: src/main/extract.c:180 922#: src/main/extract.c:177
921msgid "run plugins in-process (simplifies debugging)" 923msgid "run plugins in-process (simplifies debugging)"
922msgstr "" 924msgstr ""
923 925
924#: src/main/extract.c:182 926#: src/main/extract.c:179
925msgid "load an extractor plugin named LIBRARY" 927msgid "load an extractor plugin named LIBRARY"
926msgstr "" 928msgstr ""
927 929
928#: src/main/extract.c:184 930#: src/main/extract.c:181
929msgid "list all keyword types" 931msgid "list all keyword types"
930msgstr "" 932msgstr ""
931 933
932#: src/main/extract.c:186 934#: src/main/extract.c:183
933msgid "do not use the default set of extractor plugins" 935msgid "do not use the default set of extractor plugins"
934msgstr "" 936msgstr ""
935 937
936#: src/main/extract.c:188 938#: src/main/extract.c:185
937msgid "print only keywords of the given TYPE (use -L to get a list)" 939msgid "print only keywords of the given TYPE (use -L to get a list)"
938msgstr "" 940msgstr ""
939 941
940#: src/main/extract.c:190 942#: src/main/extract.c:187
941msgid "print the version number" 943msgid "print the version number"
942msgstr "" 944msgstr ""
943 945
944#: src/main/extract.c:192 946#: src/main/extract.c:189
945msgid "be verbose" 947msgid "be verbose"
946msgstr "" 948msgstr ""
947 949
948#: src/main/extract.c:194 950#: src/main/extract.c:191
949msgid "do not print keywords of the given TYPE" 951msgid "do not print keywords of the given TYPE"
950msgstr "" 952msgstr ""
951 953
952#: src/main/extract.c:197 954#: src/main/extract.c:194
953msgid "extract [OPTIONS] [FILENAME]*" 955msgid "extract [OPTIONS] [FILENAME]*"
954msgstr "" 956msgstr ""
955 957
956#: src/main/extract.c:198 958#: src/main/extract.c:195
957msgid "Extract metadata from files." 959msgid "Extract metadata from files."
958msgstr "" 960msgstr ""
959 961
960#: src/main/extract.c:238 962#: src/main/extract.c:236
961#, c-format 963#, c-format
962msgid "Found by `%s' plugin:\n" 964msgid "Found by `%s' plugin:\n"
963msgstr "" 965msgstr ""
964 966
965#: src/main/extract.c:245 967#: src/main/extract.c:239 src/main/extract.c:320
968#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
969msgid "unknown"
970msgstr ""
971
972#: src/main/extract.c:244
966#, c-format 973#, c-format
967msgid "%s - (unknown, %u bytes)\n" 974msgid "%s - (unknown, %u bytes)\n"
968msgstr "" 975msgstr ""
969 976
970#: src/main/extract.c:266 977#: src/main/extract.c:268
971#, c-format 978#, c-format
972msgid "%s - (binary, %u bytes)\n" 979msgid "%s - (binary, %u bytes)\n"
973msgstr "%s - (binario, %u bite)\n" 980msgstr "%s - (binario, %u bite)\n"
974 981
975#: src/main/extract.c:603 src/main/extract.c:613 982#: src/main/extract.c:601 src/main/extract.c:611
976#, c-format 983#, c-format
977msgid "Illegal combination of options, cannot combine multiple styles of printing.\n" 984msgid ""
985"Illegal combination of options, cannot combine multiple styles of printing.\n"
978msgstr "" 986msgstr ""
979 987
980#: src/main/extract.c:640 988#: src/main/extract.c:638
981#, c-format 989#, c-format
982msgid "You must specify an argument for the `%s' option (option ignored).\n" 990msgid "You must specify an argument for the `%s' option (option ignored).\n"
983msgstr "Deve essere specificato un argomento per l'opzione \"%s\" (opzione ignorata).\n" 991msgstr ""
992"Deve essere specificato un argomento per l'opzione \"%s\" (opzione "
993"ignorata).\n"
984 994
985#: src/main/extract.c:705 995#: src/main/extract.c:703
986#, c-format 996#, c-format
987msgid "Use --help to get a list of options.\n" 997msgid "Use --help to get a list of options.\n"
988msgstr "Usare --help per ottenere un elenco di opzioni.\n" 998msgstr "Usare --help per ottenere un elenco di opzioni.\n"
989 999
990#: src/main/extract.c:737 1000#: src/main/extract.c:741
991#, c-format 1001#, c-format
992msgid "%% BiBTeX file\n" 1002msgid "%% BiBTeX file\n"
993msgstr "%% file BiBTeX\n" 1003msgstr "%% file BiBTeX\n"
994 1004
995#: src/main/extract.c:744 1005#: src/main/extract.c:748
996#, c-format 1006#, c-format
997msgid "Keywords for file %s:\n" 1007msgid "Keywords for file %s:\n"
998msgstr "" 1008msgstr ""
@@ -1146,7 +1156,9 @@ msgid "publishing institution"
1146msgstr "" 1156msgstr ""
1147 1157
1148#: src/main/extractor_metatypes.c:77 1158#: src/main/extractor_metatypes.c:77
1149msgid "institution that was involved in the publishing, but not necessarily the publisher" 1159msgid ""
1160"institution that was involved in the publishing, but not necessarily the "
1161"publisher"
1150msgstr "" 1162msgstr ""
1151 1163
1152#: src/main/extractor_metatypes.c:78 1164#: src/main/extractor_metatypes.c:78
@@ -1186,8 +1198,12 @@ msgid "publication day"
1186msgstr "giorno di pubblicazione" 1198msgstr "giorno di pubblicazione"
1187 1199
1188#: src/main/extractor_metatypes.c:88 1200#: src/main/extractor_metatypes.c:88
1189msgid "day of publication (or, if unpublished, the day of creation), relative to the given month" 1201msgid ""
1190msgstr "giorno di pubblicazione (o, se non pubblicato, il giorno di creazione), relativo al mese dato" 1202"day of publication (or, if unpublished, the day of creation), relative to "
1203"the given month"
1204msgstr ""
1205"giorno di pubblicazione (o, se non pubblicato, il giorno di creazione), "
1206"relativo al mese dato"
1191 1207
1192#: src/main/extractor_metatypes.c:89 1208#: src/main/extractor_metatypes.c:89
1193msgid "publication date" 1209msgid "publication date"
@@ -1341,10 +1357,6 @@ msgstr ""
1341msgid "ISO 2-letter country code for the country of origin" 1357msgid "ISO 2-letter country code for the country of origin"
1342msgstr "" 1358msgstr ""
1343 1359
1344#: src/main/extractor_metatypes.c:136
1345msgid "unknown"
1346msgstr ""
1347
1348#: src/main/extractor_metatypes.c:137 1360#: src/main/extractor_metatypes.c:137
1349msgid "specifics are not known" 1361msgid "specifics are not known"
1350msgstr "" 1362msgstr ""
@@ -1422,7 +1434,9 @@ msgid "unknown date"
1422msgstr "" 1434msgstr ""
1423 1435
1424#: src/main/extractor_metatypes.c:163 1436#: src/main/extractor_metatypes.c:163
1425msgid "ambiguous date (could specify creation time, modification time or access time)" 1437msgid ""
1438"ambiguous date (could specify creation time, modification time or access "
1439"time)"
1426msgstr "" 1440msgstr ""
1427 1441
1428#: src/main/extractor_metatypes.c:164 1442#: src/main/extractor_metatypes.c:164
@@ -1690,7 +1704,9 @@ msgid "target platform"
1690msgstr "" 1704msgstr ""
1691 1705
1692#: src/main/extractor_metatypes.c:238 1706#: src/main/extractor_metatypes.c:238
1693msgid "name of the architecture, operating system and distribution this package is for" 1707msgid ""
1708"name of the architecture, operating system and distribution this package is "
1709"for"
1694msgstr "" 1710msgstr ""
1695 1711
1696#: src/main/extractor_metatypes.c:239 1712#: src/main/extractor_metatypes.c:239
@@ -1698,7 +1714,9 @@ msgid "resource type"
1698msgstr "" 1714msgstr ""
1699 1715
1700#: src/main/extractor_metatypes.c:240 1716#: src/main/extractor_metatypes.c:240
1701msgid "categorization of the nature of the resource that is more specific than the file format" 1717msgid ""
1718"categorization of the nature of the resource that is more specific than the "
1719"file format"
1702msgstr "" 1720msgstr ""
1703 1721
1704#: src/main/extractor_metatypes.c:241 1722#: src/main/extractor_metatypes.c:241
@@ -1706,7 +1724,8 @@ msgid "library search path"
1706msgstr "" 1724msgstr ""
1707 1725
1708#: src/main/extractor_metatypes.c:242 1726#: src/main/extractor_metatypes.c:242
1709msgid "path in the file system to be considered when looking for required libraries" 1727msgid ""
1728"path in the file system to be considered when looking for required libraries"
1710msgstr "" 1729msgstr ""
1711 1730
1712#: src/main/extractor_metatypes.c:243 1731#: src/main/extractor_metatypes.c:243
@@ -1838,7 +1857,7 @@ msgid "paragraph count"
1838msgstr "" 1857msgstr ""
1839 1858
1840#: src/main/extractor_metatypes.c:302 1859#: src/main/extractor_metatypes.c:302
1841msgid "number o paragraphs" 1860msgid "number of paragraphs"
1842msgstr "" 1861msgstr ""
1843 1862
1844#: src/main/extractor_metatypes.c:304 1863#: src/main/extractor_metatypes.c:304
@@ -1934,7 +1953,9 @@ msgid "performer"
1934msgstr "" 1953msgstr ""
1935 1954
1936#: src/main/extractor_metatypes.c:335 1955#: src/main/extractor_metatypes.c:335
1937msgid "The artist(s) who performed the work (conductor, orchestra, soloists, actor, etc.)" 1956msgid ""
1957"The artist(s) who performed the work (conductor, orchestra, soloists, actor, "
1958"etc.)"
1938msgstr "" 1959msgstr ""
1939 1960
1940#: src/main/extractor_metatypes.c:337 1961#: src/main/extractor_metatypes.c:337
@@ -2122,7 +2143,8 @@ msgid "interpretation"
2122msgstr "" 2143msgstr ""
2123 2144
2124#: src/main/extractor_metatypes.c:388 2145#: src/main/extractor_metatypes.c:388
2125msgid "information about the people behind interpretations of an existing piece" 2146msgid ""
2147"information about the people behind interpretations of an existing piece"
2126msgstr "" 2148msgstr ""
2127 2149
2128#: src/main/extractor_metatypes.c:389 2150#: src/main/extractor_metatypes.c:389
@@ -2246,7 +2268,8 @@ msgid "full data"
2246msgstr "" 2268msgstr ""
2247 2269
2248#: src/main/extractor_metatypes.c:423 2270#: src/main/extractor_metatypes.c:423
2249msgid "entry that contains the full, original binary data (not really meta data)" 2271msgid ""
2272"entry that contains the full, original binary data (not really meta data)"
2250msgstr "" 2273msgstr ""
2251 2274
2252#: src/main/extractor_metatypes.c:425 2275#: src/main/extractor_metatypes.c:425
@@ -2277,6 +2300,15 @@ msgstr ""
2277msgid "name of the group or band" 2300msgid "name of the group or band"
2278msgstr "" 2301msgstr ""
2279 2302
2280#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2303#: src/main/extractor_metatypes.c:436
2304#, fuzzy
2305msgid "original filename"
2306msgstr "originale"
2307
2308#: src/main/extractor_metatypes.c:437
2309msgid "name of the original file (reserved for GNUnet)"
2310msgstr ""
2311
2312#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2281msgid "last" 2313msgid "last"
2282msgstr "" 2314msgstr ""
diff --git a/po/libextractor.pot b/po/libextractor.pot
index f8212e4..30c02a3 100644
--- a/po/libextractor.pot
+++ b/po/libextractor.pot
@@ -8,10 +8,11 @@ msgid ""
8msgstr "" 8msgstr ""
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-06-13 13:15+0200\n" 11"POT-Creation-Date: 2011-11-28 12:53+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"
15"Language: \n"
15"MIME-Version: 1.0\n" 16"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=CHARSET\n" 17"Content-Type: text/plain; charset=CHARSET\n"
17"Content-Transfer-Encoding: 8bit\n" 18"Content-Transfer-Encoding: 8bit\n"
@@ -786,27 +787,27 @@ msgstr ""
786msgid "Layer III" 787msgid "Layer III"
787msgstr "" 788msgstr ""
788 789
789#: src/plugins/mp3_extractor.c:247 790#: src/plugins/mp3_extractor.c:245
790msgid "VBR" 791msgid "VBR"
791msgstr "" 792msgstr ""
792 793
793#: src/plugins/mp3_extractor.c:247 794#: src/plugins/mp3_extractor.c:245
794msgid "CBR" 795msgid "CBR"
795msgstr "" 796msgstr ""
796 797
797#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140 798#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
798msgid "copyright" 799msgid "copyright"
799msgstr "" 800msgstr ""
800 801
801#: src/plugins/mp3_extractor.c:250 802#: src/plugins/mp3_extractor.c:248
802msgid "no copyright" 803msgid "no copyright"
803msgstr "" 804msgstr ""
804 805
805#: src/plugins/mp3_extractor.c:251 806#: src/plugins/mp3_extractor.c:249
806msgid "original" 807msgid "original"
807msgstr "" 808msgstr ""
808 809
809#: src/plugins/mp3_extractor.c:251 810#: src/plugins/mp3_extractor.c:249
810msgid "copy" 811msgid "copy"
811msgstr "" 812msgstr ""
812 813
@@ -885,12 +886,12 @@ msgstr ""
885msgid "%s: option `-W %s' doesn't allow an argument\n" 886msgid "%s: option `-W %s' doesn't allow an argument\n"
886msgstr "" 887msgstr ""
887 888
888#: src/main/extractor.c:2294 889#: src/main/extractor.c:2372
889#, c-format 890#, c-format
890msgid "Initialization of plugin mechanism failed: %s!\n" 891msgid "Initialization of plugin mechanism failed: %s!\n"
891msgstr "" 892msgstr ""
892 893
893#: src/main/extract.c:97 894#: src/main/extract.c:98
894#, c-format 895#, c-format
895msgid "" 896msgid ""
896"Usage: %s\n" 897"Usage: %s\n"
@@ -898,106 +899,106 @@ msgid ""
898"\n" 899"\n"
899msgstr "" 900msgstr ""
900 901
901#: src/main/extract.c:100 902#: src/main/extract.c:101
902#, c-format 903#, c-format
903msgid "" 904msgid ""
904"Arguments mandatory for long options are also mandatory for short options.\n" 905"Arguments mandatory for long options are also mandatory for short options.\n"
905msgstr "" 906msgstr ""
906 907
907#: src/main/extract.c:170 908#: src/main/extract.c:171
908msgid "print output in bibtex format" 909msgid "print output in bibtex format"
909msgstr "" 910msgstr ""
910 911
911#: src/main/extract.c:172 912#: src/main/extract.c:173
912msgid "produce grep-friendly output (all results on one line per file)" 913msgid "produce grep-friendly output (all results on one line per file)"
913msgstr "" 914msgstr ""
914 915
915#: src/main/extract.c:174 916#: src/main/extract.c:175
916msgid "print this help" 917msgid "print this help"
917msgstr "" 918msgstr ""
918 919
919#: src/main/extract.c:176 920#: src/main/extract.c:177
920msgid "run plugins in-process (simplifies debugging)" 921msgid "run plugins in-process (simplifies debugging)"
921msgstr "" 922msgstr ""
922 923
923#: src/main/extract.c:178 924#: src/main/extract.c:179
924msgid "load an extractor plugin named LIBRARY" 925msgid "load an extractor plugin named LIBRARY"
925msgstr "" 926msgstr ""
926 927
927#: src/main/extract.c:180 928#: src/main/extract.c:181
928msgid "list all keyword types" 929msgid "list all keyword types"
929msgstr "" 930msgstr ""
930 931
931#: src/main/extract.c:182 932#: src/main/extract.c:183
932msgid "do not use the default set of extractor plugins" 933msgid "do not use the default set of extractor plugins"
933msgstr "" 934msgstr ""
934 935
935#: src/main/extract.c:184 936#: src/main/extract.c:185
936msgid "print only keywords of the given TYPE (use -L to get a list)" 937msgid "print only keywords of the given TYPE (use -L to get a list)"
937msgstr "" 938msgstr ""
938 939
939#: src/main/extract.c:186 940#: src/main/extract.c:187
940msgid "print the version number" 941msgid "print the version number"
941msgstr "" 942msgstr ""
942 943
943#: src/main/extract.c:188 944#: src/main/extract.c:189
944msgid "be verbose" 945msgid "be verbose"
945msgstr "" 946msgstr ""
946 947
947#: src/main/extract.c:190 948#: src/main/extract.c:191
948msgid "do not print keywords of the given TYPE" 949msgid "do not print keywords of the given TYPE"
949msgstr "" 950msgstr ""
950 951
951#: src/main/extract.c:193 952#: src/main/extract.c:194
952msgid "extract [OPTIONS] [FILENAME]*" 953msgid "extract [OPTIONS] [FILENAME]*"
953msgstr "" 954msgstr ""
954 955
955#: src/main/extract.c:194 956#: src/main/extract.c:195
956msgid "Extract metadata from files." 957msgid "Extract metadata from files."
957msgstr "" 958msgstr ""
958 959
959#: src/main/extract.c:235 960#: src/main/extract.c:236
960#, c-format 961#, c-format
961msgid "Found by `%s' plugin:\n" 962msgid "Found by `%s' plugin:\n"
962msgstr "" 963msgstr ""
963 964
964#: src/main/extract.c:238 src/main/extract.c:319 965#: src/main/extract.c:239 src/main/extract.c:320
965#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68 966#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
966msgid "unknown" 967msgid "unknown"
967msgstr "" 968msgstr ""
968 969
969#: src/main/extract.c:243 970#: src/main/extract.c:244
970#, c-format 971#, c-format
971msgid "%s - (unknown, %u bytes)\n" 972msgid "%s - (unknown, %u bytes)\n"
972msgstr "" 973msgstr ""
973 974
974#: src/main/extract.c:267 975#: src/main/extract.c:268
975#, c-format 976#, c-format
976msgid "%s - (binary, %u bytes)\n" 977msgid "%s - (binary, %u bytes)\n"
977msgstr "" 978msgstr ""
978 979
979#: src/main/extract.c:600 src/main/extract.c:610 980#: src/main/extract.c:601 src/main/extract.c:611
980#, c-format 981#, c-format
981msgid "" 982msgid ""
982"Illegal combination of options, cannot combine multiple styles of printing.\n" 983"Illegal combination of options, cannot combine multiple styles of printing.\n"
983msgstr "" 984msgstr ""
984 985
985#: src/main/extract.c:637 986#: src/main/extract.c:638
986#, c-format 987#, c-format
987msgid "You must specify an argument for the `%s' option (option ignored).\n" 988msgid "You must specify an argument for the `%s' option (option ignored).\n"
988msgstr "" 989msgstr ""
989 990
990#: src/main/extract.c:702 991#: src/main/extract.c:703
991#, c-format 992#, c-format
992msgid "Use --help to get a list of options.\n" 993msgid "Use --help to get a list of options.\n"
993msgstr "" 994msgstr ""
994 995
995#: src/main/extract.c:740 996#: src/main/extract.c:741
996#, c-format 997#, c-format
997msgid "%% BiBTeX file\n" 998msgid "%% BiBTeX file\n"
998msgstr "" 999msgstr ""
999 1000
1000#: src/main/extract.c:747 1001#: src/main/extract.c:748
1001#, c-format 1002#, c-format
1002msgid "Keywords for file %s:\n" 1003msgid "Keywords for file %s:\n"
1003msgstr "" 1004msgstr ""
@@ -1850,7 +1851,7 @@ msgid "paragraph count"
1850msgstr "" 1851msgstr ""
1851 1852
1852#: src/main/extractor_metatypes.c:302 1853#: src/main/extractor_metatypes.c:302
1853msgid "number o paragraphs" 1854msgid "number of paragraphs"
1854msgstr "" 1855msgstr ""
1855 1856
1856#: src/main/extractor_metatypes.c:304 1857#: src/main/extractor_metatypes.c:304
@@ -2293,6 +2294,14 @@ msgstr ""
2293msgid "name of the group or band" 2294msgid "name of the group or band"
2294msgstr "" 2295msgstr ""
2295 2296
2296#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2297#: src/main/extractor_metatypes.c:436
2298msgid "original filename"
2299msgstr ""
2300
2301#: src/main/extractor_metatypes.c:437
2302msgid "name of the original file (reserved for GNUnet)"
2303msgstr ""
2304
2305#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2297msgid "last" 2306msgid "last"
2298msgstr "" 2307msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 0bce5c9..4ad99f2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,10 +7,11 @@ msgid ""
7msgstr "" 7msgstr ""
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-06-13 13:15+0200\n" 10"POT-Creation-Date: 2011-11-28 12:53+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"
14"Language: nl\n"
14"MIME-Version: 1.0\n" 15"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 16"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 17"Content-Transfer-Encoding: 8bit\n"
@@ -790,28 +791,28 @@ msgstr ""
790msgid "Layer III" 791msgid "Layer III"
791msgstr "" 792msgstr ""
792 793
793#: src/plugins/mp3_extractor.c:247 794#: src/plugins/mp3_extractor.c:245
794msgid "VBR" 795msgid "VBR"
795msgstr "" 796msgstr ""
796 797
797#: src/plugins/mp3_extractor.c:247 798#: src/plugins/mp3_extractor.c:245
798msgid "CBR" 799msgid "CBR"
799msgstr "" 800msgstr ""
800 801
801#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140 802#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
802msgid "copyright" 803msgid "copyright"
803msgstr "copyright" 804msgstr "copyright"
804 805
805#: src/plugins/mp3_extractor.c:250 806#: src/plugins/mp3_extractor.c:248
806#, fuzzy 807#, fuzzy
807msgid "no copyright" 808msgid "no copyright"
808msgstr "copyright" 809msgstr "copyright"
809 810
810#: src/plugins/mp3_extractor.c:251 811#: src/plugins/mp3_extractor.c:249
811msgid "original" 812msgid "original"
812msgstr "" 813msgstr ""
813 814
814#: src/plugins/mp3_extractor.c:251 815#: src/plugins/mp3_extractor.c:249
815#, fuzzy 816#, fuzzy
816msgid "copy" 817msgid "copy"
817msgstr "firma" 818msgstr "firma"
@@ -891,12 +892,12 @@ msgstr "%s: optie '-W %s' is niet eenduidig\n"
891msgid "%s: option `-W %s' doesn't allow an argument\n" 892msgid "%s: option `-W %s' doesn't allow an argument\n"
892msgstr "%s: optie '-W %s' staat geen argument toe\n" 893msgstr "%s: optie '-W %s' staat geen argument toe\n"
893 894
894#: src/main/extractor.c:2294 895#: src/main/extractor.c:2372
895#, c-format 896#, c-format
896msgid "Initialization of plugin mechanism failed: %s!\n" 897msgid "Initialization of plugin mechanism failed: %s!\n"
897msgstr "Initialisatie van plugin-mechanisme is mislukt: %s\n" 898msgstr "Initialisatie van plugin-mechanisme is mislukt: %s\n"
898 899
899#: src/main/extract.c:97 900#: src/main/extract.c:98
900#, c-format 901#, c-format
901msgid "" 902msgid ""
902"Usage: %s\n" 903"Usage: %s\n"
@@ -907,7 +908,7 @@ msgstr ""
907"%s\n" 908"%s\n"
908"\n" 909"\n"
909 910
910#: src/main/extract.c:100 911#: src/main/extract.c:101
911#, c-format 912#, c-format
912msgid "" 913msgid ""
913"Arguments mandatory for long options are also mandatory for short options.\n" 914"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -915,103 +916,103 @@ msgstr ""
915"Argumenten die verplicht zijn voor lange opties zijn dat ook voor korte " 916"Argumenten die verplicht zijn voor lange opties zijn dat ook voor korte "
916"opties.\n" 917"opties.\n"
917 918
918#: src/main/extract.c:170 919#: src/main/extract.c:171
919msgid "print output in bibtex format" 920msgid "print output in bibtex format"
920msgstr "uitvoer in bibtex-indeling produceren" 921msgstr "uitvoer in bibtex-indeling produceren"
921 922
922#: src/main/extract.c:172 923#: src/main/extract.c:173
923msgid "produce grep-friendly output (all results on one line per file)" 924msgid "produce grep-friendly output (all results on one line per file)"
924msgstr "" 925msgstr ""
925"uitvoer produceren die makkelijk te greppen is (alle resultaten op één regel " 926"uitvoer produceren die makkelijk te greppen is (alle resultaten op één regel "
926"per bestand)" 927"per bestand)"
927 928
928#: src/main/extract.c:174 929#: src/main/extract.c:175
929msgid "print this help" 930msgid "print this help"
930msgstr "deze hulptekst tonen" 931msgstr "deze hulptekst tonen"
931 932
932#: src/main/extract.c:176 933#: src/main/extract.c:177
933msgid "run plugins in-process (simplifies debugging)" 934msgid "run plugins in-process (simplifies debugging)"
934msgstr "" 935msgstr ""
935 936
936#: src/main/extract.c:178 937#: src/main/extract.c:179
937msgid "load an extractor plugin named LIBRARY" 938msgid "load an extractor plugin named LIBRARY"
938msgstr "deze extractor-plugin laden" 939msgstr "deze extractor-plugin laden"
939 940
940#: src/main/extract.c:180 941#: src/main/extract.c:181
941msgid "list all keyword types" 942msgid "list all keyword types"
942msgstr "alle sleutelwoordtypes opsommen" 943msgstr "alle sleutelwoordtypes opsommen"
943 944
944#: src/main/extract.c:182 945#: src/main/extract.c:183
945msgid "do not use the default set of extractor plugins" 946msgid "do not use the default set of extractor plugins"
946msgstr "de standaardset extractor-plugins niet gebruiken" 947msgstr "de standaardset extractor-plugins niet gebruiken"
947 948
948#: src/main/extract.c:184 949#: src/main/extract.c:185
949msgid "print only keywords of the given TYPE (use -L to get a list)" 950msgid "print only keywords of the given TYPE (use -L to get a list)"
950msgstr "" 951msgstr ""
951"alleen sleutelwoorden van dit type tonen (gebruik '-L' voor een overzicht)" 952"alleen sleutelwoorden van dit type tonen (gebruik '-L' voor een overzicht)"
952 953
953#: src/main/extract.c:186 954#: src/main/extract.c:187
954msgid "print the version number" 955msgid "print the version number"
955msgstr "programmaversie tonen" 956msgstr "programmaversie tonen"
956 957
957#: src/main/extract.c:188 958#: src/main/extract.c:189
958msgid "be verbose" 959msgid "be verbose"
959msgstr "gedetailleerde uivoer produceren" 960msgstr "gedetailleerde uivoer produceren"
960 961
961#: src/main/extract.c:190 962#: src/main/extract.c:191
962msgid "do not print keywords of the given TYPE" 963msgid "do not print keywords of the given TYPE"
963msgstr "sleutelwoorden van dit type niet tonen" 964msgstr "sleutelwoorden van dit type niet tonen"
964 965
965#: src/main/extract.c:193 966#: src/main/extract.c:194
966msgid "extract [OPTIONS] [FILENAME]*" 967msgid "extract [OPTIONS] [FILENAME]*"
967msgstr "extract [OPTIES] [BESTANDSNAAM]*" 968msgstr "extract [OPTIES] [BESTANDSNAAM]*"
968 969
969#: src/main/extract.c:194 970#: src/main/extract.c:195
970msgid "Extract metadata from files." 971msgid "Extract metadata from files."
971msgstr "Metadata uit bestanden lezen." 972msgstr "Metadata uit bestanden lezen."
972 973
973#: src/main/extract.c:235 974#: src/main/extract.c:236
974#, fuzzy, c-format 975#, fuzzy, c-format
975msgid "Found by `%s' plugin:\n" 976msgid "Found by `%s' plugin:\n"
976msgstr "Laden van plugin '%s' is mislukt: %s\n" 977msgstr "Laden van plugin '%s' is mislukt: %s\n"
977 978
978#: src/main/extract.c:238 src/main/extract.c:319 979#: src/main/extract.c:239 src/main/extract.c:320
979#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68 980#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
980msgid "unknown" 981msgid "unknown"
981msgstr "onbekend" 982msgstr "onbekend"
982 983
983#: src/main/extract.c:243 984#: src/main/extract.c:244
984#, c-format 985#, c-format
985msgid "%s - (unknown, %u bytes)\n" 986msgid "%s - (unknown, %u bytes)\n"
986msgstr "" 987msgstr ""
987 988
988#: src/main/extract.c:267 989#: src/main/extract.c:268
989#, fuzzy, c-format 990#, fuzzy, c-format
990msgid "%s - (binary, %u bytes)\n" 991msgid "%s - (binary, %u bytes)\n"
991msgstr "%s - (binair)\n" 992msgstr "%s - (binair)\n"
992 993
993#: src/main/extract.c:600 src/main/extract.c:610 994#: src/main/extract.c:601 src/main/extract.c:611
994#, c-format 995#, c-format
995msgid "" 996msgid ""
996"Illegal combination of options, cannot combine multiple styles of printing.\n" 997"Illegal combination of options, cannot combine multiple styles of printing.\n"
997msgstr "" 998msgstr ""
998 999
999#: src/main/extract.c:637 1000#: src/main/extract.c:638
1000#, c-format 1001#, c-format
1001msgid "You must specify an argument for the `%s' option (option ignored).\n" 1002msgid "You must specify an argument for the `%s' option (option ignored).\n"
1002msgstr "Optie '%s' vereist een argument -- optie is genegeerd.\n" 1003msgstr "Optie '%s' vereist een argument -- optie is genegeerd.\n"
1003 1004
1004#: src/main/extract.c:702 1005#: src/main/extract.c:703
1005#, c-format 1006#, c-format
1006msgid "Use --help to get a list of options.\n" 1007msgid "Use --help to get a list of options.\n"
1007msgstr "Gebruik '--help' voor een lijst met mogelijke opties.\n" 1008msgstr "Gebruik '--help' voor een lijst met mogelijke opties.\n"
1008 1009
1009#: src/main/extract.c:740 1010#: src/main/extract.c:741
1010#, c-format 1011#, c-format
1011msgid "%% BiBTeX file\n" 1012msgid "%% BiBTeX file\n"
1012msgstr "%% BiBTeX-bestand\n" 1013msgstr "%% BiBTeX-bestand\n"
1013 1014
1014#: src/main/extract.c:747 1015#: src/main/extract.c:748
1015#, c-format 1016#, c-format
1016msgid "Keywords for file %s:\n" 1017msgid "Keywords for file %s:\n"
1017msgstr "Trefwoorden voor bestand %s:\n" 1018msgstr "Trefwoorden voor bestand %s:\n"
@@ -1922,8 +1923,9 @@ msgid "paragraph count"
1922msgstr "aantal alinea's" 1923msgstr "aantal alinea's"
1923 1924
1924#: src/main/extractor_metatypes.c:302 1925#: src/main/extractor_metatypes.c:302
1925msgid "number o paragraphs" 1926#, fuzzy
1926msgstr "" 1927msgid "number of paragraphs"
1928msgstr "bewerkingscycli"
1927 1929
1928#: src/main/extractor_metatypes.c:304 1930#: src/main/extractor_metatypes.c:304
1929msgid "word count" 1931msgid "word count"
@@ -2402,7 +2404,17 @@ msgstr "groep"
2402msgid "name of the group or band" 2404msgid "name of the group or band"
2403msgstr "uitgever" 2405msgstr "uitgever"
2404 2406
2405#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2407#: src/main/extractor_metatypes.c:436
2408#, fuzzy
2409msgid "original filename"
2410msgstr "naam"
2411
2412#: src/main/extractor_metatypes.c:437
2413#, fuzzy
2414msgid "name of the original file (reserved for GNUnet)"
2415msgstr "uitgever"
2416
2417#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2406#, fuzzy 2418#, fuzzy
2407msgid "last" 2419msgid "last"
2408msgstr "flits" 2420msgstr "flits"
diff --git a/po/ro.po b/po/ro.po
index 3428d25..cc4afca 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,10 +9,11 @@ msgid ""
9msgstr "" 9msgstr ""
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-06-13 13:15+0200\n" 12"POT-Creation-Date: 2011-11-28 12:53+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"
16"Language: ro\n"
16"MIME-Version: 1.0\n" 17"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=ISO-8859-2\n" 18"Content-Type: text/plain; charset=ISO-8859-2\n"
18"Content-Transfer-Encoding: 8bit\n" 19"Content-Transfer-Encoding: 8bit\n"
@@ -792,28 +793,28 @@ msgstr ""
792msgid "Layer III" 793msgid "Layer III"
793msgstr "" 794msgstr ""
794 795
795#: src/plugins/mp3_extractor.c:247 796#: src/plugins/mp3_extractor.c:245
796msgid "VBR" 797msgid "VBR"
797msgstr "" 798msgstr ""
798 799
799#: src/plugins/mp3_extractor.c:247 800#: src/plugins/mp3_extractor.c:245
800msgid "CBR" 801msgid "CBR"
801msgstr "" 802msgstr ""
802 803
803#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140 804#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
804msgid "copyright" 805msgid "copyright"
805msgstr "copyright" 806msgstr "copyright"
806 807
807#: src/plugins/mp3_extractor.c:250 808#: src/plugins/mp3_extractor.c:248
808#, fuzzy 809#, fuzzy
809msgid "no copyright" 810msgid "no copyright"
810msgstr "copyright" 811msgstr "copyright"
811 812
812#: src/plugins/mp3_extractor.c:251 813#: src/plugins/mp3_extractor.c:249
813msgid "original" 814msgid "original"
814msgstr "" 815msgstr ""
815 816
816#: src/plugins/mp3_extractor.c:251 817#: src/plugins/mp3_extractor.c:249
817#, fuzzy 818#, fuzzy
818msgid "copy" 819msgid "copy"
819msgstr "copyright" 820msgstr "copyright"
@@ -893,12 +894,12 @@ msgstr "%s: opþiunea `-W %s' este ambiguã\n"
893msgid "%s: option `-W %s' doesn't allow an argument\n" 894msgid "%s: option `-W %s' doesn't allow an argument\n"
894msgstr "%s: opþiunea `-W %s' nu permite un argument\n" 895msgstr "%s: opþiunea `-W %s' nu permite un argument\n"
895 896
896#: src/main/extractor.c:2294 897#: src/main/extractor.c:2372
897#, c-format 898#, c-format
898msgid "Initialization of plugin mechanism failed: %s!\n" 899msgid "Initialization of plugin mechanism failed: %s!\n"
899msgstr "iniþializare mecanismului de plugin a eºuat: %s!\n" 900msgstr "iniþializare mecanismului de plugin a eºuat: %s!\n"
900 901
901#: src/main/extract.c:97 902#: src/main/extract.c:98
902#, c-format 903#, c-format
903msgid "" 904msgid ""
904"Usage: %s\n" 905"Usage: %s\n"
@@ -909,7 +910,7 @@ msgstr ""
909"%s\n" 910"%s\n"
910"\n" 911"\n"
911 912
912#: src/main/extract.c:100 913#: src/main/extract.c:101
913#, c-format 914#, c-format
914msgid "" 915msgid ""
915"Arguments mandatory for long options are also mandatory for short options.\n" 916"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -917,103 +918,103 @@ msgstr ""
917"Argumentele obligatorii pentru opþiunile lungi sunt obligatorii ºi pentru " 918"Argumentele obligatorii pentru opþiunile lungi sunt obligatorii ºi pentru "
918"opþiunile scurte.\n" 919"opþiunile scurte.\n"
919 920
920#: src/main/extract.c:170 921#: src/main/extract.c:171
921msgid "print output in bibtex format" 922msgid "print output in bibtex format"
922msgstr "afiºeazã ieºirea în format bibtex" 923msgstr "afiºeazã ieºirea în format bibtex"
923 924
924#: src/main/extract.c:172 925#: src/main/extract.c:173
925msgid "produce grep-friendly output (all results on one line per file)" 926msgid "produce grep-friendly output (all results on one line per file)"
926msgstr "" 927msgstr ""
927 928
928#: src/main/extract.c:174 929#: src/main/extract.c:175
929msgid "print this help" 930msgid "print this help"
930msgstr "afiºeazã acest mesaj de ajutor" 931msgstr "afiºeazã acest mesaj de ajutor"
931 932
932#: src/main/extract.c:176 933#: src/main/extract.c:177
933msgid "run plugins in-process (simplifies debugging)" 934msgid "run plugins in-process (simplifies debugging)"
934msgstr "" 935msgstr ""
935 936
936#: src/main/extract.c:178 937#: src/main/extract.c:179
937msgid "load an extractor plugin named LIBRARY" 938msgid "load an extractor plugin named LIBRARY"
938msgstr "încarcã un plugin extractor numit LIBRÃRIE" 939msgstr "încarcã un plugin extractor numit LIBRÃRIE"
939 940
940#: src/main/extract.c:180 941#: src/main/extract.c:181
941msgid "list all keyword types" 942msgid "list all keyword types"
942msgstr "listeazã toate tipurile de cuvinte cheie" 943msgstr "listeazã toate tipurile de cuvinte cheie"
943 944
944#: src/main/extract.c:182 945#: src/main/extract.c:183
945msgid "do not use the default set of extractor plugins" 946msgid "do not use the default set of extractor plugins"
946msgstr "nu folosi setul implicit de plugin-uri extractor" 947msgstr "nu folosi setul implicit de plugin-uri extractor"
947 948
948#: src/main/extract.c:184 949#: src/main/extract.c:185
949msgid "print only keywords of the given TYPE (use -L to get a list)" 950msgid "print only keywords of the given TYPE (use -L to get a list)"
950msgstr "" 951msgstr ""
951"afiºeazã numai cuvintele cheie pentru TIP-ul dat (foloseºte -L pentru a " 952"afiºeazã numai cuvintele cheie pentru TIP-ul dat (foloseºte -L pentru a "
952"obþine o listã" 953"obþine o listã"
953 954
954#: src/main/extract.c:186 955#: src/main/extract.c:187
955msgid "print the version number" 956msgid "print the version number"
956msgstr "afiºeazã numãrul versiunii" 957msgstr "afiºeazã numãrul versiunii"
957 958
958#: src/main/extract.c:188 959#: src/main/extract.c:189
959msgid "be verbose" 960msgid "be verbose"
960msgstr "fi vorbãreþ" 961msgstr "fi vorbãreþ"
961 962
962#: src/main/extract.c:190 963#: src/main/extract.c:191
963msgid "do not print keywords of the given TYPE" 964msgid "do not print keywords of the given TYPE"
964msgstr "nu afiºa cuvinte cheie de TIP-ul dat" 965msgstr "nu afiºa cuvinte cheie de TIP-ul dat"
965 966
966#: src/main/extract.c:193 967#: src/main/extract.c:194
967msgid "extract [OPTIONS] [FILENAME]*" 968msgid "extract [OPTIONS] [FILENAME]*"
968msgstr "extract [OPÞIUNI] [NUME_FIªIER]*" 969msgstr "extract [OPÞIUNI] [NUME_FIªIER]*"
969 970
970#: src/main/extract.c:194 971#: src/main/extract.c:195
971msgid "Extract metadata from files." 972msgid "Extract metadata from files."
972msgstr "Extrage metadata din fiºiere." 973msgstr "Extrage metadata din fiºiere."
973 974
974#: src/main/extract.c:235 975#: src/main/extract.c:236
975#, fuzzy, c-format 976#, fuzzy, c-format
976msgid "Found by `%s' plugin:\n" 977msgid "Found by `%s' plugin:\n"
977msgstr "Încãrcarea plugin-ului '%s' a eºuat: %s\n" 978msgstr "Încãrcarea plugin-ului '%s' a eºuat: %s\n"
978 979
979#: src/main/extract.c:238 src/main/extract.c:319 980#: src/main/extract.c:239 src/main/extract.c:320
980#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68 981#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
981msgid "unknown" 982msgid "unknown"
982msgstr "necunoscut" 983msgstr "necunoscut"
983 984
984#: src/main/extract.c:243 985#: src/main/extract.c:244
985#, c-format 986#, c-format
986msgid "%s - (unknown, %u bytes)\n" 987msgid "%s - (unknown, %u bytes)\n"
987msgstr "" 988msgstr ""
988 989
989#: src/main/extract.c:267 990#: src/main/extract.c:268
990#, fuzzy, c-format 991#, fuzzy, c-format
991msgid "%s - (binary, %u bytes)\n" 992msgid "%s - (binary, %u bytes)\n"
992msgstr "%s - (binar)\n" 993msgstr "%s - (binar)\n"
993 994
994#: src/main/extract.c:600 src/main/extract.c:610 995#: src/main/extract.c:601 src/main/extract.c:611
995#, c-format 996#, c-format
996msgid "" 997msgid ""
997"Illegal combination of options, cannot combine multiple styles of printing.\n" 998"Illegal combination of options, cannot combine multiple styles of printing.\n"
998msgstr "" 999msgstr ""
999 1000
1000#: src/main/extract.c:637 1001#: src/main/extract.c:638
1001#, fuzzy, c-format 1002#, fuzzy, c-format
1002msgid "You must specify an argument for the `%s' option (option ignored).\n" 1003msgid "You must specify an argument for the `%s' option (option ignored).\n"
1003msgstr "" 1004msgstr ""
1004"Trebuie sã specificaþi un argument pentru opþiunea '%s' (opþiune ignoratã).\n" 1005"Trebuie sã specificaþi un argument pentru opþiunea '%s' (opþiune ignoratã).\n"
1005 1006
1006#: src/main/extract.c:702 1007#: src/main/extract.c:703
1007#, c-format 1008#, c-format
1008msgid "Use --help to get a list of options.\n" 1009msgid "Use --help to get a list of options.\n"
1009msgstr "Folosiþi --help pentru a obþine o listã de opþiuni.\n" 1010msgstr "Folosiþi --help pentru a obþine o listã de opþiuni.\n"
1010 1011
1011#: src/main/extract.c:740 1012#: src/main/extract.c:741
1012#, c-format 1013#, c-format
1013msgid "%% BiBTeX file\n" 1014msgid "%% BiBTeX file\n"
1014msgstr "%% BiBTeX file\n" 1015msgstr "%% BiBTeX file\n"
1015 1016
1016#: src/main/extract.c:747 1017#: src/main/extract.c:748
1017#, c-format 1018#, c-format
1018msgid "Keywords for file %s:\n" 1019msgid "Keywords for file %s:\n"
1019msgstr "Cuvinte cheie pentru fiºier %s:\n" 1020msgstr "Cuvinte cheie pentru fiºier %s:\n"
@@ -1924,8 +1925,9 @@ msgid "paragraph count"
1924msgstr "numãr de pagini" 1925msgstr "numãr de pagini"
1925 1926
1926#: src/main/extractor_metatypes.c:302 1927#: src/main/extractor_metatypes.c:302
1927msgid "number o paragraphs" 1928#, fuzzy
1928msgstr "" 1929msgid "number of paragraphs"
1930msgstr "Numãr legãturi în afara domeniului"
1929 1931
1930#: src/main/extractor_metatypes.c:304 1932#: src/main/extractor_metatypes.c:304
1931#, fuzzy 1933#, fuzzy
@@ -2410,7 +2412,17 @@ msgstr "grup"
2410msgid "name of the group or band" 2412msgid "name of the group or band"
2411msgstr "publicist" 2413msgstr "publicist"
2412 2414
2413#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2415#: src/main/extractor_metatypes.c:436
2416#, fuzzy
2417msgid "original filename"
2418msgstr "nume_fiºier"
2419
2420#: src/main/extractor_metatypes.c:437
2421#, fuzzy
2422msgid "name of the original file (reserved for GNUnet)"
2423msgstr "publicist"
2424
2425#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2414#, fuzzy 2426#, fuzzy
2415msgid "last" 2427msgid "last"
2416msgstr "bliþ" 2428msgstr "bliþ"
diff --git a/po/rw.po b/po/rw.po
index 15fd3c6..7699bb5 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -16,10 +16,11 @@ msgid ""
16msgstr "" 16msgstr ""
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-06-13 13:15+0200\n" 19"POT-Creation-Date: 2011-11-28 12:53+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"
23"Language: rw\n"
23"MIME-Version: 1.0\n" 24"MIME-Version: 1.0\n"
24"Content-Type: text/plain; charset=UTF-8\n" 25"Content-Type: text/plain; charset=UTF-8\n"
25"Content-Transfer-Encoding: 8bit\n" 26"Content-Transfer-Encoding: 8bit\n"
@@ -853,29 +854,29 @@ msgstr ""
853msgid "Layer III" 854msgid "Layer III"
854msgstr "" 855msgstr ""
855 856
856#: src/plugins/mp3_extractor.c:247 857#: src/plugins/mp3_extractor.c:245
857msgid "VBR" 858msgid "VBR"
858msgstr "" 859msgstr ""
859 860
860#: src/plugins/mp3_extractor.c:247 861#: src/plugins/mp3_extractor.c:245
861msgid "CBR" 862msgid "CBR"
862msgstr "" 863msgstr ""
863 864
864#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140 865#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
865#, fuzzy 866#, fuzzy
866msgid "copyright" 867msgid "copyright"
867msgstr "Uburenganzira bw'umuhimbyi" 868msgstr "Uburenganzira bw'umuhimbyi"
868 869
869#: src/plugins/mp3_extractor.c:250 870#: src/plugins/mp3_extractor.c:248
870#, fuzzy 871#, fuzzy
871msgid "no copyright" 872msgid "no copyright"
872msgstr "Uburenganzira bw'umuhimbyi" 873msgstr "Uburenganzira bw'umuhimbyi"
873 874
874#: src/plugins/mp3_extractor.c:251 875#: src/plugins/mp3_extractor.c:249
875msgid "original" 876msgid "original"
876msgstr "" 877msgstr ""
877 878
878#: src/plugins/mp3_extractor.c:251 879#: src/plugins/mp3_extractor.c:249
879#, fuzzy 880#, fuzzy
880msgid "copy" 881msgid "copy"
881msgstr "Uburenganzira bw'umuhimbyi" 882msgstr "Uburenganzira bw'umuhimbyi"
@@ -955,12 +956,12 @@ msgstr "%s:Ihitamo ni"
955msgid "%s: option `-W %s' doesn't allow an argument\n" 956msgid "%s: option `-W %s' doesn't allow an argument\n"
956msgstr "%s:Ihitamo Kwemerera" 957msgstr "%s:Ihitamo Kwemerera"
957 958
958#: src/main/extractor.c:2294 959#: src/main/extractor.c:2372
959#, fuzzy, c-format 960#, fuzzy, c-format
960msgid "Initialization of plugin mechanism failed: %s!\n" 961msgid "Initialization of plugin mechanism failed: %s!\n"
961msgstr "Bya Byanze" 962msgstr "Bya Byanze"
962 963
963#: src/main/extract.c:97 964#: src/main/extract.c:98
964#, fuzzy, c-format 965#, fuzzy, c-format
965msgid "" 966msgid ""
966"Usage: %s\n" 967"Usage: %s\n"
@@ -968,115 +969,115 @@ msgid ""
968"\n" 969"\n"
969msgstr "Ikoresha:" 970msgstr "Ikoresha:"
970 971
971#: src/main/extract.c:100 972#: src/main/extract.c:101
972#, fuzzy, c-format 973#, fuzzy, c-format
973msgid "" 974msgid ""
974"Arguments mandatory for long options are also mandatory for short options.\n" 975"Arguments mandatory for long options are also mandatory for short options.\n"
975msgstr "kugirango Amahitamo kugirango Amahitamo" 976msgstr "kugirango Amahitamo kugirango Amahitamo"
976 977
977#: src/main/extract.c:170 978#: src/main/extract.c:171
978#, fuzzy 979#, fuzzy
979msgid "print output in bibtex format" 980msgid "print output in bibtex format"
980msgstr "Gucapa Ibisohoka in Imiterere" 981msgstr "Gucapa Ibisohoka in Imiterere"
981 982
982#: src/main/extract.c:172 983#: src/main/extract.c:173
983msgid "produce grep-friendly output (all results on one line per file)" 984msgid "produce grep-friendly output (all results on one line per file)"
984msgstr "" 985msgstr ""
985 986
986#: src/main/extract.c:174 987#: src/main/extract.c:175
987#, fuzzy 988#, fuzzy
988msgid "print this help" 989msgid "print this help"
989msgstr "Gucapa iyi Ifashayobora" 990msgstr "Gucapa iyi Ifashayobora"
990 991
991#: src/main/extract.c:176 992#: src/main/extract.c:177
992msgid "run plugins in-process (simplifies debugging)" 993msgid "run plugins in-process (simplifies debugging)"
993msgstr "" 994msgstr ""
994 995
995#: src/main/extract.c:178 996#: src/main/extract.c:179
996#, fuzzy 997#, fuzzy
997msgid "load an extractor plugin named LIBRARY" 998msgid "load an extractor plugin named LIBRARY"
998msgstr "Ibirimo" 999msgstr "Ibirimo"
999 1000
1000#: src/main/extract.c:180 1001#: src/main/extract.c:181
1001#, fuzzy 1002#, fuzzy
1002msgid "list all keyword types" 1003msgid "list all keyword types"
1003msgstr "Urutonde Byose Ijambo- banze" 1004msgstr "Urutonde Byose Ijambo- banze"
1004 1005
1005#: src/main/extract.c:182 1006#: src/main/extract.c:183
1006#, fuzzy 1007#, fuzzy
1007msgid "do not use the default set of extractor plugins" 1008msgid "do not use the default set of extractor plugins"
1008msgstr "OYA Gukoresha i Mburabuzi Gushyiraho Bya" 1009msgstr "OYA Gukoresha i Mburabuzi Gushyiraho Bya"
1009 1010
1010#: src/main/extract.c:184 1011#: src/main/extract.c:185
1011#, fuzzy 1012#, fuzzy
1012msgid "print only keywords of the given TYPE (use -L to get a list)" 1013msgid "print only keywords of the given TYPE (use -L to get a list)"
1013msgstr "Gucapa Amagambo fatizo Bya i Gukoresha Kuri Kubona a Urutonde" 1014msgstr "Gucapa Amagambo fatizo Bya i Gukoresha Kuri Kubona a Urutonde"
1014 1015
1015#: src/main/extract.c:186 1016#: src/main/extract.c:187
1016#, fuzzy 1017#, fuzzy
1017msgid "print the version number" 1018msgid "print the version number"
1018msgstr "Gucapa i Verisiyo Umubare" 1019msgstr "Gucapa i Verisiyo Umubare"
1019 1020
1020#: src/main/extract.c:188 1021#: src/main/extract.c:189
1021msgid "be verbose" 1022msgid "be verbose"
1022msgstr "" 1023msgstr ""
1023 1024
1024#: src/main/extract.c:190 1025#: src/main/extract.c:191
1025#, fuzzy 1026#, fuzzy
1026msgid "do not print keywords of the given TYPE" 1027msgid "do not print keywords of the given TYPE"
1027msgstr "OYA Gucapa Amagambo fatizo Bya i" 1028msgstr "OYA Gucapa Amagambo fatizo Bya i"
1028 1029
1029#: src/main/extract.c:193 1030#: src/main/extract.c:194
1030msgid "extract [OPTIONS] [FILENAME]*" 1031msgid "extract [OPTIONS] [FILENAME]*"
1031msgstr "" 1032msgstr ""
1032 1033
1033#: src/main/extract.c:194 1034#: src/main/extract.c:195
1034#, fuzzy 1035#, fuzzy
1035msgid "Extract metadata from files." 1036msgid "Extract metadata from files."
1036msgstr "Bivuye Idosiye" 1037msgstr "Bivuye Idosiye"
1037 1038
1038#: src/main/extract.c:235 1039#: src/main/extract.c:236
1039#, fuzzy, c-format 1040#, fuzzy, c-format
1040msgid "Found by `%s' plugin:\n" 1041msgid "Found by `%s' plugin:\n"
1041msgstr "Byanze" 1042msgstr "Byanze"
1042 1043
1043#: src/main/extract.c:238 src/main/extract.c:319 1044#: src/main/extract.c:239 src/main/extract.c:320
1044#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68 1045#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
1045msgid "unknown" 1046msgid "unknown"
1046msgstr "itazwi" 1047msgstr "itazwi"
1047 1048
1048#: src/main/extract.c:243 1049#: src/main/extract.c:244
1049#, c-format 1050#, c-format
1050msgid "%s - (unknown, %u bytes)\n" 1051msgid "%s - (unknown, %u bytes)\n"
1051msgstr "" 1052msgstr ""
1052 1053
1053#: src/main/extract.c:267 1054#: src/main/extract.c:268
1054#, fuzzy, c-format 1055#, fuzzy, c-format
1055msgid "%s - (binary, %u bytes)\n" 1056msgid "%s - (binary, %u bytes)\n"
1056msgstr "%s-(Nyabibiri" 1057msgstr "%s-(Nyabibiri"
1057 1058
1058#: src/main/extract.c:600 src/main/extract.c:610 1059#: src/main/extract.c:601 src/main/extract.c:611
1059#, c-format 1060#, c-format
1060msgid "" 1061msgid ""
1061"Illegal combination of options, cannot combine multiple styles of printing.\n" 1062"Illegal combination of options, cannot combine multiple styles of printing.\n"
1062msgstr "" 1063msgstr ""
1063 1064
1064#: src/main/extract.c:637 1065#: src/main/extract.c:638
1065#, fuzzy, c-format 1066#, fuzzy, c-format
1066msgid "You must specify an argument for the `%s' option (option ignored).\n" 1067msgid "You must specify an argument for the `%s' option (option ignored).\n"
1067msgstr "kugirango i Ihitamo Ihitamo" 1068msgstr "kugirango i Ihitamo Ihitamo"
1068 1069
1069#: src/main/extract.c:702 1070#: src/main/extract.c:703
1070#, fuzzy, c-format 1071#, fuzzy, c-format
1071msgid "Use --help to get a list of options.\n" 1072msgid "Use --help to get a list of options.\n"
1072msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo" 1073msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
1073 1074
1074#: src/main/extract.c:740 1075#: src/main/extract.c:741
1075#, c-format 1076#, c-format
1076msgid "%% BiBTeX file\n" 1077msgid "%% BiBTeX file\n"
1077msgstr "" 1078msgstr ""
1078 1079
1079#: src/main/extract.c:747 1080#: src/main/extract.c:748
1080#, fuzzy, c-format 1081#, fuzzy, c-format
1081msgid "Keywords for file %s:\n" 1082msgid "Keywords for file %s:\n"
1082msgstr "kugirango IDOSIYE" 1083msgstr "kugirango IDOSIYE"
@@ -2081,8 +2082,9 @@ msgid "paragraph count"
2081msgstr "Kubara amapaje" 2082msgstr "Kubara amapaje"
2082 2083
2083#: src/main/extractor_metatypes.c:302 2084#: src/main/extractor_metatypes.c:302
2084msgid "number o paragraphs" 2085#, fuzzy
2085msgstr "" 2086msgid "number of paragraphs"
2087msgstr "Umubare Inyuma Bya Urutonde"
2086 2088
2087# sw/source\ui\inc\swmn.hrc:_MN_INS.MN_SUB_FIELD.FN_INSERT_FLD_PGCOUNT.text 2089# sw/source\ui\inc\swmn.hrc:_MN_INS.MN_SUB_FIELD.FN_INSERT_FLD_PGCOUNT.text
2088#: src/main/extractor_metatypes.c:304 2090#: src/main/extractor_metatypes.c:304
@@ -2637,7 +2639,17 @@ msgstr "Itsinda"
2637msgid "name of the group or band" 2639msgid "name of the group or band"
2638msgstr "Uwasohoye inyandiko" 2640msgstr "Uwasohoye inyandiko"
2639 2641
2640#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2642#: src/main/extractor_metatypes.c:436
2643#, fuzzy
2644msgid "original filename"
2645msgstr "Izina ry'idosiye"
2646
2647#: src/main/extractor_metatypes.c:437
2648#, fuzzy
2649msgid "name of the original file (reserved for GNUnet)"
2650msgstr "Uwasohoye inyandiko"
2651
2652#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2641#, fuzzy 2653#, fuzzy
2642msgid "last" 2654msgid "last"
2643msgstr "Umuhanzi" 2655msgstr "Umuhanzi"
diff --git a/po/sv.po b/po/sv.po
index 1d73f3a..78e15df 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,10 +7,11 @@ msgid ""
7msgstr "" 7msgstr ""
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-06-13 13:15+0200\n" 10"POT-Creation-Date: 2011-11-28 12:53+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"
14"Language: sv\n"
14"MIME-Version: 1.0\n" 15"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=utf-8\n" 16"Content-Type: text/plain; charset=utf-8\n"
16"Content-Transfer-Encoding: 8bit\n" 17"Content-Transfer-Encoding: 8bit\n"
@@ -788,28 +789,28 @@ msgstr "Layer II"
788msgid "Layer III" 789msgid "Layer III"
789msgstr "Layer III" 790msgstr "Layer III"
790 791
791#: src/plugins/mp3_extractor.c:247 792#: src/plugins/mp3_extractor.c:245
792msgid "VBR" 793msgid "VBR"
793msgstr "VBR" 794msgstr "VBR"
794 795
795#: src/plugins/mp3_extractor.c:247 796#: src/plugins/mp3_extractor.c:245
796msgid "CBR" 797msgid "CBR"
797msgstr "CBR" 798msgstr "CBR"
798 799
799#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140 800#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
800msgid "copyright" 801msgid "copyright"
801msgstr "copyright" 802msgstr "copyright"
802 803
803#: src/plugins/mp3_extractor.c:250 804#: src/plugins/mp3_extractor.c:248
804msgid "no copyright" 805msgid "no copyright"
805msgstr "ingen copyright" 806msgstr "ingen copyright"
806 807
807#: src/plugins/mp3_extractor.c:251 808#: src/plugins/mp3_extractor.c:249
808#, fuzzy 809#, fuzzy
809msgid "original" 810msgid "original"
810msgstr "original" 811msgstr "original"
811 812
812#: src/plugins/mp3_extractor.c:251 813#: src/plugins/mp3_extractor.c:249
813msgid "copy" 814msgid "copy"
814msgstr "kopia" 815msgstr "kopia"
815 816
@@ -888,12 +889,12 @@ msgstr "%s: flagga \"-W %s\" är tvetydig\n"
888msgid "%s: option `-W %s' doesn't allow an argument\n" 889msgid "%s: option `-W %s' doesn't allow an argument\n"
889msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n" 890msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
890 891
891#: src/main/extractor.c:2294 892#: src/main/extractor.c:2372
892#, c-format 893#, c-format
893msgid "Initialization of plugin mechanism failed: %s!\n" 894msgid "Initialization of plugin mechanism failed: %s!\n"
894msgstr "Initiering av insticksmekanism misslyckades: %s!\n" 895msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
895 896
896#: src/main/extract.c:97 897#: src/main/extract.c:98
897#, c-format 898#, c-format
898msgid "" 899msgid ""
899"Usage: %s\n" 900"Usage: %s\n"
@@ -904,7 +905,7 @@ msgstr ""
904"%s\n" 905"%s\n"
905"\n" 906"\n"
906 907
907#: src/main/extract.c:100 908#: src/main/extract.c:101
908#, c-format 909#, c-format
909msgid "" 910msgid ""
910"Arguments mandatory for long options are also mandatory for short options.\n" 911"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -912,100 +913,100 @@ msgstr ""
912"Argument som är obligatoriska för långa flaggor är också obligatoriska för " 913"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
913"korta flaggor.\n" 914"korta flaggor.\n"
914 915
915#: src/main/extract.c:170 916#: src/main/extract.c:171
916msgid "print output in bibtex format" 917msgid "print output in bibtex format"
917msgstr "skriv ut i bibtex-format" 918msgstr "skriv ut i bibtex-format"
918 919
919#: src/main/extract.c:172 920#: src/main/extract.c:173
920msgid "produce grep-friendly output (all results on one line per file)" 921msgid "produce grep-friendly output (all results on one line per file)"
921msgstr "producera grep-vänligt utdata (alla resultat på en rad per fil)" 922msgstr "producera grep-vänligt utdata (alla resultat på en rad per fil)"
922 923
923#: src/main/extract.c:174 924#: src/main/extract.c:175
924msgid "print this help" 925msgid "print this help"
925msgstr "skriv ut denna hjälp" 926msgstr "skriv ut denna hjälp"
926 927
927#: src/main/extract.c:176 928#: src/main/extract.c:177
928msgid "run plugins in-process (simplifies debugging)" 929msgid "run plugins in-process (simplifies debugging)"
929msgstr "" 930msgstr ""
930 931
931#: src/main/extract.c:178 932#: src/main/extract.c:179
932msgid "load an extractor plugin named LIBRARY" 933msgid "load an extractor plugin named LIBRARY"
933msgstr "läser in instick för uppackning med namnet BIBLIOTEK" 934msgstr "läser in instick för uppackning med namnet BIBLIOTEK"
934 935
935#: src/main/extract.c:180 936#: src/main/extract.c:181
936msgid "list all keyword types" 937msgid "list all keyword types"
937msgstr "lista alla typer av nyckelord" 938msgstr "lista alla typer av nyckelord"
938 939
939#: src/main/extract.c:182 940#: src/main/extract.c:183
940msgid "do not use the default set of extractor plugins" 941msgid "do not use the default set of extractor plugins"
941msgstr "använd inte förvalda uppsättningen av uppackningsinstick" 942msgstr "använd inte förvalda uppsättningen av uppackningsinstick"
942 943
943#: src/main/extract.c:184 944#: src/main/extract.c:185
944msgid "print only keywords of the given TYPE (use -L to get a list)" 945msgid "print only keywords of the given TYPE (use -L to get a list)"
945msgstr "skriv endast ut nyckelord av angiven TYP (använd -L för lista)" 946msgstr "skriv endast ut nyckelord av angiven TYP (använd -L för lista)"
946 947
947#: src/main/extract.c:186 948#: src/main/extract.c:187
948msgid "print the version number" 949msgid "print the version number"
949msgstr "skriv ut versionsnummer" 950msgstr "skriv ut versionsnummer"
950 951
951#: src/main/extract.c:188 952#: src/main/extract.c:189
952msgid "be verbose" 953msgid "be verbose"
953msgstr "var informativ" 954msgstr "var informativ"
954 955
955#: src/main/extract.c:190 956#: src/main/extract.c:191
956msgid "do not print keywords of the given TYPE" 957msgid "do not print keywords of the given TYPE"
957msgstr "skriv inte ut nyckelord av angiven TYP" 958msgstr "skriv inte ut nyckelord av angiven TYP"
958 959
959#: src/main/extract.c:193 960#: src/main/extract.c:194
960msgid "extract [OPTIONS] [FILENAME]*" 961msgid "extract [OPTIONS] [FILENAME]*"
961msgstr "extract [FLAGGOR] [FILNAMN]*" 962msgstr "extract [FLAGGOR] [FILNAMN]*"
962 963
963#: src/main/extract.c:194 964#: src/main/extract.c:195
964msgid "Extract metadata from files." 965msgid "Extract metadata from files."
965msgstr "Extrahera metadata från filer." 966msgstr "Extrahera metadata från filer."
966 967
967#: src/main/extract.c:235 968#: src/main/extract.c:236
968#, fuzzy, c-format 969#, fuzzy, c-format
969msgid "Found by `%s' plugin:\n" 970msgid "Found by `%s' plugin:\n"
970msgstr "Inläsning av instick \"%s\" misslyckades: %s\n" 971msgstr "Inläsning av instick \"%s\" misslyckades: %s\n"
971 972
972#: src/main/extract.c:238 src/main/extract.c:319 973#: src/main/extract.c:239 src/main/extract.c:320
973#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68 974#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
974msgid "unknown" 975msgid "unknown"
975msgstr "okänd" 976msgstr "okänd"
976 977
977#: src/main/extract.c:243 978#: src/main/extract.c:244
978#, c-format 979#, c-format
979msgid "%s - (unknown, %u bytes)\n" 980msgid "%s - (unknown, %u bytes)\n"
980msgstr "" 981msgstr ""
981 982
982#: src/main/extract.c:267 983#: src/main/extract.c:268
983#, fuzzy, c-format 984#, fuzzy, c-format
984msgid "%s - (binary, %u bytes)\n" 985msgid "%s - (binary, %u bytes)\n"
985msgstr "%s - (binär)\n" 986msgstr "%s - (binär)\n"
986 987
987#: src/main/extract.c:600 src/main/extract.c:610 988#: src/main/extract.c:601 src/main/extract.c:611
988#, c-format 989#, c-format
989msgid "" 990msgid ""
990"Illegal combination of options, cannot combine multiple styles of printing.\n" 991"Illegal combination of options, cannot combine multiple styles of printing.\n"
991msgstr "" 992msgstr ""
992 993
993#: src/main/extract.c:637 994#: src/main/extract.c:638
994#, c-format 995#, c-format
995msgid "You must specify an argument for the `%s' option (option ignored).\n" 996msgid "You must specify an argument for the `%s' option (option ignored).\n"
996msgstr "Du måste ange ett argument för flaggan \"%s\" (flagga ignoreras).\n" 997msgstr "Du måste ange ett argument för flaggan \"%s\" (flagga ignoreras).\n"
997 998
998#: src/main/extract.c:702 999#: src/main/extract.c:703
999#, c-format 1000#, c-format
1000msgid "Use --help to get a list of options.\n" 1001msgid "Use --help to get a list of options.\n"
1001msgstr "Använd --help för att få en lista på flaggor.\n" 1002msgstr "Använd --help för att få en lista på flaggor.\n"
1002 1003
1003#: src/main/extract.c:740 1004#: src/main/extract.c:741
1004#, c-format 1005#, c-format
1005msgid "%% BiBTeX file\n" 1006msgid "%% BiBTeX file\n"
1006msgstr "%% BiBTeX-fil\n" 1007msgstr "%% BiBTeX-fil\n"
1007 1008
1008#: src/main/extract.c:747 1009#: src/main/extract.c:748
1009#, c-format 1010#, c-format
1010msgid "Keywords for file %s:\n" 1011msgid "Keywords for file %s:\n"
1011msgstr "Nyckelord för filen %s:\n" 1012msgstr "Nyckelord för filen %s:\n"
@@ -1918,8 +1919,9 @@ msgid "paragraph count"
1918msgstr "antal stycken" 1919msgstr "antal stycken"
1919 1920
1920#: src/main/extractor_metatypes.c:302 1921#: src/main/extractor_metatypes.c:302
1921msgid "number o paragraphs" 1922#, fuzzy
1922msgstr "" 1923msgid "number of paragraphs"
1924msgstr "redigeringscykler"
1923 1925
1924#: src/main/extractor_metatypes.c:304 1926#: src/main/extractor_metatypes.c:304
1925msgid "word count" 1927msgid "word count"
@@ -2404,7 +2406,17 @@ msgstr "grupp"
2404msgid "name of the group or band" 2406msgid "name of the group or band"
2405msgstr "publicerad av" 2407msgstr "publicerad av"
2406 2408
2407#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2409#: src/main/extractor_metatypes.c:436
2410#, fuzzy
2411msgid "original filename"
2412msgstr "original"
2413
2414#: src/main/extractor_metatypes.c:437
2415#, fuzzy
2416msgid "name of the original file (reserved for GNUnet)"
2417msgstr "publicerad av"
2418
2419#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2408#, fuzzy 2420#, fuzzy
2409msgid "last" 2421msgid "last"
2410msgstr "blixt" 2422msgstr "blixt"
diff --git a/po/uk.po b/po/uk.po
index 639c022..fddd906 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
7msgstr "" 7msgstr ""
8"Project-Id-Version: libextractor 0.6.2\n" 8"Project-Id-Version: libextractor 0.6.2\n"
9"Report-Msgid-Bugs-To: libextractor@gnu.org\n" 9"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
10"POT-Creation-Date: 2010-06-13 13:15+0200\n" 10"POT-Creation-Date: 2011-11-28 12:53+0100\n"
11"PO-Revision-Date: 2011-07-22 16:22+0300\n" 11"PO-Revision-Date: 2011-07-22 16:22+0300\n"
12"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" 12"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
13"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" 13"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -16,7 +16,8 @@ msgstr ""
16"Content-Type: text/plain; charset=UTF-8\n" 16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n" 17"Content-Transfer-Encoding: 8bit\n"
18"X-Generator: Lokalize 1.2\n" 18"X-Generator: Lokalize 1.2\n"
19"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" 19"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
20"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
20 21
21#: src/plugins/qt_extractor.c:30 src/plugins/id3_extractor.c:44 22#: src/plugins/qt_extractor.c:30 src/plugins/id3_extractor.c:44
22msgid "Blues" 23msgid "Blues"
@@ -788,27 +789,27 @@ msgstr "Layer II"
788msgid "Layer III" 789msgid "Layer III"
789msgstr "Layer III" 790msgstr "Layer III"
790 791
791#: src/plugins/mp3_extractor.c:247 792#: src/plugins/mp3_extractor.c:245
792msgid "VBR" 793msgid "VBR"
793msgstr "VBR" 794msgstr "VBR"
794 795
795#: src/plugins/mp3_extractor.c:247 796#: src/plugins/mp3_extractor.c:245
796msgid "CBR" 797msgid "CBR"
797msgstr "CBR" 798msgstr "CBR"
798 799
799#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140 800#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
800msgid "copyright" 801msgid "copyright"
801msgstr "захищено авторÑькими правами" 802msgstr "захищено авторÑькими правами"
802 803
803#: src/plugins/mp3_extractor.c:250 804#: src/plugins/mp3_extractor.c:248
804msgid "no copyright" 805msgid "no copyright"
805msgstr "без захиÑту авторÑькими правами" 806msgstr "без захиÑту авторÑькими правами"
806 807
807#: src/plugins/mp3_extractor.c:251 808#: src/plugins/mp3_extractor.c:249
808msgid "original" 809msgid "original"
809msgstr "оригінал" 810msgstr "оригінал"
810 811
811#: src/plugins/mp3_extractor.c:251 812#: src/plugins/mp3_extractor.c:249
812msgid "copy" 813msgid "copy"
813msgstr "копіÑ" 814msgstr "копіÑ"
814 815
@@ -887,12 +888,12 @@ msgstr "%s: параметр «-W %s» неоднозначний\n"
887msgid "%s: option `-W %s' doesn't allow an argument\n" 888msgid "%s: option `-W %s' doesn't allow an argument\n"
888msgstr "%s: параметр «-W %s» не повинен мати аргументу\n" 889msgstr "%s: параметр «-W %s» не повинен мати аргументу\n"
889 890
890#: src/main/extractor.c:2294 891#: src/main/extractor.c:2372
891#, c-format 892#, c-format
892msgid "Initialization of plugin mechanism failed: %s!\n" 893msgid "Initialization of plugin mechanism failed: %s!\n"
893msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби ініціалізації механізму додатків: %s!\n" 894msgstr "Помилка під Ñ‡Ð°Ñ Ñпроби ініціалізації механізму додатків: %s!\n"
894 895
895#: src/main/extract.c:97 896#: src/main/extract.c:98
896#, c-format 897#, c-format
897msgid "" 898msgid ""
898"Usage: %s\n" 899"Usage: %s\n"
@@ -903,104 +904,118 @@ msgstr ""
903"%s\n" 904"%s\n"
904"\n" 905"\n"
905 906
906#: src/main/extract.c:100 907#: src/main/extract.c:101
907#, c-format 908#, c-format
908msgid "Arguments mandatory for long options are also mandatory for short options.\n" 909msgid ""
909msgstr "Обов’Ñзкові аргументи Ð´Ð»Ñ Ð´Ð¾Ð²Ð³Ð¸Ñ… форм запиÑу параметрів Ñ” обов’Ñзковими Ñ– Ð´Ð»Ñ Ñкорочених форм.\n" 910"Arguments mandatory for long options are also mandatory for short options.\n"
911msgstr ""
912"Обов’Ñзкові аргументи Ð´Ð»Ñ Ð´Ð¾Ð²Ð³Ð¸Ñ… форм запиÑу параметрів Ñ” обов’Ñзковими Ñ– "
913"Ð´Ð»Ñ Ñкорочених форм.\n"
910 914
911#: src/main/extract.c:170 915#: src/main/extract.c:171
912msgid "print output in bibtex format" 916msgid "print output in bibtex format"
913msgstr "вивеÑти дані у форматі bibtex" 917msgstr "вивеÑти дані у форматі bibtex"
914 918
915#: src/main/extract.c:172 919#: src/main/extract.c:173
916msgid "produce grep-friendly output (all results on one line per file)" 920msgid "produce grep-friendly output (all results on one line per file)"
917msgstr "виводити дані у режимі ÑуміÑноÑÑ‚Ñ– з grep (єдиний Ñ€Ñдок Ð´Ð»Ñ Ð²ÑÑ–Ñ… результатів з файла)" 921msgstr ""
922"виводити дані у режимі ÑуміÑноÑÑ‚Ñ– з grep (єдиний Ñ€Ñдок Ð´Ð»Ñ Ð²ÑÑ–Ñ… результатів "
923"з файла)"
918 924
919#: src/main/extract.c:174 925#: src/main/extract.c:175
920msgid "print this help" 926msgid "print this help"
921msgstr "показати ці довідкові дані" 927msgstr "показати ці довідкові дані"
922 928
923#: src/main/extract.c:176 929#: src/main/extract.c:177
924msgid "run plugins in-process (simplifies debugging)" 930msgid "run plugins in-process (simplifies debugging)"
925msgstr "запуÑкати додатки у межах процеÑу (Ñпрощує діагноÑтику)" 931msgstr "запуÑкати додатки у межах процеÑу (Ñпрощує діагноÑтику)"
926 932
927#: src/main/extract.c:178 933#: src/main/extract.c:179
928msgid "load an extractor plugin named LIBRARY" 934msgid "load an extractor plugin named LIBRARY"
929msgstr "завантажити додаток Ð²Ð¸Ð´Ð¾Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð· назвою LIBRARY" 935msgstr "завантажити додаток Ð²Ð¸Ð´Ð¾Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð· назвою LIBRARY"
930 936
931#: src/main/extract.c:180 937#: src/main/extract.c:181
932msgid "list all keyword types" 938msgid "list all keyword types"
933msgstr "ÑпиÑок вÑÑ–Ñ… типів ключових Ñлів" 939msgstr "ÑпиÑок вÑÑ–Ñ… типів ключових Ñлів"
934 940
935#: src/main/extract.c:182 941#: src/main/extract.c:183
936msgid "do not use the default set of extractor plugins" 942msgid "do not use the default set of extractor plugins"
937msgstr "не викориÑтовувати типовий набір додатків видобуваннÑ" 943msgstr "не викориÑтовувати типовий набір додатків видобуваннÑ"
938 944
939#: src/main/extract.c:184 945#: src/main/extract.c:185
940msgid "print only keywords of the given TYPE (use -L to get a list)" 946msgid "print only keywords of the given TYPE (use -L to get a list)"
941msgstr "виводити ключові Ñлова лише вказаного типу TYPE (ÑкориÑтайтеÑÑ -L, щоб отримати ÑпиÑок)" 947msgstr ""
948"виводити ключові Ñлова лише вказаного типу TYPE (ÑкориÑтайтеÑÑ -L, щоб "
949"отримати ÑпиÑок)"
942 950
943#: src/main/extract.c:186 951#: src/main/extract.c:187
944msgid "print the version number" 952msgid "print the version number"
945msgstr "вивеÑти номер верÑÑ–Ñ—" 953msgstr "вивеÑти номер верÑÑ–Ñ—"
946 954
947#: src/main/extract.c:188 955#: src/main/extract.c:189
948msgid "be verbose" 956msgid "be verbose"
949msgstr "режим з докладних повідомлень" 957msgstr "режим з докладних повідомлень"
950 958
951#: src/main/extract.c:190 959#: src/main/extract.c:191
952msgid "do not print keywords of the given TYPE" 960msgid "do not print keywords of the given TYPE"
953msgstr "не виводити ключових Ñлів вказаного типу TYPE" 961msgstr "не виводити ключових Ñлів вказаного типу TYPE"
954 962
955#: src/main/extract.c:193 963#: src/main/extract.c:194
956msgid "extract [OPTIONS] [FILENAME]*" 964msgid "extract [OPTIONS] [FILENAME]*"
957msgstr "extract [ПÐРÐМЕТРИ] [ÐÐЗВÐ_ФÐЙЛÐ]*" 965msgstr "extract [ПÐРÐМЕТРИ] [ÐÐЗВÐ_ФÐЙЛÐ]*"
958 966
959#: src/main/extract.c:194 967#: src/main/extract.c:195
960msgid "Extract metadata from files." 968msgid "Extract metadata from files."
961msgstr "Видобути метадані з файлів." 969msgstr "Видобути метадані з файлів."
962 970
963#: src/main/extract.c:235 971#: src/main/extract.c:236
964#, c-format 972#, c-format
965msgid "Found by `%s' plugin:\n" 973msgid "Found by `%s' plugin:\n"
966msgstr "Знайдено додатком «%s»:\n" 974msgstr "Знайдено додатком «%s»:\n"
967 975
968#: src/main/extract.c:238 src/main/extract.c:319 976#: src/main/extract.c:239 src/main/extract.c:320
969#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68 977#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
970msgid "unknown" 978msgid "unknown"
971msgstr "невідомий" 979msgstr "невідомий"
972 980
973#: src/main/extract.c:243 981#: src/main/extract.c:244
974#, c-format 982#, c-format
975msgid "%s - (unknown, %u bytes)\n" 983msgid "%s - (unknown, %u bytes)\n"
976msgstr "%s — (невідомий, %u байтів)\n" 984msgstr "%s — (невідомий, %u байтів)\n"
977 985
978#: src/main/extract.c:267 986#: src/main/extract.c:268
979#, c-format 987#, c-format
980msgid "%s - (binary, %u bytes)\n" 988msgid "%s - (binary, %u bytes)\n"
981msgstr "%s — (бінарний, %u байтів)\n" 989msgstr "%s — (бінарний, %u байтів)\n"
982 990
983#: src/main/extract.c:600 src/main/extract.c:610 991#: src/main/extract.c:601 src/main/extract.c:611
984#, c-format 992#, c-format
985msgid "Illegal combination of options, cannot combine multiple styles of printing.\n" 993msgid ""
986msgstr "Ðекоректне Ð¿Ð¾Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð², не можна визначати декілька Ñтилів Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ….\n" 994"Illegal combination of options, cannot combine multiple styles of printing.\n"
995msgstr ""
996"Ðекоректне Ð¿Ð¾Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð², не можна визначати декілька Ñтилів "
997"Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ….\n"
987 998
988#: src/main/extract.c:637 999#: src/main/extract.c:638
989#, c-format 1000#, c-format
990msgid "You must specify an argument for the `%s' option (option ignored).\n" 1001msgid "You must specify an argument for the `%s' option (option ignored).\n"
991msgstr "Параметр «%s» можна викориÑтовувати лише з додатковим аргументом (параметр проігноровано).\n" 1002msgstr ""
1003"Параметр «%s» можна викориÑтовувати лише з додатковим аргументом (параметр "
1004"проігноровано).\n"
992 1005
993#: src/main/extract.c:702 1006#: src/main/extract.c:703
994#, c-format 1007#, c-format
995msgid "Use --help to get a list of options.\n" 1008msgid "Use --help to get a list of options.\n"
996msgstr "СкориÑтайтеÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --help Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ ÑпиÑку можливих параметрів командного Ñ€Ñдка.\n" 1009msgstr ""
1010"СкориÑтайтеÑÑ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --help Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ ÑпиÑку можливих параметрів "
1011"командного Ñ€Ñдка.\n"
997 1012
998#: src/main/extract.c:740 1013#: src/main/extract.c:741
999#, c-format 1014#, c-format
1000msgid "%% BiBTeX file\n" 1015msgid "%% BiBTeX file\n"
1001msgstr "%% файл BiBTeX\n" 1016msgstr "%% файл BiBTeX\n"
1002 1017
1003#: src/main/extract.c:747 1018#: src/main/extract.c:748
1004#, c-format 1019#, c-format
1005msgid "Keywords for file %s:\n" 1020msgid "Keywords for file %s:\n"
1006msgstr "Ключові Ñлова Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %s:\n" 1021msgstr "Ключові Ñлова Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð° %s:\n"
@@ -1154,8 +1169,12 @@ msgid "publishing institution"
1154msgstr "організаціÑ-видавець" 1169msgstr "організаціÑ-видавець"
1155 1170
1156#: src/main/extractor_metatypes.c:77 1171#: src/main/extractor_metatypes.c:77
1157msgid "institution that was involved in the publishing, but not necessarily the publisher" 1172msgid ""
1158msgstr "уÑтанова, Ñка брала учаÑÑ‚ÑŒ у опублікуванні, не обов’Ñзково безпоÑередній видавець" 1173"institution that was involved in the publishing, but not necessarily the "
1174"publisher"
1175msgstr ""
1176"уÑтанова, Ñка брала учаÑÑ‚ÑŒ у опублікуванні, не обов’Ñзково безпоÑередній "
1177"видавець"
1159 1178
1160#: src/main/extractor_metatypes.c:78 1179#: src/main/extractor_metatypes.c:78
1161msgid "publication series" 1180msgid "publication series"
@@ -1194,8 +1213,12 @@ msgid "publication day"
1194msgstr "день публікації" 1213msgstr "день публікації"
1195 1214
1196#: src/main/extractor_metatypes.c:88 1215#: src/main/extractor_metatypes.c:88
1197msgid "day of publication (or, if unpublished, the day of creation), relative to the given month" 1216msgid ""
1198msgstr "день публікації (або, Ñкщо не опубліковано, день ÑтвореннÑ) у вказаному міÑÑці" 1217"day of publication (or, if unpublished, the day of creation), relative to "
1218"the given month"
1219msgstr ""
1220"день публікації (або, Ñкщо не опубліковано, день ÑтвореннÑ) у вказаному "
1221"міÑÑці"
1199 1222
1200#: src/main/extractor_metatypes.c:89 1223#: src/main/extractor_metatypes.c:89
1201msgid "publication date" 1224msgid "publication date"
@@ -1426,8 +1449,12 @@ msgid "unknown date"
1426msgstr "невідома дата" 1449msgstr "невідома дата"
1427 1450
1428#: src/main/extractor_metatypes.c:163 1451#: src/main/extractor_metatypes.c:163
1429msgid "ambiguous date (could specify creation time, modification time or access time)" 1452msgid ""
1430msgstr "неоднозначні дані (можуть відповідати чаÑу ÑтвореннÑ, чаÑу внеÑÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ð½ або чаÑу доÑтупу)" 1453"ambiguous date (could specify creation time, modification time or access "
1454"time)"
1455msgstr ""
1456"неоднозначні дані (можуть відповідати чаÑу ÑтвореннÑ, чаÑу внеÑÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ð½ або "
1457"чаÑу доÑтупу)"
1431 1458
1432#: src/main/extractor_metatypes.c:164 1459#: src/main/extractor_metatypes.c:164
1433msgid "creation date" 1460msgid "creation date"
@@ -1694,15 +1721,21 @@ msgid "target platform"
1694msgstr "платформа призначеннÑ" 1721msgstr "платформа призначеннÑ"
1695 1722
1696#: src/main/extractor_metatypes.c:238 1723#: src/main/extractor_metatypes.c:238
1697msgid "name of the architecture, operating system and distribution this package is for" 1724msgid ""
1698msgstr "назва архітектури, операційної ÑиÑтеми та диÑтрибутива, Ð´Ð»Ñ Ñких призначено цей пакунок" 1725"name of the architecture, operating system and distribution this package is "
1726"for"
1727msgstr ""
1728"назва архітектури, операційної ÑиÑтеми та диÑтрибутива, Ð´Ð»Ñ Ñких призначено "
1729"цей пакунок"
1699 1730
1700#: src/main/extractor_metatypes.c:239 1731#: src/main/extractor_metatypes.c:239
1701msgid "resource type" 1732msgid "resource type"
1702msgstr "тип реÑурÑу" 1733msgstr "тип реÑурÑу"
1703 1734
1704#: src/main/extractor_metatypes.c:240 1735#: src/main/extractor_metatypes.c:240
1705msgid "categorization of the nature of the resource that is more specific than the file format" 1736msgid ""
1737"categorization of the nature of the resource that is more specific than the "
1738"file format"
1706msgstr "категоріÑ, до Ñкої належить реÑурÑ, Ñпецифічніша за формат файла" 1739msgstr "категоріÑ, до Ñкої належить реÑурÑ, Ñпецифічніша за формат файла"
1707 1740
1708#: src/main/extractor_metatypes.c:241 1741#: src/main/extractor_metatypes.c:241
@@ -1710,7 +1743,8 @@ msgid "library search path"
1710msgstr "шлÑÑ… пошуку бібліотек" 1743msgstr "шлÑÑ… пошуку бібліотек"
1711 1744
1712#: src/main/extractor_metatypes.c:242 1745#: src/main/extractor_metatypes.c:242
1713msgid "path in the file system to be considered when looking for required libraries" 1746msgid ""
1747"path in the file system to be considered when looking for required libraries"
1714msgstr "шлÑÑ… у файловій ÑиÑтемі, за Ñким Ñлід шукати потрібні бібліотеки" 1748msgstr "шлÑÑ… у файловій ÑиÑтемі, за Ñким Ñлід шукати потрібні бібліотеки"
1715 1749
1716#: src/main/extractor_metatypes.c:243 1750#: src/main/extractor_metatypes.c:243
@@ -1842,7 +1876,8 @@ msgid "paragraph count"
1842msgstr "кількіÑÑ‚ÑŒ абзаців" 1876msgstr "кількіÑÑ‚ÑŒ абзаців"
1843 1877
1844#: src/main/extractor_metatypes.c:302 1878#: src/main/extractor_metatypes.c:302
1845msgid "number o paragraphs" 1879#, fuzzy
1880msgid "number of paragraphs"
1846msgstr "кількіÑÑ‚ÑŒ абзаців" 1881msgstr "кількіÑÑ‚ÑŒ абзаців"
1847 1882
1848#: src/main/extractor_metatypes.c:304 1883#: src/main/extractor_metatypes.c:304
@@ -1938,7 +1973,9 @@ msgid "performer"
1938msgstr "виконавець" 1973msgstr "виконавець"
1939 1974
1940#: src/main/extractor_metatypes.c:335 1975#: src/main/extractor_metatypes.c:335
1941msgid "The artist(s) who performed the work (conductor, orchestra, soloists, actor, etc.)" 1976msgid ""
1977"The artist(s) who performed the work (conductor, orchestra, soloists, actor, "
1978"etc.)"
1942msgstr "Виконавець твору (диригент, оркеÑÑ‚Ñ€, ÑоліÑти тощо)" 1979msgstr "Виконавець твору (диригент, оркеÑÑ‚Ñ€, ÑоліÑти тощо)"
1943 1980
1944#: src/main/extractor_metatypes.c:337 1981#: src/main/extractor_metatypes.c:337
@@ -2126,7 +2163,8 @@ msgid "interpretation"
2126msgstr "інтерпретаціÑ" 2163msgstr "інтерпретаціÑ"
2127 2164
2128#: src/main/extractor_metatypes.c:388 2165#: src/main/extractor_metatypes.c:388
2129msgid "information about the people behind interpretations of an existing piece" 2166msgid ""
2167"information about the people behind interpretations of an existing piece"
2130msgstr "дані щодо творців інтерпретації твору" 2168msgstr "дані щодо творців інтерпретації твору"
2131 2169
2132#: src/main/extractor_metatypes.c:389 2170#: src/main/extractor_metatypes.c:389
@@ -2250,7 +2288,8 @@ msgid "full data"
2250msgstr "дані повніÑÑ‚ÑŽ" 2288msgstr "дані повніÑÑ‚ÑŽ"
2251 2289
2252#: src/main/extractor_metatypes.c:423 2290#: src/main/extractor_metatypes.c:423
2253msgid "entry that contains the full, original binary data (not really meta data)" 2291msgid ""
2292"entry that contains the full, original binary data (not really meta data)"
2254msgstr "запиÑ, що міÑтить повні початкові двійкові дані (а не метадані)" 2293msgstr "запиÑ, що міÑтить повні початкові двійкові дані (а не метадані)"
2255 2294
2256#: src/main/extractor_metatypes.c:425 2295#: src/main/extractor_metatypes.c:425
@@ -2281,6 +2320,16 @@ msgstr "група"
2281msgid "name of the group or band" 2320msgid "name of the group or band"
2282msgstr "назва групи" 2321msgstr "назва групи"
2283 2322
2284#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2323#: src/main/extractor_metatypes.c:436
2324#, fuzzy
2325msgid "original filename"
2326msgstr "початкова назва"
2327
2328#: src/main/extractor_metatypes.c:437
2329#, fuzzy
2330msgid "name of the original file (reserved for GNUnet)"
2331msgstr "Ñ–Ð¼â€™Ñ Ð°Ð±Ð¾ назва Ð²Ð¸ÐºÐ¾Ð½Ð°Ð²Ñ†Ñ Ð¾Ñ€Ð¸Ð³Ñ–Ð½Ð°Ð»Ñƒ"
2332
2333#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2285msgid "last" 2334msgid "last"
2286msgstr "триваліÑÑ‚ÑŒ" 2335msgstr "триваліÑÑ‚ÑŒ"
diff --git a/po/vi.po b/po/vi.po
index 4b30721..cacee40 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,10 +8,11 @@ msgid ""
8msgstr "" 8msgstr ""
9"Project-Id-Version: libextractor 0.6.0\n" 9"Project-Id-Version: libextractor 0.6.0\n"
10"Report-Msgid-Bugs-To: libextractor@gnu.org\n" 10"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
11"POT-Creation-Date: 2010-06-13 13:15+0200\n" 11"POT-Creation-Date: 2011-11-28 12:53+0100\n"
12"PO-Revision-Date: 2010-02-11 00:13+0930\n" 12"PO-Revision-Date: 2010-02-11 00:13+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"
15"Language: vi\n"
15"MIME-Version: 1.0\n" 16"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n" 17"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n" 18"Content-Transfer-Encoding: 8bit\n"
@@ -788,27 +789,27 @@ msgstr "Lá»›p 2"
788msgid "Layer III" 789msgid "Layer III"
789msgstr "Lá»›p 3" 790msgstr "Lá»›p 3"
790 791
791#: src/plugins/mp3_extractor.c:247 792#: src/plugins/mp3_extractor.c:245
792msgid "VBR" 793msgid "VBR"
793msgstr "VBR" 794msgstr "VBR"
794 795
795#: src/plugins/mp3_extractor.c:247 796#: src/plugins/mp3_extractor.c:245
796msgid "CBR" 797msgid "CBR"
797msgstr "CBR" 798msgstr "CBR"
798 799
799#: src/plugins/mp3_extractor.c:250 src/main/extractor_metatypes.c:140 800#: src/plugins/mp3_extractor.c:248 src/main/extractor_metatypes.c:140
800msgid "copyright" 801msgid "copyright"
801msgstr "bản quyá»n" 802msgstr "bản quyá»n"
802 803
803#: src/plugins/mp3_extractor.c:250 804#: src/plugins/mp3_extractor.c:248
804msgid "no copyright" 805msgid "no copyright"
805msgstr "không có tác quyá»n" 806msgstr "không có tác quyá»n"
806 807
807#: src/plugins/mp3_extractor.c:251 808#: src/plugins/mp3_extractor.c:249
808msgid "original" 809msgid "original"
809msgstr "gốc" 810msgstr "gốc"
810 811
811#: src/plugins/mp3_extractor.c:251 812#: src/plugins/mp3_extractor.c:249
812msgid "copy" 813msgid "copy"
813msgstr "chép" 814msgstr "chép"
814 815
@@ -887,12 +888,12 @@ msgstr "%s: tùy chá»n « -W %s » là mÆ¡ hồ\n"
887msgid "%s: option `-W %s' doesn't allow an argument\n" 888msgid "%s: option `-W %s' doesn't allow an argument\n"
888msgstr "%s: tùy chá»n « -W %s » không cho phép đối số\n" 889msgstr "%s: tùy chá»n « -W %s » không cho phép đối số\n"
889 890
890#: src/main/extractor.c:2294 891#: src/main/extractor.c:2372
891#, c-format 892#, c-format
892msgid "Initialization of plugin mechanism failed: %s!\n" 893msgid "Initialization of plugin mechanism failed: %s!\n"
893msgstr "Việc khởi động cơ chế cầm phít bị lỗi: %s\n" 894msgstr "Việc khởi động cơ chế cầm phít bị lỗi: %s\n"
894 895
895#: src/main/extract.c:97 896#: src/main/extract.c:98
896#, c-format 897#, c-format
897msgid "" 898msgid ""
898"Usage: %s\n" 899"Usage: %s\n"
@@ -903,7 +904,7 @@ msgstr ""
903"%s\n" 904"%s\n"
904"\n" 905"\n"
905 906
906#: src/main/extract.c:100 907#: src/main/extract.c:101
907#, c-format 908#, c-format
908msgid "" 909msgid ""
909"Arguments mandatory for long options are also mandatory for short options.\n" 910"Arguments mandatory for long options are also mandatory for short options.\n"
@@ -911,106 +912,106 @@ msgstr ""
911"Má»i đối số bắt buá»™c phải sá»­ dụng vá»›i tùy chá»n dài cÅ©ng bắt buá»™c vá»›i tùy chá»n " 912"Má»i đối số bắt buá»™c phải sá»­ dụng vá»›i tùy chá»n dài cÅ©ng bắt buá»™c vá»›i tùy chá»n "
912"ngắn.\n" 913"ngắn.\n"
913 914
914#: src/main/extract.c:170 915#: src/main/extract.c:171
915msgid "print output in bibtex format" 916msgid "print output in bibtex format"
916msgstr "hiển thị dữ liệu xuất có dạng bibtex" 917msgstr "hiển thị dữ liệu xuất có dạng bibtex"
917 918
918#: src/main/extract.c:172 919#: src/main/extract.c:173
919msgid "produce grep-friendly output (all results on one line per file)" 920msgid "produce grep-friendly output (all results on one line per file)"
920msgstr "" 921msgstr ""
921"tạo ra kết xuất thân thiện vá»›i grep (má»i kết quả trên cùng dòng của má»—i tập " 922"tạo ra kết xuất thân thiện vá»›i grep (má»i kết quả trên cùng dòng của má»—i tập "
922"tin)" 923"tin)"
923 924
924#: src/main/extract.c:174 925#: src/main/extract.c:175
925msgid "print this help" 926msgid "print this help"
926msgstr "hiển thị trợ giúp này" 927msgstr "hiển thị trợ giúp này"
927 928
928#: src/main/extract.c:176 929#: src/main/extract.c:177
929msgid "run plugins in-process (simplifies debugging)" 930msgid "run plugins in-process (simplifies debugging)"
930msgstr "chạy phần bổ sung bên trong tiến trình (giản dị hoá chức năng gỡ rối)" 931msgstr "chạy phần bổ sung bên trong tiến trình (giản dị hoá chức năng gỡ rối)"
931 932
932#: src/main/extract.c:178 933#: src/main/extract.c:179
933msgid "load an extractor plugin named LIBRARY" 934msgid "load an extractor plugin named LIBRARY"
934msgstr "tải một trình cầm phít rút có tên LIBRARY (THƯ VIÊN)" 935msgstr "tải một trình cầm phít rút có tên LIBRARY (THƯ VIÊN)"
935 936
936#: src/main/extract.c:180 937#: src/main/extract.c:181
937msgid "list all keyword types" 938msgid "list all keyword types"
938msgstr "liệt kê má»i kiểu từ khoá" 939msgstr "liệt kê má»i kiểu từ khoá"
939 940
940#: src/main/extract.c:182 941#: src/main/extract.c:183
941msgid "do not use the default set of extractor plugins" 942msgid "do not use the default set of extractor plugins"
942msgstr "đừng dùng bộ trình rút mặc định" 943msgstr "đừng dùng bộ trình rút mặc định"
943 944
944#: src/main/extract.c:184 945#: src/main/extract.c:185
945msgid "print only keywords of the given TYPE (use -L to get a list)" 946msgid "print only keywords of the given TYPE (use -L to get a list)"
946msgstr "" 947msgstr ""
947"hiển thị chỉ từ khoá KIỂU (TYPE) đã cho thôi (dùng « -L » để xem danh sách)" 948"hiển thị chỉ từ khoá KIỂU (TYPE) đã cho thôi (dùng « -L » để xem danh sách)"
948 949
949#: src/main/extract.c:186 950#: src/main/extract.c:187
950msgid "print the version number" 951msgid "print the version number"
951msgstr "hiển thị số thứ tự phiên bản" 952msgstr "hiển thị số thứ tự phiên bản"
952 953
953#: src/main/extract.c:188 954#: src/main/extract.c:189
954msgid "be verbose" 955msgid "be verbose"
955msgstr "xuất chi tiết" 956msgstr "xuất chi tiết"
956 957
957#: src/main/extract.c:190 958#: src/main/extract.c:191
958msgid "do not print keywords of the given TYPE" 959msgid "do not print keywords of the given TYPE"
959msgstr "đừng hiển thị từ khoá KIỂU (TYPE) đã cho" 960msgstr "đừng hiển thị từ khoá KIỂU (TYPE) đã cho"
960 961
961#: src/main/extract.c:193 962#: src/main/extract.c:194
962msgid "extract [OPTIONS] [FILENAME]*" 963msgid "extract [OPTIONS] [FILENAME]*"
963msgstr "" 964msgstr ""
964"extract [TÙY_CHỌN] [TÊN_TẬP_TIN]*\n" 965"extract [TÙY_CHỌN] [TÊN_TẬP_TIN]*\n"
965"[extract: trích ra]" 966"[extract: trích ra]"
966 967
967#: src/main/extract.c:194 968#: src/main/extract.c:195
968msgid "Extract metadata from files." 969msgid "Extract metadata from files."
969msgstr "Rút siêu dữ liệu ra tập tin." 970msgstr "Rút siêu dữ liệu ra tập tin."
970 971
971#: src/main/extract.c:235 972#: src/main/extract.c:236
972#, c-format 973#, c-format
973msgid "Found by `%s' plugin:\n" 974msgid "Found by `%s' plugin:\n"
974msgstr "Tìm bởi phần bổ sung « %s »:\n" 975msgstr "Tìm bởi phần bổ sung « %s »:\n"
975 976
976#: src/main/extract.c:238 src/main/extract.c:319 977#: src/main/extract.c:239 src/main/extract.c:320
977#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68 978#: src/main/extractor_metatypes.c:136 src/main/extractor_print.c:68
978msgid "unknown" 979msgid "unknown"
979msgstr "không rõ" 980msgstr "không rõ"
980 981
981#: src/main/extract.c:243 982#: src/main/extract.c:244
982#, c-format 983#, c-format
983msgid "%s - (unknown, %u bytes)\n" 984msgid "%s - (unknown, %u bytes)\n"
984msgstr "%s - (không rõ, %u byte)\n" 985msgstr "%s - (không rõ, %u byte)\n"
985 986
986#: src/main/extract.c:267 987#: src/main/extract.c:268
987#, c-format 988#, c-format
988msgid "%s - (binary, %u bytes)\n" 989msgid "%s - (binary, %u bytes)\n"
989msgstr "%s - (nhị phân, %u byte)\n" 990msgstr "%s - (nhị phân, %u byte)\n"
990 991
991#: src/main/extract.c:600 src/main/extract.c:610 992#: src/main/extract.c:601 src/main/extract.c:611
992#, c-format 993#, c-format
993msgid "" 994msgid ""
994"Illegal combination of options, cannot combine multiple styles of printing.\n" 995"Illegal combination of options, cannot combine multiple styles of printing.\n"
995msgstr "sai tổ hợp các tuỳ chá»n này, không thể kết hợp nhiá»u cách in.\n" 996msgstr "sai tổ hợp các tuỳ chá»n này, không thể kết hợp nhiá»u cách in.\n"
996 997
997#: src/main/extract.c:637 998#: src/main/extract.c:638
998#, c-format 999#, c-format
999msgid "You must specify an argument for the `%s' option (option ignored).\n" 1000msgid "You must specify an argument for the `%s' option (option ignored).\n"
1000msgstr "Bạn phải ghi rõ má»™t đối số cho tùy chá»n « %s » (tùy chá»n bị bá» qua).\n" 1001msgstr "Bạn phải ghi rõ má»™t đối số cho tùy chá»n « %s » (tùy chá»n bị bá» qua).\n"
1001 1002
1002#: src/main/extract.c:702 1003#: src/main/extract.c:703
1003#, c-format 1004#, c-format
1004msgid "Use --help to get a list of options.\n" 1005msgid "Use --help to get a list of options.\n"
1005msgstr "" 1006msgstr ""
1006"Hãy sá»­ dụng lệnh « --help » (trợ giúp) để xem má»™t danh sách các tùy chá»n.\n" 1007"Hãy sá»­ dụng lệnh « --help » (trợ giúp) để xem má»™t danh sách các tùy chá»n.\n"
1007 1008
1008#: src/main/extract.c:740 1009#: src/main/extract.c:741
1009#, c-format 1010#, c-format
1010msgid "%% BiBTeX file\n" 1011msgid "%% BiBTeX file\n"
1011msgstr "%% tập tin BiBTeX\n" 1012msgstr "%% tập tin BiBTeX\n"
1012 1013
1013#: src/main/extract.c:747 1014#: src/main/extract.c:748
1014#, c-format 1015#, c-format
1015msgid "Keywords for file %s:\n" 1016msgid "Keywords for file %s:\n"
1016msgstr "Từ khoá cho tập tin %s:\n" 1017msgstr "Từ khoá cho tập tin %s:\n"
@@ -1872,7 +1873,8 @@ msgid "paragraph count"
1872msgstr "số đếm đoạn văn" 1873msgstr "số đếm đoạn văn"
1873 1874
1874#: src/main/extractor_metatypes.c:302 1875#: src/main/extractor_metatypes.c:302
1875msgid "number o paragraphs" 1876#, fuzzy
1877msgid "number of paragraphs"
1876msgstr "số các đoạn văn" 1878msgstr "số các đoạn văn"
1877 1879
1878#: src/main/extractor_metatypes.c:304 1880#: src/main/extractor_metatypes.c:304
@@ -2318,6 +2320,16 @@ msgstr "nhóm"
2318msgid "name of the group or band" 2320msgid "name of the group or band"
2319msgstr "tên của nhóm hay dàn nhạc" 2321msgstr "tên của nhóm hay dàn nhạc"
2320 2322
2321#: src/main/extractor_metatypes.c:436 src/main/extractor_metatypes.c:437 2323#: src/main/extractor_metatypes.c:436
2324#, fuzzy
2325msgid "original filename"
2326msgstr "tên gốc"
2327
2328#: src/main/extractor_metatypes.c:437
2329#, fuzzy
2330msgid "name of the original file (reserved for GNUnet)"
2331msgstr "tên của ngÆ°á»i biểu diá»…n gốc"
2332
2333#: src/main/extractor_metatypes.c:438 src/main/extractor_metatypes.c:439
2322msgid "last" 2334msgid "last"
2323msgstr "cuối" 2335msgstr "cuối"
diff --git a/src/include/extractor.h b/src/include/extractor.h
index f195dce..3435594 100644
--- a/src/include/extractor.h
+++ b/src/include/extractor.h
@@ -32,7 +32,7 @@ extern "C" {
32 * 0.2.6-1 => 0x00020601 32 * 0.2.6-1 => 0x00020601
33 * 4.5.2-0 => 0x04050200 33 * 4.5.2-0 => 0x04050200
34 */ 34 */
35#define EXTRACTOR_VERSION 0x00060201 35#define EXTRACTOR_VERSION 0x00060300
36 36
37#include <stdio.h> 37#include <stdio.h>
38 38
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 189835d..916f1f6 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -30,7 +30,7 @@ libextractor_la_LIBADD = \
30 30
31 31
32EXTRA_DIST = \ 32EXTRA_DIST = \
33 iconv.c 33 iconv.c fuzz_default.sh fuzz_thumbnail.sh
34 34
35libextractor_la_CPPFLAGS = -DPLUGINDIR=\"@RPLUGINDIR@\" -DPLUGININSTDIR=\"${plugindir}\" $(AM_CPPFLAGS) 35libextractor_la_CPPFLAGS = -DPLUGINDIR=\"@RPLUGINDIR@\" -DPLUGININSTDIR=\"${plugindir}\" $(AM_CPPFLAGS)
36 36
diff --git a/src/main/extractor.c b/src/main/extractor.c
index 8d5d0f4..4fb5b18 100644
--- a/src/main/extractor.c
+++ b/src/main/extractor.c
@@ -308,7 +308,6 @@ get_path_from_PATH() {
308 char * buf; 308 char * buf;
309 char * ret; 309 char * ret;
310 const char * p; 310 const char * p;
311 size_t size;
312 311
313 p = getenv("PATH"); 312 p = getenv("PATH");
314 if (p == NULL) 313 if (p == NULL)
@@ -322,7 +321,6 @@ get_path_from_PATH() {
322 free (path); 321 free (path);
323 return NULL; 322 return NULL;
324 } 323 }
325 size = strlen(path);
326 pos = path; 324 pos = path;
327 325
328 while (NULL != (end = strchr(pos, ':'))) { 326 while (NULL != (end = strchr(pos, ':'))) {
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 5a29df3..c489d19 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -131,6 +131,7 @@ libextractor_applefile_la_LIBADD = \
131libextractor_asf_la_SOURCES = \ 131libextractor_asf_la_SOURCES = \
132 asf_extractor.c 132 asf_extractor.c
133libextractor_asf_la_LDFLAGS = \ 133libextractor_asf_la_LDFLAGS = \
134 $(top_builddir)/src/common/libextractor_common.la \
134 $(PLUGINFLAGS) 135 $(PLUGINFLAGS)
135 136
136libextractor_deb_la_SOURCES = \ 137libextractor_deb_la_SOURCES = \
diff --git a/src/plugins/asf_extractor.c b/src/plugins/asf_extractor.c
index ea8b803..459af86 100644
--- a/src/plugins/asf_extractor.c
+++ b/src/plugins/asf_extractor.c
@@ -1,6 +1,6 @@
1/* 1/*
2 This file is part of libextractor. 2 This file is part of libextractor.
3 (C) 2002, 2003 Vidyut Samanta and Christian Grothoff 3 (C) 2002, 2003, 2011 Vidyut Samanta and Christian Grothoff
4 4
5 libextractor is free software; you can redistribute it and/or modify 5 libextractor is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published 6 it under the terms of the GNU General Public License as published
@@ -53,28 +53,20 @@
53 53
54#include "platform.h" 54#include "platform.h"
55#include "extractor.h" 55#include "extractor.h"
56#include "convert.h"
57#include <stdint.h>
56 58
57#define CODEC_TYPE_AUDIO 0
58#define CODEC_TYPE_VIDEO 1
59#define CODEC_TYPE_CONTROL 2
60#define MAX_NUM_STREAMS 23
61
62#define DEFRAG_BUFSIZE 65536
63#define DEMUX_START 1
64#define DEMUX_FINISHED 0 59#define DEMUX_FINISHED 0
60#define DEMUX_START 1
65 61
66 62
67/* 63/*
68 * define asf GUIDs (list from avifile) 64 * define asf GUIDs (list from avifile)
69 */ 65 */
70#define GUID_ERROR 0 66#define GUID_ERROR 0
71
72 /* base ASF objects */
73#define GUID_ASF_HEADER 1 67#define GUID_ASF_HEADER 1
74#define GUID_ASF_DATA 2 68#define GUID_ASF_DATA 2
75#define GUID_ASF_SIMPLE_INDEX 3 69#define GUID_ASF_SIMPLE_INDEX 3
76
77 /* header ASF objects */
78#define GUID_ASF_FILE_PROPERTIES 4 70#define GUID_ASF_FILE_PROPERTIES 4
79#define GUID_ASF_STREAM_PROPERTIES 5 71#define GUID_ASF_STREAM_PROPERTIES 5
80#define GUID_ASF_STREAM_BITRATE_PROPERTIES 6 72#define GUID_ASF_STREAM_BITRATE_PROPERTIES 6
@@ -88,33 +80,16 @@
88#define GUID_ASF_EXTENDED_CONTENT_DESCRIPTION 14 80#define GUID_ASF_EXTENDED_CONTENT_DESCRIPTION 14
89#define GUID_ASF_ERROR_CORRECTION 15 81#define GUID_ASF_ERROR_CORRECTION 15
90#define GUID_ASF_PADDING 16 82#define GUID_ASF_PADDING 16
91
92 /* stream properties object stream type */
93#define GUID_ASF_AUDIO_MEDIA 17 83#define GUID_ASF_AUDIO_MEDIA 17
94#define GUID_ASF_VIDEO_MEDIA 18 84#define GUID_ASF_VIDEO_MEDIA 18
95#define GUID_ASF_COMMAND_MEDIA 19 85#define GUID_ASF_COMMAND_MEDIA 19
96
97 /* stream properties object error correction type */
98#define GUID_ASF_NO_ERROR_CORRECTION 20 86#define GUID_ASF_NO_ERROR_CORRECTION 20
99#define GUID_ASF_AUDIO_SPREAD 21 87#define GUID_ASF_AUDIO_SPREAD 21
100
101 /* mutual exclusion object exlusion type */
102#define GUID_ASF_MUTEX_BITRATE 22 88#define GUID_ASF_MUTEX_BITRATE 22
103#define GUID_ASF_MUTEX_UKNOWN 23 89#define GUID_ASF_MUTEX_UKNOWN 23
104
105 /* header extension */
106#define GUID_ASF_RESERVED_1 24 90#define GUID_ASF_RESERVED_1 24
107
108 /* script command */
109#define GUID_ASF_RESERVED_SCRIPT_COMMNAND 25 91#define GUID_ASF_RESERVED_SCRIPT_COMMNAND 25
110
111 /* marker object */
112#define GUID_ASF_RESERVED_MARKER 26 92#define GUID_ASF_RESERVED_MARKER 26
113
114 /* various */
115/*
116#define GUID_ASF_HEAD2 27
117*/
118#define GUID_ASF_AUDIO_CONCEAL_NONE 27 93#define GUID_ASF_AUDIO_CONCEAL_NONE 27
119#define GUID_ASF_CODEC_COMMENT1_HEADER 28 94#define GUID_ASF_CODEC_COMMENT1_HEADER 28
120#define GUID_ASF_2_0_HEADER 29 95#define GUID_ASF_2_0_HEADER 29
@@ -122,28 +97,15 @@
122#define GUID_END 30 97#define GUID_END 30
123 98
124 99
125/* asf stream types */
126#define ASF_STREAM_TYPE_UNKNOWN 0
127#define ASF_STREAM_TYPE_AUDIO 1
128#define ASF_STREAM_TYPE_VIDEO 2
129#define ASF_STREAM_TYPE_CONTROL 3
130
131#define ASF_MAX_NUM_STREAMS 23
132
133
134typedef unsigned long long ext_uint64_t;
135typedef unsigned int ext_uint32_t;
136typedef unsigned short ext_uint16_t;
137typedef unsigned char ext_uint8_t;
138
139typedef struct 100typedef struct
140{ 101{
141 ext_uint32_t v1; 102 uint32_t v1;
142 ext_uint16_t v2; 103 uint16_t v2;
143 ext_uint16_t v3; 104 uint16_t v3;
144 ext_uint8_t v4[8]; 105 uint8_t v4[8];
145} LE_GUID; 106} LE_GUID;
146 107
108
147static const struct 109static const struct
148{ 110{
149 const char *name; 111 const char *name;
@@ -342,92 +304,29 @@ static const struct
342 { 304 {
3430x90, 0x34, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xbe}}},}; 3050x90, 0x34, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xbe}}},};
344 306
345typedef struct
346{
347 int num;
348 int seq;
349
350 int frag_offset;
351 int64_t timestamp;
352 int ts_per_kbyte;
353 int defrag;
354 307
355 ext_uint32_t buf_type; 308struct demux_asf_s
356 int stream_id;
357
358 ext_uint8_t *buffer;
359} asf_stream_t;
360
361typedef struct demux_asf_s
362{ 309{
363 /* pointer to the stream data */ 310 /* pointer to the stream data */
364 const char *input; 311 const char *input;
365 /* current position in stream */ 312 /* current position in stream */
366 size_t inputPos; 313 size_t inputPos;
367 size_t inputLen;
368
369 int keyframe_found;
370
371 int seqno;
372 ext_uint32_t packet_size;
373 ext_uint8_t packet_flags;
374 ext_uint32_t data_size;
375
376 ext_uint32_t bitrates[MAX_NUM_STREAMS];
377 int num_streams;
378 int num_audio_streams;
379 int num_video_streams;
380 int audio_stream;
381 int video_stream;
382 int audio_stream_id;
383 int video_stream_id;
384 int control_stream_id;
385
386 ext_uint16_t wavex[1024];
387 int wavex_size;
388
389 char title[512];
390 char author[512];
391 char copyright[512];
392 char comment[512];
393
394 ext_uint32_t length, rate;
395 314
396 /* packet filling */ 315 size_t inputLen;
397 int packet_size_left;
398
399 /* frame rate calculations, discontinuity detection */
400
401 int64_t last_pts[2];
402 int32_t frame_duration;
403 int send_newpts;
404 int64_t last_frame_pts;
405 316
406 /* only for reading */ 317 uint32_t length;
407 ext_uint32_t packet_padsize;
408 int nb_frames;
409 ext_uint8_t frame_flag;
410 ext_uint8_t segtype;
411 int frame;
412 318
413 int status; 319 int status;
414 320
415 /* byte reordering from audio streams */ 321 char *title;
416 int reorder_h; 322 char *author;
417 int reorder_w; 323 char *copyright;
418 int reorder_b; 324 char *comment;
419 325 char *rating;
420 off_t header_size; 326};
421 int buf_flag_seek;
422
423 /* first packet position */
424 int64_t first_packet_pos;
425
426 int reference_mode;
427} demux_asf_t;
428 327
429static int 328static int
430readBuf (demux_asf_t * this, void *buf, int len) 329readBuf (struct demux_asf_s * this, void *buf, int len)
431{ 330{
432 int min; 331 int min;
433 332
@@ -439,10 +338,10 @@ readBuf (demux_asf_t * this, void *buf, int len)
439 return min; 338 return min;
440} 339}
441 340
442static ext_uint8_t 341static uint8_t
443get_byte (demux_asf_t * this) 342get_byte (struct demux_asf_s * this)
444{ 343{
445 ext_uint8_t buf; 344 uint8_t buf;
446 int i; 345 int i;
447 346
448 i = readBuf (this, &buf, 1); 347 i = readBuf (this, &buf, 1);
@@ -451,10 +350,10 @@ get_byte (demux_asf_t * this)
451 return buf; 350 return buf;
452} 351}
453 352
454static ext_uint16_t 353static uint16_t
455get_le16 (demux_asf_t * this) 354get_le16 (struct demux_asf_s * this)
456{ 355{
457 ext_uint8_t buf[2]; 356 uint8_t buf[2];
458 int i; 357 int i;
459 358
460 i = readBuf (this, buf, 2); 359 i = readBuf (this, buf, 2);
@@ -463,10 +362,10 @@ get_le16 (demux_asf_t * this)
463 return buf[0] | (buf[1] << 8); 362 return buf[0] | (buf[1] << 8);
464} 363}
465 364
466static ext_uint32_t 365static uint32_t
467get_le32 (demux_asf_t * this) 366get_le32 (struct demux_asf_s * this)
468{ 367{
469 ext_uint8_t buf[4]; 368 uint8_t buf[4];
470 int i; 369 int i;
471 370
472 i = readBuf (this, buf, 4); 371 i = readBuf (this, buf, 4);
@@ -475,26 +374,26 @@ get_le32 (demux_asf_t * this)
475 return buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24); 374 return buf[0] | (buf[1] << 8) | (buf[2] << 16) | (buf[3] << 24);
476} 375}
477 376
478static ext_uint64_t 377static uint64_t
479get_le64 (demux_asf_t * this) 378get_le64 (struct demux_asf_s * this)
480{ 379{
481 ext_uint8_t buf[8]; 380 uint8_t buf[8];
482 int i; 381 int i;
483 382
484 i = readBuf (this, buf, 8); 383 i = readBuf (this, buf, 8);
485 if (i != 8) 384 if (i != 8)
486 this->status = DEMUX_FINISHED; 385 this->status = DEMUX_FINISHED;
487 return (ext_uint64_t) buf[0] 386 return (uint64_t) buf[0]
488 | ((ext_uint64_t) buf[1] << 8) 387 | ((uint64_t) buf[1] << 8)
489 | ((ext_uint64_t) buf[2] << 16) 388 | ((uint64_t) buf[2] << 16)
490 | ((ext_uint64_t) buf[3] << 24) 389 | ((uint64_t) buf[3] << 24)
491 | ((ext_uint64_t) buf[4] << 32) 390 | ((uint64_t) buf[4] << 32)
492 | ((ext_uint64_t) buf[5] << 40) 391 | ((uint64_t) buf[5] << 40)
493 | ((ext_uint64_t) buf[6] << 48) | ((ext_uint64_t) buf[7] << 54); 392 | ((uint64_t) buf[6] << 48) | ((uint64_t) buf[7] << 54);
494} 393}
495 394
496static int 395static int
497get_guid (demux_asf_t * this) 396get_guid (struct demux_asf_s * this)
498{ 397{
499 int i; 398 int i;
500 LE_GUID g; 399 LE_GUID g;
@@ -513,193 +412,72 @@ get_guid (demux_asf_t * this)
513 return GUID_ERROR; 412 return GUID_ERROR;
514} 413}
515 414
516static void
517get_str16_nolen (demux_asf_t * this, int len, char *buf, int buf_size)
518{
519
520 int c;
521 char *q;
522
523 q = buf;
524 while (len > 0)
525 {
526 c = get_le16 (this);
527 if ((q - buf) < buf_size - 1)
528 *q++ = c;
529 len -= 2;
530 }
531 *q = '\0';
532}
533 415
534static int 416static int
535asf_read_header (demux_asf_t * this) 417asf_read_header (struct demux_asf_s * this)
536{ 418{
537 int guid; 419 int guid;
538 ext_uint64_t gsize; 420 uint64_t gsize;
421 uint16_t len1, len2, len3, len4, len5;
539 422
540 guid = get_guid (this); 423 guid = get_guid (this);
541 if (guid != GUID_ASF_HEADER) 424 if (guid != GUID_ASF_HEADER)
542 return 0; 425 return 0;
543 get_le64 (this); 426 get_le64 (this); /* object size */
544 get_le32 (this); 427 get_le32 (this); /* number of header objects */
545 get_byte (this); 428 get_byte (this); /* reserved 1 */
546 get_byte (this); 429 get_byte (this); /* reserved 2 */
547
548 while (this->status != DEMUX_FINISHED) 430 while (this->status != DEMUX_FINISHED)
549 { 431 {
550 guid = get_guid (this); 432 guid = get_guid (this); /* object ID */
551 gsize = get_le64 (this); 433 gsize = get_le64 (this); /* object size */
552
553 if (gsize < 24) 434 if (gsize < 24)
554 goto fail; 435 goto fail;
555
556 switch (guid) 436 switch (guid)
557 { 437 {
558 case GUID_ASF_FILE_PROPERTIES: 438 case GUID_ASF_FILE_PROPERTIES:
559 { 439 guid = get_guid (this); /* file ID */
560 ext_uint64_t start_time, end_time; 440 get_le64 (this); /* file size */
561 441 get_le64 (this); /* creation date */
562 guid = get_guid (this); 442 get_le64 (this); /* nb_packets */
563 get_le64 (this); /* file size */ 443 this->length = get_le64 (this); /* play duration in 100 ns units */
564 get_le64 (this); /* file time */ 444 get_le64 (this); /* send duration */
565 get_le64 (this); /* nb_packets */ 445 get_le64 (this); /* preroll */
566 446 get_le32 (this); /* flags */
567 end_time = get_le64 (this); 447 get_le32 (this); /* min size */
568 448 get_le32 (this); /* max size */
569 this->length = get_le64 (this) / 10000; 449 get_le32 (this); /* max bitrate */
570 if (this->length)
571 this->rate = this->inputLen / (this->length / 1000);
572 else
573 this->rate = 0;
574
575
576 start_time = get_le32 (this); /* start timestamp in 1/1000 s */
577
578 get_le32 (this); /* unknown */
579 get_le32 (this); /* min size */
580 this->packet_size = get_le32 (this); /* max size */
581 get_le32 (this); /* max bitrate */
582 get_le32 (this);
583 }
584 break; 450 break;
585
586 case (GUID_ASF_STREAM_PROPERTIES):
587 {
588 int type;
589 ext_uint32_t total_size, stream_data_size;
590 ext_uint16_t stream_id;
591 ext_uint64_t pos1, pos2;
592 pos1 = this->inputPos;
593
594 guid = get_guid (this);
595 switch (guid)
596 {
597 case GUID_ASF_AUDIO_MEDIA:
598 type = CODEC_TYPE_AUDIO;
599 break;
600
601 case GUID_ASF_VIDEO_MEDIA:
602 type = CODEC_TYPE_VIDEO;
603 break;
604
605 case GUID_ASF_COMMAND_MEDIA:
606 type = CODEC_TYPE_CONTROL;
607 break;
608
609 default:
610 goto fail;
611 }
612
613 guid = get_guid (this);
614 get_le64 (this);
615 total_size = get_le32 (this);
616 if (total_size > sizeof (this->wavex))
617 goto fail;
618 stream_data_size = get_le32 (this);
619 stream_id = get_le16 (this); /* stream id */
620 get_le32 (this);
621
622 if (type == CODEC_TYPE_AUDIO)
623 {
624 ext_uint8_t buffer[6];
625
626 readBuf (this, (ext_uint8_t *) this->wavex, total_size);
627 if (guid == GUID_ASF_AUDIO_SPREAD)
628 {
629 readBuf (this, buffer, 6);
630 this->reorder_h = buffer[0];
631 this->reorder_w = (buffer[2] << 8) | buffer[1];
632 this->reorder_b = (buffer[4] << 8) | buffer[3];
633 this->reorder_w /= this->reorder_b;
634 }
635 else
636 {
637 this->reorder_b = this->reorder_h = this->reorder_w = 1;
638 }
639
640 this->wavex_size = total_size; /* 18 + this->wavex[8]; */
641 this->num_audio_streams++;
642 }
643 else if (type == CODEC_TYPE_VIDEO)
644 {
645
646 ext_uint16_t i;
647
648 get_le32 (this); /* width */
649 get_le32 (this); /* height */
650 get_byte (this);
651
652 i = get_le16 (this); /* size */
653 this->inputPos += i;
654 this->num_video_streams++;
655 }
656 else if (type == CODEC_TYPE_CONTROL)
657 {
658 this->control_stream_id = stream_id;
659 }
660
661 this->num_streams++;
662 pos2 = this->inputPos;
663 this->inputPos += gsize - (pos2 - pos1 + 24);
664 }
665 break;
666
667 case GUID_ASF_DATA: 451 case GUID_ASF_DATA:
668 goto headers_ok; 452 goto headers_ok;
669 break; 453 break;
670 case GUID_ASF_CONTENT_DESCRIPTION: 454 case GUID_ASF_CONTENT_DESCRIPTION:
671 { 455 len1 = get_le16 (this);
672 ext_uint16_t len1, len2, len3, len4, len5; 456 len2 = get_le16 (this);
673 457 len3 = get_le16 (this);
674 len1 = get_le16 (this); 458 len4 = get_le16 (this);
675 len2 = get_le16 (this); 459 len5 = get_le16 (this);
676 len3 = get_le16 (this); 460 this->title = EXTRACTOR_common_convert_to_utf8 (&this->input[this->inputPos],
677 len4 = get_le16 (this); 461 len1,
678 len5 = get_le16 (this); 462 "UTF-16");
679 get_str16_nolen (this, len1, this->title, sizeof (this->title)); 463 this->inputPos += len1;
680 get_str16_nolen (this, len2, this->author, sizeof (this->author)); 464 this->author = EXTRACTOR_common_convert_to_utf8 (&this->input[this->inputPos],
681 get_str16_nolen (this, len3, this->copyright, 465 len2,
682 sizeof (this->copyright)); 466 "UTF-16");
683 get_str16_nolen (this, len4, this->comment, 467 this->inputPos += len2;
684 sizeof (this->comment)); 468 this->copyright = EXTRACTOR_common_convert_to_utf8 (&this->input[this->inputPos],
685 this->inputPos += len5; 469 len3,
686 } 470 "UTF-16");
471 this->inputPos += len3;
472 this->comment = EXTRACTOR_common_convert_to_utf8 (&this->input[this->inputPos],
473 len4,
474 "UTF-16");
475 this->inputPos += len4;
476 this->rating = EXTRACTOR_common_convert_to_utf8 (&this->input[this->inputPos],
477 len5,
478 "UTF-16");
479 this->inputPos += len5;
687 break; 480 break;
688
689 case GUID_ASF_STREAM_BITRATE_PROPERTIES:
690 {
691 ext_uint16_t streams, stream_id;
692 ext_uint16_t i;
693
694 streams = get_le16 (this);
695 for (i = 0; i < streams; i++)
696 {
697 stream_id = get_le16 (this);
698 this->bitrates[stream_id] = get_le32 (this);
699 }
700 }
701 break;
702
703 default: 481 default:
704 this->inputPos += gsize - 24; 482 this->inputPos += gsize - 24;
705 } 483 }
@@ -707,10 +485,7 @@ asf_read_header (demux_asf_t * this)
707 485
708headers_ok: 486headers_ok:
709 this->inputPos += sizeof (LE_GUID) + 10; 487 this->inputPos += sizeof (LE_GUID) + 10;
710 this->packet_size_left = 0;
711 this->first_packet_pos = this->inputPos;
712 return 1; 488 return 1;
713
714fail: 489fail:
715 return 0; 490 return 0;
716} 491}
@@ -734,57 +509,79 @@ EXTRACTOR_asf_extract (const char *data,
734 void *proc_cls, 509 void *proc_cls,
735 const char *options) 510 const char *options)
736{ 511{
737 demux_asf_t this; 512 struct demux_asf_s this;
738 size_t slen; 513 size_t slen;
514 char duration_str[30];
515 int ret;
739 516
740 memset (&this, 0, sizeof (demux_asf_t)); 517 memset (&this, 0, sizeof (struct demux_asf_s));
741 this.input = data; 518 this.input = data;
742 this.inputLen = size; 519 this.inputLen = size;
743 this.status = DEMUX_START; 520 this.status = DEMUX_START;
744 if (0 == asf_read_header (&this)) 521 ret = 0;
745 return 0; 522 if (1 == asf_read_header (&this))
746 523 {
747 if ( ( (0 < (slen = strlen(this.title))) && 524 snprintf (duration_str,
748 (0 != proc (proc_cls, 525 sizeof (duration_str),
749 "asf", 526 "%llu ms", (unsigned long long) (this.length / 10000LL));
750 EXTRACTOR_METATYPE_TITLE, 527 if ( ( (this.title != NULL) &&
751 EXTRACTOR_METAFORMAT_C_STRING, 528 (0 < (slen = strlen(this.title))) &&
752 "text/plain", 529 (0 != proc (proc_cls,
753 this.title, 530 "asf",
754 slen + 1)) ) || 531 EXTRACTOR_METATYPE_TITLE,
755 ( (0 < (slen = strlen(this.author))) && 532 EXTRACTOR_METAFORMAT_C_STRING,
756 (0 != proc (proc_cls, 533 "text/plain",
757 "asf", 534 this.title,
758 EXTRACTOR_METATYPE_AUTHOR_NAME, 535 slen + 1)) ) ||
759 EXTRACTOR_METAFORMAT_C_STRING, 536 ( (this.author != NULL) &&
760 "text/plain", 537 (0 < (slen = strlen(this.author))) &&
761 this.author, 538 (0 != proc (proc_cls,
762 slen + 1)) ) || 539 "asf",
763 ( (0 < (slen = strlen(this.comment))) && 540 EXTRACTOR_METATYPE_AUTHOR_NAME,
541 EXTRACTOR_METAFORMAT_C_STRING,
542 "text/plain",
543 this.author,
544 slen + 1)) ) ||
545 ( (this.comment != NULL) &&
546 (0 < (slen = strlen(this.comment))) &&
547 (0 != proc (proc_cls,
548 "asf",
549 EXTRACTOR_METATYPE_COMMENT,
550 EXTRACTOR_METAFORMAT_C_STRING,
551 "text/plain",
552 this.comment,
553 slen + 1)) ) ||
554 ( (this.copyright != NULL) &&
555 (0 < (slen = strlen(this.copyright))) &&
556 (0 != proc (proc_cls,
557 "asf",
558 EXTRACTOR_METATYPE_COPYRIGHT,
559 EXTRACTOR_METAFORMAT_C_STRING,
560 "text/plain",
561 this.copyright,
562 slen + 1)) ) ||
764 (0 != proc (proc_cls, 563 (0 != proc (proc_cls,
765 "asf", 564 "asf",
766 EXTRACTOR_METATYPE_COMMENT, 565 EXTRACTOR_METATYPE_MIMETYPE,
767 EXTRACTOR_METAFORMAT_C_STRING, 566 EXTRACTOR_METAFORMAT_C_STRING,
768 "text/plain", 567 "text/plain",
769 this.comment, 568 "video/x-ms-asf",
770 slen + 1)) ) || 569 strlen("video/x-ms-asf") + 1)) ||
771 ( (0 < (slen = strlen(this.copyright))) &&
772 (0 != proc (proc_cls, 570 (0 != proc (proc_cls,
773 "asf", 571 "asf",
774 EXTRACTOR_METATYPE_COPYRIGHT, 572 EXTRACTOR_METATYPE_DURATION,
775 EXTRACTOR_METAFORMAT_C_STRING, 573 EXTRACTOR_METAFORMAT_C_STRING,
776 "text/plain", 574 "text/plain",
777 this.copyright, 575 duration_str,
778 slen + 1)) ) || 576 strlen(duration_str) + 1)) )
779 (0 != proc (proc_cls, 577 ret = 1;
780 "asf", 578 }
781 EXTRACTOR_METATYPE_MIMETYPE, 579 free (this.title);
782 EXTRACTOR_METAFORMAT_C_STRING, 580 free (this.author);
783 "text/plain", 581 free (this.copyright);
784 "video/x-ms-asf", 582 free (this.comment);
785 strlen("video/x-ms-asf") + 1)) ) 583 free (this.rating);
786 return 1; 584 return ret;
787 return 0;
788} 585}
789 586
790/* end of asf_extractor.c */ 587/* end of asf_extractor.c */
diff --git a/src/plugins/flv_extractor.c b/src/plugins/flv_extractor.c
index 7572b6d..00ffb0c 100644
--- a/src/plugins/flv_extractor.c
+++ b/src/plugins/flv_extractor.c
@@ -316,13 +316,12 @@ static int parse_amf(const unsigned char **data,
316 { 316 {
317 char *key; 317 char *key;
318 unsigned char type; 318 unsigned char type;
319 long max_index; 319
320
321 if (*len < 4) { 320 if (*len < 4) {
322 ret = -1; 321 ret = -1;
323 break; 322 break;
324 } 323 }
325 max_index = readInt32(&ptr); 324 /* max_index */ readInt32(&ptr);
326 *len -= 4; 325 *len -= 4;
327 ret = readASString(&ptr, len, &key); 326 ret = readASString(&ptr, len, &key);
328 if (ret == -1) 327 if (ret == -1)
diff --git a/src/plugins/id3v24_extractor.c b/src/plugins/id3v24_extractor.c
index 8c9cb9b..9055a7b 100644
--- a/src/plugins/id3v24_extractor.c
+++ b/src/plugins/id3v24_extractor.c
@@ -138,11 +138,9 @@ EXTRACTOR_id3v24_extract (const unsigned char *data,
138 int unsync; 138 int unsync;
139 int extendedHdr; 139 int extendedHdr;
140 int experimental; 140 int experimental;
141 int footer;
142 uint32_t tsize; 141 uint32_t tsize;
143 uint32_t pos; 142 uint32_t pos;
144 uint32_t ehdrSize; 143 uint32_t ehdrSize;
145 uint32_t padding;
146 uint32_t csize; 144 uint32_t csize;
147 int i; 145 int i;
148 uint16_t flags; 146 uint16_t flags;
@@ -162,14 +160,13 @@ EXTRACTOR_id3v24_extract (const unsigned char *data,
162 experimental = (data[5] & 0x20) > 0; 160 experimental = (data[5] & 0x20) > 0;
163 if (experimental) 161 if (experimental)
164 return 0; 162 return 0;
165 footer = (data[5] & 0x10) > 0; 163 /* footer = (data[5] & 0x10) > 0; */
166 tsize = (((data[6] & 0x7F) << 21) | 164 tsize = (((data[6] & 0x7F) << 21) |
167 ((data[7] & 0x7F) << 14) | 165 ((data[7] & 0x7F) << 14) |
168 ((data[8] & 0x7F) << 7) | ((data[9] & 0x7F) << 0)); 166 ((data[8] & 0x7F) << 7) | ((data[9] & 0x7F) << 0));
169 if (tsize + 10 > size) 167 if (tsize + 10 > size)
170 return 0; 168 return 0;
171 pos = 10; 169 pos = 10;
172 padding = 0;
173 if (extendedHdr) 170 if (extendedHdr)
174 { 171 {
175 ehdrSize = (((data[10] & 0x7F) << 21) | 172 ehdrSize = (((data[10] & 0x7F) << 21) |
diff --git a/src/plugins/id3v2_extractor.c b/src/plugins/id3v2_extractor.c
index c852423..4f50d05 100644
--- a/src/plugins/id3v2_extractor.c
+++ b/src/plugins/id3v2_extractor.c
@@ -125,7 +125,6 @@ EXTRACTOR_id3v2_extract (const unsigned char *data,
125 void *proc_cls, 125 void *proc_cls,
126 const char *options) 126 const char *options)
127{ 127{
128 int unsync;
129 unsigned int tsize; 128 unsigned int tsize;
130 unsigned int pos; 129 unsigned int pos;
131 unsigned int off; 130 unsigned int off;
@@ -137,7 +136,7 @@ EXTRACTOR_id3v2_extract (const unsigned char *data,
137 (data[1] != 0x44) || 136 (data[1] != 0x44) ||
138 (data[2] != 0x33) || (data[3] != 0x02) || (data[4] != 0x00)) 137 (data[2] != 0x33) || (data[3] != 0x02) || (data[4] != 0x00))
139 return 0; 138 return 0;
140 unsync = (data[5] & 0x80) > 0; 139 /* unsync: (data[5] & 0x80) > 0; */
141 tsize = (((data[6] & 0x7F) << 21) | 140 tsize = (((data[6] & 0x7F) << 21) |
142 ((data[7] & 0x7F) << 14) | 141 ((data[7] & 0x7F) << 14) |
143 ((data[8] & 0x7F) << 07) | ((data[9] & 0x7F) << 00)); 142 ((data[8] & 0x7F) << 07) | ((data[9] & 0x7F) << 00));
diff --git a/src/plugins/mkv_extractor.c b/src/plugins/mkv_extractor.c
index fc7489f..678b4de 100644
--- a/src/plugins/mkv_extractor.c
+++ b/src/plugins/mkv_extractor.c
@@ -48,7 +48,7 @@
48/** 48/**
49 * FIXME: document 49 * FIXME: document
50 */ 50 */
51enum 51enum MKV_TrackType
52{ 52{
53 MKV_Track_video = 1, 53 MKV_Track_video = 1,
54 MKV_Track_audio = 2, 54 MKV_Track_audio = 2,
@@ -135,12 +135,11 @@ VINTparse (const unsigned char *buffer, size_t start, size_t end,
135 135
136 136
137/** 137/**
138 * FIXME: 'unsigned int' or 'uint32_t' for ID?
139 * FIXME: document arguments, return value... 138 * FIXME: document arguments, return value...
140 */ 139 */
141static int 140static unsigned int
142elementRead (const unsigned char *buffer, size_t start, size_t end, 141elementRead (const unsigned char *buffer, size_t start, size_t end,
143 unsigned int *id, int64_t * size) 142 uint32_t *id, int64_t * size)
144{ 143{
145 int64_t tempID; 144 int64_t tempID;
146 int64_t tempsize; 145 int64_t tempsize;
@@ -155,7 +154,7 @@ elementRead (const unsigned char *buffer, size_t start, size_t end,
155 size_offset = VINTparse (buffer, start + id_offset, end, &tempsize, 1); 154 size_offset = VINTparse (buffer, start + id_offset, end, &tempsize, 1);
156 if (!size_offset) 155 if (!size_offset)
157 return 0; 156 return 0;
158 *id = (unsigned int) tempID; /*id must be <4 and must fit in uint */ 157 *id = (uint32_t) tempID;
159 *size = tempsize; 158 *size = tempsize;
160 return id_offset + size_offset; 159 return id_offset + size_offset;
161} 160}
@@ -173,15 +172,14 @@ getInt (const unsigned char *buffer, size_t start, size_t size)
173 172
174 result = 0; 173 result = 0;
175 for (c = 1; c <= size; c++) 174 for (c = 1; c <= size; c++)
176 result += buffer[start + c - 1] << (8 * (size - c)); 175 result += ((uint64_t)buffer[start + c - 1]) << (8 * (size - c));
177 return result; 176 return result;
178} 177}
179 178
180static float 179static float
181getFloat (const char *buffer, size_t start, size_t size) 180getFloat (const unsigned char *buffer, size_t start, size_t size)
182{ 181{
183 float result; 182 unsigned char tmp[4];
184 char tmp[4];
185 183
186 if (size != sizeof (float)) 184 if (size != sizeof (float))
187 return 0.0; 185 return 0.0;
@@ -193,7 +191,7 @@ getFloat (const char *buffer, size_t start, size_t size)
193 tmp[3] = buffer[start]; 191 tmp[3] = buffer[start];
194 return *((float *) (tmp)); 192 return *((float *) (tmp));
195 } 193 }
196 return result; 194 return 0.0;
197} 195}
198 196
199static const unsigned int MKV_Parse_list[] = { 197static const unsigned int MKV_Parse_list[] = {
@@ -216,27 +214,27 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
216 const char *options) 214 const char *options)
217{ 215{
218 int ret; 216 int ret;
219 char buffer[128]; 217 char buffer[256];
220 char temp[128]; 218 size_t p;
221 size_t p; /*pointer in buffer */ 219 int c;
222 int c, c2; /*counter in some loops */ 220 uint32_t eID;
223 unsigned int eID; /*element ID */ 221 int64_t eSize; /* signed? */
224 int64_t eSize; /*Size of element content */ 222 unsigned int offs;
225 int offs;
226 int64_t timescale = 1000000; 223 int64_t timescale = 1000000;
227 float duration = -1.0; 224 float duration = -1.0;
228 int64_t DefaultDuration = 0; 225 enum MKV_TrackType trackType;
229 int TrackType = 0; 226 int have_audio = 0;
230 int pvt_look_flag = 0; 227 int have_video = 0;
231 int curr_c = -1; 228 unsigned int value_width = 0;
232 int a_c = -1; 229 unsigned int value_height = 0;
233 int v_c = -1; 230 int64_t value;
234 int t_c = -1;
235 int value_width = 0;
236 int value_height = 0;
237 int value = 0;
238 size_t size1; 231 size_t size1;
239 const unsigned char *start; 232 const unsigned char *start;
233 int is_mkv = 0;
234 unsigned int fps = 0;
235 unsigned int bit_depth = 0;
236 const unsigned char *codec = NULL;
237 int codec_strlen = 0;
240 238
241 if (size > 32 * 1024) 239 if (size > 32 * 1024)
242 size1 = 32 * 1024; 240 size1 = 32 * 1024;
@@ -255,125 +253,65 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
255 p += offs; 253 p += offs;
256 if (!offs || p >= size) 254 if (!offs || p >= size)
257 break; 255 break;
256 if (MKVID_EBML == eID)
257 {
258 ADD ("video/mkv", EXTRACTOR_METATYPE_MIMETYPE);
259 is_mkv = 1;
260 continue;
261 }
262 if (! is_mkv)
263 return 0;
258 for (c = 0; c < sizeof (MKV_Parse_list) / sizeof (*MKV_Parse_list); c++) 264 for (c = 0; c < sizeof (MKV_Parse_list) / sizeof (*MKV_Parse_list); c++)
259 if (MKV_Parse_list[c] == eID) 265 if (MKV_Parse_list[c] == eID)
260 { 266 break;
261 break;
262 }
263 if (c < sizeof (MKV_Parse_list) / sizeof (*MKV_Parse_list)) 267 if (c < sizeof (MKV_Parse_list) / sizeof (*MKV_Parse_list))
264 continue; 268 continue;
269
265 if (p + eSize > size) 270 if (p + eSize > size)
266 break; /*TODO - add (if requied) suckup from file to data */ 271 break;
267 if (eSize == 4 || eSize == 8 || eSize == 1 || eSize == 2)
268 value = (int) getInt (data, p, eSize);
269 272
273 if ( (eSize == 4) || (eSize == 8) || (eSize == 1) || (eSize == 2))
274 value = getInt (data, p, eSize);
275
270 switch (eID) 276 switch (eID)
271 { 277 {
272 case MKVID_TrackType: /*detect a stream type (video/audio/text) */ 278 case MKVID_TrackType: /*detect a stream type (video/audio/text) */
273 TrackType = value; 279 trackType = (enum MKV_TrackType) value;
274 pvt_look_flag = 0; 280 switch (trackType)
275 switch (TrackType)
276 { 281 {
277 case MKV_Track_video: 282 case MKV_Track_video:
278 v_c++; 283 have_video = 1;
279 if (v_c > MAX_STREAMS)
280 v_c = MAX_STREAMS;
281 if (duration != -1.0)
282 {
283 /* FIXME: duration might still be -1 here, defer until
284 end of function & check if duration is != -1 */
285 snprintf (buffer,
286 sizeof(buffer),
287 "%u s (video)",
288 (int) (duration / 1e+9 * (float) timescale));
289 ADD (buffer, EXTRACTOR_METATYPE_DURATION);
290 }
291 curr_c = v_c;
292 break; 284 break;
293 case MKV_Track_audio: 285 case MKV_Track_audio:
294 a_c++; 286 have_audio = 1;
295 if (a_c > MAX_STREAMS)
296 a_c = MAX_STREAMS;
297 if (duration != -1.0)
298 {
299 /* FIXME: duration might still be -1 here, defer until
300 end of function & check if duration is != -1 */
301 snprintf (buffer,
302 sizeof (buffer),
303 "%u s (audio)",
304 (unsigned int) (duration / 1e+9 * (float) timescale));
305 ADD (buffer, EXTRACTOR_METATYPE_DURATION);
306 }
307 curr_c = a_c;
308 break; 287 break;
288 case MKV_Track_subtitle:
289 break;
309 case MKV_Track_subtitle_orig: 290 case MKV_Track_subtitle_orig:
310 t_c++; 291 break;
311 TrackType = MKV_Track_subtitle; /*for normal use in lang array */
312 if (t_c > MAX_STREAMS)
313 t_c = MAX_STREAMS;
314 curr_c = t_c;
315 break;
316 } 292 }
317 break; 293 break;
318 case MKVID_DefaultDuration: /*fps detection */ 294 case MKVID_DefaultDuration:
319 if (TrackType == MKV_Track_video && v_c >= 0) 295 fps = (unsigned int) (1000000000 / value);
320 {
321 DefaultDuration = value;
322 if (DefaultDuration > 100)
323 {
324 /* FIXME: integrate with codec name/id into 'METATYPE_FORMAT' */
325 snprintf (buffer,
326 sizeof (buffer),
327 "fps: %u", 1000000000 / DefaultDuration);
328 ADD (buffer, EXTRACTOR_METATYPE_UNKNOWN);
329 }
330 }
331 break; 296 break;
332 case MKVID_Language: /*stream language */ 297 case MKVID_Language:
333 if (curr_c >= 0 && TrackType < 4 && eSize < MAX_STRING_SIZE) 298 snprintf (buffer,
334 { 299 sizeof (buffer),
335 /* FIXME: why first temp, then buffer? */ 300 "%.*s",
336 snprintf (buffer, 301 (int) eSize,
337 sizeof (buffer), 302 data + p);
338 "%.*s", 303 ADD (buffer, EXTRACTOR_METATYPE_LANGUAGE);
339 (int) eSize,
340 data + p);
341 ADD (buffer, EXTRACTOR_METATYPE_LANGUAGE);
342 }
343 break; 304 break;
344 case MKVID_CodecName: /*passtrough */ 305 case MKVID_CodecName:
345 case MKVID_CodecID: /*codec detection (if V_MS/VFW/FOURCC - set a fourcc code, else fill a vcodecs value) */ 306 case MKVID_CodecID:
346 if (curr_c >= 0 && TrackType < 4 && eSize < MAX_STRING_SIZE) 307 codec = data + p;
347 { 308 codec_strlen = eSize;
348 if (!strncmp (data + p, "V_MS/VFW/FOURCC", eSize))
349 pvt_look_flag = 1;
350 snprintf (buffer,
351 sizeof (buffer),
352 "codec: %.*s",
353 (int) eSize,
354 data + p);
355 ADD (buffer,
356 EXTRACTOR_METATYPE_FORMAT);
357 }
358 break; 309 break;
359 case MKVID_CodecPrivate: 310 case MKVID_CodecPrivate:
360 if (pvt_look_flag && v_c >= 0 && eSize >= 24)
361 { /*CodecPrivate contains a BITMAPINFOHEADER structure due CodecID==V_MS/VFW/FOURCC */
362 pvt_look_flag = 0;
363 //TODO
364 /*
365 video[v_c][V_cc]=(buffer[p+16]<<24)+(buffer[p+17]<<16)+(buffer[p+18]<<8)+buffer[p+19];
366 if (codec[v_c][MKV_Track_video])
367 {
368 free (codec[v_c][MKV_Track_video]);
369 codec[v_c][MKV_Track_video] = NULL;
370 }
371 */
372 }
373 break; 311 break;
374 case MKVID_PixelWidth: /*pasthough *//*bug with aspect differ from 1:1 */ 312 case MKVID_PixelWidth: /*pasthough *//*bug with aspect differ from 1:1 */
375 case MKVID_DisplayWidth: 313 case MKVID_DisplayWidth:
376 value_width = value; 314 value_width = value;
377 break; 315 break;
378 case MKVID_PixelHeight: /*pasthough */ 316 case MKVID_PixelHeight: /*pasthough */
379 case MKVID_DisplayHeight: 317 case MKVID_DisplayHeight:
@@ -381,60 +319,88 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
381 break; 319 break;
382 case MKVID_TimeCodeScale: 320 case MKVID_TimeCodeScale:
383 timescale = getInt (data, p, eSize); 321 timescale = getInt (data, p, eSize);
384 snprintf (buffer,
385 sizeof (buffer),
386 "TimeScale: %u", timescale);
387 ADD (buffer, EXTRACTOR_METATYPE_UNKNOWN);
388 break; 322 break;
389 case MKVID_Duration: 323 case MKVID_Duration:
390 duration = getFloat (data, p, eSize); 324 duration = getFloat (data, p, eSize);
391 snprintf (buffer,
392 sizeof (buffer),
393 "%f ms", duration);
394 ADD (buffer, EXTRACTOR_METATYPE_DURATION);
395 break; 325 break;
396 case MKVID_Channels: 326 case MKVID_Channels:
397 snprintf (buffer, 327 /* num_channels = (unsigned int) value; */
398 sizeof (buffer),
399 "channels: %u", value);
400 ADD (buffer, EXTRACTOR_METATYPE_UNKNOWN);
401 break; 328 break;
402 case MKVID_BitDepth: 329 case MKVID_BitDepth:
403 snprintf (buffer, 330 bit_depth = (unsigned int) value;
404 sizeof (buffer),
405 "BitDepth: %u", value);
406 ADD (buffer, EXTRACTOR_METATYPE_UNKNOWN);
407 break; 331 break;
408 case MKVID_OutputSamplingFrequency: /*pasthough */ 332 case MKVID_OutputSamplingFrequency:
409 case MKVID_SamplingFrequency: 333 case MKVID_SamplingFrequency:
410 /* FIXME: the resulting value seems wrong... Unit? */ 334 /* FIXME: what unit has 'value'? */
411 snprintf (buffer,
412 sizeof (buffer),
413 "Sampling Frequency: %u", value);
414 ADD (buffer, EXTRACTOR_METATYPE_UNKNOWN);
415 break;
416 break; 335 break;
417 case MKVID_Title: 336 case MKVID_Title:
418 if (eSize > MAX_STRING_SIZE) 337 if (eSize > MAX_STRING_SIZE)
419 break; 338 break;
420 strncpy(temp,data+p,eSize); 339 snprintf (buffer,
421 temp[eSize] = '\0'; 340 sizeof (buffer),
422 ADD (temp, EXTRACTOR_METATYPE_TITLE); 341 "%.*s",
342 (int) eSize,
343 (const char*) data + p);
344 ADD (buffer, EXTRACTOR_METATYPE_TITLE);
345 break;
346 default:
423 break; 347 break;
424/*TODO case MKVID_Tags:*/
425 } 348 }
426 p += eSize; /*skip unknown or uninteresting */ 349 p += eSize; /*skip unknown or uninteresting */
427 } 350 }
428 while (1); 351 while (1);
352
353 snprintf (buffer,
354 sizeof (buffer),
355 "%u s (%s%s%s)",
356 (unsigned int) (duration / 1e+9 * (float) timescale),
357 (have_audio ? "audio" : ""),
358 ((have_audio && have_video) ? "/" : ""),
359 (have_video ? "video" : ""));
360 if ( (have_audio || have_video) && (duration >= 0.0) )
361 ADD (buffer, EXTRACTOR_METATYPE_DURATION);
429 if ( (value_width != 0) && (value_height != 0) ) 362 if ( (value_width != 0) && (value_height != 0) )
363 {
430 snprintf (buffer, 364 snprintf (buffer,
431 sizeof(buffer), 365 sizeof(buffer),
432 "%ux%u", 366 "%ux%u",
433 value_width, value_height); 367 value_width, value_height);
434 ADD (buffer, EXTRACTOR_METATYPE_IMAGE_DIMENSIONS); 368 ADD (buffer, EXTRACTOR_METATYPE_IMAGE_DIMENSIONS);
435 369 }
436EXIT:
437 370
371 if (NULL != codec)
372 {
373 if ( (fps != 0) && (bit_depth != 0) )
374 snprintf (buffer,
375 sizeof (buffer),
376 "%.*s (%u fps, %u bit)",
377 codec_strlen,
378 codec,
379 fps,
380 bit_depth);
381 else if (fps != 0)
382 snprintf (buffer,
383 sizeof (buffer),
384 "%.*s (%u fps)",
385 codec_strlen,
386 codec,
387 fps);
388 else if (bit_depth != 0)
389 snprintf (buffer,
390 sizeof (buffer),
391 "%.*s (%u bit)",
392 codec_strlen,
393 codec,
394 bit_depth);
395 else
396 snprintf (buffer,
397 sizeof (buffer),
398 "%.*s",
399 codec_strlen,
400 codec);
401 ADD (buffer,
402 EXTRACTOR_METATYPE_FORMAT);
403 }
404EXIT:
438 return ret; 405 return ret;
439
440} 406}
diff --git a/src/plugins/tar_extractor.c b/src/plugins/tar_extractor.c
index eb308f6..2ea0ac9 100644
--- a/src/plugins/tar_extractor.c
+++ b/src/plugins/tar_extractor.c
@@ -472,14 +472,9 @@ EXTRACTOR_tar_extract (const char *data,
472 if ((0 < keylength) && (NULL != valptr) 472 if ((0 < keylength) && (NULL != valptr)
473 && (keyptr != valptr)) 473 && (keyptr != valptr))
474 { 474 {
475 unsigned int difflength = 0;
476
477 while ((valptr < data + pos + (size_t) fsize) 475 while ((valptr < data + pos + (size_t) fsize)
478 && (' ' == *valptr)) 476 && (' ' == *valptr))
479 valptr += 1; 477 valptr += 1;
480
481 difflength = (valptr - keyptr);
482
483 if (0 == memcmp (valptr, "path=", 5)) 478 if (0 == memcmp (valptr, "path=", 5))
484 { 479 {
485 nameptr = valptr + 5; 480 nameptr = valptr + 5;
diff --git a/src/plugins/zip_extractor.c b/src/plugins/zip_extractor.c
index 518533d..8738295 100644
--- a/src/plugins/zip_extractor.c
+++ b/src/plugins/zip_extractor.c
@@ -91,9 +91,14 @@ EXTRACTOR_zip_extract (const unsigned char *data,
91 char *filecomment; 91 char *filecomment;
92 const unsigned char *pos; 92 const unsigned char *pos;
93 unsigned int offset, stop; 93 unsigned int offset, stop;
94 unsigned int name_length, extra_length, comment_length; 94 unsigned int name_length;
95 unsigned int extra_length;
96 unsigned int comment_length;
95 unsigned int filecomment_length; 97 unsigned int filecomment_length;
96 unsigned int entry_total, entry_count; 98 unsigned int entry_count;
99#if DEBUG_EXTRACT_ZIP
100 unsigned int entry_total;
101#endif
97 102
98 /* I think the smallest zipfile you can have is about 120 bytes */ 103 /* I think the smallest zipfile you can have is about 120 bytes */
99 if ((NULL == data) || (size < 100)) 104 if ((NULL == data) || (size < 100))
@@ -192,8 +197,8 @@ EXTRACTOR_zip_extract (const unsigned char *data,
192 fprintf (stderr, 197 fprintf (stderr,
193 "WARNING: May not be able to find all the files in this" 198 "WARNING: May not be able to find all the files in this"
194 " ZIP archive (no multi-volume support right now).\n"); 199 " ZIP archive (no multi-volume support right now).\n");
200 entry_total = pos[10] + (pos[11] << 8);
195#endif 201#endif
196 entry_total = pos[10] + (pos[11] << 8);
197 entry_count = 0; 202 entry_count = 0;
198 203
199 /* jump to start of central directory, ASSUMING that the starting disk that it's on is disk 0 */ 204 /* jump to start of central directory, ASSUMING that the starting disk that it's on is disk 0 */
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 00:29:13 +0000