commit 068fee0d62ed59350fca615be6b7d31bbae49f0a
parent 6afba238080153652a9e4dd186ced8f528a7e798
Author: Christian Grothoff <christian@grothoff.org>
Date: Mon, 14 Jul 2008 08:05:14 +0000
argh
Diffstat:
10 files changed, 127 insertions(+), 59 deletions(-)
diff --git a/po/de.po b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.14\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2008-07-13 15:09-0600\n"
+"POT-Creation-Date: 2008-07-14 02:05-0600\n"
"PO-Revision-Date: 2007-03-23 23:16+0100\n"
"Last-Translator: Nils Durner <durner@gnunet.org>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -122,12 +122,12 @@ msgstr "extract [OPTIONEN] [DATEINAME]*"
msgid "Extract metadata from files."
msgstr "Metadaten aus den Dateien extrahieren."
-#: src/main/extract.c:190 src/main/extractor.c:1533
+#: src/main/extract.c:190 src/main/extractor.c:1535
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (binär)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1538
+#: src/main/extract.c:201 src/main/extractor.c:1540
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "UNGÜLTIGE ART - %s\n"
@@ -693,12 +693,20 @@ msgstr ""
msgid "disc number"
msgstr "Nummer der Platte"
-#: src/main/extractor.c:599
+#: src/main/extractor.c:180
+msgid "preferred display style (GNUnet)"
+msgstr ""
+
+#: src/main/extractor.c:181
+msgid "GNUnet URI of ECBC data"
+msgstr ""
+
+#: src/main/extractor.c:601
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisierung des Plugin-Mechanismus' ist fehlgeschlagen: %s.\n"
-#: src/main/extractor.c:763
+#: src/main/extractor.c:765
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -707,12 +715,12 @@ msgstr ""
"Das Auflösen von Symbol `%s' in Bibliothek `%s' ist fehlgeschlagen, deshalb "
"wurde `%s' versucht, was aber auch fehlschlug. Fehler sind: `%s' und `%s'.\n"
-#: src/main/extractor.c:794
+#: src/main/extractor.c:796
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Laden des »%s«-Plugins ist fehlgeschlagen: %s\n"
-#: src/main/extractor.c:1006
+#: src/main/extractor.c:1008
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Entladen des »%s«-Plugins ist fehlgeschlagen!\n"
diff --git a/po/ga.po b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.20\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2008-07-13 15:09-0600\n"
+"POT-Creation-Date: 2008-07-14 02:05-0600\n"
"PO-Revision-Date: 2008-03-21 20:46-0700\n"
"Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -119,12 +119,12 @@ msgstr "extract [ROGHANNA] [COMHADAINM]*"
msgid "Extract metadata from files."
msgstr "Bain meiteashonra as comhaid."
-#: src/main/extract.c:190 src/main/extractor.c:1533
+#: src/main/extract.c:190 src/main/extractor.c:1535
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (dnrtha)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1538
+#: src/main/extract.c:201 src/main/extractor.c:1540
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "CINEL NEAMHBHAIL - %s\n"
@@ -690,12 +690,20 @@ msgstr "c
msgid "disc number"
msgstr "uimhir an diosca"
-#: src/main/extractor.c:599
+#: src/main/extractor.c:180
+msgid "preferred display style (GNUnet)"
+msgstr ""
+
+#: src/main/extractor.c:181
+msgid "GNUnet URI of ECBC data"
+msgstr ""
+
+#: src/main/extractor.c:601
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Theip ar ths meicnocht na mbreisen: %s!\n"
-#: src/main/extractor.c:763
+#: src/main/extractor.c:765
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -705,12 +713,12 @@ msgstr ""
"bhain m triail as `%s', ach theip ar an cheann sin freisin. Na hearrid: `"
"%s' agus `%s'.\n"
-#: src/main/extractor.c:794
+#: src/main/extractor.c:796
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Theip ar lucht an bhreisein `%s': %s\n"
-#: src/main/extractor.c:1006
+#: src/main/extractor.c:1008
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Theip ar dhlucht an bhreisein `%s'!\n"
diff --git a/po/libextractor.pot b/po/libextractor.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2008-07-13 15:09-0600\n"
+"POT-Creation-Date: 2008-07-14 02:05-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,12 +108,12 @@ msgstr ""
msgid "Extract metadata from files."
msgstr ""
-#: src/main/extract.c:190 src/main/extractor.c:1533
+#: src/main/extract.c:190 src/main/extractor.c:1535
#, c-format
msgid "%s - (binary)\n"
msgstr ""
-#: src/main/extract.c:201 src/main/extractor.c:1538
+#: src/main/extract.c:201 src/main/extractor.c:1540
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr ""
@@ -678,24 +678,32 @@ msgstr ""
msgid "disc number"
msgstr ""
-#: src/main/extractor.c:599
+#: src/main/extractor.c:180
+msgid "preferred display style (GNUnet)"
+msgstr ""
+
+#: src/main/extractor.c:181
+msgid "GNUnet URI of ECBC data"
+msgstr ""
+
+#: src/main/extractor.c:601
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr ""
-#: src/main/extractor.c:763
+#: src/main/extractor.c:765
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
"failed also. Errors are: `%s' and `%s'.\n"
msgstr ""
-#: src/main/extractor.c:794
+#: src/main/extractor.c:796
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr ""
-#: src/main/extractor.c:1006
+#: src/main/extractor.c:1008
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor-0.5.20a\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2008-07-13 15:09-0600\n"
+"POT-Creation-Date: 2008-07-14 02:05-0600\n"
"PO-Revision-Date: 2008-04-28 14:52+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -119,12 +119,12 @@ msgstr "extract [OPTIES] [BESTANDSNAAM]*"
msgid "Extract metadata from files."
msgstr "Metadata uit bestanden lezen."
-#: src/main/extract.c:190 src/main/extractor.c:1533
+#: src/main/extract.c:190 src/main/extractor.c:1535
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (binair)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1538
+#: src/main/extract.c:201 src/main/extractor.c:1540
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "ONGELDIG TYPE - %s\n"
@@ -689,12 +689,20 @@ msgstr "International Standard Recording Code"
msgid "disc number"
msgstr "CD-nummer"
-#: src/main/extractor.c:599
+#: src/main/extractor.c:180
+msgid "preferred display style (GNUnet)"
+msgstr ""
+
+#: src/main/extractor.c:181
+msgid "GNUnet URI of ECBC data"
+msgstr ""
+
+#: src/main/extractor.c:601
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisatie van plugin-mechanisme is mislukt: %s\n"
-#: src/main/extractor.c:763
+#: src/main/extractor.c:765
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -704,12 +712,12 @@ msgstr ""
"het herleiden van '%s' mislukte ook.\n"
"De foutmeldingen waren: '%s' en '%s'.\n"
-#: src/main/extractor.c:794
+#: src/main/extractor.c:796
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Laden van plugin '%s' is mislukt: %s\n"
-#: src/main/extractor.c:1006
+#: src/main/extractor.c:1008
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Verwijderen van plugin '%s' is mislukt.\n"
diff --git a/po/ro.po b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.3\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2008-07-13 15:09-0600\n"
+"POT-Creation-Date: 2008-07-14 02:05-0600\n"
"PO-Revision-Date: 2005-08-16 12:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
"Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -126,12 +126,12 @@ msgstr "extract [OP
msgid "Extract metadata from files."
msgstr "Extrage metadata din fiiere."
-#: src/main/extract.c:190 src/main/extractor.c:1533
+#: src/main/extract.c:190 src/main/extractor.c:1535
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (binar)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1538
+#: src/main/extract.c:201 src/main/extractor.c:1540
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "TIP INVALID - %s\n"
@@ -722,12 +722,20 @@ msgstr ""
msgid "disc number"
msgstr "Numr de fiier incorect"
-#: src/main/extractor.c:599
+#: src/main/extractor.c:180
+msgid "preferred display style (GNUnet)"
+msgstr ""
+
+#: src/main/extractor.c:181
+msgid "GNUnet URI of ECBC data"
+msgstr ""
+
+#: src/main/extractor.c:601
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "iniializare mecanismului de plugin a euat: %s!\n"
-#: src/main/extractor.c:763
+#: src/main/extractor.c:765
#, fuzzy, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -736,12 +744,12 @@ msgstr ""
"Rezolvarea simbolului '%s' n biblioteca '%s' a euat, aa c am ncercat '%"
"s', dar i acesta a euat. Erorile sunt: '%s' i '%s'.\n"
-#: src/main/extractor.c:794
+#: src/main/extractor.c:796
#, fuzzy, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "ncrcarea plugin-ului '%s' a euat: %s\n"
-#: src/main/extractor.c:1006
+#: src/main/extractor.c:1008
#, fuzzy, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Descrcarea plugin-ului '%s' a euat!\n"
diff --git a/po/rw.po b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.4.2\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2008-07-13 15:09-0600\n"
+"POT-Creation-Date: 2008-07-14 02:05-0600\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -134,12 +134,12 @@ msgstr ""
msgid "Extract metadata from files."
msgstr "Bivuye Idosiye"
-#: src/main/extract.c:190 src/main/extractor.c:1533
+#: src/main/extract.c:190 src/main/extractor.c:1535
#, fuzzy, c-format
msgid "%s - (binary)\n"
msgstr "%s-(Nyabibiri"
-#: src/main/extract.c:201 src/main/extractor.c:1538
+#: src/main/extract.c:201 src/main/extractor.c:1540
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr ""
@@ -877,24 +877,32 @@ msgstr ""
msgid "disc number"
msgstr "IDOSIYE Umubare"
-#: src/main/extractor.c:599
+#: src/main/extractor.c:180
+msgid "preferred display style (GNUnet)"
+msgstr ""
+
+#: src/main/extractor.c:181
+msgid "GNUnet URI of ECBC data"
+msgstr ""
+
+#: src/main/extractor.c:601
#, fuzzy, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Bya Byanze"
-#: src/main/extractor.c:763
+#: src/main/extractor.c:765
#, fuzzy, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
"failed also. Errors are: `%s' and `%s'.\n"
msgstr "IKIMENYETSO in Isomero Byanze Byanze Na"
-#: src/main/extractor.c:794
+#: src/main/extractor.c:796
#, fuzzy, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Byanze"
-#: src/main/extractor.c:1006
+#: src/main/extractor.c:1008
#, fuzzy, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Byanze"
diff --git a/po/sv.po b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.20\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2008-07-13 15:09-0600\n"
+"POT-Creation-Date: 2008-07-14 02:05-0600\n"
"PO-Revision-Date: 2008-04-01 12:46+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -114,12 +114,12 @@ msgstr "extract [FLAGGOR] [FILNAMN]*"
msgid "Extract metadata from files."
msgstr "Extrahera metadata från filer."
-#: src/main/extract.c:190 src/main/extractor.c:1533
+#: src/main/extract.c:190 src/main/extractor.c:1535
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (binär)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1538
+#: src/main/extract.c:201 src/main/extractor.c:1540
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "OGILTIG TYP - %s\n"
@@ -690,12 +690,20 @@ msgstr "internationell standardkod för inspelning"
msgid "disc number"
msgstr "skivnummer"
-#: src/main/extractor.c:599
+#: src/main/extractor.c:180
+msgid "preferred display style (GNUnet)"
+msgstr ""
+
+#: src/main/extractor.c:181
+msgid "GNUnet URI of ECBC data"
+msgstr ""
+
+#: src/main/extractor.c:601
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
-#: src/main/extractor.c:763
+#: src/main/extractor.c:765
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -704,12 +712,12 @@ msgstr ""
"Uppslag av symbol \"%s\" i bibliotek \"%s\" misslyckades så jag försökte med "
"\"%s\" men det misslyckades också. Felen är: \"%s\" och \"%s\".\n"
-#: src/main/extractor.c:794
+#: src/main/extractor.c:796
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Inläsning av instick \"%s\" misslyckades: %s\n"
-#: src/main/extractor.c:1006
+#: src/main/extractor.c:1008
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Urläsning av instick \"%s\" misslyckades!\n"
diff --git a/po/vi.po b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.20\n"
"Report-Msgid-Bugs-To: libextractor@gnu.org\n"
-"POT-Creation-Date: 2008-07-13 15:09-0600\n"
+"POT-Creation-Date: 2008-07-14 02:05-0600\n"
"PO-Revision-Date: 2008-03-30 21:44+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -124,12 +124,12 @@ msgstr ""
msgid "Extract metadata from files."
msgstr "Rút siêu dữ liệu ra tập tin."
-#: src/main/extract.c:190 src/main/extractor.c:1533
+#: src/main/extract.c:190 src/main/extractor.c:1535
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (nhị phân)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1538
+#: src/main/extract.c:201 src/main/extractor.c:1540
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "KIỂU KHÔNG HỢP LỆ — %s\n"
@@ -700,12 +700,20 @@ msgstr "mã thu tiêu chuẩn quốc tế"
msgid "disc number"
msgstr "số thứ tự đĩa"
-#: src/main/extractor.c:599
+#: src/main/extractor.c:180
+msgid "preferred display style (GNUnet)"
+msgstr ""
+
+#: src/main/extractor.c:181
+msgid "GNUnet URI of ECBC data"
+msgstr ""
+
+#: src/main/extractor.c:601
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Việc khởi động cơ chế cầm phít bị lỗi: %s\n"
-#: src/main/extractor.c:763
+#: src/main/extractor.c:765
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -714,12 +722,12 @@ msgstr ""
"Việc tháo gỡ ký hiệu « %s » trong thư viện « %s » bị lỗi, thì đã cố « %s », "
"nhưng mà nó cũng không thành công. Gặp lỗi « %s » và « %s ».\n"
-#: src/main/extractor.c:794
+#: src/main/extractor.c:796
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Việc tải bổ sung « %s » bị lỗi: %s\n"
-#: src/main/extractor.c:1006
+#: src/main/extractor.c:1008
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Việc bỏ tải bổ sung « %s » bị lỗi.\n"
diff --git a/src/include/extractor.h b/src/include/extractor.h
@@ -32,7 +32,7 @@ extern "C" {
* 0.2.6-1 => 0x00020601
* 4.5.2-0 => 0x04050200
*/
-#define EXTRACTOR_VERSION 0x00052000
+#define EXTRACTOR_VERSION 0x00052003
#include <stdio.h>
@@ -188,12 +188,14 @@ typedef enum {
EXTRACTOR_TRACK_NUMBER = 132,
EXTRACTOR_ISRC = 133,
EXTRACTOR_DISC_NUMBER = 134,
+ EXTRACTOR_GNUNET_DISPLAY_TYPE = 135,
+ EXTRACTOR_GNUNET_ECBC_URI = 136,
} EXTRACTOR_KeywordType;
/**
* Test if a given LE type contains binary data.
*/
-#define EXTRACTOR_isBinaryType(type) (type == EXTRACTOR_THUMBNAIL_DATA)
+#define EXTRACTOR_isBinaryType(type) (type == EXTRACTOR_THUMBNAIL_DATA)
/**
* A linked list of keywords. This structure is passed around
diff --git a/src/main/extractor.c b/src/main/extractor.c
@@ -177,11 +177,13 @@ static const char *keywordTypes[] = {
gettext_noop("track number"),
gettext_noop("international standard recording code"),
gettext_noop("disc number"), /* 134 */
+ gettext_noop("preferred display style (GNUnet)"),
+ gettext_noop("GNUnet URI of ECBC data"),
NULL,
};
/* the number of keyword types (for bounds-checking) */
-#define HIGHEST_TYPE_NUMBER 135
+#define HIGHEST_TYPE_NUMBER 137
#ifdef HAVE_LIBOGG
#if HAVE_VORBIS
