[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6581 - in Extractor: . contrib doc po src/include
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r6581 - in Extractor: . contrib doc po src/include |
|
Date: |
Fri, 21 Mar 2008 00:00:53 -0600 (MDT) |
Author: grothoff
Date: 2008-03-21 00:00:52 -0600 (Fri, 21 Mar 2008)
New Revision: 6581
Modified:
Extractor/ChangeLog
Extractor/INSTALL
Extractor/configure.ac
Extractor/contrib/doxygen
Extractor/doc/mdate-sh
Extractor/doc/texinfo.tex
Extractor/doc/version.texi
Extractor/po/de.po
Extractor/po/ga.po
Extractor/po/libextractor.pot
Extractor/po/ro.po
Extractor/po/rw.po
Extractor/po/sv.po
Extractor/po/vi.po
Extractor/src/include/extractor.h
Log:
release
Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/ChangeLog 2008-03-21 06:00:52 UTC (rev 6581)
@@ -1,3 +1,6 @@
+Thu Mar 20 23:38:47 MDT 2008
+ Releasing libextractor 0.5.20.
+
Fri Mar 7 13:29:01 EET 2008
Added disc number.
Modified: Extractor/INSTALL
===================================================================
--- Extractor/INSTALL 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/INSTALL 2008-03-21 06:00:52 UTC (rev 6581)
@@ -2,7 +2,7 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -67,6 +67,9 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
Modified: Extractor/configure.ac
===================================================================
--- Extractor/configure.ac 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/configure.ac 2008-03-21 06:00:52 UTC (rev 6581)
@@ -1,8 +1,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT([libextractor], [0.5.19a], address@hidden)
+AC_INIT([libextractor], [0.5.20], address@hidden)
AC_REVISION($Revision: 1.67 $)
-AM_INIT_AUTOMAKE([libextractor], [0.5.19a])
+AM_INIT_AUTOMAKE([libextractor], [0.5.20])
AM_CONFIG_HEADER(src/include/config.h)
AH_TOP([#define _GNU_SOURCE 1])
Modified: Extractor/contrib/doxygen
===================================================================
--- Extractor/contrib/doxygen 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/contrib/doxygen 2008-03-21 06:00:52 UTC (rev 6581)
@@ -23,7 +23,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.5.19a
+PROJECT_NUMBER = 0.5.20
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Modified: Extractor/doc/mdate-sh
===================================================================
--- Extractor/doc/mdate-sh 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/doc/mdate-sh 2008-03-21 06:00:52 UTC (rev 6581)
@@ -1,9 +1,9 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
-scriptversion=2005-06-29.22
+scriptversion=2007-03-30.02
-# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software
+# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005, 2007 Free Software
# Foundation, Inc.
# written by Ulrich Drepper <address@hidden>, June 1995
#
@@ -75,6 +75,10 @@
else
ls_command='ls -l -d'
fi
+# Avoid user/group names that might have spaces, when possible.
+if ls -n /dev/null 1>/dev/null 2>&1; then
+ ls_command="$ls_command -n"
+fi
# A `ls -l' line looks as follows on OS/2.
# drwxrwx--- 0 Aug 11 2001 foo
@@ -89,7 +93,7 @@
# words should be skipped to get the date.
# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
-set x`ls -l -d /`
+set x`$ls_command /`
# Find which argument is the month.
month=
Modified: Extractor/doc/texinfo.tex
===================================================================
--- Extractor/doc/texinfo.tex 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/doc/texinfo.tex 2008-03-21 06:00:52 UTC (rev 6581)
@@ -3,16 +3,16 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2006-10-04.17}
+\def\texinfoversion{2007-12-02.17}
%
-% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
-% Software Foundation, Inc.
+% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 2007,
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+% 2007 Free Software Foundation, Inc.
%
-% This texinfo.tex file is free software; you can redistribute it and/or
+% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
-% published by the Free Software Foundation; either version 2, or (at
-% your option) any later version.
+% published by the Free Software Foundation, either version 3 of the
+% License, or (at your option) any later version.
%
% This texinfo.tex file is distributed in the hope that it will be
% useful, but WITHOUT ANY WARRANTY; without even the implied warranty
@@ -20,9 +20,7 @@
% General Public License for more details.
%
% You should have received a copy of the GNU General Public License
-% along with this texinfo.tex file; see the file COPYING. If not, write
-% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-% Boston, MA 02110-1301, USA.
+% along with this program. If not, see <http://www.gnu.org/licenses/>.
%
% As a special exception, when this file is read by TeX when processing
% a Texinfo source document, you may use the result without
@@ -67,7 +65,7 @@
\everyjob{\message{[Texinfo version \texinfoversion]}%
\catcode`+=\active \catcode`\_=\active}
-\message{Basics,}
+
\chardef\other=12
% We never want plain's \outer definition of \+ in Texinfo.
@@ -279,6 +277,50 @@
\newdimen\cornerthick \cornerthick=.3pt
\newdimen\topandbottommargin \topandbottommargin=.75in
+% Output a mark which sets \thischapter, \thissection and \thiscolor.
+% We dump everything together because we only have one kind of mark.
+% This works because we only use \botmark / \topmark, not \firstmark.
+%
+% A mark contains a subexpression of the \ifcase ... \fi construct.
+% \get*marks macros below extract the needed part using \ifcase.
+%
+% Another complication is to let the user choose whether \thischapter
+% (\thissection) refers to the chapter (section) in effect at the top
+% of a page, or that at the bottom of a page. The solution is
+% described on page 260 of The TeXbook. It involves outputting two
+% marks for the sectioning macros, one before the section break, and
+% one after. I won't pretend I can describe this better than DEK...
+\def\domark{%
+ \toks0=\expandafter{\lastchapterdefs}%
+ \toks2=\expandafter{\lastsectiondefs}%
+ \toks4=\expandafter{\prevchapterdefs}%
+ \toks6=\expandafter{\prevsectiondefs}%
+ \toks8=\expandafter{\lastcolordefs}%
+ \mark{%
+ \the\toks0 \the\toks2
+ \noexpand\or \the\toks4 \the\toks6
+ \noexpand\else \the\toks8
+ }%
+}
+% \topmark doesn't work for the very first chapter (after the title
+% page or the contents), so we use \firstmark there -- this gets us
+% the mark with the chapter defs, unless the user sneaks in, e.g.,
+% @setcolor (or @url, or @link, etc.) between @contents and the very
+% first @chapter.
+\def\gettopheadingmarks{%
+ \ifcase0\topmark\fi
+ \ifx\thischapter\empty \ifcase0\firstmark\fi \fi
+}
+\def\getbottomheadingmarks{\ifcase1\botmark\fi}
+\def\getcolormarks{\ifcase2\topmark\fi}
+
+% Avoid "undefined control sequence" errors.
+\def\lastchapterdefs{}
+\def\lastsectiondefs{}
+\def\prevchapterdefs{}
+\def\prevsectiondefs{}
+\def\lastcolordefs{}
+
% Main output routine.
\chardef\PAGE = 255
\output = {\onepageout{\pagecontents\PAGE}}
@@ -296,7 +338,9 @@
%
% Do this outside of the \shipout so @code etc. will be expanded in
% the headline as they should be, not taken literally (outputting ''code).
+ \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi
\setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
+ \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi
\setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
%
{%
@@ -375,7 +419,7 @@
% marginal hacks, address@hidden (Juha Takala)
\ifvoid\margin\else % marginal info is present
\rlap{\kern\hsize\vbox address@hidden \vss}}\fi
address@hidden \unvbox#1
address@hidden \unvbox#1\relax
\ifvoid\footins\else\vskip\skip\footins\footnoterule \unvbox\footins\fi
address@hidden \kern-\dimen@ \vfil \fi}
}
@@ -1225,8 +1269,9 @@
% To handle parens, we must adopt a different approach, since parens are
% not active characters. hyperref.dtx (which has the same problem as
-% us) handles it with this amazing macro to replace tokens. I've
-% tinkered with it a little for texinfo, but it's definitely from there.
+% us) handles it with this amazing macro to replace tokens, with minor
+% changes for Texinfo. It is included here under the GPL by permission
+% from the author, Heiko Oberdiek.
%
% #1 is the tokens to replace.
% #2 is the replacement.
@@ -1255,13 +1300,83 @@
\HyPsdSubst{)}{\realbackslash)}{#1}%
}
+\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
+with PDF output, and none of those formats could be found. (.eps cannot
+be supported due to the design of the PDF format; use regular TeX (DVI
+output) for that.)}
+
\ifpdf
- \input pdfcolor
- \pdfcatalog{/PageMode /UseOutlines}%
+ %
+ % Color manipulation macros based on pdfcolor.tex.
+ \def\cmykDarkRed{0.28 1 1 0.35}
+ \def\cmykBlack{0 0 0 1}
+ %
+ \def\pdfsetcolor#1{\pdfliteral{#1 k}}
+ % Set color, and create a mark which defines \thiscolor accordingly,
+ % so that \makeheadline knows which color to restore.
+ \def\setcolor#1{%
+ \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}%
+ \domark
+ \pdfsetcolor{#1}%
+ }
+ %
+ \def\maincolor{\cmykBlack}
+ \pdfsetcolor{\maincolor}
+ \edef\thiscolor{\maincolor}
+ \def\lastcolordefs{}
+ %
+ \def\makefootline{%
+ \baselineskip24pt
+ \line{\pdfsetcolor{\maincolor}\the\footline}%
+ }
+ %
+ \def\makeheadline{%
+ \vbox to 0pt{%
+ \vskip-22.5pt
+ \line{%
+ \vbox to8.5pt{}%
+ % Extract \thiscolor definition from the marks.
+ \getcolormarks
+ % Typeset the headline with \maincolor, then restore the color.
+ \pdfsetcolor{\maincolor}\the\headline\pdfsetcolor{\thiscolor}%
+ }%
+ \vss
+ }%
+ \nointerlineskip
+ }
+ %
+ %
+ \pdfcatalog{/PageMode /UseOutlines}
+ %
% #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
\def\dopdfimage#1#2#3{%
\def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
\def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
+ %
+ % pdftex (and the PDF format) support .png, .jpg, .pdf (among
+ % others). Let's try in that order.
+ \let\pdfimgext=\empty
+ \begingroup
+ \openin 1 #1.png \ifeof 1
+ \openin 1 #1.jpg \ifeof 1
+ \openin 1 #1.jpeg \ifeof 1
+ \openin 1 #1.JPG \ifeof 1
+ \openin 1 #1.pdf \ifeof 1
+ \errhelp = \nopdfimagehelp
+ \errmessage{Could not find image file #1 for pdf}%
+ \else \gdef\pdfimgext{pdf}%
+ \fi
+ \else \gdef\pdfimgext{JPG}%
+ \fi
+ \else \gdef\pdfimgext{jpeg}%
+ \fi
+ \else \gdef\pdfimgext{jpg}%
+ \fi
+ \else \gdef\pdfimgext{png}%
+ \fi
+ \closein 1
+ \endgroup
+ %
% without \immediate, pdftex seg faults when the same image is
% included twice. (Version 3.14159-pre-1.0-unofficial-20010704.)
\ifnum\pdftexversion < 14
@@ -1272,28 +1387,35 @@
\ifdim \wd0 >0pt width \imagewidth \fi
\ifdim \wd2 >0pt height \imageheight \fi
\ifnum\pdftexversion<13
- #1.pdf%
+ #1.\pdfimgext
\else
- {#1.pdf}%
+ {#1.\pdfimgext}%
\fi
\ifnum\pdftexversion < 14 \else
\pdfrefximage \pdflastximage
\fi}
+ %
\def\pdfmkdest#1{{%
% We have to set dummies so commands such as @code, and characters
% such as \, aren't expanded when present in a section title.
- \atdummies
+ \indexnofonts
+ \turnoffactive
\activebackslashdouble
+ \makevalueexpandable
\def\pdfdestname{#1}%
\backslashparens\pdfdestname
- \pdfdest name{\pdfdestname} xyz%
- }}%
+ \safewhatsit{\pdfdest name{\pdfdestname} xyz}%
+ }}
%
% used to mark target names; must be expandable.
- \def\pdfmkpgn#1{#1}%
+ \def\pdfmkpgn#1{#1}
%
- \let\linkcolor = \Blue % was Cyan, but that seems light?
- \def\endlink{\Black\pdfendlink}
+ % by default, use a color that is dark enough to print on paper as
+ % nearly black, but still distinguishable for online viewing.
+ \def\urlcolor{\cmykDarkRed}
+ \def\linkcolor{\cmykDarkRed}
+ \def\endlink{\setcolor{\maincolor}\pdfendlink}
+ %
% Adding outlines to PDF; macros for calculating structure of outlines
% come from Petr Olsak
\def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
@@ -1395,7 +1517,7 @@
\indexnofonts
\setupdatafile
\catcode`\\=\active \otherbackslash
- \input \jobname.toc
+ \input \tocreadfilename
\endgroup
}
%
@@ -1425,7 +1547,7 @@
address@hidden@}%
\let\/=\empty
\makevalueexpandable
- \leavevmode\Red
+ \leavevmode\setcolor{\urlcolor}%
\startlink attr{/Border [0 0 0]}%
user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
\endgroup}
@@ -1452,13 +1574,14 @@
{\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
\def\pdflink#1{%
\startlink attr{/Border [0 0 0]} goto name{\pdfmkpgn{#1}}
- \linkcolor #1\endlink}
+ \setcolor{\linkcolor}#1\endlink}
\def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
\else
\let\pdfmkdest = \gobble
\let\pdfurl = \gobble
\let\endlink = \relax
- \let\linkcolor = \relax
+ \let\setcolor = \gobble
+ \let\pdfsetcolor = \gobble
\let\pdfmakeoutlines = \relax
\fi % \ifx\pdfoutput
@@ -1505,8 +1628,12 @@
\def\strutheightpercent{.70833}
\def\strutdepthpercent {.29167}
%
+% can get a sort of poor man's double spacing by redefining this.
+\def\baselinefactor{1}
+%
\def\setleading#1{%
- \normalbaselineskip = #1\relax
+ \dimen0 = #1\relax
+ \normalbaselineskip = \baselinefactor\dimen0
\normallineskip = \lineskipfactor\normalbaselineskip
\normalbaselines
\setbox\strutbox =\hbox{%
@@ -1515,13 +1642,280 @@
}%
}
+% PDF CMaps. See also LaTeX's t1.cmap.
+%
+% do nothing with this by default.
+\expandafter\let\csname cmapOT1\endcsname\gobble
+\expandafter\let\csname cmapOT1IT\endcsname\gobble
+\expandafter\let\csname cmapOT1TT\endcsname\gobble
+% if we are producing pdf, and we have \pdffontattr, then define cmaps.
+% (\pdffontattr was introduced many years ago, but people still run
+% older pdftex's; it's easy to conditionalize, so we do.)
+\ifpdf \ifx\pdffontattr\undefined \else
+ \begingroup
+ \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+ \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1-0)
+%%Title: (TeX-OT1-0 TeX OT1 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+8 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<23> <26> <0023>
+<28> <3B> <0028>
+<3F> <5B> <003F>
+<5D> <5E> <005D>
+<61> <7A> <0061>
+<7B> <7C> <2013>
+endbfrange
+40 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <00660066>
+<0C> <00660069>
+<0D> <0066006C>
+<0E> <006600660069>
+<0F> <00660066006C>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<21> <0021>
+<22> <201D>
+<27> <2019>
+<3C> <00A1>
+<3D> <003D>
+<3E> <00BF>
+<5C> <201C>
+<5F> <02D9>
+<60> <2018>
+<7D> <02DD>
+<7E> <007E>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+ }\endgroup
+ \expandafter\edef\csname cmapOT1\endcsname#1{%
+ \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+ }%
+%
+% \cmapOT1IT
+ \begingroup
+ \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+ \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1IT-0)
+%%Title: (TeX-OT1IT-0 TeX OT1IT 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1IT)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1IT-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+8 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<25> <26> <0025>
+<28> <3B> <0028>
+<3F> <5B> <003F>
+<5D> <5E> <005D>
+<61> <7A> <0061>
+<7B> <7C> <2013>
+endbfrange
+42 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <00660066>
+<0C> <00660069>
+<0D> <0066006C>
+<0E> <006600660069>
+<0F> <00660066006C>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<21> <0021>
+<22> <201D>
+<23> <0023>
+<24> <00A3>
+<27> <2019>
+<3C> <00A1>
+<3D> <003D>
+<3E> <00BF>
+<5C> <201C>
+<5F> <02D9>
+<60> <2018>
+<7D> <02DD>
+<7E> <007E>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+ }\endgroup
+ \expandafter\edef\csname cmapOT1IT\endcsname#1{%
+ \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+ }%
+%
+% \cmapOT1TT
+ \begingroup
+ \catcode`\^^M=\active \def^^M{^^J}% Output line endings as the ^^J char.
+ \catcode`\%=12 \immediate\pdfobj stream {%!PS-Adobe-3.0 Resource-CMap
+%%DocumentNeededResources: ProcSet (CIDInit)
+%%IncludeResource: ProcSet (CIDInit)
+%%BeginResource: CMap (TeX-OT1TT-0)
+%%Title: (TeX-OT1TT-0 TeX OT1TT 0)
+%%Version: 1.000
+%%EndComments
+/CIDInit /ProcSet findresource begin
+12 dict begin
+begincmap
+/CIDSystemInfo
+<< /Registry (TeX)
+/Ordering (OT1TT)
+/Supplement 0
+>> def
+/CMapName /TeX-OT1TT-0 def
+/CMapType 2 def
+1 begincodespacerange
+<00> <7F>
+endcodespacerange
+5 beginbfrange
+<00> <01> <0393>
+<09> <0A> <03A8>
+<21> <26> <0021>
+<28> <5F> <0028>
+<61> <7E> <0061>
+endbfrange
+32 beginbfchar
+<02> <0398>
+<03> <039B>
+<04> <039E>
+<05> <03A0>
+<06> <03A3>
+<07> <03D2>
+<08> <03A6>
+<0B> <2191>
+<0C> <2193>
+<0D> <0027>
+<0E> <00A1>
+<0F> <00BF>
+<10> <0131>
+<11> <0237>
+<12> <0060>
+<13> <00B4>
+<14> <02C7>
+<15> <02D8>
+<16> <00AF>
+<17> <02DA>
+<18> <00B8>
+<19> <00DF>
+<1A> <00E6>
+<1B> <0153>
+<1C> <00F8>
+<1D> <00C6>
+<1E> <0152>
+<1F> <00D8>
+<20> <2423>
+<27> <2019>
+<60> <2018>
+<7F> <00A8>
+endbfchar
+endcmap
+CMapName currentdict /CMap defineresource pop
+end
+end
+%%EndResource
+%%EOF
+ }\endgroup
+ \expandafter\edef\csname cmapOT1TT\endcsname#1{%
+ \pdffontattr#1{/ToUnicode \the\pdflastobj\space 0 R}%
+ }%
+\fi\fi
+
+
% Set the font macro #1 to the font named #2, adding on the
% specified font prefix (normally `cm').
-% #3 is the font's design size, #4 is a scale factor
-\def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
+% #3 is the font's design size, #4 is a scale factor, #5 is the CMap
+% encoding (currently only OT1, OT1IT and OT1TT are allowed, pass
+% empty to omit).
+\def\setfont#1#2#3#4#5{%
+ \font#1=\fontprefix#2#3 scaled #4
+ \csname cmap#5\endcsname#1%
+}
+% This is what gets called when #5 of \setfont is empty.
+\let\cmap\gobble
+% emacs-page end of cmaps
-
% Use cm as the default font prefix.
% To specify the font prefix, you must define \fontprefix
% before you read in texinfo.tex.
@@ -1548,119 +1942,127 @@
% Definitions for a main text size of 11pt. This is the default in
% Texinfo.
%
-\def\definetextfontsizexi{
+\def\definetextfontsizexi{%
% Text fonts (11.2pt, magstep1).
\def\textnominalsize{11pt}
\edef\mainmagstep{\magstephalf}
-\setfont\textrm\rmshape{10}{\mainmagstep}
-\setfont\texttt\ttshape{10}{\mainmagstep}
-\setfont\textbf\bfshape{10}{\mainmagstep}
-\setfont\textit\itshape{10}{\mainmagstep}
-\setfont\textsl\slshape{10}{\mainmagstep}
-\setfont\textsf\sfshape{10}{\mainmagstep}
-\setfont\textsc\scshape{10}{\mainmagstep}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}
+\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
+\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
+\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
+\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
+\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
+\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
+\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
\font\texti=cmmi10 scaled \mainmagstep
\font\textsy=cmsy10 scaled \mainmagstep
+\def\textecsize{1095}
% A few fonts for @defun names and args.
-\setfont\defbf\bfshape{10}{\magstep1}
-\setfont\deftt\ttshape{10}{\magstep1}
-\setfont\defttsl\ttslshape{10}{\magstep1}
+\setfont\defbf\bfshape{10}{\magstep1}{OT1}
+\setfont\deftt\ttshape{10}{\magstep1}{OT1TT}
+\setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT}
\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
% Fonts for indices, footnotes, small examples (9pt).
\def\smallnominalsize{9pt}
-\setfont\smallrm\rmshape{9}{1000}
-\setfont\smalltt\ttshape{9}{1000}
-\setfont\smallbf\bfshape{10}{900}
-\setfont\smallit\itshape{9}{1000}
-\setfont\smallsl\slshape{9}{1000}
-\setfont\smallsf\sfshape{9}{1000}
-\setfont\smallsc\scshape{10}{900}
-\setfont\smallttsl\ttslshape{10}{900}
+\setfont\smallrm\rmshape{9}{1000}{OT1}
+\setfont\smalltt\ttshape{9}{1000}{OT1TT}
+\setfont\smallbf\bfshape{10}{900}{OT1}
+\setfont\smallit\itshape{9}{1000}{OT1IT}
+\setfont\smallsl\slshape{9}{1000}{OT1}
+\setfont\smallsf\sfshape{9}{1000}{OT1}
+\setfont\smallsc\scshape{10}{900}{OT1}
+\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
\font\smalli=cmmi9
\font\smallsy=cmsy9
+\def\smallecsize{0900}
% Fonts for small examples (8pt).
\def\smallernominalsize{8pt}
-\setfont\smallerrm\rmshape{8}{1000}
-\setfont\smallertt\ttshape{8}{1000}
-\setfont\smallerbf\bfshape{10}{800}
-\setfont\smallerit\itshape{8}{1000}
-\setfont\smallersl\slshape{8}{1000}
-\setfont\smallersf\sfshape{8}{1000}
-\setfont\smallersc\scshape{10}{800}
-\setfont\smallerttsl\ttslshape{10}{800}
+\setfont\smallerrm\rmshape{8}{1000}{OT1}
+\setfont\smallertt\ttshape{8}{1000}{OT1TT}
+\setfont\smallerbf\bfshape{10}{800}{OT1}
+\setfont\smallerit\itshape{8}{1000}{OT1IT}
+\setfont\smallersl\slshape{8}{1000}{OT1}
+\setfont\smallersf\sfshape{8}{1000}{OT1}
+\setfont\smallersc\scshape{10}{800}{OT1}
+\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
\font\smalleri=cmmi8
\font\smallersy=cmsy8
+\def\smallerecsize{0800}
% Fonts for title page (20.4pt):
\def\titlenominalsize{20pt}
-\setfont\titlerm\rmbshape{12}{\magstep3}
-\setfont\titleit\itbshape{10}{\magstep4}
-\setfont\titlesl\slbshape{10}{\magstep4}
-\setfont\titlett\ttbshape{12}{\magstep3}
-\setfont\titlettsl\ttslshape{10}{\magstep4}
-\setfont\titlesf\sfbshape{17}{\magstep1}
+\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
+\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
+\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
+\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
+\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
\let\titlebf=\titlerm
-\setfont\titlesc\scbshape{10}{\magstep4}
+\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
\font\titlei=cmmi12 scaled \magstep3
\font\titlesy=cmsy10 scaled \magstep4
\def\authorrm{\secrm}
\def\authortt{\sectt}
+\def\titleecsize{2074}
% Chapter (and unnumbered) fonts (17.28pt).
\def\chapnominalsize{17pt}
-\setfont\chaprm\rmbshape{12}{\magstep2}
-\setfont\chapit\itbshape{10}{\magstep3}
-\setfont\chapsl\slbshape{10}{\magstep3}
-\setfont\chaptt\ttbshape{12}{\magstep2}
-\setfont\chapttsl\ttslshape{10}{\magstep3}
-\setfont\chapsf\sfbshape{17}{1000}
+\setfont\chaprm\rmbshape{12}{\magstep2}{OT1}
+\setfont\chapit\itbshape{10}{\magstep3}{OT1IT}
+\setfont\chapsl\slbshape{10}{\magstep3}{OT1}
+\setfont\chaptt\ttbshape{12}{\magstep2}{OT1TT}
+\setfont\chapttsl\ttslshape{10}{\magstep3}{OT1TT}
+\setfont\chapsf\sfbshape{17}{1000}{OT1}
\let\chapbf=\chaprm
-\setfont\chapsc\scbshape{10}{\magstep3}
+\setfont\chapsc\scbshape{10}{\magstep3}{OT1}
\font\chapi=cmmi12 scaled \magstep2
\font\chapsy=cmsy10 scaled \magstep3
+\def\chapecsize{1728}
% Section fonts (14.4pt).
\def\secnominalsize{14pt}
-\setfont\secrm\rmbshape{12}{\magstep1}
-\setfont\secit\itbshape{10}{\magstep2}
-\setfont\secsl\slbshape{10}{\magstep2}
-\setfont\sectt\ttbshape{12}{\magstep1}
-\setfont\secttsl\ttslshape{10}{\magstep2}
-\setfont\secsf\sfbshape{12}{\magstep1}
+\setfont\secrm\rmbshape{12}{\magstep1}{OT1}
+\setfont\secit\itbshape{10}{\magstep2}{OT1IT}
+\setfont\secsl\slbshape{10}{\magstep2}{OT1}
+\setfont\sectt\ttbshape{12}{\magstep1}{OT1TT}
+\setfont\secttsl\ttslshape{10}{\magstep2}{OT1TT}
+\setfont\secsf\sfbshape{12}{\magstep1}{OT1}
\let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep2}
+\setfont\secsc\scbshape{10}{\magstep2}{OT1}
\font\seci=cmmi12 scaled \magstep1
\font\secsy=cmsy10 scaled \magstep2
+\def\sececsize{1440}
% Subsection fonts (13.15pt).
\def\ssecnominalsize{13pt}
-\setfont\ssecrm\rmbshape{12}{\magstephalf}
-\setfont\ssecit\itbshape{10}{1315}
-\setfont\ssecsl\slbshape{10}{1315}
-\setfont\ssectt\ttbshape{12}{\magstephalf}
-\setfont\ssecttsl\ttslshape{10}{1315}
-\setfont\ssecsf\sfbshape{12}{\magstephalf}
+\setfont\ssecrm\rmbshape{12}{\magstephalf}{OT1}
+\setfont\ssecit\itbshape{10}{1315}{OT1IT}
+\setfont\ssecsl\slbshape{10}{1315}{OT1}
+\setfont\ssectt\ttbshape{12}{\magstephalf}{OT1TT}
+\setfont\ssecttsl\ttslshape{10}{1315}{OT1TT}
+\setfont\ssecsf\sfbshape{12}{\magstephalf}{OT1}
\let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{1315}
+\setfont\ssecsc\scbshape{10}{1315}{OT1}
\font\sseci=cmmi12 scaled \magstephalf
\font\ssecsy=cmsy10 scaled 1315
+\def\ssececsize{1200}
% Reduced fonts for @acro in text (10pt).
\def\reducednominalsize{10pt}
-\setfont\reducedrm\rmshape{10}{1000}
-\setfont\reducedtt\ttshape{10}{1000}
-\setfont\reducedbf\bfshape{10}{1000}
-\setfont\reducedit\itshape{10}{1000}
-\setfont\reducedsl\slshape{10}{1000}
-\setfont\reducedsf\sfshape{10}{1000}
-\setfont\reducedsc\scshape{10}{1000}
-\setfont\reducedttsl\ttslshape{10}{1000}
+\setfont\reducedrm\rmshape{10}{1000}{OT1}
+\setfont\reducedtt\ttshape{10}{1000}{OT1TT}
+\setfont\reducedbf\bfshape{10}{1000}{OT1}
+\setfont\reducedit\itshape{10}{1000}{OT1IT}
+\setfont\reducedsl\slshape{10}{1000}{OT1}
+\setfont\reducedsf\sfshape{10}{1000}{OT1}
+\setfont\reducedsc\scshape{10}{1000}{OT1}
+\setfont\reducedttsl\ttslshape{10}{1000}{OT1TT}
\font\reducedi=cmmi10
\font\reducedsy=cmsy10
+\def\reducedecsize{1000}
% reset the current fonts
\textfonts
@@ -1677,115 +2079,123 @@
% Text fonts (10pt).
\def\textnominalsize{10pt}
\edef\mainmagstep{1000}
-\setfont\textrm\rmshape{10}{\mainmagstep}
-\setfont\texttt\ttshape{10}{\mainmagstep}
-\setfont\textbf\bfshape{10}{\mainmagstep}
-\setfont\textit\itshape{10}{\mainmagstep}
-\setfont\textsl\slshape{10}{\mainmagstep}
-\setfont\textsf\sfshape{10}{\mainmagstep}
-\setfont\textsc\scshape{10}{\mainmagstep}
-\setfont\textttsl\ttslshape{10}{\mainmagstep}
+\setfont\textrm\rmshape{10}{\mainmagstep}{OT1}
+\setfont\texttt\ttshape{10}{\mainmagstep}{OT1TT}
+\setfont\textbf\bfshape{10}{\mainmagstep}{OT1}
+\setfont\textit\itshape{10}{\mainmagstep}{OT1IT}
+\setfont\textsl\slshape{10}{\mainmagstep}{OT1}
+\setfont\textsf\sfshape{10}{\mainmagstep}{OT1}
+\setfont\textsc\scshape{10}{\mainmagstep}{OT1}
+\setfont\textttsl\ttslshape{10}{\mainmagstep}{OT1TT}
\font\texti=cmmi10 scaled \mainmagstep
\font\textsy=cmsy10 scaled \mainmagstep
+\def\textecsize{1000}
% A few fonts for @defun names and args.
-\setfont\defbf\bfshape{10}{\magstephalf}
-\setfont\deftt\ttshape{10}{\magstephalf}
-\setfont\defttsl\ttslshape{10}{\magstephalf}
+\setfont\defbf\bfshape{10}{\magstephalf}{OT1}
+\setfont\deftt\ttshape{10}{\magstephalf}{OT1TT}
+\setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT}
\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
% Fonts for indices, footnotes, small examples (9pt).
\def\smallnominalsize{9pt}
-\setfont\smallrm\rmshape{9}{1000}
-\setfont\smalltt\ttshape{9}{1000}
-\setfont\smallbf\bfshape{10}{900}
-\setfont\smallit\itshape{9}{1000}
-\setfont\smallsl\slshape{9}{1000}
-\setfont\smallsf\sfshape{9}{1000}
-\setfont\smallsc\scshape{10}{900}
-\setfont\smallttsl\ttslshape{10}{900}
+\setfont\smallrm\rmshape{9}{1000}{OT1}
+\setfont\smalltt\ttshape{9}{1000}{OT1TT}
+\setfont\smallbf\bfshape{10}{900}{OT1}
+\setfont\smallit\itshape{9}{1000}{OT1IT}
+\setfont\smallsl\slshape{9}{1000}{OT1}
+\setfont\smallsf\sfshape{9}{1000}{OT1}
+\setfont\smallsc\scshape{10}{900}{OT1}
+\setfont\smallttsl\ttslshape{10}{900}{OT1TT}
\font\smalli=cmmi9
\font\smallsy=cmsy9
+\def\smallecsize{0900}
% Fonts for small examples (8pt).
\def\smallernominalsize{8pt}
-\setfont\smallerrm\rmshape{8}{1000}
-\setfont\smallertt\ttshape{8}{1000}
-\setfont\smallerbf\bfshape{10}{800}
-\setfont\smallerit\itshape{8}{1000}
-\setfont\smallersl\slshape{8}{1000}
-\setfont\smallersf\sfshape{8}{1000}
-\setfont\smallersc\scshape{10}{800}
-\setfont\smallerttsl\ttslshape{10}{800}
+\setfont\smallerrm\rmshape{8}{1000}{OT1}
+\setfont\smallertt\ttshape{8}{1000}{OT1TT}
+\setfont\smallerbf\bfshape{10}{800}{OT1}
+\setfont\smallerit\itshape{8}{1000}{OT1IT}
+\setfont\smallersl\slshape{8}{1000}{OT1}
+\setfont\smallersf\sfshape{8}{1000}{OT1}
+\setfont\smallersc\scshape{10}{800}{OT1}
+\setfont\smallerttsl\ttslshape{10}{800}{OT1TT}
\font\smalleri=cmmi8
\font\smallersy=cmsy8
+\def\smallerecsize{0800}
% Fonts for title page (20.4pt):
\def\titlenominalsize{20pt}
-\setfont\titlerm\rmbshape{12}{\magstep3}
-\setfont\titleit\itbshape{10}{\magstep4}
-\setfont\titlesl\slbshape{10}{\magstep4}
-\setfont\titlett\ttbshape{12}{\magstep3}
-\setfont\titlettsl\ttslshape{10}{\magstep4}
-\setfont\titlesf\sfbshape{17}{\magstep1}
+\setfont\titlerm\rmbshape{12}{\magstep3}{OT1}
+\setfont\titleit\itbshape{10}{\magstep4}{OT1IT}
+\setfont\titlesl\slbshape{10}{\magstep4}{OT1}
+\setfont\titlett\ttbshape{12}{\magstep3}{OT1TT}
+\setfont\titlettsl\ttslshape{10}{\magstep4}{OT1TT}
+\setfont\titlesf\sfbshape{17}{\magstep1}{OT1}
\let\titlebf=\titlerm
-\setfont\titlesc\scbshape{10}{\magstep4}
+\setfont\titlesc\scbshape{10}{\magstep4}{OT1}
\font\titlei=cmmi12 scaled \magstep3
\font\titlesy=cmsy10 scaled \magstep4
\def\authorrm{\secrm}
\def\authortt{\sectt}
+\def\titleecsize{2074}
% Chapter fonts (14.4pt).
\def\chapnominalsize{14pt}
-\setfont\chaprm\rmbshape{12}{\magstep1}
-\setfont\chapit\itbshape{10}{\magstep2}
-\setfont\chapsl\slbshape{10}{\magstep2}
-\setfont\chaptt\ttbshape{12}{\magstep1}
-\setfont\chapttsl\ttslshape{10}{\magstep2}
-\setfont\chapsf\sfbshape{12}{\magstep1}
+\setfont\chaprm\rmbshape{12}{\magstep1}{OT1}
+\setfont\chapit\itbshape{10}{\magstep2}{OT1IT}
+\setfont\chapsl\slbshape{10}{\magstep2}{OT1}
+\setfont\chaptt\ttbshape{12}{\magstep1}{OT1TT}
+\setfont\chapttsl\ttslshape{10}{\magstep2}{OT1TT}
+\setfont\chapsf\sfbshape{12}{\magstep1}{OT1}
\let\chapbf\chaprm
-\setfont\chapsc\scbshape{10}{\magstep2}
+\setfont\chapsc\scbshape{10}{\magstep2}{OT1}
\font\chapi=cmmi12 scaled \magstep1
\font\chapsy=cmsy10 scaled \magstep2
+\def\chapecsize{1440}
% Section fonts (12pt).
\def\secnominalsize{12pt}
-\setfont\secrm\rmbshape{12}{1000}
-\setfont\secit\itbshape{10}{\magstep1}
-\setfont\secsl\slbshape{10}{\magstep1}
-\setfont\sectt\ttbshape{12}{1000}
-\setfont\secttsl\ttslshape{10}{\magstep1}
-\setfont\secsf\sfbshape{12}{1000}
+\setfont\secrm\rmbshape{12}{1000}{OT1}
+\setfont\secit\itbshape{10}{\magstep1}{OT1IT}
+\setfont\secsl\slbshape{10}{\magstep1}{OT1}
+\setfont\sectt\ttbshape{12}{1000}{OT1TT}
+\setfont\secttsl\ttslshape{10}{\magstep1}{OT1TT}
+\setfont\secsf\sfbshape{12}{1000}{OT1}
\let\secbf\secrm
-\setfont\secsc\scbshape{10}{\magstep1}
+\setfont\secsc\scbshape{10}{\magstep1}{OT1}
\font\seci=cmmi12
\font\secsy=cmsy10 scaled \magstep1
+\def\sececsize{1200}
% Subsection fonts (10pt).
\def\ssecnominalsize{10pt}
-\setfont\ssecrm\rmbshape{10}{1000}
-\setfont\ssecit\itbshape{10}{1000}
-\setfont\ssecsl\slbshape{10}{1000}
-\setfont\ssectt\ttbshape{10}{1000}
-\setfont\ssecttsl\ttslshape{10}{1000}
-\setfont\ssecsf\sfbshape{10}{1000}
+\setfont\ssecrm\rmbshape{10}{1000}{OT1}
+\setfont\ssecit\itbshape{10}{1000}{OT1IT}
+\setfont\ssecsl\slbshape{10}{1000}{OT1}
+\setfont\ssectt\ttbshape{10}{1000}{OT1TT}
+\setfont\ssecttsl\ttslshape{10}{1000}{OT1TT}
+\setfont\ssecsf\sfbshape{10}{1000}{OT1}
\let\ssecbf\ssecrm
-\setfont\ssecsc\scbshape{10}{1000}
+\setfont\ssecsc\scbshape{10}{1000}{OT1}
\font\sseci=cmmi10
\font\ssecsy=cmsy10
+\def\ssececsize{1000}
% Reduced fonts for @acro in text (9pt).
\def\reducednominalsize{9pt}
-\setfont\reducedrm\rmshape{9}{1000}
-\setfont\reducedtt\ttshape{9}{1000}
-\setfont\reducedbf\bfshape{10}{900}
-\setfont\reducedit\itshape{9}{1000}
-\setfont\reducedsl\slshape{9}{1000}
-\setfont\reducedsf\sfshape{9}{1000}
-\setfont\reducedsc\scshape{10}{900}
-\setfont\reducedttsl\ttslshape{10}{900}
+\setfont\reducedrm\rmshape{9}{1000}{OT1}
+\setfont\reducedtt\ttshape{9}{1000}{OT1TT}
+\setfont\reducedbf\bfshape{10}{900}{OT1}
+\setfont\reducedit\itshape{9}{1000}{OT1IT}
+\setfont\reducedsl\slshape{9}{1000}{OT1}
+\setfont\reducedsf\sfshape{9}{1000}{OT1}
+\setfont\reducedsc\scshape{10}{900}{OT1}
+\setfont\reducedttsl\ttslshape{10}{900}{OT1TT}
\font\reducedi=cmmi9
\font\reducedsy=cmsy9
+\def\reducedecsize{0900}
% reduce space between paragraphs
\divide\parskip by 2
@@ -1941,10 +2351,10 @@
\newcount\fontdepth \fontdepth=0
% Fonts for short table of contents.
-\setfont\shortcontrm\rmshape{12}{1000}
-\setfont\shortcontbf\bfshape{10}{\magstep1} % no cmb12
-\setfont\shortcontsl\slshape{12}{1000}
-\setfont\shortconttt\ttshape{12}{1000}
+\setfont\shortcontrm\rmshape{12}{1000}{OT1}
+\setfont\shortcontbf\bfshape{10}{\magstep1}{OT1} % no cmb12
+\setfont\shortcontsl\slshape{12}{1000}{OT1}
+\setfont\shortconttt\ttshape{12}{1000}{OT1TT}
%% Add scribe-like font environments, plus @l for inline lisp (usually sans
%% serif) and @ii for TeX italic
@@ -2007,7 +2417,7 @@
\null
}
\def\samp#1{`\tclose{#1}'\null}
-\setfont\keyrm\rmshape{8}{1000}
+\setfont\keyrm\rmshape{8}{1000}{OT1}
\font\keysy=cmsy9
\def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
\raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
@@ -2015,6 +2425,7 @@
\hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
\kern-0.4pt\hrule}%
\kern-.06em\raise0.4pt\hbox{\angleright}}}}
+\def\key #1{{\nohyphenation \uppercase{#1}}\null}
% The old definition, with no lozenge:
%\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
\def\ctrl #1{{\tt \rawbackslash \hat}#1}
@@ -2299,6 +2710,35 @@
\thiseurofont
}
+% Hacks for glyphs from the EC fonts similar to \euro. We don't
+% use \let for the aliases, because sometimes we redefine the original
+% macro, and the alias should reflect the redefinition.
+\def\guillemetleft{{\ecfont \char"13}}
+\def\guillemotleft{\guillemetleft}
+\def\guillemetright{{\ecfont \char"14}}
+\def\guillemotright{\guillemetright}
+\def\guilsinglleft{{\ecfont \char"0E}}
+\def\guilsinglright{{\ecfont \char"0F}}
+\def\quotedblbase{{\ecfont \char"12}}
+\def\quotesinglbase{{\ecfont \char"0D}}
+%
+\def\ecfont{%
+ % We can't distinguish serif/sanserif and italic/slanted, but this
+ % is used for crude hacks anyway (like adding French and German
+ % quotes to documents typeset with CM, where we lose kerning), so
+ % hopefully nobody will notice/care.
+ \edef\ecsize{\csname\curfontsize ecsize\endcsname}%
+ \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}%
+ \ifx\curfontstyle\bfstylename
+ % bold:
+ \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize
+ \else
+ % regular:
+ \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize
+ \fi
+ \thisecfont
+}
+
% @registeredsymbol - R in a circle. The font for the R should really
% be smaller yet, but lllsize is the best we can do for now.
% Adapted from the plain.tex definition of \copyright.
@@ -2321,7 +2761,13 @@
\def\Orb{\mathhexbox20D}
\fi
+% Quotes.
+\chardef\quotedblleft="5C
+\chardef\quotedblright=`\"
+\chardef\quoteleft=`\`
+\chardef\quoteright=`\'
+
\message{page headings,}
\newskip\titlepagetopglue \titlepagetopglue = 1.5in
@@ -2490,7 +2936,34 @@
\parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
+% @evenheadingmarks top \thischapter <- chapter at the top of a page
+% @evenheadingmarks bottom \thischapter <- chapter at the bottom of a page
+%
+% The same set of arguments for:
+%
+% @oddheadingmarks
+% @evenfootingmarks
+% @oddfootingmarks
+% @everyheadingmarks
+% @everyfootingmarks
+\def\evenheadingmarks{\headingmarks{even}{heading}}
+\def\oddheadingmarks{\headingmarks{odd}{heading}}
+\def\evenfootingmarks{\headingmarks{even}{footing}}
+\def\oddfootingmarks{\headingmarks{odd}{footing}}
+\def\everyheadingmarks#1 {\headingmarks{even}{heading}{#1}
+ \headingmarks{odd}{heading}{#1} }
+\def\everyfootingmarks#1 {\headingmarks{even}{footing}{#1}
+ \headingmarks{odd}{footing}{#1} }
+% #1 = even/odd, #2 = heading/footing, #3 = top/bottom.
+\def\headingmarks#1#2#3 {%
+ \expandafter\let\expandafter\temp \csname get#3headingmarks\endcsname
+ \global\expandafter\let\csname get#1#2marks\endcsname \temp
+}
+
+\everyheadingmarks bottom
+\everyfootingmarks bottom
+
% @headings double turns headings on for double-sided printing.
% @headings single turns headings on for single-sided printing.
% @headings off turns them off.
@@ -3530,11 +4003,21 @@
\definedummyword\equiv
\definedummyword\error
\definedummyword\euro
+ \definedummyword\guillemetleft
+ \definedummyword\guillemetright
+ \definedummyword\guilsinglleft
+ \definedummyword\guilsinglright
\definedummyword\expansion
\definedummyword\minus
\definedummyword\pounds
\definedummyword\point
\definedummyword\print
+ \definedummyword\quotedblbase
+ \definedummyword\quotedblleft
+ \definedummyword\quotedblright
+ \definedummyword\quoteleft
+ \definedummyword\quoteright
+ \definedummyword\quotesinglbase
\definedummyword\result
\definedummyword\textdegree
%
@@ -3664,11 +4147,21 @@
\def\equiv{==}%
\def\error{error}%
\def\euro{euro}%
+ \def\guillemetleft{<<}%
+ \def\guillemetright{>>}%
+ \def\guilsinglleft{<}%
+ \def\guilsinglright{>}%
\def\expansion{==>}%
\def\minus{-}%
\def\pounds{pounds}%
\def\point{.}%
\def\print{-|}%
+ \def\quotedblbase{"}%
+ \def\quotedblleft{"}%
+ \def\quotedblright{"}%
+ \def\quoteleft{`}%
+ \def\quoteright{'}%
+ \def\quotesinglbase{,}%
\def\result{=>}%
\def\textdegree{degrees}%
%
@@ -3710,11 +4203,7 @@
%
\edef\writeto{\csname#1indfile\endcsname}%
%
- \ifvmode
- \dosubindsanitize
- \else
- \dosubindwrite
- \fi
+ \safewhatsit\dosubindwrite
}%
\fi
}
@@ -3751,13 +4240,13 @@
\temp
}
-% Take care of unwanted page breaks:
+% Take care of unwanted page breaks/skips around a whatsit:
%
% If a skip is the last thing on the list now, preserve it
% by backing up by \lastskip, doing the \write, then inserting
% the skip again. Otherwise, the whatsit generated by the
-% \write will make \lastskip zero. The result is that sequences
-% like this:
+% \write or \pdfdest will make \lastskip zero. The result is that
+% sequences like this:
% @end defun
% @tindex whatever
% @defun ...
@@ -3781,25 +4270,31 @@
%
\edef\zeroskipmacro{\expandafter\the\csname address@hidden
%
+\newskip\whatsitskip
+\newcount\whatsitpenalty
+%
% ..., ready, GO:
%
-\def\dosubindsanitize{%
+\def\safewhatsit#1{%
+\ifhmode
+ #1%
+\else
% \lastskip and \lastpenalty cannot both be nonzero simultaneously.
- \skip0 = \lastskip
+ \whatsitskip = \lastskip
\edef\lastskipmacro{\the\lastskip}%
- \count255 = \lastpenalty
+ \whatsitpenalty = \lastpenalty
%
% If \lastskip is nonzero, that means the last item was a
% skip. And since a skip is discardable, that means this
- % -\skip0 glue we're inserting is preceded by a
+ % -\whatsitskip glue we're inserting is preceded by a
% non-discardable item, therefore it is not a potential
% breakpoint, therefore no \nobreak needed.
\ifx\lastskipmacro\zeroskipmacro
\else
- \vskip-\skip0
+ \vskip-\whatsitskip
\fi
%
- \dosubindwrite
+ #1%
%
\ifx\lastskipmacro\zeroskipmacro
% If \lastskip was zero, perhaps the last item was a penalty, and
@@ -3813,13 +4308,14 @@
% Description.
% would allow a break between the index-whatever whatsit
% and the "Description." paragraph.
- \ifnum\count255>9999 \penalty\count255 \fi
+ \ifnum\whatsitpenalty>9999 \penalty\whatsitpenalty \fi
\else
% On the other hand, if we had a nonzero \lastskip,
% this make-up glue would be preceded by a non-discardable item
% (the whatsit from the \write), so we must insert a \nobreak.
- \nobreak\vskip\skip0
+ \nobreak\vskip\whatsitskip
\fi
+\fi
}
% The index entry written in the file actually looks like
@@ -3862,6 +4358,7 @@
%
\smallfonts \rm
\tolerance = 9500
+ \plainfrenchspacing
\everypar = {}% don't want the \kern\-parindent from indentation suppression.
%
% See if the index file exists and is nonempty.
@@ -3991,11 +4488,8 @@
% The following is kludged to not output a line of dots in the index if
% there are no page numbers. The next person who breaks this will be
% cursed by a Unix daemon.
- \def\tempa{{\rm }}%
- \def\tempb{#1}%
- \edef\tempc{\tempa}%
- \edef\tempd{\tempb}%
- \ifx\tempc\tempd
+ \setbox\boxA = \hbox{#1}%
+ \ifdim\wd\boxA = 0pt
\ %
\else
%
@@ -4131,6 +4625,34 @@
%
% All done with double columns.
\def\enddoublecolumns{%
+ % The following penalty ensures that the page builder is exercised
+ % _before_ we change the output routine. This is necessary in the
+ % following situation:
+ %
+ % The last section of the index consists only of a single entry.
+ % Before this section, \pagetotal is less than \pagegoal, so no
+ % break occurs before the last section starts. However, the last
+ % section, consisting of \initial and the single \entry, does not
+ % fit on the page and has to be broken off. Without the following
+ % penalty the page builder will not be exercised until \eject
+ % below, and by that time we'll already have changed the output
+ % routine to the \balancecolumns version, so the next-to-last
+ % double-column page will be processed with \balancecolumns, which
+ % is wrong: The two columns will go to the main vertical list, with
+ % the broken-off section in the recent contributions. As soon as
+ % the output routine finishes, TeX starts reconsidering the page
+ % break. The two columns and the broken-off section both fit on the
+ % page, because the two columns now take up only half of the page
+ % goal. When TeX sees \eject from below which follows the final
+ % section, it invokes the new output routine that we've set after
+ % \balancecolumns below; \onepageout will try to fit the two columns
+ % and the final section into the vbox of \pageheight (see
+ % \pagebody), causing an overfull box.
+ %
+ % Note that glue won't work here, because glue does not exercise the
+ % page builder, unlike penalties (see The TeXbook, pp. 280-281).
+ \penalty0
+ %
\output = {%
% Split the last of the double-column material. Leave it on the
% current page, no automatic page break.
@@ -4240,11 +4762,15 @@
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
-% Each @chapter defines this as the name of the chapter.
-% page headings and footings can use it. @section does likewise.
-% However, they are not reliable, because we don't use marks.
+% Each @chapter defines these (using marks) as the number+name, number
+% and name of the chapter. Page headings and footings can use
+% these. @section does likewise.
\def\thischapter{}
+\def\thischapternum{}
+\def\thischaptername{}
\def\thissection{}
+\def\thissectionnum{}
+\def\thissectionname{}
\newcount\absseclevel % used to calculate proper heading level
\newcount\secbase\secbase=0 % @raisesections/@lowersections modify this count
@@ -4545,7 +5071,20 @@
\def\chapbreak{\dobreak \chapheadingskip {-4000}}
\def\chappager{\par\vfill\supereject}
-\def\chapoddpage{\chappager \ifodd\pageno \else \hbox to 0pt{} \chappager\fi}
+% Because \domark is called before \chapoddpage, the filler page will
+% get the headings for the next chapter, which is wrong. But we don't
+% care -- we just disable all headings on the filler page.
+\def\chapoddpage{%
+ \chappager
+ \ifodd\pageno \else
+ \begingroup
+ \evenheadline={\hfil}\evenfootline={\hfil}%
+ \oddheadline={\hfil}\oddfootline={\hfil}%
+ \hbox to 0pt{}%
+ \chappager
+ \endgroup
+ \fi
+}
\def\setchapternewpage #1 {\csname CHAPPAG#1\endcsname}
@@ -4579,45 +5118,72 @@
\def\Yappendixkeyword{Yappendix}
%
\def\chapmacro#1#2#3{%
+ % Insert the first mark before the heading break (see notes for \domark).
+ \let\prevchapterdefs=\lastchapterdefs
+ \let\prevsectiondefs=\lastsectiondefs
+ \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}%
+ \gdef\thissection{}}%
+ %
+ \def\temptype{#2}%
+ \ifx\temptype\Ynothingkeyword
+ \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+ \gdef\thischapter{\thischaptername}}%
+ \else\ifx\temptype\Yomitfromtockeyword
+ \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}%
+ \gdef\thischapter{}}%
+ \else\ifx\temptype\Yappendixkeyword
+ \toks0={#1}%
+ \xdef\lastchapterdefs{%
+ \gdef\noexpand\thischaptername{\the\toks0}%
+ \gdef\noexpand\thischapternum{\appendixletter}%
+ \gdef\noexpand\thischapter{\putwordAppendix{} \noexpand\thischapternum:
+ \noexpand\thischaptername}%
+ }%
+ \else
+ \toks0={#1}%
+ \xdef\lastchapterdefs{%
+ \gdef\noexpand\thischaptername{\the\toks0}%
+ \gdef\noexpand\thischapternum{\the\chapno}%
+ \gdef\noexpand\thischapter{\putwordChapter{} \noexpand\thischapternum:
+ \noexpand\thischaptername}%
+ }%
+ \fi\fi\fi
+ %
+ % Output the mark. Pass it through \safewhatsit, to take care of
+ % the preceding space.
+ \safewhatsit\domark
+ %
+ % Insert the chapter heading break.
\pchapsepmacro
+ %
+ % Now the second mark, after the heading break. No break points
+ % between here and the heading.
+ \let\prevchapterdefs=\lastchapterdefs
+ \let\prevsectiondefs=\lastsectiondefs
+ \domark
+ %
{%
\chapfonts \rm
%
- % Have to define \thissection before calling \donoderef, because the
+ % Have to define \lastsection before calling \donoderef, because the
% xref code eventually uses it. On the other hand, it has to be called
% after \pchapsepmacro, or the headline will change too soon.
- \gdef\thissection{#1}%
- \gdef\thischaptername{#1}%
+ \gdef\lastsection{#1}%
%
% Only insert the separating space if we have a chapter/appendix
% number, and don't print the unnumbered ``number''.
- \def\temptype{#2}%
\ifx\temptype\Ynothingkeyword
\setbox0 = \hbox{}%
\def\toctype{unnchap}%
- \gdef\thischapternum{}%
- \gdef\thischapter{#1}%
\else\ifx\temptype\Yomitfromtockeyword
\setbox0 = \hbox{}% contents like unnumbered, but no toc entry
\def\toctype{omit}%
- \gdef\thischapternum{}%
- \gdef\thischapter{}%
\else\ifx\temptype\Yappendixkeyword
\setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
\def\toctype{app}%
- \xdef\thischapternum{\appendixletter}%
- % We don't substitute the actual chapter name into \thischapter
- % because we don't want its macros evaluated now. And we don't
- % use \thissection because that changes with each section.
- %
- \xdef\thischapter{\putwordAppendix{} \appendixletter:
- \noexpand\thischaptername}%
\else
\setbox0 = \hbox{#3\enspace}%
\def\toctype{numchap}%
- \xdef\thischapternum{\the\chapno}%
- \xdef\thischapter{\putwordChapter{} \the\chapno:
- \noexpand\thischaptername}%
\fi\fi\fi
%
% Write the toc entry for this chapter. Must come before the
@@ -4633,6 +5199,7 @@
\donoderef{#2}%
%
% Typeset the actual heading.
+ \nobreak % Avoid page breaks at the interline glue.
\vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
\hangindent=\wd0 \centerparametersmaybe
\unhbox0 #1\par}%
@@ -4695,36 +5262,78 @@
% the section type for xrefs (Ynumbered, Ynothing, Yappendix), #4 is the
% section number.
%
+\def\seckeyword{sec}
+%
\def\sectionheading#1#2#3#4{%
{%
% Switch to the right set of fonts.
\csname #2fonts\endcsname \rm
%
+ \def\sectionlevel{#2}%
+ \def\temptype{#3}%
+ %
+ % Insert first mark before the heading break (see notes for \domark).
+ \let\prevsectiondefs=\lastsectiondefs
+ \ifx\temptype\Ynothingkeyword
+ \ifx\sectionlevel\seckeyword
+ \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}%
+ \gdef\thissection{\thissectionname}}%
+ \fi
+ \else\ifx\temptype\Yomitfromtockeyword
+ % Don't redefine \thissection.
+ \else\ifx\temptype\Yappendixkeyword
+ \ifx\sectionlevel\seckeyword
+ \toks0={#1}%
+ \xdef\lastsectiondefs{%
+ \gdef\noexpand\thissectionname{\the\toks0}%
+ \gdef\noexpand\thissectionnum{#4}%
+ \gdef\noexpand\thissection{\putwordSection{}
\noexpand\thissectionnum:
+ \noexpand\thissectionname}%
+ }%
+ \fi
+ \else
+ \ifx\sectionlevel\seckeyword
+ \toks0={#1}%
+ \xdef\lastsectiondefs{%
+ \gdef\noexpand\thissectionname{\the\toks0}%
+ \gdef\noexpand\thissectionnum{#4}%
+ \gdef\noexpand\thissection{\putwordSection{}
\noexpand\thissectionnum:
+ \noexpand\thissectionname}%
+ }%
+ \fi
+ \fi\fi\fi
+ %
+ % Output the mark. Pass it through \safewhatsit, to take care of
+ % the preceding space.
+ \safewhatsit\domark
+ %
% Insert space above the heading.
\csname #2headingbreak\endcsname
%
+ % Now the second mark, after the heading break. No break points
+ % between here and the heading.
+ \let\prevsectiondefs=\lastsectiondefs
+ \domark
+ %
% Only insert the space after the number if we have a section number.
- \def\sectionlevel{#2}%
- \def\temptype{#3}%
- %
\ifx\temptype\Ynothingkeyword
\setbox0 = \hbox{}%
\def\toctype{unn}%
- \gdef\thissection{#1}%
+ \gdef\lastsection{#1}%
\else\ifx\temptype\Yomitfromtockeyword
% for @headings -- no section number, don't include in toc,
- % and don't redefine \thissection.
+ % and don't redefine \lastsection.
\setbox0 = \hbox{}%
\def\toctype{omit}%
\let\sectionlevel=\empty
\else\ifx\temptype\Yappendixkeyword
\setbox0 = \hbox{#4\enspace}%
\def\toctype{app}%
- \gdef\thissection{#1}%
+ \gdef\lastsection{#1}%
\else
\setbox0 = \hbox{#4\enspace}%
\def\toctype{num}%
- \gdef\thissection{#1}%
+ \gdef\lastsection{#1}%
\fi\fi\fi
%
% Write the toc entry (before \donoderef). See comments in \chapmacro.
@@ -4839,7 +5448,7 @@
\def\readtocfile{%
\setupdatafile
\activecatcodes
- \input \jobname.toc
+ \input \tocreadfilename
}
\newskip\contentsrightmargin \contentsrightmargin=1in
@@ -4858,7 +5467,6 @@
%
% Don't need to put `Contents' or `Short Contents' in the headline.
% It is abundantly clear what they are.
- \def\thischapter{}%
\chapmacro{#1}{Yomitfromtoc}{}%
%
\savepageno = \pageno
@@ -4870,11 +5478,16 @@
\ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi
}
+% redefined for the two-volume lispref. We always output on
+% \jobname.toc even if this is redefined.
+%
+\def\tocreadfilename{\jobname.toc}
% Normal (long) toc.
+%
\def\contents{%
\startcontents{\putwordTOC}%
- \openin 1 \jobname.toc
+ \openin 1 \tocreadfilename\space
\ifeof 1 \else
\readtocfile
\fi
@@ -4912,7 +5525,7 @@
\let\numsubsubsecentry = \numsecentry
\let\appsubsubsecentry = \numsecentry
\let\unnsubsubsecentry = \numsecentry
- \openin 1 \jobname.toc
+ \openin 1 \tocreadfilename\space
\ifeof 1 \else
\readtocfile
\fi
@@ -5247,12 +5860,18 @@
\let\SETdispenvsize\relax
\def\setnormaldispenv{%
\ifx\SETdispenvsize\smallword
+ % end paragraph for sake of leading, in case document has no blank
+ % line. This is redundant with what happens in \aboveenvbreak, but
+ % we need to do it before changing the fonts, and it's inconvenient
+ % to change the fonts afterward.
+ \ifnum \lastpenalty=10000 \else \endgraf \fi
\smallexamplefonts \rm
\fi
}
\def\setsmalldispenv{%
\ifx\SETdispenvsize\nosmallword
\else
+ \ifnum \lastpenalty=10000 \else \endgraf \fi
\smallexamplefonts \rm
\fi
}
@@ -5419,11 +6038,11 @@
% regular 0x27.
%
\def\codequoteright{%
- \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
- '%
- \else
- \char'15
- \fi
+ \expandafter\ifx\csname SETtxicodequoteundirected\endcsname\relax
+ \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
+ '%
+ \else \char'15 \fi
+ \else \char'15 \fi
}
%
% and a similar option for the left quote char vs. a grave accent.
@@ -5431,11 +6050,11 @@
% the code environments to do likewise.
%
\def\codequoteleft{%
- \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
- `%
- \else
- \char'22
- \fi
+ \expandafter\ifx\csname SETtxicodequotebacktick\endcsname\relax
+ \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
+ `%
+ \else \char'22 \fi
+ \else \char'22 \fi
}
%
\begingroup
@@ -5553,28 +6172,36 @@
\endgroup
}
+
\message{defuns,}
% @defun etc.
\newskip\defbodyindent \defbodyindent=.4in
\newskip\defargsindent \defargsindent=50pt
\newskip\deflastargmargin \deflastargmargin=18pt
+\newcount\defunpenalty
% Start the processing of @deffn:
\def\startdefun{%
\ifnum\lastpenalty<10000
\medbreak
+ \defunpenalty=10003 % Will keep this @deffn together with the
+ % following @def command, see below.
\else
% If there are two @def commands in a row, we'll have a \nobreak,
% which is there to keep the function description together with its
% header. But if there's nothing but headers, we need to allow a
% break somewhere. Check specifically for penalty 10002, inserted
- % by \defargscommonending, instead of 10000, since the sectioning
+ % by \printdefunline, instead of 10000, since the sectioning
% commands also insert a nobreak penalty, and we don't want to allow
% a break between a section heading and a defun.
- %
- \ifnum\lastpenalty=10002 \penalty2000 \fi
%
+ % As a minor refinement, we avoid "club" headers by signalling
+ % with penalty of 10003 after the very first @deffn in the
+ % sequence (see above), and penalty of 10002 after any following
+ % @def command.
+ \ifnum\lastpenalty=10002 \penalty2000 \else \defunpenalty=10002 \fi
+ %
% Similarly, after a section heading, do not allow a break.
% But do insert the glue.
\medskip % preceded by discardable penalty, so not a breakpoint
@@ -5591,7 +6218,7 @@
%
% As above, allow line break if we have multiple x headers in a row.
% It's not a great place, though.
- \ifnum\lastpenalty=10002 \penalty3000 \fi
+ \ifnum\lastpenalty=10002 \penalty3000 \else \defunpenalty=10002 \fi
%
% And now, it's time to reuse the body of the original defun:
\expandafter\gobbledefun#1%
@@ -5609,7 +6236,7 @@
\advance\rightskip by 0pt plus 1fil
\endgraf
\nobreak\vskip -\parskip
- \penalty 10002 % signal to \startdefun and \dodefunx
+ \penalty\defunpenalty % signal to \startdefun and \dodefunx
% Some of the @defun-type tags do not enable magic parentheses,
% rendering the following check redundant. But we don't optimize.
\checkparencounts
@@ -5878,12 +6505,14 @@
\ifnum\parencount=0 \else \badparencount \fi
\ifnum\brackcount=0 \else \badbrackcount \fi
}
+% these should not use \errmessage; the glibc manual, at least, actually
+% has such constructs (when documenting function pointers).
\def\badparencount{%
- \errmessage{Unbalanced parentheses in @def}%
+ \message{Warning: unbalanced parentheses in @def...}%
\global\parencount=0
}
\def\badbrackcount{%
- \errmessage{Unbalanced square braces in @def}%
+ \message{Warning: unbalanced square brackets in @def...}%
\global\brackcount=0
}
@@ -5978,6 +6607,10 @@
% all characters are catcode 10, 11 or 12, except \ which is active
% (as in normal texinfo). It is necessary to change the definition of \.
+% Non-ASCII encodings make 8-bit characters active, so un-activate
+% them to avoid their expansion. Must do this non-globally, to
+% confine the change to the current group.
+
% It's necessary to have hard CRs when the macro is executed. This is
% done by making ^^M (\endlinechar) catcode 12 when reading the macro
% body, and then making it the \newlinechar in \scanmacro.
@@ -5992,6 +6625,7 @@
\catcode`\_=\other
\catcode`\|=\other
\catcode`\~=\other
+ \ifx\declaredencoding\ascii \else \setnonasciicharscatcodenonglobal\other \fi
}
\def\scanargctxt{%
@@ -6209,7 +6843,6 @@
\message{cross references,}
\newwrite\auxfile
-
\newif\ifhavexrefs % True if xref values are known.
\newif\ifwarnedxrefs % True if we warned once that they aren't known.
@@ -6254,7 +6887,7 @@
% \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an
% anchor), which consists of three parts:
-% 1) NAME-title - the current sectioning name taken from \thissection,
+% 1) NAME-title - the current sectioning name taken from \lastsection,
% or the anchor name.
% 2) NAME-snt - section number and type, passed as the SNT arg, or
% empty for anchors.
@@ -6273,10 +6906,10 @@
address@hidden #1 of \setref, expanded by the \edef
##1}{##2}}% these are parameters of \writexrdef
}%
- \toks0 = \expandafter{\thissection}%
+ \toks0 = \expandafter{\lastsection}%
\immediate \writexrdef{title}{\the\toks0 }%
\immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc.
- \writexrdef{pg}{\folio}% will be written later, during \shipout
+ \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, during
\shipout
}%
\fi
}
@@ -6322,7 +6955,8 @@
\ifpdf
\leavevmode
\getfilename{#4}%
- {\turnoffactive
+ {\indexnofonts
+ \turnoffactive
% See comments at \activebackslashdouble.
{\activebackslashdouble \xdef\pdfxrefdest{#1}%
\backslashparens\pdfxrefdest}%
@@ -6335,7 +6969,7 @@
goto name{\pdfmkpgn{\pdfxrefdest}}%
\fi
}%
- \linkcolor
+ \setcolor{\linkcolor}%
\fi
%
% Float references are printed completely differently: "Figure 1.2"
@@ -6373,7 +7007,7 @@
% is a loss. Therefore, we give the text of the node name again, so it
% is as if TeX is seeing it for the first time.
\ifdim \wd1 > 0pt
- \putwordsection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
+ \putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
\else
% _ (for example) has to be the character _ for the purposes of the
% control sequence corresponding to the node, but it has to expand
@@ -6469,10 +7103,18 @@
% collisions). But if this is a float type, we have more work to do.
%
\def\xrdef#1#2{%
- \expandafter\gdef\csname XR#1\endcsname{#2}% remember this xref value.
+ {% The node name might contain 8-bit characters, which in our current
+ % implementation are changed to commands like @'e. Don't let these
+ % mess up the control sequence name.
+ \indexnofonts
+ \turnoffactive
+ \xdef\safexrefname{#1}%
+ }%
%
+ \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% remember this xref
+ %
% Was that xref control sequence that we just defined for a float?
- \expandafter\iffloat\csname XR#1\endcsname
+ \expandafter\iffloat\csname XR\safexrefname\endcsname
% it was a float, and we have the (safe) float type in \iffloattype.
\expandafter\let\expandafter\floatlist
\csname floatlist\iffloattype\endcsname
@@ -6487,7 +7129,8 @@
%
% Remember this xref in the control sequence \floatlistFLOATTYPE,
% for later use in \listoffloats.
- \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0{#1}}%
+ \expandafter\xdef\csname floatlist\iffloattype\endcsname{\the\toks0
+ {\safexrefname}}%
\fi
}
@@ -6591,6 +7234,7 @@
\input\jobname.#1
\endgroup}
+
\message{insertions,}
% including footnotes.
@@ -6863,13 +7507,13 @@
\global\advance\floatno by 1
%
{%
- % This magic value for \thissection is output by \setref as the
+ % This magic value for \lastsection is output by \setref as the
% XREFLABEL-title value. \xrefX uses it to distinguish float
% labels (which have a completely different output format) from
% node and anchor labels. And \xrdef uses it to construct the
% lists of floats.
%
- \edef\thissection{\floatmagic=\safefloattype}%
+ \edef\lastsection{\floatmagic=\safefloattype}%
\setref{\floatlabel}{Yfloat}%
}%
\fi
@@ -7004,7 +7648,7 @@
% #1 is the control sequence we are passed; we expand into a conditional
% which is true if #1 represents a float ref. That is, the magic
-% \thissection value which we \setref above.
+% \lastsection value which we \setref above.
%
\def\iffloat#1{\expandafter\doiffloat#1==\finish}
%
@@ -7065,39 +7709,871 @@
\writeentry
}}
+
\message{localization,}
-% and i18n.
% @documentlanguage is usually given very early, just after
% @setfilename. If done too late, it may not override everything
-% properly. Single argument is the language abbreviation.
-% It would be nice if we could set up a hyphenation file here.
+% properly. Single argument is the language (de) or locale (de_DE)
+% abbreviation. It would be nice if we could set up a hyphenation file.
%
-\parseargdef\documentlanguage{%
+{
+ \catcode`\_ = \active
+ \globaldefs=1
+\parseargdef\documentlanguage{\begingroup
+ \let_=\normalunderscore % normal _ character for filenames
\tex % read txi-??.tex file in plain TeX.
- % Read the file if it exists.
+ % Read the file by the name they passed if it exists.
\openin 1 txi-#1.tex
\ifeof 1
- \errhelp = \nolanghelp
- \errmessage{Cannot read language file txi-#1.tex}%
+ \documentlanguagetrywithoutunderscore{#1_\finish}%
\else
\input txi-#1.tex
\fi
\closein 1
\endgroup
+\endgroup}
}
+%
+% If they passed de_DE, and txi-de_DE.tex doesn't exist,
+% try txi-de.tex.
+%
+\def\documentlanguagetrywithoutunderscore#1_#2\finish{%
+ \openin 1 txi-#1.tex
+ \ifeof 1
+ \errhelp = \nolanghelp
+ \errmessage{Cannot read language file txi-#1.tex}%
+ \else
+ \input txi-#1.tex
+ \fi
+ \closein 1
+}
+%
\newhelp\nolanghelp{The given language definition file cannot be found or
is empty. Maybe you need to install it? In the current directory
should work if nowhere else does.}
+% Set the catcode of characters 128 through 255 to the specified number.
+%
+\def\setnonasciicharscatcode#1{%
+ \count255=128
+ \loop\ifnum\count255<256
+ \global\catcode\count255=#1\relax
+ \advance\count255 by 1
+ \repeat
+}
-% @documentencoding should change something in TeX eventually, most
-% likely, but for now just recognize it.
-\let\documentencoding = \comment
+\def\setnonasciicharscatcodenonglobal#1{%
+ \count255=128
+ \loop\ifnum\count255<256
+ \catcode\count255=#1\relax
+ \advance\count255 by 1
+ \repeat
+}
+% @documentencoding sets the definition of non-ASCII characters
+% according to the specified encoding.
+%
+\parseargdef\documentencoding{%
+ % Encoding being declared for the document.
+ \def\declaredencoding{\csname #1.enc\endcsname}%
+ %
+ % Supported encodings: names converted to tokens in order to be able
+ % to compare them with \ifx.
+ \def\ascii{\csname US-ASCII.enc\endcsname}%
+ \def\latnine{\csname ISO-8859-15.enc\endcsname}%
+ \def\latone{\csname ISO-8859-1.enc\endcsname}%
+ \def\lattwo{\csname ISO-8859-2.enc\endcsname}%
+ \def\utfeight{\csname UTF-8.enc\endcsname}%
+ %
+ \ifx \declaredencoding \ascii
+ \asciichardefs
+ %
+ \else \ifx \declaredencoding \lattwo
+ \setnonasciicharscatcode\active
+ \lattwochardefs
+ %
+ \else \ifx \declaredencoding \latone
+ \setnonasciicharscatcode\active
+ \latonechardefs
+ %
+ \else \ifx \declaredencoding \latnine
+ \setnonasciicharscatcode\active
+ \latninechardefs
+ %
+ \else \ifx \declaredencoding \utfeight
+ \setnonasciicharscatcode\active
+ \utfeightchardefs
+ %
+ \else
+ \message{Unknown document encoding #1, ignoring.}%
+ %
+ \fi % utfeight
+ \fi % latnine
+ \fi % latone
+ \fi % lattwo
+ \fi % ascii
+}
-% Page size parameters.
+% A message to be logged when using a character that isn't available
+% the default font encoding (OT1).
+%
+\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}}
+
+% Take account of \c (plain) vs. \, (Texinfo) difference.
+\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi}
+
+% First, make active non-ASCII characters in order for them to be
+% correctly categorized when TeX reads the replacement text of
+% macros containing the character definitions.
+\setnonasciicharscatcode\active
%
+% Latin1 (ISO-8859-1) character definitions.
+\def\latonechardefs{%
+ \gdef^^a0{~}
+ \gdef^^a1{\exclamdown}
+ \gdef^^a2{\missingcharmsg{CENT SIGN}}
+ \gdef^^a3{{\pounds}}
+ \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+ \gdef^^a5{\missingcharmsg{YEN SIGN}}
+ \gdef^^a6{\missingcharmsg{BROKEN BAR}}
+ \gdef^^a7{\S}
+ \gdef^^a8{\"{}}
+ \gdef^^a9{\copyright}
+ \gdef^^aa{\ordf}
+ \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}}
+ \gdef^^ac{$\lnot$}
+ \gdef^^ad{\-}
+ \gdef^^ae{\registeredsymbol}
+ \gdef^^af{\={}}
+ %
+ \gdef^^b0{\textdegree}
+ \gdef^^b1{$\pm$}
+ \gdef^^b2{$^2$}
+ \gdef^^b3{$^3$}
+ \gdef^^b4{\'{}}
+ \gdef^^b5{$\mu$}
+ \gdef^^b6{\P}
+ %
+ \gdef^^b7{$^.$}
+ \gdef^^b8{\cedilla\ }
+ \gdef^^b9{$^1$}
+ \gdef^^ba{\ordm}
+ %
+ \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}}
+ \gdef^^bc{$1\over4$}
+ \gdef^^bd{$1\over2$}
+ \gdef^^be{$3\over4$}
+ \gdef^^bf{\questiondown}
+ %
+ \gdef^^c0{\`A}
+ \gdef^^c1{\'A}
+ \gdef^^c2{\^A}
+ \gdef^^c3{\~A}
+ \gdef^^c4{\"A}
+ \gdef^^c5{\ringaccent A}
+ \gdef^^c6{\AE}
+ \gdef^^c7{\cedilla C}
+ \gdef^^c8{\`E}
+ \gdef^^c9{\'E}
+ \gdef^^ca{\^E}
+ \gdef^^cb{\"E}
+ \gdef^^cc{\`I}
+ \gdef^^cd{\'I}
+ \gdef^^ce{\^I}
+ \gdef^^cf{\"I}
+ %
+ \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}}
+ \gdef^^d1{\~N}
+ \gdef^^d2{\`O}
+ \gdef^^d3{\'O}
+ \gdef^^d4{\^O}
+ \gdef^^d5{\~O}
+ \gdef^^d6{\"O}
+ \gdef^^d7{$\times$}
+ \gdef^^d8{\O}
+ \gdef^^d9{\`U}
+ \gdef^^da{\'U}
+ \gdef^^db{\^U}
+ \gdef^^dc{\"U}
+ \gdef^^dd{\'Y}
+ \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}}
+ \gdef^^df{\ss}
+ %
+ \gdef^^e0{\`a}
+ \gdef^^e1{\'a}
+ \gdef^^e2{\^a}
+ \gdef^^e3{\~a}
+ \gdef^^e4{\"a}
+ \gdef^^e5{\ringaccent a}
+ \gdef^^e6{\ae}
+ \gdef^^e7{\cedilla c}
+ \gdef^^e8{\`e}
+ \gdef^^e9{\'e}
+ \gdef^^ea{\^e}
+ \gdef^^eb{\"e}
+ \gdef^^ec{\`{\dotless i}}
+ \gdef^^ed{\'{\dotless i}}
+ \gdef^^ee{\^{\dotless i}}
+ \gdef^^ef{\"{\dotless i}}
+ %
+ \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}}
+ \gdef^^f1{\~n}
+ \gdef^^f2{\`o}
+ \gdef^^f3{\'o}
+ \gdef^^f4{\^o}
+ \gdef^^f5{\~o}
+ \gdef^^f6{\"o}
+ \gdef^^f7{$\div$}
+ \gdef^^f8{\o}
+ \gdef^^f9{\`u}
+ \gdef^^fa{\'u}
+ \gdef^^fb{\^u}
+ \gdef^^fc{\"u}
+ \gdef^^fd{\'y}
+ \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}}
+ \gdef^^ff{\"y}
+}
+
+% Latin9 (ISO-8859-15) encoding character definitions.
+\def\latninechardefs{%
+ % Encoding is almost identical to Latin1.
+ \latonechardefs
+ %
+ \gdef^^a4{\euro}
+ \gdef^^a6{\v S}
+ \gdef^^a8{\v s}
+ \gdef^^b4{\v Z}
+ \gdef^^b8{\v z}
+ \gdef^^bc{\OE}
+ \gdef^^bd{\oe}
+ \gdef^^be{\"Y}
+}
+
+% Latin2 (ISO-8859-2) character definitions.
+\def\lattwochardefs{%
+ \gdef^^a0{~}
+ \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}}
+ \gdef^^a2{\u{}}
+ \gdef^^a3{\L}
+ \gdef^^a4{\missingcharmsg{CURRENCY SIGN}}
+ \gdef^^a5{\v L}
+ \gdef^^a6{\'S}
+ \gdef^^a7{\S}
+ \gdef^^a8{\"{}}
+ \gdef^^a9{\v S}
+ \gdef^^aa{\cedilla S}
+ \gdef^^ab{\v T}
+ \gdef^^ac{\'Z}
+ \gdef^^ad{\-}
+ \gdef^^ae{\v Z}
+ \gdef^^af{\dotaccent Z}
+ %
+ \gdef^^b0{\textdegree}
+ \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}}
+ \gdef^^b2{\missingcharmsg{OGONEK}}
+ \gdef^^b3{\l}
+ \gdef^^b4{\'{}}
+ \gdef^^b5{\v l}
+ \gdef^^b6{\'s}
+ \gdef^^b7{\v{}}
+ \gdef^^b8{\cedilla\ }
+ \gdef^^b9{\v s}
+ \gdef^^ba{\cedilla s}
+ \gdef^^bb{\v t}
+ \gdef^^bc{\'z}
+ \gdef^^bd{\H{}}
+ \gdef^^be{\v z}
+ \gdef^^bf{\dotaccent z}
+ %
+ \gdef^^c0{\'R}
+ \gdef^^c1{\'A}
+ \gdef^^c2{\^A}
+ \gdef^^c3{\u A}
+ \gdef^^c4{\"A}
+ \gdef^^c5{\'L}
+ \gdef^^c6{\'C}
+ \gdef^^c7{\cedilla C}
+ \gdef^^c8{\v C}
+ \gdef^^c9{\'E}
+ \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}}
+ \gdef^^cb{\"E}
+ \gdef^^cc{\v E}
+ \gdef^^cd{\'I}
+ \gdef^^ce{\^I}
+ \gdef^^cf{\v D}
+ %
+ \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}}
+ \gdef^^d1{\'N}
+ \gdef^^d2{\v N}
+ \gdef^^d3{\'O}
+ \gdef^^d4{\^O}
+ \gdef^^d5{\H O}
+ \gdef^^d6{\"O}
+ \gdef^^d7{$\times$}
+ \gdef^^d8{\v R}
+ \gdef^^d9{\ringaccent U}
+ \gdef^^da{\'U}
+ \gdef^^db{\H U}
+ \gdef^^dc{\"U}
+ \gdef^^dd{\'Y}
+ \gdef^^de{\cedilla T}
+ \gdef^^df{\ss}
+ %
+ \gdef^^e0{\'r}
+ \gdef^^e1{\'a}
+ \gdef^^e2{\^a}
+ \gdef^^e3{\u a}
+ \gdef^^e4{\"a}
+ \gdef^^e5{\'l}
+ \gdef^^e6{\'c}
+ \gdef^^e7{\cedilla c}
+ \gdef^^e8{\v c}
+ \gdef^^e9{\'e}
+ \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}}
+ \gdef^^eb{\"e}
+ \gdef^^ec{\v e}
+ \gdef^^ed{\'\i}
+ \gdef^^ee{\^\i}
+ \gdef^^ef{\v d}
+ %
+ \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}}
+ \gdef^^f1{\'n}
+ \gdef^^f2{\v n}
+ \gdef^^f3{\'o}
+ \gdef^^f4{\^o}
+ \gdef^^f5{\H o}
+ \gdef^^f6{\"o}
+ \gdef^^f7{$\div$}
+ \gdef^^f8{\v r}
+ \gdef^^f9{\ringaccent u}
+ \gdef^^fa{\'u}
+ \gdef^^fb{\H u}
+ \gdef^^fc{\"u}
+ \gdef^^fd{\'y}
+ \gdef^^fe{\cedilla t}
+ \gdef^^ff{\dotaccent{}}
+}
+
+% UTF-8 character definitions.
+%
+% This code to support UTF-8 is based on LaTeX's utf8.def, with some
+% changes for Texinfo conventions. It is included here under the GPL by
+% permission from Frank Mittelbach and the LaTeX team.
+%
+\newcount\countUTFx
+\newcount\countUTFy
+\newcount\countUTFz
+
+\gdef\UTFviiiTwoOctets#1#2{\expandafter
+ \UTFviiiDefined\csname u8:#1\string #2\endcsname}
+%
+\gdef\UTFviiiThreeOctets#1#2#3{\expandafter
+ \UTFviiiDefined\csname u8:#1\string #2\string #3\endcsname}
+%
+\gdef\UTFviiiFourOctets#1#2#3#4{\expandafter
+ \UTFviiiDefined\csname u8:#1\string #2\string #3\string #4\endcsname}
+
+\gdef\UTFviiiDefined#1{%
+ \ifx #1\relax
+ \message{\linenumber Unicode char \string #1 not defined for Texinfo}%
+ \else
+ \expandafter #1%
+ \fi
+}
+
+\begingroup
+ \catcode`\~13
+ \catcode`\"12
+
+ \def\UTFviiiLoop{%
+ \global\catcode\countUTFx\active
+ \uccode`\~\countUTFx
+ \uppercase\expandafter{\UTFviiiTmp}%
+ \advance\countUTFx by 1
+ \ifnum\countUTFx < \countUTFy
+ \expandafter\UTFviiiLoop
+ \fi}
+
+ \countUTFx = "C2
+ \countUTFy = "E0
+ \def\UTFviiiTmp{%
+ \xdef~{\noexpand\UTFviiiTwoOctets\string~}}
+ \UTFviiiLoop
+
+ \countUTFx = "E0
+ \countUTFy = "F0
+ \def\UTFviiiTmp{%
+ \xdef~{\noexpand\UTFviiiThreeOctets\string~}}
+ \UTFviiiLoop
+
+ \countUTFx = "F0
+ \countUTFy = "F4
+ \def\UTFviiiTmp{%
+ \xdef~{\noexpand\UTFviiiFourOctets\string~}}
+ \UTFviiiLoop
+\endgroup
+
+\begingroup
+ \catcode`\"=12
+ \catcode`\<=12
+ \catcode`\.=12
+ \catcode`\,=12
+ \catcode`\;=12
+ \catcode`\!=12
+ \catcode`\~=13
+
+ \gdef\DeclareUnicodeCharacter#1#2{%
+ \countUTFz = "#1\relax
+ \wlog{\space\space defining Unicode char U+#1 (decimal \the\countUTFz)}%
+ \begingroup
+ \parseXMLCharref
+ \def\UTFviiiTwoOctets##1##2{%
+ \csname u8:##1\string ##2\endcsname}%
+ \def\UTFviiiThreeOctets##1##2##3{%
+ \csname u8:##1\string ##2\string ##3\endcsname}%
+ \def\UTFviiiFourOctets##1##2##3##4{%
+ \csname u8:##1\string ##2\string ##3\string ##4\endcsname}%
+ \expandafter\expandafter\expandafter\expandafter
+ \expandafter\expandafter\expandafter
+ \gdef\UTFviiiTmp{#2}%
+ \endgroup}
+
+ \gdef\parseXMLCharref{%
+ \ifnum\countUTFz < "A0\relax
+ \errhelp = \EMsimple
+ \errmessage{Cannot define Unicode char value < 00A0}%
+ \else\ifnum\countUTFz < "800\relax
+ \parseUTFviiiA,%
+ \parseUTFviiiB C\UTFviiiTwoOctets.,%
+ \else\ifnum\countUTFz < "10000\relax
+ \parseUTFviiiA;%
+ \parseUTFviiiA,%
+ \parseUTFviiiB E\UTFviiiThreeOctets.{,;}%
+ \else
+ \parseUTFviiiA;%
+ \parseUTFviiiA,%
+ \parseUTFviiiA!%
+ \parseUTFviiiB F\UTFviiiFourOctets.{!,;}%
+ \fi\fi\fi
+ }
+
+ \gdef\parseUTFviiiA#1{%
+ \countUTFx = \countUTFz
+ \divide\countUTFz by 64
+ \countUTFy = \countUTFz
+ \multiply\countUTFz by 64
+ \advance\countUTFx by -\countUTFz
+ \advance\countUTFx by 128
+ \uccode `#1\countUTFx
+ \countUTFz = \countUTFy}
+
+ \gdef\parseUTFviiiB#1#2#3#4{%
+ \advance\countUTFz by "#10\relax
+ \uccode `#3\countUTFz
+ \uppercase{\gdef\UTFviiiTmp{#2#3#4}}}
+\endgroup
+
+\def\utfeightchardefs{%
+ \DeclareUnicodeCharacter{00A0}{\tie}
+ \DeclareUnicodeCharacter{00A1}{\exclamdown}
+ \DeclareUnicodeCharacter{00A3}{\pounds}
+ \DeclareUnicodeCharacter{00A8}{\"{ }}
+ \DeclareUnicodeCharacter{00A9}{\copyright}
+ \DeclareUnicodeCharacter{00AA}{\ordf}
+ \DeclareUnicodeCharacter{00AB}{\guillemetleft}
+ \DeclareUnicodeCharacter{00AD}{\-}
+ \DeclareUnicodeCharacter{00AE}{\registeredsymbol}
+ \DeclareUnicodeCharacter{00AF}{\={ }}
+
+ \DeclareUnicodeCharacter{00B0}{\ringaccent{ }}
+ \DeclareUnicodeCharacter{00B4}{\'{ }}
+ \DeclareUnicodeCharacter{00B8}{\cedilla{ }}
+ \DeclareUnicodeCharacter{00BA}{\ordm}
+ \DeclareUnicodeCharacter{00BB}{\guillemetright}
+ \DeclareUnicodeCharacter{00BF}{\questiondown}
+
+ \DeclareUnicodeCharacter{00C0}{\`A}
+ \DeclareUnicodeCharacter{00C1}{\'A}
+ \DeclareUnicodeCharacter{00C2}{\^A}
+ \DeclareUnicodeCharacter{00C3}{\~A}
+ \DeclareUnicodeCharacter{00C4}{\"A}
+ \DeclareUnicodeCharacter{00C5}{\AA}
+ \DeclareUnicodeCharacter{00C6}{\AE}
+ \DeclareUnicodeCharacter{00C7}{\cedilla{C}}
+ \DeclareUnicodeCharacter{00C8}{\`E}
+ \DeclareUnicodeCharacter{00C9}{\'E}
+ \DeclareUnicodeCharacter{00CA}{\^E}
+ \DeclareUnicodeCharacter{00CB}{\"E}
+ \DeclareUnicodeCharacter{00CC}{\`I}
+ \DeclareUnicodeCharacter{00CD}{\'I}
+ \DeclareUnicodeCharacter{00CE}{\^I}
+ \DeclareUnicodeCharacter{00CF}{\"I}
+
+ \DeclareUnicodeCharacter{00D1}{\~N}
+ \DeclareUnicodeCharacter{00D2}{\`O}
+ \DeclareUnicodeCharacter{00D3}{\'O}
+ \DeclareUnicodeCharacter{00D4}{\^O}
+ \DeclareUnicodeCharacter{00D5}{\~O}
+ \DeclareUnicodeCharacter{00D6}{\"O}
+ \DeclareUnicodeCharacter{00D8}{\O}
+ \DeclareUnicodeCharacter{00D9}{\`U}
+ \DeclareUnicodeCharacter{00DA}{\'U}
+ \DeclareUnicodeCharacter{00DB}{\^U}
+ \DeclareUnicodeCharacter{00DC}{\"U}
+ \DeclareUnicodeCharacter{00DD}{\'Y}
+ \DeclareUnicodeCharacter{00DF}{\ss}
+
+ \DeclareUnicodeCharacter{00E0}{\`a}
+ \DeclareUnicodeCharacter{00E1}{\'a}
+ \DeclareUnicodeCharacter{00E2}{\^a}
+ \DeclareUnicodeCharacter{00E3}{\~a}
+ \DeclareUnicodeCharacter{00E4}{\"a}
+ \DeclareUnicodeCharacter{00E5}{\aa}
+ \DeclareUnicodeCharacter{00E6}{\ae}
+ \DeclareUnicodeCharacter{00E7}{\cedilla{c}}
+ \DeclareUnicodeCharacter{00E8}{\`e}
+ \DeclareUnicodeCharacter{00E9}{\'e}
+ \DeclareUnicodeCharacter{00EA}{\^e}
+ \DeclareUnicodeCharacter{00EB}{\"e}
+ \DeclareUnicodeCharacter{00EC}{\`{\dotless{i}}}
+ \DeclareUnicodeCharacter{00ED}{\'{\dotless{i}}}
+ \DeclareUnicodeCharacter{00EE}{\^{\dotless{i}}}
+ \DeclareUnicodeCharacter{00EF}{\"{\dotless{i}}}
+
+ \DeclareUnicodeCharacter{00F1}{\~n}
+ \DeclareUnicodeCharacter{00F2}{\`o}
+ \DeclareUnicodeCharacter{00F3}{\'o}
+ \DeclareUnicodeCharacter{00F4}{\^o}
+ \DeclareUnicodeCharacter{00F5}{\~o}
+ \DeclareUnicodeCharacter{00F6}{\"o}
+ \DeclareUnicodeCharacter{00F8}{\o}
+ \DeclareUnicodeCharacter{00F9}{\`u}
+ \DeclareUnicodeCharacter{00FA}{\'u}
+ \DeclareUnicodeCharacter{00FB}{\^u}
+ \DeclareUnicodeCharacter{00FC}{\"u}
+ \DeclareUnicodeCharacter{00FD}{\'y}
+ \DeclareUnicodeCharacter{00FF}{\"y}
+
+ \DeclareUnicodeCharacter{0100}{\=A}
+ \DeclareUnicodeCharacter{0101}{\=a}
+ \DeclareUnicodeCharacter{0102}{\u{A}}
+ \DeclareUnicodeCharacter{0103}{\u{a}}
+ \DeclareUnicodeCharacter{0106}{\'C}
+ \DeclareUnicodeCharacter{0107}{\'c}
+ \DeclareUnicodeCharacter{0108}{\^C}
+ \DeclareUnicodeCharacter{0109}{\^c}
+ \DeclareUnicodeCharacter{010A}{\dotaccent{C}}
+ \DeclareUnicodeCharacter{010B}{\dotaccent{c}}
+ \DeclareUnicodeCharacter{010C}{\v{C}}
+ \DeclareUnicodeCharacter{010D}{\v{c}}
+ \DeclareUnicodeCharacter{010E}{\v{D}}
+
+ \DeclareUnicodeCharacter{0112}{\=E}
+ \DeclareUnicodeCharacter{0113}{\=e}
+ \DeclareUnicodeCharacter{0114}{\u{E}}
+ \DeclareUnicodeCharacter{0115}{\u{e}}
+ \DeclareUnicodeCharacter{0116}{\dotaccent{E}}
+ \DeclareUnicodeCharacter{0117}{\dotaccent{e}}
+ \DeclareUnicodeCharacter{011A}{\v{E}}
+ \DeclareUnicodeCharacter{011B}{\v{e}}
+ \DeclareUnicodeCharacter{011C}{\^G}
+ \DeclareUnicodeCharacter{011D}{\^g}
+ \DeclareUnicodeCharacter{011E}{\u{G}}
+ \DeclareUnicodeCharacter{011F}{\u{g}}
+
+ \DeclareUnicodeCharacter{0120}{\dotaccent{G}}
+ \DeclareUnicodeCharacter{0121}{\dotaccent{g}}
+ \DeclareUnicodeCharacter{0124}{\^H}
+ \DeclareUnicodeCharacter{0125}{\^h}
+ \DeclareUnicodeCharacter{0128}{\~I}
+ \DeclareUnicodeCharacter{0129}{\~{\dotless{i}}}
+ \DeclareUnicodeCharacter{012A}{\=I}
+ \DeclareUnicodeCharacter{012B}{\={\dotless{i}}}
+ \DeclareUnicodeCharacter{012C}{\u{I}}
+ \DeclareUnicodeCharacter{012D}{\u{\dotless{i}}}
+
+ \DeclareUnicodeCharacter{0130}{\dotaccent{I}}
+ \DeclareUnicodeCharacter{0131}{\dotless{i}}
+ \DeclareUnicodeCharacter{0132}{IJ}
+ \DeclareUnicodeCharacter{0133}{ij}
+ \DeclareUnicodeCharacter{0134}{\^J}
+ \DeclareUnicodeCharacter{0135}{\^{\dotless{j}}}
+ \DeclareUnicodeCharacter{0139}{\'L}
+ \DeclareUnicodeCharacter{013A}{\'l}
+
+ \DeclareUnicodeCharacter{0141}{\L}
+ \DeclareUnicodeCharacter{0142}{\l}
+ \DeclareUnicodeCharacter{0143}{\'N}
+ \DeclareUnicodeCharacter{0144}{\'n}
+ \DeclareUnicodeCharacter{0147}{\v{N}}
+ \DeclareUnicodeCharacter{0148}{\v{n}}
+ \DeclareUnicodeCharacter{014C}{\=O}
+ \DeclareUnicodeCharacter{014D}{\=o}
+ \DeclareUnicodeCharacter{014E}{\u{O}}
+ \DeclareUnicodeCharacter{014F}{\u{o}}
+
+ \DeclareUnicodeCharacter{0150}{\H{O}}
+ \DeclareUnicodeCharacter{0151}{\H{o}}
+ \DeclareUnicodeCharacter{0152}{\OE}
+ \DeclareUnicodeCharacter{0153}{\oe}
+ \DeclareUnicodeCharacter{0154}{\'R}
+ \DeclareUnicodeCharacter{0155}{\'r}
+ \DeclareUnicodeCharacter{0158}{\v{R}}
+ \DeclareUnicodeCharacter{0159}{\v{r}}
+ \DeclareUnicodeCharacter{015A}{\'S}
+ \DeclareUnicodeCharacter{015B}{\'s}
+ \DeclareUnicodeCharacter{015C}{\^S}
+ \DeclareUnicodeCharacter{015D}{\^s}
+ \DeclareUnicodeCharacter{015E}{\cedilla{S}}
+ \DeclareUnicodeCharacter{015F}{\cedilla{s}}
+
+ \DeclareUnicodeCharacter{0160}{\v{S}}
+ \DeclareUnicodeCharacter{0161}{\v{s}}
+ \DeclareUnicodeCharacter{0162}{\cedilla{t}}
+ \DeclareUnicodeCharacter{0163}{\cedilla{T}}
+ \DeclareUnicodeCharacter{0164}{\v{T}}
+
+ \DeclareUnicodeCharacter{0168}{\~U}
+ \DeclareUnicodeCharacter{0169}{\~u}
+ \DeclareUnicodeCharacter{016A}{\=U}
+ \DeclareUnicodeCharacter{016B}{\=u}
+ \DeclareUnicodeCharacter{016C}{\u{U}}
+ \DeclareUnicodeCharacter{016D}{\u{u}}
+ \DeclareUnicodeCharacter{016E}{\ringaccent{U}}
+ \DeclareUnicodeCharacter{016F}{\ringaccent{u}}
+
+ \DeclareUnicodeCharacter{0170}{\H{U}}
+ \DeclareUnicodeCharacter{0171}{\H{u}}
+ \DeclareUnicodeCharacter{0174}{\^W}
+ \DeclareUnicodeCharacter{0175}{\^w}
+ \DeclareUnicodeCharacter{0176}{\^Y}
+ \DeclareUnicodeCharacter{0177}{\^y}
+ \DeclareUnicodeCharacter{0178}{\"Y}
+ \DeclareUnicodeCharacter{0179}{\'Z}
+ \DeclareUnicodeCharacter{017A}{\'z}
+ \DeclareUnicodeCharacter{017B}{\dotaccent{Z}}
+ \DeclareUnicodeCharacter{017C}{\dotaccent{z}}
+ \DeclareUnicodeCharacter{017D}{\v{Z}}
+ \DeclareUnicodeCharacter{017E}{\v{z}}
+
+ \DeclareUnicodeCharacter{01C4}{D\v{Z}}
+ \DeclareUnicodeCharacter{01C5}{D\v{z}}
+ \DeclareUnicodeCharacter{01C6}{d\v{z}}
+ \DeclareUnicodeCharacter{01C7}{LJ}
+ \DeclareUnicodeCharacter{01C8}{Lj}
+ \DeclareUnicodeCharacter{01C9}{lj}
+ \DeclareUnicodeCharacter{01CA}{NJ}
+ \DeclareUnicodeCharacter{01CB}{Nj}
+ \DeclareUnicodeCharacter{01CC}{nj}
+ \DeclareUnicodeCharacter{01CD}{\v{A}}
+ \DeclareUnicodeCharacter{01CE}{\v{a}}
+ \DeclareUnicodeCharacter{01CF}{\v{I}}
+
+ \DeclareUnicodeCharacter{01D0}{\v{\dotless{i}}}
+ \DeclareUnicodeCharacter{01D1}{\v{O}}
+ \DeclareUnicodeCharacter{01D2}{\v{o}}
+ \DeclareUnicodeCharacter{01D3}{\v{U}}
+ \DeclareUnicodeCharacter{01D4}{\v{u}}
+
+ \DeclareUnicodeCharacter{01E2}{\={\AE}}
+ \DeclareUnicodeCharacter{01E3}{\={\ae}}
+ \DeclareUnicodeCharacter{01E6}{\v{G}}
+ \DeclareUnicodeCharacter{01E7}{\v{g}}
+ \DeclareUnicodeCharacter{01E8}{\v{K}}
+ \DeclareUnicodeCharacter{01E9}{\v{k}}
+
+ \DeclareUnicodeCharacter{01F0}{\v{\dotless{j}}}
+ \DeclareUnicodeCharacter{01F1}{DZ}
+ \DeclareUnicodeCharacter{01F2}{Dz}
+ \DeclareUnicodeCharacter{01F3}{dz}
+ \DeclareUnicodeCharacter{01F4}{\'G}
+ \DeclareUnicodeCharacter{01F5}{\'g}
+ \DeclareUnicodeCharacter{01F8}{\`N}
+ \DeclareUnicodeCharacter{01F9}{\`n}
+ \DeclareUnicodeCharacter{01FC}{\'{\AE}}
+ \DeclareUnicodeCharacter{01FD}{\'{\ae}}
+ \DeclareUnicodeCharacter{01FE}{\'{\O}}
+ \DeclareUnicodeCharacter{01FF}{\'{\o}}
+
+ \DeclareUnicodeCharacter{021E}{\v{H}}
+ \DeclareUnicodeCharacter{021F}{\v{h}}
+
+ \DeclareUnicodeCharacter{0226}{\dotaccent{A}}
+ \DeclareUnicodeCharacter{0227}{\dotaccent{a}}
+ \DeclareUnicodeCharacter{0228}{\cedilla{E}}
+ \DeclareUnicodeCharacter{0229}{\cedilla{e}}
+ \DeclareUnicodeCharacter{022E}{\dotaccent{O}}
+ \DeclareUnicodeCharacter{022F}{\dotaccent{o}}
+
+ \DeclareUnicodeCharacter{0232}{\=Y}
+ \DeclareUnicodeCharacter{0233}{\=y}
+ \DeclareUnicodeCharacter{0237}{\dotless{j}}
+
+ \DeclareUnicodeCharacter{1E02}{\dotaccent{B}}
+ \DeclareUnicodeCharacter{1E03}{\dotaccent{b}}
+ \DeclareUnicodeCharacter{1E04}{\udotaccent{B}}
+ \DeclareUnicodeCharacter{1E05}{\udotaccent{b}}
+ \DeclareUnicodeCharacter{1E06}{\ubaraccent{B}}
+ \DeclareUnicodeCharacter{1E07}{\ubaraccent{b}}
+ \DeclareUnicodeCharacter{1E0A}{\dotaccent{D}}
+ \DeclareUnicodeCharacter{1E0B}{\dotaccent{d}}
+ \DeclareUnicodeCharacter{1E0C}{\udotaccent{D}}
+ \DeclareUnicodeCharacter{1E0D}{\udotaccent{d}}
+ \DeclareUnicodeCharacter{1E0E}{\ubaraccent{D}}
+ \DeclareUnicodeCharacter{1E0F}{\ubaraccent{d}}
+
+ \DeclareUnicodeCharacter{1E1E}{\dotaccent{F}}
+ \DeclareUnicodeCharacter{1E1F}{\dotaccent{f}}
+
+ \DeclareUnicodeCharacter{1E20}{\=G}
+ \DeclareUnicodeCharacter{1E21}{\=g}
+ \DeclareUnicodeCharacter{1E22}{\dotaccent{H}}
+ \DeclareUnicodeCharacter{1E23}{\dotaccent{h}}
+ \DeclareUnicodeCharacter{1E24}{\udotaccent{H}}
+ \DeclareUnicodeCharacter{1E25}{\udotaccent{h}}
+ \DeclareUnicodeCharacter{1E26}{\"H}
+ \DeclareUnicodeCharacter{1E27}{\"h}
+
+ \DeclareUnicodeCharacter{1E30}{\'K}
+ \DeclareUnicodeCharacter{1E31}{\'k}
+ \DeclareUnicodeCharacter{1E32}{\udotaccent{K}}
+ \DeclareUnicodeCharacter{1E33}{\udotaccent{k}}
+ \DeclareUnicodeCharacter{1E34}{\ubaraccent{K}}
+ \DeclareUnicodeCharacter{1E35}{\ubaraccent{k}}
+ \DeclareUnicodeCharacter{1E36}{\udotaccent{L}}
+ \DeclareUnicodeCharacter{1E37}{\udotaccent{l}}
+ \DeclareUnicodeCharacter{1E3A}{\ubaraccent{L}}
+ \DeclareUnicodeCharacter{1E3B}{\ubaraccent{l}}
+ \DeclareUnicodeCharacter{1E3E}{\'M}
+ \DeclareUnicodeCharacter{1E3F}{\'m}
+
+ \DeclareUnicodeCharacter{1E40}{\dotaccent{M}}
+ \DeclareUnicodeCharacter{1E41}{\dotaccent{m}}
+ \DeclareUnicodeCharacter{1E42}{\udotaccent{M}}
+ \DeclareUnicodeCharacter{1E43}{\udotaccent{m}}
+ \DeclareUnicodeCharacter{1E44}{\dotaccent{N}}
+ \DeclareUnicodeCharacter{1E45}{\dotaccent{n}}
+ \DeclareUnicodeCharacter{1E46}{\udotaccent{N}}
+ \DeclareUnicodeCharacter{1E47}{\udotaccent{n}}
+ \DeclareUnicodeCharacter{1E48}{\ubaraccent{N}}
+ \DeclareUnicodeCharacter{1E49}{\ubaraccent{n}}
+
+ \DeclareUnicodeCharacter{1E54}{\'P}
+ \DeclareUnicodeCharacter{1E55}{\'p}
+ \DeclareUnicodeCharacter{1E56}{\dotaccent{P}}
+ \DeclareUnicodeCharacter{1E57}{\dotaccent{p}}
+ \DeclareUnicodeCharacter{1E58}{\dotaccent{R}}
+ \DeclareUnicodeCharacter{1E59}{\dotaccent{r}}
+ \DeclareUnicodeCharacter{1E5A}{\udotaccent{R}}
+ \DeclareUnicodeCharacter{1E5B}{\udotaccent{r}}
+ \DeclareUnicodeCharacter{1E5E}{\ubaraccent{R}}
+ \DeclareUnicodeCharacter{1E5F}{\ubaraccent{r}}
+
+ \DeclareUnicodeCharacter{1E60}{\dotaccent{S}}
+ \DeclareUnicodeCharacter{1E61}{\dotaccent{s}}
+ \DeclareUnicodeCharacter{1E62}{\udotaccent{S}}
+ \DeclareUnicodeCharacter{1E63}{\udotaccent{s}}
+ \DeclareUnicodeCharacter{1E6A}{\dotaccent{T}}
+ \DeclareUnicodeCharacter{1E6B}{\dotaccent{t}}
+ \DeclareUnicodeCharacter{1E6C}{\udotaccent{T}}
+ \DeclareUnicodeCharacter{1E6D}{\udotaccent{t}}
+ \DeclareUnicodeCharacter{1E6E}{\ubaraccent{T}}
+ \DeclareUnicodeCharacter{1E6F}{\ubaraccent{t}}
+
+ \DeclareUnicodeCharacter{1E7C}{\~V}
+ \DeclareUnicodeCharacter{1E7D}{\~v}
+ \DeclareUnicodeCharacter{1E7E}{\udotaccent{V}}
+ \DeclareUnicodeCharacter{1E7F}{\udotaccent{v}}
+
+ \DeclareUnicodeCharacter{1E80}{\`W}
+ \DeclareUnicodeCharacter{1E81}{\`w}
+ \DeclareUnicodeCharacter{1E82}{\'W}
+ \DeclareUnicodeCharacter{1E83}{\'w}
+ \DeclareUnicodeCharacter{1E84}{\"W}
+ \DeclareUnicodeCharacter{1E85}{\"w}
+ \DeclareUnicodeCharacter{1E86}{\dotaccent{W}}
+ \DeclareUnicodeCharacter{1E87}{\dotaccent{w}}
+ \DeclareUnicodeCharacter{1E88}{\udotaccent{W}}
+ \DeclareUnicodeCharacter{1E89}{\udotaccent{w}}
+ \DeclareUnicodeCharacter{1E8A}{\dotaccent{X}}
+ \DeclareUnicodeCharacter{1E8B}{\dotaccent{x}}
+ \DeclareUnicodeCharacter{1E8C}{\"X}
+ \DeclareUnicodeCharacter{1E8D}{\"x}
+ \DeclareUnicodeCharacter{1E8E}{\dotaccent{Y}}
+ \DeclareUnicodeCharacter{1E8F}{\dotaccent{y}}
+
+ \DeclareUnicodeCharacter{1E90}{\^Z}
+ \DeclareUnicodeCharacter{1E91}{\^z}
+ \DeclareUnicodeCharacter{1E92}{\udotaccent{Z}}
+ \DeclareUnicodeCharacter{1E93}{\udotaccent{z}}
+ \DeclareUnicodeCharacter{1E94}{\ubaraccent{Z}}
+ \DeclareUnicodeCharacter{1E95}{\ubaraccent{z}}
+ \DeclareUnicodeCharacter{1E96}{\ubaraccent{h}}
+ \DeclareUnicodeCharacter{1E97}{\"t}
+ \DeclareUnicodeCharacter{1E98}{\ringaccent{w}}
+ \DeclareUnicodeCharacter{1E99}{\ringaccent{y}}
+
+ \DeclareUnicodeCharacter{1EA0}{\udotaccent{A}}
+ \DeclareUnicodeCharacter{1EA1}{\udotaccent{a}}
+
+ \DeclareUnicodeCharacter{1EB8}{\udotaccent{E}}
+ \DeclareUnicodeCharacter{1EB9}{\udotaccent{e}}
+ \DeclareUnicodeCharacter{1EBC}{\~E}
+ \DeclareUnicodeCharacter{1EBD}{\~e}
+
+ \DeclareUnicodeCharacter{1ECA}{\udotaccent{I}}
+ \DeclareUnicodeCharacter{1ECB}{\udotaccent{i}}
+ \DeclareUnicodeCharacter{1ECC}{\udotaccent{O}}
+ \DeclareUnicodeCharacter{1ECD}{\udotaccent{o}}
+
+ \DeclareUnicodeCharacter{1EE4}{\udotaccent{U}}
+ \DeclareUnicodeCharacter{1EE5}{\udotaccent{u}}
+
+ \DeclareUnicodeCharacter{1EF2}{\`Y}
+ \DeclareUnicodeCharacter{1EF3}{\`y}
+ \DeclareUnicodeCharacter{1EF4}{\udotaccent{Y}}
+
+ \DeclareUnicodeCharacter{1EF8}{\~Y}
+ \DeclareUnicodeCharacter{1EF9}{\~y}
+
+ \DeclareUnicodeCharacter{2013}{--}
+ \DeclareUnicodeCharacter{2014}{---}
+ \DeclareUnicodeCharacter{2018}{\quoteleft}
+ \DeclareUnicodeCharacter{2019}{\quoteright}
+ \DeclareUnicodeCharacter{201A}{\quotesinglbase}
+ \DeclareUnicodeCharacter{201C}{\quotedblleft}
+ \DeclareUnicodeCharacter{201D}{\quotedblright}
+ \DeclareUnicodeCharacter{201E}{\quotedblbase}
+ \DeclareUnicodeCharacter{2022}{\bullet}
+ \DeclareUnicodeCharacter{2026}{\dots}
+ \DeclareUnicodeCharacter{2039}{\guilsinglleft}
+ \DeclareUnicodeCharacter{203A}{\guilsinglright}
+ \DeclareUnicodeCharacter{20AC}{\euro}
+
+ \DeclareUnicodeCharacter{2192}{\expansion}
+ \DeclareUnicodeCharacter{21D2}{\result}
+
+ \DeclareUnicodeCharacter{2212}{\minus}
+ \DeclareUnicodeCharacter{2217}{\point}
+ \DeclareUnicodeCharacter{2261}{\equiv}
+}% end of \utfeightchardefs
+
+
+% US-ASCII character definitions.
+\def\asciichardefs{% nothing need be done
+ \relax
+}
+
+% Make non-ASCII characters printable again for compatibility with
+% existing Texinfo documents that may use them, even without declaring a
+% document encoding.
+%
+\setnonasciicharscatcode \other
+
+
+\message{formatting,}
+
\newdimen\defaultparindent \defaultparindent = 15pt
\chapheadingskip = 15pt plus 4pt minus 2pt
@@ -7110,7 +8586,7 @@
% Don't be so finicky about underfull hboxes, either.
\hbadness = 2000
-% Following George Bush, just get rid of widows and orphans.
+% Following George Bush, get rid of widows and orphans.
\widowpenalty=10000
\clubpenalty=10000
@@ -7157,6 +8633,10 @@
\ifpdf
\pdfpageheight #7\relax
\pdfpagewidth #8\relax
+ % if we don't reset these, they will remain at "1 true in" of
+ % whatever layout pdftex was dumped with.
+ \pdfhorigin = 1 true in
+ \pdfvorigin = 1 true in
\fi
%
\setleading{\textleading}
@@ -7171,7 +8651,7 @@
\textleading = 13.2pt
%
% If page is nothing but text, make it come out even.
- \internalpagesizes{46\baselineskip}{6in}%
+ \internalpagesizes{607.2pt}{6in}% that's 46 lines
{\voffset}{.25in}%
{\bindingoffset}{36pt}%
{11in}{8.5in}%
@@ -7183,7 +8663,7 @@
\textleading = 12pt
%
\internalpagesizes{7.5in}{5in}%
- {\voffset}{.25in}%
+ {-.2in}{0in}%
{\bindingoffset}{16pt}%
{9.25in}{7in}%
%
@@ -7227,7 +8707,7 @@
% \global\normaloffset = -6mm
% \global\bindingoffset = 10mm
% @end tex
- \internalpagesizes{51\baselineskip}{160mm}
+ \internalpagesizes{673.2pt}{160mm}% that's 51 lines
{\voffset}{\hoffset}%
{\bindingoffset}{44pt}%
{297mm}{210mm}%
@@ -7292,7 +8772,7 @@
\parskip = 3pt plus 2pt minus 1pt
\setleading{\textleading}%
%
- \dimen0 = #1
+ \dimen0 = #1\relax
\advance\dimen0 by \voffset
%
\dimen2 = \hsize
Modified: Extractor/doc/version.texi
===================================================================
--- Extractor/doc/version.texi 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/doc/version.texi 2008-03-21 06:00:52 UTC (rev 6581)
@@ -1,4 +1,4 @@
@set UPDATED 9 June 2007
@set UPDATED-MONTH June 2007
address@hidden EDITION 0.5.19a
address@hidden VERSION 0.5.19a
address@hidden EDITION 0.5.20
address@hidden VERSION 0.5.20
Modified: Extractor/po/de.po
===================================================================
--- Extractor/po/de.po 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/po/de.po 2008-03-21 06:00:52 UTC (rev 6581)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: libextractor 0.5.14\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-01-07 08:48-0700\n"
+"POT-Creation-Date: 2008-03-20 23:53-0600\n"
"PO-Revision-Date: 2007-03-23 23:16+0100\n"
"Last-Translator: Nils Durner <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -123,12 +123,12 @@
msgid "Extract metadata from files."
msgstr "Metadaten aus den Dateien extrahieren."
-#: src/main/extract.c:190 src/main/extractor.c:1444
+#: src/main/extract.c:190 src/main/extractor.c:1513
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (binär)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1449
+#: src/main/extract.c:201 src/main/extractor.c:1518
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "UNGÜLTIGE ART - %s\n"
@@ -185,8 +185,7 @@
#, c-format
msgid "You must specify an argument for the `%s' option (option ignored).\n"
msgstr ""
-"Sie müssen ein Argument für die Option »%s« angeben (Option wird "
-"ignoriert).\n"
+"Sie müssen ein Argument für die Option »%s« angeben (Option wird
ignoriert).\n"
#: src/main/extract.c:607
#, c-format
@@ -683,12 +682,25 @@
msgid "filesize"
msgstr "Dateigröße"
-#: src/main/extractor.c:529
+#: src/main/extractor.c:176
+msgid "track number"
+msgstr ""
+
+#: src/main/extractor.c:177
+msgid "international standard recording code"
+msgstr ""
+
+#: src/main/extractor.c:178
+#, fuzzy
+msgid "disc number"
+msgstr "Haftungsausschluss"
+
+#: src/main/extractor.c:598
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initialisierung des Plugin-Mechanismus' ist fehlgeschlagen: %s.\n"
-#: src/main/extractor.c:683
+#: src/main/extractor.c:752
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -697,12 +709,12 @@
"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:712
+#: src/main/extractor.c:781
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Laden des »%s«-Plugins ist fehlgeschlagen: %s\n"
-#: src/main/extractor.c:917
+#: src/main/extractor.c:986
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Entladen des »%s«-Plugins ist fehlgeschlagen!\n"
@@ -829,607 +841,607 @@
msgid "Kernel routines"
msgstr "Kernelroutinen"
-#: src/plugins/mp3extractor.c:50 src/plugins/qtextractor.c:30
+#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:30
msgid "Blues"
msgstr "Blues"
-#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:31
+#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:31
msgid "Classic Rock"
msgstr "Klassischer Rock"
-#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:32
+#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:32
msgid "Country"
msgstr "Country"
-#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:33
+#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:33
msgid "Dance"
msgstr "Dance"
-#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:34
+#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:34
msgid "Disco"
msgstr "Disco"
-#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:35
+#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:35
msgid "Funk"
msgstr "Funk"
-#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:36
+#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:36
msgid "Grunge"
msgstr "Grunge"
-#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:37
+#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:37
msgid "Hip-Hop"
msgstr "Hip-Hop"
-#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:38
+#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:38
msgid "Jazz"
msgstr "Jazz"
-#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:39
+#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:39
msgid "Metal"
msgstr "Metal"
-#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:40
+#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:40
msgid "New Age"
msgstr "New Age"
-#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:41
+#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:41
msgid "Oldies"
msgstr "Oldies"
-#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:42
+#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:42
msgid "Other"
msgstr "Sonstiges"
-#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:43
+#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:43
msgid "Pop"
msgstr "Pop"
-#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:44
+#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:44
msgid "R&B"
msgstr "R&B"
-#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:45
+#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:45
msgid "Rap"
msgstr "Rap"
-#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:46
+#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:46
msgid "Reggae"
msgstr "Reggae"
-#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:47
+#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:47
msgid "Rock"
msgstr "Rock"
-#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:48
+#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:48
msgid "Techno"
msgstr "Techno"
-#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:49
+#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:49
msgid "Industrial"
msgstr "Industriell"
-#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:50
+#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:50
msgid "Alternative"
msgstr "Alternative"
-#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:51
+#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:51
msgid "Ska"
msgstr "Ska"
-#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:52
+#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:52
msgid "Death Metal"
msgstr "Death Metal"
-#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:53
+#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:53
msgid "Pranks"
msgstr "Pranks"
-#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:54
+#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:54
msgid "Soundtrack"
msgstr "Filmmusik (Soundtrack)"
-#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:55
+#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:55
msgid "Euro-Techno"
msgstr "Euro-Techno"
-#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:56
+#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:56
msgid "Ambient"
msgstr "Ambient"
-#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:57
+#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:57
msgid "Trip-Hop"
msgstr "Trip-Hop"
-#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:58
+#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:58
msgid "Vocal"
msgstr "Vokal"
-#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:59
+#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:59
msgid "Jazz+Funk"
msgstr "Jazz+Funk"
-#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:60
+#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:60
msgid "Fusion"
msgstr "Fusion"
-#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:61
+#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:61
msgid "Trance"
msgstr "Trance"
-#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:62
+#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:62
msgid "Classical"
msgstr "Klassik"
-#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:63
+#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:63
msgid "Instrumental"
msgstr "Instrumental"
-#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:64
+#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:64
msgid "Acid"
msgstr "Acid"
-#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:65
+#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:65
msgid "House"
msgstr "House"
-#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:66
+#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:66
msgid "Game"
msgstr "Spiel"
-#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:67
+#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:67
msgid "Sound Clip"
msgstr "Soundclip"
-#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:68
+#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:68
msgid "Gospel"
msgstr "Gospel"
-#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:69
+#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:69
msgid "Noise"
msgstr "Noise"
-#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:70
+#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:70
msgid "Alt. Rock"
msgstr "Alt. Rock"
-#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:71
+#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:71
msgid "Bass"
msgstr "Bass"
-#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:72
+#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:72
msgid "Soul"
msgstr "Soul"
-#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:73
+#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:73
msgid "Punk"
msgstr "Punk"
-#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:74
+#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:74
msgid "Space"
msgstr "Space"
-#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:75
+#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:75
msgid "Meditative"
msgstr "Meditative"
-#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:76
+#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:76
msgid "Instrumental Pop"
msgstr "Instrumental Pop"
-#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:77
+#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:77
msgid "Instrumental Rock"
msgstr "Instrumental Rock"
-#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:78
+#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:78
msgid "Ethnic"
msgstr "Ethnic"
-#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:79
+#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:79
msgid "Gothic"
msgstr "Gothic"
-#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:80
+#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:80
msgid "Darkwave"
msgstr "Darkwave"
-#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:81
+#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:81
msgid "Techno-Industrial"
msgstr "Techno-Industrial"
-#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:82
+#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:82
msgid "Electronic"
msgstr "Electronic"
-#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:83
+#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:83
msgid "Pop-Folk"
msgstr "Pop-Folk"
-#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:84
+#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:84
msgid "Eurodance"
msgstr "Eurodance"
-#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:85
+#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:85
msgid "Dream"
msgstr "Dream"
-#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:86
+#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:86
msgid "Southern Rock"
msgstr "Southern Rock"
-#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:87
+#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:87
msgid "Comedy"
msgstr "Comedy"
-#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:88
+#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:88
msgid "Cult"
msgstr "Cult"
-#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:89
+#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:89
msgid "Gangsta Rap"
msgstr "Gangsta Rap"
-#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:90
+#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:90
msgid "Top 40"
msgstr "Top 40"
-#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:91
+#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:91
msgid "Christian Rap"
msgstr "Christian Rap"
-#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:92
+#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:92
msgid "Pop/Funk"
msgstr "Pop/Funk"
-#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:93
+#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:93
msgid "Jungle"
msgstr "Jungle"
-#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:94
+#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:94
msgid "Native American"
msgstr "Native American"
-#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:95
+#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:95
msgid "Cabaret"
msgstr "Cabaret"
-#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:96
+#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:96
msgid "New Wave"
msgstr "New Wave"
-#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:97
+#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:97
msgid "Psychedelic"
msgstr "Psychedelic"
-#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:98
+#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:98
msgid "Rave"
msgstr "Rave"
-#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:99
+#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:99
msgid "Showtunes"
msgstr "Showtunes"
-#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:100
+#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:100
msgid "Trailer"
msgstr "Trailer"
-#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:101
+#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:101
msgid "Lo-Fi"
msgstr "Lo-Fi"
-#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:102
+#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:102
msgid "Tribal"
msgstr "Tribal"
-#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:103
+#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:103
msgid "Acid Punk"
msgstr "Acid Punk"
-#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:104
+#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:104
msgid "Acid Jazz"
msgstr "Acid Jazz"
-#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:105
+#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:105
msgid "Polka"
msgstr "Polka"
-#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:106
+#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:106
msgid "Retro"
msgstr "Retro"
-#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:107
+#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:107
msgid "Musical"
msgstr "Musical"
-#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:108
+#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:108
msgid "Rock & Roll"
msgstr "Rock & Roll"
-#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:109
+#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:109
msgid "Hard Rock"
msgstr "Hard Rock"
-#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:110
+#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:110
msgid "Folk"
msgstr "Folk"
-#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:111
+#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:111
msgid "Folk/Rock"
msgstr "Folk/Rock"
-#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:112
+#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:112
msgid "National Folk"
msgstr "National Folk"
-#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:113
+#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:113
msgid "Swing"
msgstr "Swing"
-#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:114
+#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:114
msgid "Fast-Fusion"
msgstr "Fast-Fusion"
-#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:115
+#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:115
msgid "Bebob"
msgstr "Bebob"
-#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:116
+#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:116
msgid "Latin"
msgstr "Latin"
-#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:117
+#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:117
msgid "Revival"
msgstr "Revival"
-#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:118
+#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:118
msgid "Celtic"
msgstr "Celtic"
-#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:119
+#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:119
msgid "Bluegrass"
msgstr "Bluegrass"
-#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:120
+#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:120
msgid "Avantgarde"
msgstr "Avantgarde"
-#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:121
+#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:121
msgid "Gothic Rock"
msgstr "Gothic Rock"
-#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:122
+#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:122
msgid "Progressive Rock"
msgstr "Progressive Rock"
-#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:123
+#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:123
msgid "Psychedelic Rock"
msgstr "Psychedelic Rock"
-#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:124
+#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:124
msgid "Symphonic Rock"
msgstr "Symphonic Rock"
-#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:125
+#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:125
msgid "Slow Rock"
msgstr "Slow Rock"
-#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:126
+#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:126
msgid "Big Band"
msgstr "Big Band"
-#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:127
+#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:127
msgid "Chorus"
msgstr "Chor"
-#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:128
+#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:128
msgid "Easy Listening"
msgstr "Easy Listening"
-#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:129
+#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:129
msgid "Acoustic"
msgstr "Acoustic"
-#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:130
+#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:130
msgid "Humour"
msgstr "Humor"
-#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:131
+#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:131
msgid "Speech"
msgstr "Sprache"
-#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:132
+#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:132
msgid "Chanson"
msgstr "Chanson"
-#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:133
+#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:133
msgid "Opera"
msgstr "Oper"
-#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:134
+#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:134
msgid "Chamber Music"
msgstr "Kammermusik"
-#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:135
+#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:135
msgid "Sonata"
msgstr "Sonate"
-#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:136
+#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:136
msgid "Symphony"
msgstr "Symphonie"
-#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:137
+#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:137
msgid "Booty Bass"
msgstr "Booty Bass"
-#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:138
+#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:138
msgid "Primus"
msgstr "Primus"
-#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:139
+#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:139
msgid "Porn Groove"
msgstr "Porn Groove"
-#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:140
+#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:140
msgid "Satire"
msgstr "Satire"
-#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:141
+#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:141
msgid "Slow Jam"
msgstr "Slow Jam"
-#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:142
+#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:142
msgid "Club"
msgstr "Club"
-#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:143
+#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:143
msgid "Tango"
msgstr "Tango"
-#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:144
+#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:144
msgid "Samba"
msgstr "Samba"
-#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:145
+#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:145
msgid "Folklore"
msgstr "Folklore"
-#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:146
+#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:146
msgid "Ballad"
msgstr "Ballad"
-#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:147
+#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:147
msgid "Power Ballad"
msgstr "Power Ballad"
-#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:148
+#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:148
msgid "Rhythmic Soul"
msgstr "Rhythmic Soul"
-#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:149
+#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:149
msgid "Freestyle"
msgstr "Freestyle"
-#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:150
+#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:150
msgid "Duet"
msgstr "Duet"
-#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:151
+#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:151
msgid "Punk Rock"
msgstr "Punk Rock"
-#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:152
+#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:152
msgid "Drum Solo"
msgstr "Drum Solo"
-#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:153
+#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:153
msgid "A Cappella"
msgstr "A cappella"
-#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:154
+#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:154
msgid "Euro-House"
msgstr "Euro-House"
-#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:155
+#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:155
msgid "Dance Hall"
msgstr "Dance Hall"
-#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:156
+#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:156
msgid "Goa"
msgstr "Goa"
-#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:157
+#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:157
msgid "Drum & Bass"
msgstr "Drum & Bass"
-#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:158
+#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:158
msgid "Club-House"
msgstr "Club-House"
-#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:159
+#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:159
msgid "Hardcore"
msgstr "Hardcore"
-#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:160
+#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:160
msgid "Terror"
msgstr "Terror"
-#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:161
+#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:161
msgid "Indie"
msgstr "Indie"
-#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:162
+#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:162
msgid "BritPop"
msgstr "BritPop"
-#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:163
+#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:163
msgid "Negerpunk"
msgstr "Negerpunk"
-#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:164
+#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:164
msgid "Polsk Punk"
msgstr "Polsk Punk"
-#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:165
+#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:165
msgid "Beat"
msgstr "Beat"
-#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:166
+#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:166
msgid "Christian Gangsta Rap"
msgstr "Christian Gangsta Rap"
-#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:167
+#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:167
msgid "Heavy Metal"
msgstr "Heavy Metal"
-#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:168
+#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:168
msgid "Black Metal"
msgstr "Black Metal"
-#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:169
+#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:169
msgid "Crossover"
msgstr "Crossover"
-#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:170
+#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:170
msgid "Contemporary Christian"
msgstr "Contemporary Christian"
-#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:171
+#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:171
msgid "Christian Rock"
msgstr "Christlicher Rock"
-#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:172
+#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:172
msgid "Merengue"
msgstr "Merengue"
-#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:173
+#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:173
msgid "Salsa"
msgstr "Salsa"
-#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:174
+#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:174
msgid "Thrash Metal"
msgstr "Thrash Metal"
-#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:175
+#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:175
msgid "Anime"
msgstr "Anime"
-#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:176
+#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:176
msgid "JPop"
msgstr "JPop"
-#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:177
+#: src/plugins/mp3extractor.c:198 src/plugins/qtextractor.c:177
msgid "Synthpop"
msgstr "Synthpop"
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "stereo"
msgstr "Stereo"
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "mono"
msgstr "Mono"
-#: src/plugins/mp3extractor.c:434
+#: src/plugins/mp3extractor.c:445
msgid "(variable bps)"
msgstr "(variable BPS)"
Modified: Extractor/po/ga.po
===================================================================
--- Extractor/po/ga.po 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/po/ga.po 2008-03-21 06:00:52 UTC (rev 6581)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: libextractor 0.5.18a\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-01-07 08:48-0700\n"
+"POT-Creation-Date: 2008-03-20 23:53-0600\n"
"PO-Revision-Date: 2007-07-25 20:46-0700\n"
"Last-Translator: Kevin Scannell <address@hidden>\n"
"Language-Team: Irish <address@hidden>\n"
@@ -119,12 +119,12 @@
msgid "Extract metadata from files."
msgstr "Bain meiteashonra� as comhaid."
-#: src/main/extract.c:190 src/main/extractor.c:1444
+#: src/main/extract.c:190 src/main/extractor.c:1513
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (d�n�rtha)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1449
+#: src/main/extract.c:201 src/main/extractor.c:1518
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "CINE�L NEAMHBHAIL� - %s\n"
@@ -678,12 +678,25 @@
msgid "filesize"
msgstr "m�id comhaid"
-#: src/main/extractor.c:529
+#: src/main/extractor.c:176
+msgid "track number"
+msgstr ""
+
+#: src/main/extractor.c:177
+msgid "international standard recording code"
+msgstr ""
+
+#: src/main/extractor.c:178
+#, fuzzy
+msgid "disc number"
+msgstr "s�anadh"
+
+#: src/main/extractor.c:598
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Theip ar th�s� meicn�ocht na mbreise�n: %s!\n"
-#: src/main/extractor.c:683
+#: src/main/extractor.c:752
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -693,12 +706,12 @@
"bhain m� triail as `%s', ach theip ar an cheann sin freisin. Na hearr�id�: `"
"%s' agus `%s'.\n"
-#: src/main/extractor.c:712
+#: src/main/extractor.c:781
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Theip ar lucht� an bhreise�in `%s': %s\n"
-#: src/main/extractor.c:917
+#: src/main/extractor.c:986
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Theip ar dh�lucht� an bhreise�in `%s'!\n"
@@ -825,608 +838,608 @@
msgid "Kernel routines"
msgstr "Feidhmeanna eithne"
-#: src/plugins/mp3extractor.c:50 src/plugins/qtextractor.c:30
+#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:30
msgid "Blues"
msgstr "Gormacha"
-#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:31
+#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:31
msgid "Classic Rock"
msgstr "Rac Clasaiceach"
-#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:32
+#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:32
msgid "Country"
msgstr "Ceolta Tuaithe"
-#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:33
+#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:33
msgid "Dance"
msgstr "Damhsa"
-#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:34
+#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:34
msgid "Disco"
msgstr "Diosc�"
-#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:35
+#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:35
msgid "Funk"
msgstr "Func"
-#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:36
+#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:36
msgid "Grunge"
msgstr "Gruinse"
-#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:37
+#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:37
msgid "Hip-Hop"
msgstr "Hip-Hap"
-#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:38
+#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:38
msgid "Jazz"
msgstr "Snagcheol"
-#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:39
+#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:39
msgid "Metal"
msgstr "Miotal"
-#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:40
+#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:40
msgid "New Age"
msgstr "Nua-Aoiseach"
-#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:41
+#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:41
msgid "Oldies"
msgstr "Seancheol"
-#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:42
+#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:42
msgid "Other"
msgstr "Eile"
-#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:43
+#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:43
msgid "Pop"
msgstr "Popcheol"
-#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:44
+#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:44
msgid "R&B"
msgstr "Rithim & Gormacha"
-#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:45
+#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:45
msgid "Rap"
msgstr "Rapcheol"
-#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:46
+#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:46
msgid "Reggae"
msgstr "Reggae"
-#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:47
+#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:47
msgid "Rock"
msgstr "Rac-Cheol"
-#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:48
+#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:48
msgid "Techno"
msgstr "Teicneo"
-#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:49
+#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:49
msgid "Industrial"
msgstr "Tionscla�och"
-#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:50
+#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:50
msgid "Alternative"
msgstr "Malartach"
-#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:51
+#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:51
msgid "Ska"
msgstr "Ska"
-#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:52
+#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:52
msgid "Death Metal"
msgstr "B�smhiotal"
-#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:53
+#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:53
msgid "Pranks"
msgstr "Cleasa"
-#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:54
+#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:54
msgid "Soundtrack"
msgstr "Fuaimrian"
-#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:55
+#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:55
msgid "Euro-Techno"
msgstr "Eora-Teicneo"
-#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:56
+#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:56
msgid "Ambient"
msgstr "Timpeallach"
-#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:57
+#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:57
msgid "Trip-Hop"
msgstr "Truip-Hap"
-#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:58
+#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:58
msgid "Vocal"
msgstr "Guthach"
-#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:59
+#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:59
msgid "Jazz+Funk"
msgstr "Snagcheol+Func"
-#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:60
+#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:60
msgid "Fusion"
msgstr "Comhle�"
-#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:61
+#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:61
msgid "Trance"
msgstr "T�mhn�al"
-#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:62
+#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:62
msgid "Classical"
msgstr "Clasaiceach"
-#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:63
+#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:63
msgid "Instrumental"
msgstr "Ionstraimeach"
-#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:64
+#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:64
msgid "Acid"
msgstr "Aig�ad"
-#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:65
+#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:65
msgid "House"
msgstr "Teach"
-#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:66
+#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:66
msgid "Game"
msgstr "Cluiche"
-#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:67
+#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:67
msgid "Sound Clip"
msgstr "Gearrth�g Fhuaime"
-#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:68
+#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:68
msgid "Gospel"
msgstr "Ceol Gaspal"
-#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:69
+#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:69
msgid "Noise"
msgstr "Torann"
-#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:70
+#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:70
msgid "Alt. Rock"
msgstr "Rac-Cheol Mal."
-#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:71
+#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:71
msgid "Bass"
msgstr "Dord"
-#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:72
+#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:72
msgid "Soul"
msgstr "Anamcheol"
-#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:73
+#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:73
msgid "Punk"
msgstr "Punc"
-#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:74
+#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:74
msgid "Space"
msgstr "Sp�s"
-#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:75
+#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:75
msgid "Meditative"
msgstr "Machnamhach"
-#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:76
+#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:76
msgid "Instrumental Pop"
msgstr "Popcheol Ionstraimeach"
-#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:77
+#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:77
msgid "Instrumental Rock"
msgstr "Rac Ionstraimeach"
-#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:78
+#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:78
msgid "Ethnic"
msgstr "Eitneach"
-#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:79
+#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:79
msgid "Gothic"
msgstr "Gotach"
-#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:80
+#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:80
msgid "Darkwave"
msgstr "An Tonn Dhubh"
-#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:81
+#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:81
msgid "Techno-Industrial"
msgstr "Teicneo-Tionscla�och"
-#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:82
+#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:82
msgid "Electronic"
msgstr "Leictreonach"
-#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:83
+#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:83
msgid "Pop-Folk"
msgstr "Popcheol T�re"
-#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:84
+#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:84
msgid "Eurodance"
msgstr "Eoradamhsa"
-#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:85
+#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:85
msgid "Dream"
msgstr "Aisling"
-#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:86
+#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:86
msgid "Southern Rock"
msgstr "Rac Deisceartach"
-#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:87
+#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:87
msgid "Comedy"
msgstr "Coim�ide"
-#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:88
+#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:88
msgid "Cult"
msgstr "Cultas"
-#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:89
+#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:89
msgid "Gangsta Rap"
msgstr "Rapcheol Gangstaeir"
-#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:90
+#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:90
msgid "Top 40"
msgstr "Cnagshingil�"
-#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:91
+#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:91
msgid "Christian Rap"
msgstr "Rapcheol Cr�osta�"
-#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:92
+#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:92
msgid "Pop/Funk"
msgstr "Popcheol/Func"
-#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:93
+#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:93
msgid "Jungle"
msgstr "Dufair"
-#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:94
+#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:94
msgid "Native American"
msgstr "Indiach-Mheirice�nach"
-#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:95
+#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:95
msgid "Cabaret"
msgstr "Cabaret"
-#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:96
+#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:96
msgid "New Wave"
msgstr "Tonn Nua"
-#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:97
+#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:97
msgid "Psychedelic"
msgstr "S�cideileach"
-#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:98
+#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:98
msgid "Rave"
msgstr "R�ibhcheol"
-#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:99
+#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:99
msgid "Showtunes"
msgstr "Se�thi�ineanna"
-#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:100
+#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:100
msgid "Trailer"
msgstr "Tr�il�ar"
-#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:101
+#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:101
msgid "Lo-Fi"
msgstr "�sle-D�lse"
-#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:102
+#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:102
msgid "Tribal"
msgstr "Treibheach"
-#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:103
+#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:103
msgid "Acid Punk"
msgstr "Punc Aig�adach"
-#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:104
+#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:104
msgid "Acid Jazz"
msgstr "Snagcheol Aig�adach"
-#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:105
+#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:105
msgid "Polka"
msgstr "Polca"
-#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:106
+#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:106
msgid "Retro"
msgstr "Aischeol"
-#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:107
+#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:107
msgid "Musical"
msgstr "Ceolra"
-#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:108
+#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:108
msgid "Rock & Roll"
msgstr "Rac Is Roll"
-#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:109
+#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:109
msgid "Hard Rock"
msgstr "Rac-Cheol Crua"
-#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:110
+#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:110
msgid "Folk"
msgstr "Ceol na nDaoine"
-#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:111
+#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:111
msgid "Folk/Rock"
msgstr "Ceol T�re/Rac-Cheol"
-#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:112
+#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:112
msgid "National Folk"
msgstr "Ceol an N�isi�in"
-#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:113
+#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:113
msgid "Swing"
msgstr "Luasc-Cheol"
-#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:114
+#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:114
msgid "Fast-Fusion"
msgstr "Comhle� Tapa"
-#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:115
+#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:115
msgid "Bebob"
msgstr "Bap"
-#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:116
+#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:116
msgid "Latin"
msgstr "Laidineach"
-#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:117
+#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:117
msgid "Revival"
msgstr "Athbheochan"
-#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:118
+#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:118
msgid "Celtic"
msgstr "Ceilteach"
-#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:119
+#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:119
msgid "Bluegrass"
msgstr "Bluegrass"
-#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:120
+#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:120
msgid "Avantgarde"
msgstr "Avant garde"
-#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:121
+#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:121
msgid "Gothic Rock"
msgstr "Rac Gotach"
-#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:122
+#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:122
msgid "Progressive Rock"
msgstr "Rac For�sach"
-#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:123
+#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:123
msgid "Psychedelic Rock"
msgstr "Rac S�cideileach"
-#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:124
+#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:124
msgid "Symphonic Rock"
msgstr "Rac Siansach"
-#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:125
+#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:125
msgid "Slow Rock"
msgstr "Rac-Cheol Mall"
-#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:126
+#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:126
msgid "Big Band"
msgstr "Banna M�r"
-#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:127
+#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:127
msgid "Chorus"
msgstr "C�r"
-#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:128
+#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:128
msgid "Easy Listening"
msgstr "R�cheol"
-#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:129
+#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:129
msgid "Acoustic"
msgstr "Fuaimi�il"
-#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:130
+#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:130
msgid "Humour"
msgstr "Greann"
-#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:131
+#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:131
msgid "Speech"
msgstr "Caint"
-#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:132
+#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:132
msgid "Chanson"
msgstr "Chanson"
-#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:133
+#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:133
msgid "Opera"
msgstr "Ceoldr�ma"
-#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:134
+#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:134
msgid "Chamber Music"
msgstr "Ceol Aireagail"
-#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:135
+#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:135
msgid "Sonata"
msgstr "Son�id"
-#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:136
+#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:136
msgid "Symphony"
msgstr "Siansa"
-#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:137
+#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:137
msgid "Booty Bass"
msgstr "Dord B�it�"
-#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:138
+#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:138
msgid "Primus"
msgstr "Primus"
-#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:139
+#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:139
msgid "Porn Groove"
msgstr "PornGr�ibh"
-#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:140
+#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:140
msgid "Satire"
msgstr "Aoir"
-#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:141
+#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:141
msgid "Slow Jam"
msgstr "Seam Mall"
-#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:142
+#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:142
msgid "Club"
msgstr "Club"
-#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:143
+#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:143
msgid "Tango"
msgstr "Tang�"
-#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:144
+#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:144
msgid "Samba"
msgstr "Samba"
-#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:145
+#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:145
msgid "Folklore"
msgstr "B�aloideas"
-#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:146
+#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:146
msgid "Ballad"
msgstr "Bail�ad"
-#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:147
+#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:147
msgid "Power Ballad"
msgstr "Bail�ad Cumhachta"
-#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:148
+#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:148
msgid "Rhythmic Soul"
msgstr "Anamcheol Rithimeach"
-#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:149
+#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:149
msgid "Freestyle"
msgstr "Saorst�l"
-#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:150
+#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:150
msgid "Duet"
msgstr "D�s�ad"
-#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:151
+#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:151
msgid "Punk Rock"
msgstr "Punc-Rac"
-#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:152
+#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:152
msgid "Drum Solo"
msgstr "Aonr�ad Druma"
-#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:153
+#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:153
msgid "A Cappella"
msgstr "A Cappella"
-#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:154
+#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:154
msgid "Euro-House"
msgstr "Eora-Teach"
-#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:155
+#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:155
msgid "Dance Hall"
msgstr "Halla Damhsa"
-#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:156
+#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:156
msgid "Goa"
msgstr "Goa"
-#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:157
+#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:157
msgid "Drum & Bass"
msgstr "Druma & Dord"
-#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:158
+#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:158
msgid "Club-House"
msgstr "Clubtheach"
-#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:159
+#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:159
msgid "Hardcore"
msgstr "F�orchrua"
-#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:160
+#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:160
msgid "Terror"
msgstr "Uaf�s"
-#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:161
+#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:161
msgid "Indie"
msgstr "Neamhsple�ch"
-#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:162
+#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:162
msgid "BritPop"
msgstr "BriotPhop"
-#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:163
+#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:163
msgid "Negerpunk"
msgstr "Negerpunk"
-#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:164
+#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:164
msgid "Polsk Punk"
msgstr "Punc Polannach"
-#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:165
+#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:165
msgid "Beat"
msgstr "Buille"
-#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:166
+#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:166
msgid "Christian Gangsta Rap"
msgstr "Rapcheol Cr�osta� Gangstaeir"
-#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:167
+#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:167
msgid "Heavy Metal"
msgstr "Ceol Trom-Mhiotalach"
-#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:168
+#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:168
msgid "Black Metal"
msgstr "Miotal Dubh"
-#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:169
+#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:169
msgid "Crossover"
msgstr "Trasach"
-#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:170
+#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:170
msgid "Contemporary Christian"
msgstr "Cr�osta� Comhaimseartha"
-#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:171
+#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:171
msgid "Christian Rock"
msgstr "Rac-Cheol Cr�osta�"
-#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:172
+#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:172
msgid "Merengue"
msgstr "Meireang"
-#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:173
+#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:173
msgid "Salsa"
msgstr "Salsa"
-#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:174
+#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:174
msgid "Thrash Metal"
msgstr "Miotal Traise�la"
# no "�"
-#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:175
+#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:175
msgid "Anime"
msgstr "Anime"
-#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:176
+#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:176
msgid "JPop"
msgstr "JPap"
-#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:177
+#: src/plugins/mp3extractor.c:198 src/plugins/qtextractor.c:177
msgid "Synthpop"
msgstr "Popcheol sint�iseach"
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "stereo"
msgstr "steiri�"
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "mono"
msgstr "mona"
-#: src/plugins/mp3extractor.c:434
+#: src/plugins/mp3extractor.c:445
msgid "(variable bps)"
msgstr "(bss athraitheach)"
Modified: Extractor/po/libextractor.pot
===================================================================
--- Extractor/po/libextractor.pot 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/po/libextractor.pot 2008-03-21 06:00:52 UTC (rev 6581)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-01-07 08:48-0700\n"
+"POT-Creation-Date: 2008-03-20 23:53-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -108,12 +108,12 @@
msgid "Extract metadata from files."
msgstr ""
-#: src/main/extract.c:190 src/main/extractor.c:1444
+#: src/main/extract.c:190 src/main/extractor.c:1513
#, c-format
msgid "%s - (binary)\n"
msgstr ""
-#: src/main/extract.c:201 src/main/extractor.c:1449
+#: src/main/extract.c:201 src/main/extractor.c:1518
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr ""
@@ -666,24 +666,36 @@
msgid "filesize"
msgstr ""
-#: src/main/extractor.c:529
+#: src/main/extractor.c:176
+msgid "track number"
+msgstr ""
+
+#: src/main/extractor.c:177
+msgid "international standard recording code"
+msgstr ""
+
+#: src/main/extractor.c:178
+msgid "disc number"
+msgstr ""
+
+#: src/main/extractor.c:598
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr ""
-#: src/main/extractor.c:683
+#: src/main/extractor.c:752
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
"failed also. Errors are: `%s' and `%s'.\n"
msgstr ""
-#: src/main/extractor.c:712
+#: src/main/extractor.c:781
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr ""
-#: src/main/extractor.c:917
+#: src/main/extractor.c:986
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr ""
@@ -810,607 +822,607 @@
msgid "Kernel routines"
msgstr ""
-#: src/plugins/mp3extractor.c:50 src/plugins/qtextractor.c:30
+#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:30
msgid "Blues"
msgstr ""
-#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:31
+#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:31
msgid "Classic Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:32
+#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:32
msgid "Country"
msgstr ""
-#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:33
+#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:33
msgid "Dance"
msgstr ""
-#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:34
+#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:34
msgid "Disco"
msgstr ""
-#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:35
+#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:35
msgid "Funk"
msgstr ""
-#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:36
+#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:36
msgid "Grunge"
msgstr ""
-#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:37
+#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:37
msgid "Hip-Hop"
msgstr ""
-#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:38
+#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:38
msgid "Jazz"
msgstr ""
-#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:39
+#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:39
msgid "Metal"
msgstr ""
-#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:40
+#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:40
msgid "New Age"
msgstr ""
-#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:41
+#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:41
msgid "Oldies"
msgstr ""
-#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:42
+#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:42
msgid "Other"
msgstr ""
-#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:43
+#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:43
msgid "Pop"
msgstr ""
-#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:44
+#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:44
msgid "R&B"
msgstr ""
-#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:45
+#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:45
msgid "Rap"
msgstr ""
-#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:46
+#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:46
msgid "Reggae"
msgstr ""
-#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:47
+#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:47
msgid "Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:48
+#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:48
msgid "Techno"
msgstr ""
-#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:49
+#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:49
msgid "Industrial"
msgstr ""
-#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:50
+#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:50
msgid "Alternative"
msgstr ""
-#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:51
+#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:51
msgid "Ska"
msgstr ""
-#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:52
+#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:52
msgid "Death Metal"
msgstr ""
-#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:53
+#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:53
msgid "Pranks"
msgstr ""
-#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:54
+#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:54
msgid "Soundtrack"
msgstr ""
-#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:55
+#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:55
msgid "Euro-Techno"
msgstr ""
-#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:56
+#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:56
msgid "Ambient"
msgstr ""
-#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:57
+#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:57
msgid "Trip-Hop"
msgstr ""
-#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:58
+#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:58
msgid "Vocal"
msgstr ""
-#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:59
+#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:59
msgid "Jazz+Funk"
msgstr ""
-#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:60
+#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:60
msgid "Fusion"
msgstr ""
-#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:61
+#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:61
msgid "Trance"
msgstr ""
-#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:62
+#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:62
msgid "Classical"
msgstr ""
-#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:63
+#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:63
msgid "Instrumental"
msgstr ""
-#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:64
+#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:64
msgid "Acid"
msgstr ""
-#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:65
+#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:65
msgid "House"
msgstr ""
-#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:66
+#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:66
msgid "Game"
msgstr ""
-#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:67
+#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:67
msgid "Sound Clip"
msgstr ""
-#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:68
+#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:68
msgid "Gospel"
msgstr ""
-#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:69
+#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:69
msgid "Noise"
msgstr ""
-#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:70
+#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:70
msgid "Alt. Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:71
+#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:71
msgid "Bass"
msgstr ""
-#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:72
+#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:72
msgid "Soul"
msgstr ""
-#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:73
+#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:73
msgid "Punk"
msgstr ""
-#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:74
+#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:74
msgid "Space"
msgstr ""
-#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:75
+#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:75
msgid "Meditative"
msgstr ""
-#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:76
+#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:76
msgid "Instrumental Pop"
msgstr ""
-#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:77
+#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:77
msgid "Instrumental Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:78
+#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:78
msgid "Ethnic"
msgstr ""
-#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:79
+#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:79
msgid "Gothic"
msgstr ""
-#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:80
+#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:80
msgid "Darkwave"
msgstr ""
-#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:81
+#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:81
msgid "Techno-Industrial"
msgstr ""
-#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:82
+#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:82
msgid "Electronic"
msgstr ""
-#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:83
+#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:83
msgid "Pop-Folk"
msgstr ""
-#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:84
+#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:84
msgid "Eurodance"
msgstr ""
-#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:85
+#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:85
msgid "Dream"
msgstr ""
-#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:86
+#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:86
msgid "Southern Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:87
+#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:87
msgid "Comedy"
msgstr ""
-#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:88
+#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:88
msgid "Cult"
msgstr ""
-#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:89
+#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:89
msgid "Gangsta Rap"
msgstr ""
-#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:90
+#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:90
msgid "Top 40"
msgstr ""
-#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:91
+#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:91
msgid "Christian Rap"
msgstr ""
-#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:92
+#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:92
msgid "Pop/Funk"
msgstr ""
-#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:93
+#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:93
msgid "Jungle"
msgstr ""
-#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:94
+#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:94
msgid "Native American"
msgstr ""
-#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:95
+#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:95
msgid "Cabaret"
msgstr ""
-#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:96
+#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:96
msgid "New Wave"
msgstr ""
-#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:97
+#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:97
msgid "Psychedelic"
msgstr ""
-#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:98
+#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:98
msgid "Rave"
msgstr ""
-#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:99
+#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:99
msgid "Showtunes"
msgstr ""
-#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:100
+#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:100
msgid "Trailer"
msgstr ""
-#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:101
+#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:101
msgid "Lo-Fi"
msgstr ""
-#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:102
+#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:102
msgid "Tribal"
msgstr ""
-#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:103
+#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:103
msgid "Acid Punk"
msgstr ""
-#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:104
+#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:104
msgid "Acid Jazz"
msgstr ""
-#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:105
+#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:105
msgid "Polka"
msgstr ""
-#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:106
+#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:106
msgid "Retro"
msgstr ""
-#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:107
+#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:107
msgid "Musical"
msgstr ""
-#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:108
+#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:108
msgid "Rock & Roll"
msgstr ""
-#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:109
+#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:109
msgid "Hard Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:110
+#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:110
msgid "Folk"
msgstr ""
-#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:111
+#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:111
msgid "Folk/Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:112
+#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:112
msgid "National Folk"
msgstr ""
-#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:113
+#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:113
msgid "Swing"
msgstr ""
-#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:114
+#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:114
msgid "Fast-Fusion"
msgstr ""
-#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:115
+#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:115
msgid "Bebob"
msgstr ""
-#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:116
+#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:116
msgid "Latin"
msgstr ""
-#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:117
+#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:117
msgid "Revival"
msgstr ""
-#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:118
+#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:118
msgid "Celtic"
msgstr ""
-#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:119
+#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:119
msgid "Bluegrass"
msgstr ""
-#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:120
+#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:120
msgid "Avantgarde"
msgstr ""
-#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:121
+#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:121
msgid "Gothic Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:122
+#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:122
msgid "Progressive Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:123
+#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:123
msgid "Psychedelic Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:124
+#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:124
msgid "Symphonic Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:125
+#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:125
msgid "Slow Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:126
+#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:126
msgid "Big Band"
msgstr ""
-#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:127
+#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:127
msgid "Chorus"
msgstr ""
-#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:128
+#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:128
msgid "Easy Listening"
msgstr ""
-#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:129
+#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:129
msgid "Acoustic"
msgstr ""
-#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:130
+#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:130
msgid "Humour"
msgstr ""
-#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:131
+#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:131
msgid "Speech"
msgstr ""
-#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:132
+#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:132
msgid "Chanson"
msgstr ""
-#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:133
+#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:133
msgid "Opera"
msgstr ""
-#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:134
+#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:134
msgid "Chamber Music"
msgstr ""
-#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:135
+#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:135
msgid "Sonata"
msgstr ""
-#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:136
+#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:136
msgid "Symphony"
msgstr ""
-#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:137
+#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:137
msgid "Booty Bass"
msgstr ""
-#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:138
+#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:138
msgid "Primus"
msgstr ""
-#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:139
+#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:139
msgid "Porn Groove"
msgstr ""
-#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:140
+#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:140
msgid "Satire"
msgstr ""
-#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:141
+#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:141
msgid "Slow Jam"
msgstr ""
-#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:142
+#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:142
msgid "Club"
msgstr ""
-#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:143
+#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:143
msgid "Tango"
msgstr ""
-#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:144
+#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:144
msgid "Samba"
msgstr ""
-#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:145
+#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:145
msgid "Folklore"
msgstr ""
-#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:146
+#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:146
msgid "Ballad"
msgstr ""
-#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:147
+#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:147
msgid "Power Ballad"
msgstr ""
-#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:148
+#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:148
msgid "Rhythmic Soul"
msgstr ""
-#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:149
+#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:149
msgid "Freestyle"
msgstr ""
-#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:150
+#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:150
msgid "Duet"
msgstr ""
-#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:151
+#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:151
msgid "Punk Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:152
+#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:152
msgid "Drum Solo"
msgstr ""
-#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:153
+#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:153
msgid "A Cappella"
msgstr ""
-#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:154
+#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:154
msgid "Euro-House"
msgstr ""
-#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:155
+#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:155
msgid "Dance Hall"
msgstr ""
-#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:156
+#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:156
msgid "Goa"
msgstr ""
-#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:157
+#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:157
msgid "Drum & Bass"
msgstr ""
-#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:158
+#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:158
msgid "Club-House"
msgstr ""
-#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:159
+#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:159
msgid "Hardcore"
msgstr ""
-#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:160
+#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:160
msgid "Terror"
msgstr ""
-#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:161
+#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:161
msgid "Indie"
msgstr ""
-#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:162
+#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:162
msgid "BritPop"
msgstr ""
-#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:163
+#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:163
msgid "Negerpunk"
msgstr ""
-#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:164
+#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:164
msgid "Polsk Punk"
msgstr ""
-#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:165
+#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:165
msgid "Beat"
msgstr ""
-#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:166
+#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:166
msgid "Christian Gangsta Rap"
msgstr ""
-#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:167
+#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:167
msgid "Heavy Metal"
msgstr ""
-#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:168
+#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:168
msgid "Black Metal"
msgstr ""
-#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:169
+#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:169
msgid "Crossover"
msgstr ""
-#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:170
+#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:170
msgid "Contemporary Christian"
msgstr ""
-#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:171
+#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:171
msgid "Christian Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:172
+#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:172
msgid "Merengue"
msgstr ""
-#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:173
+#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:173
msgid "Salsa"
msgstr ""
-#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:174
+#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:174
msgid "Thrash Metal"
msgstr ""
-#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:175
+#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:175
msgid "Anime"
msgstr ""
-#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:176
+#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:176
msgid "JPop"
msgstr ""
-#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:177
+#: src/plugins/mp3extractor.c:198 src/plugins/qtextractor.c:177
msgid "Synthpop"
msgstr ""
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "stereo"
msgstr ""
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "mono"
msgstr ""
-#: src/plugins/mp3extractor.c:434
+#: src/plugins/mp3extractor.c:445
msgid "(variable bps)"
msgstr ""
Modified: Extractor/po/ro.po
===================================================================
--- Extractor/po/ro.po 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/po/ro.po 2008-03-21 06:00:52 UTC (rev 6581)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: libextractor 0.5.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-01-07 08:48-0700\n"
+"POT-Creation-Date: 2008-03-20 23:53-0600\n"
"PO-Revision-Date: 2005-08-16 12:00-0500\n"
"Last-Translator: Laurentiu Buzdugan <address@hidden>\n"
"Language-Team: Romanian <address@hidden>\n"
@@ -126,12 +126,12 @@
msgid "Extract metadata from files."
msgstr "Extrage metadata din fi�iere."
-#: src/main/extract.c:190 src/main/extractor.c:1444
+#: src/main/extract.c:190 src/main/extractor.c:1513
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (binar)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1449
+#: src/main/extract.c:201 src/main/extractor.c:1518
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "TIP INVALID - %s\n"
@@ -709,12 +709,25 @@
msgid "filesize"
msgstr "m�rime"
-#: src/main/extractor.c:529
+#: src/main/extractor.c:176
+msgid "track number"
+msgstr ""
+
+#: src/main/extractor.c:177
+msgid "international standard recording code"
+msgstr ""
+
+#: src/main/extractor.c:178
+#, fuzzy
+msgid "disc number"
+msgstr "Num�r de fi�ier incorect"
+
+#: src/main/extractor.c:598
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "ini�ializare mecanismului de plugin a e�uat: %s!\n"
-#: src/main/extractor.c:683
+#: src/main/extractor.c:752
#, fuzzy, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -723,12 +736,12 @@
"Rezolvarea simbolului '%s' �n biblioteca '%s' a e�uat, a�a c� am �ncercat '%"
"s', dar �i acesta a e�uat. Erorile sunt: '%s' �i '%s'.\n"
-#: src/main/extractor.c:712
+#: src/main/extractor.c:781
#, fuzzy, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "�nc�rcarea plugin-ului '%s' a e�uat: %s\n"
-#: src/main/extractor.c:917
+#: src/main/extractor.c:986
#, fuzzy, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Desc�rcarea plugin-ului '%s' a e�uat!\n"
@@ -856,607 +869,607 @@
msgid "Kernel routines"
msgstr "Proceduri kernel"
-#: src/plugins/mp3extractor.c:50 src/plugins/qtextractor.c:30
+#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:30
msgid "Blues"
msgstr "Blues"
-#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:31
+#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:31
msgid "Classic Rock"
msgstr "Rock clasic"
-#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:32
+#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:32
msgid "Country"
msgstr "�ar�"
-#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:33
+#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:33
msgid "Dance"
msgstr "Dance"
-#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:34
+#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:34
msgid "Disco"
msgstr "Disco"
-#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:35
+#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:35
msgid "Funk"
msgstr "Funk"
-#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:36
+#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:36
msgid "Grunge"
msgstr "Grunge"
-#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:37
+#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:37
msgid "Hip-Hop"
msgstr "Hip-Hop"
-#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:38
+#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:38
msgid "Jazz"
msgstr "Jazz"
-#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:39
+#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:39
msgid "Metal"
msgstr "Metal"
-#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:40
+#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:40
msgid "New Age"
msgstr "New Age"
-#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:41
+#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:41
msgid "Oldies"
msgstr "Oldies"
-#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:42
+#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:42
msgid "Other"
msgstr "Altele"
-#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:43
+#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:43
msgid "Pop"
msgstr "Pop"
-#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:44
+#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:44
msgid "R&B"
msgstr "R&B"
-#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:45
+#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:45
msgid "Rap"
msgstr "Rap"
-#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:46
+#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:46
msgid "Reggae"
msgstr "Reggae"
-#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:47
+#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:47
msgid "Rock"
msgstr "Rock"
-#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:48
+#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:48
msgid "Techno"
msgstr "Techno"
-#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:49
+#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:49
msgid "Industrial"
msgstr "Industrial"
-#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:50
+#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:50
msgid "Alternative"
msgstr "Alternative"
-#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:51
+#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:51
msgid "Ska"
msgstr "Ska"
-#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:52
+#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:52
msgid "Death Metal"
msgstr "Death Metal"
-#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:53
+#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:53
msgid "Pranks"
msgstr "Pranks"
-#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:54
+#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:54
msgid "Soundtrack"
msgstr "Soundtrack"
-#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:55
+#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:55
msgid "Euro-Techno"
msgstr "Euro-Techno"
-#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:56
+#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:56
msgid "Ambient"
msgstr "Ambient"
-#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:57
+#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:57
msgid "Trip-Hop"
msgstr "Trip-Hop"
-#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:58
+#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:58
msgid "Vocal"
msgstr "Vocal"
-#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:59
+#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:59
msgid "Jazz+Funk"
msgstr "Jazz+Funk"
-#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:60
+#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:60
msgid "Fusion"
msgstr "Fusion"
-#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:61
+#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:61
msgid "Trance"
msgstr "Trance"
-#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:62
+#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:62
msgid "Classical"
msgstr "Clasic�"
-#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:63
+#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:63
msgid "Instrumental"
msgstr "Instrumental"
-#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:64
+#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:64
msgid "Acid"
msgstr "Acid"
-#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:65
+#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:65
msgid "House"
msgstr "House"
-#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:66
+#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:66
msgid "Game"
msgstr "Joc"
-#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:67
+#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:67
msgid "Sound Clip"
msgstr "Clip sonor"
-#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:68
+#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:68
msgid "Gospel"
msgstr "Gospel"
-#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:69
+#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:69
msgid "Noise"
msgstr "Zgomot"
-#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:70
+#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:70
msgid "Alt. Rock"
msgstr "Rock Alternativ"
-#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:71
+#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:71
msgid "Bass"
msgstr "Bass"
-#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:72
+#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:72
msgid "Soul"
msgstr "Soul"
-#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:73
+#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:73
msgid "Punk"
msgstr "Punk"
-#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:74
+#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:74
msgid "Space"
msgstr "Spa�iu"
-#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:75
+#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:75
msgid "Meditative"
msgstr "Meditativ"
-#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:76
+#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:76
msgid "Instrumental Pop"
msgstr "Instrumental Pop"
-#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:77
+#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:77
msgid "Instrumental Rock"
msgstr "Instrumental Rock"
-#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:78
+#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:78
msgid "Ethnic"
msgstr "Ethnic"
-#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:79
+#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:79
msgid "Gothic"
msgstr "Gothic"
-#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:80
+#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:80
msgid "Darkwave"
msgstr "Darkwave"
-#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:81
+#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:81
msgid "Techno-Industrial"
msgstr "Techno-Industrial"
-#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:82
+#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:82
msgid "Electronic"
msgstr "Electronic"
-#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:83
+#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:83
msgid "Pop-Folk"
msgstr "Pop-Folk"
-#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:84
+#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:84
msgid "Eurodance"
msgstr "Eurodance"
-#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:85
+#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:85
msgid "Dream"
msgstr "Dream"
-#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:86
+#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:86
msgid "Southern Rock"
msgstr "Southern Rock"
-#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:87
+#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:87
msgid "Comedy"
msgstr "Comedy"
-#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:88
+#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:88
msgid "Cult"
msgstr "Cult"
-#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:89
+#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:89
msgid "Gangsta Rap"
msgstr "Gangsta Rap"
-#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:90
+#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:90
msgid "Top 40"
msgstr "Top 40"
-#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:91
+#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:91
msgid "Christian Rap"
msgstr "Christian Rap"
-#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:92
+#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:92
msgid "Pop/Funk"
msgstr "Pop/Funk"
-#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:93
+#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:93
msgid "Jungle"
msgstr "Jungle"
-#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:94
+#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:94
msgid "Native American"
msgstr "Native American"
-#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:95
+#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:95
msgid "Cabaret"
msgstr "Cabaret"
-#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:96
+#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:96
msgid "New Wave"
msgstr "New Wave"
-#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:97
+#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:97
msgid "Psychedelic"
msgstr "Psychedelic"
-#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:98
+#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:98
msgid "Rave"
msgstr "Rave"
-#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:99
+#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:99
msgid "Showtunes"
msgstr "Showtunes"
-#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:100
+#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:100
msgid "Trailer"
msgstr "Trailer"
-#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:101
+#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:101
msgid "Lo-Fi"
msgstr "Lo-Fi"
-#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:102
+#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:102
msgid "Tribal"
msgstr "Tribal"
-#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:103
+#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:103
msgid "Acid Punk"
msgstr "Acid Punk"
-#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:104
+#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:104
msgid "Acid Jazz"
msgstr "Acid Jazz"
-#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:105
+#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:105
msgid "Polka"
msgstr "Polka"
-#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:106
+#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:106
msgid "Retro"
msgstr "Retro"
-#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:107
+#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:107
msgid "Musical"
msgstr "Musical"
-#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:108
+#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:108
msgid "Rock & Roll"
msgstr "Rock & Roll"
-#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:109
+#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:109
msgid "Hard Rock"
msgstr "Hard Rock"
-#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:110
+#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:110
msgid "Folk"
msgstr "Folk"
-#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:111
+#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:111
msgid "Folk/Rock"
msgstr "Folk/Rock"
-#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:112
+#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:112
msgid "National Folk"
msgstr "National Folk"
-#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:113
+#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:113
msgid "Swing"
msgstr "Swing"
-#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:114
+#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:114
msgid "Fast-Fusion"
msgstr "Fast-Fusion"
-#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:115
+#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:115
msgid "Bebob"
msgstr "Bebob"
-#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:116
+#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:116
msgid "Latin"
msgstr "Latin"
-#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:117
+#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:117
msgid "Revival"
msgstr "Revival"
-#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:118
+#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:118
msgid "Celtic"
msgstr "Celtic"
-#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:119
+#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:119
msgid "Bluegrass"
msgstr "Bluegrass"
-#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:120
+#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:120
msgid "Avantgarde"
msgstr "Avantgarde"
-#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:121
+#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:121
msgid "Gothic Rock"
msgstr "Gothic Rock"
-#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:122
+#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:122
msgid "Progressive Rock"
msgstr "Progressive Rock"
-#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:123
+#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:123
msgid "Psychedelic Rock"
msgstr "Psychedelic Rock"
-#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:124
+#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:124
msgid "Symphonic Rock"
msgstr "Symphonic Rock"
-#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:125
+#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:125
msgid "Slow Rock"
msgstr "Slow Rock"
-#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:126
+#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:126
msgid "Big Band"
msgstr "Big Band"
-#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:127
+#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:127
msgid "Chorus"
msgstr "Chorus"
-#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:128
+#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:128
msgid "Easy Listening"
msgstr "Easy Listening"
-#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:129
+#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:129
msgid "Acoustic"
msgstr "Acoustic"
-#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:130
+#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:130
msgid "Humour"
msgstr "Umor"
-#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:131
+#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:131
msgid "Speech"
msgstr "Discurs"
-#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:132
+#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:132
msgid "Chanson"
msgstr "Chanson"
-#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:133
+#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:133
msgid "Opera"
msgstr "Oper�"
-#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:134
+#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:134
msgid "Chamber Music"
msgstr "Muzic� de camer�"
-#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:135
+#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:135
msgid "Sonata"
msgstr "Sonet"
-#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:136
+#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:136
msgid "Symphony"
msgstr "Simfonie"
-#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:137
+#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:137
msgid "Booty Bass"
msgstr "Booty Bass"
-#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:138
+#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:138
msgid "Primus"
msgstr "Primus"
-#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:139
+#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:139
msgid "Porn Groove"
msgstr "Porn Groove"
-#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:140
+#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:140
msgid "Satire"
msgstr "Satire"
-#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:141
+#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:141
msgid "Slow Jam"
msgstr "Slow Jam"
-#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:142
+#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:142
msgid "Club"
msgstr "Club"
-#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:143
+#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:143
msgid "Tango"
msgstr "Tango"
-#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:144
+#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:144
msgid "Samba"
msgstr "Samba"
-#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:145
+#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:145
msgid "Folklore"
msgstr "Folklore"
-#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:146
+#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:146
msgid "Ballad"
msgstr "Ballad"
-#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:147
+#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:147
msgid "Power Ballad"
msgstr "Power Ballad"
-#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:148
+#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:148
msgid "Rhythmic Soul"
msgstr "Rhythmic Soul"
-#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:149
+#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:149
msgid "Freestyle"
msgstr "Freestyle"
-#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:150
+#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:150
msgid "Duet"
msgstr "Duet"
-#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:151
+#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:151
msgid "Punk Rock"
msgstr "Punk Rock"
-#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:152
+#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:152
msgid "Drum Solo"
msgstr "Drum Solo"
-#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:153
+#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:153
msgid "A Cappella"
msgstr "A Cappella"
-#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:154
+#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:154
msgid "Euro-House"
msgstr "Euro-House"
-#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:155
+#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:155
msgid "Dance Hall"
msgstr "Dance Hall"
-#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:156
+#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:156
msgid "Goa"
msgstr "Goa"
-#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:157
+#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:157
msgid "Drum & Bass"
msgstr "Drum & Bass"
-#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:158
+#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:158
msgid "Club-House"
msgstr "Club-House"
-#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:159
+#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:159
msgid "Hardcore"
msgstr "Hardcore"
-#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:160
+#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:160
msgid "Terror"
msgstr "Terror"
-#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:161
+#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:161
msgid "Indie"
msgstr "Indie"
-#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:162
+#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:162
msgid "BritPop"
msgstr "BritPop"
-#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:163
+#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:163
msgid "Negerpunk"
msgstr "Negerpunk"
-#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:164
+#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:164
msgid "Polsk Punk"
msgstr "Polsk Punk"
-#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:165
+#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:165
msgid "Beat"
msgstr "Beat"
-#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:166
+#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:166
msgid "Christian Gangsta Rap"
msgstr "Christian Gangsta Rap"
-#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:167
+#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:167
msgid "Heavy Metal"
msgstr "Heavy Metal"
-#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:168
+#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:168
msgid "Black Metal"
msgstr "Black Metal"
-#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:169
+#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:169
msgid "Crossover"
msgstr "Crossover"
-#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:170
+#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:170
msgid "Contemporary Christian"
msgstr "Contemporary Christian"
-#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:171
+#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:171
msgid "Christian Rock"
msgstr "Christian Rock"
-#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:172
+#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:172
msgid "Merengue"
msgstr "Merengue"
-#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:173
+#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:173
msgid "Salsa"
msgstr "Salsa"
-#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:174
+#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:174
msgid "Thrash Metal"
msgstr "Thrash Metal"
-#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:175
+#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:175
msgid "Anime"
msgstr "Anime"
-#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:176
+#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:176
msgid "JPop"
msgstr "JPop"
-#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:177
+#: src/plugins/mp3extractor.c:198 src/plugins/qtextractor.c:177
msgid "Synthpop"
msgstr "Synthpop"
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "stereo"
msgstr "stereo"
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "mono"
msgstr "mono"
-#: src/plugins/mp3extractor.c:434
+#: src/plugins/mp3extractor.c:445
msgid "(variable bps)"
msgstr "(bps variabil)"
@@ -1642,9 +1655,6 @@
#~ msgid "Exec format error"
#~ msgstr "Eroare format exec"
-#~ msgid "Bad file number"
-#~ msgstr "Num�r de fi�ier incorect"
-
#~ msgid "No children"
#~ msgstr "Nici un copil"
Modified: Extractor/po/rw.po
===================================================================
--- Extractor/po/rw.po 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/po/rw.po 2008-03-21 06:00:52 UTC (rev 6581)
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: libextractor 0.4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-01-07 08:48-0700\n"
+"POT-Creation-Date: 2008-03-20 23:53-0600\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <address@hidden>\n"
"Language-Team: Kinyarwanda <address@hidden>\n"
@@ -134,12 +134,12 @@
msgid "Extract metadata from files."
msgstr "Bivuye Idosiye"
-#: src/main/extract.c:190 src/main/extractor.c:1444
+#: src/main/extract.c:190 src/main/extractor.c:1513
#, fuzzy, c-format
msgid "%s - (binary)\n"
msgstr "%s-(Nyabibiri"
-#: src/main/extract.c:201 src/main/extractor.c:1449
+#: src/main/extract.c:201 src/main/extractor.c:1518
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr ""
@@ -864,24 +864,37 @@
msgid "filesize"
msgstr "ingano"
-#: src/main/extractor.c:529
+#: src/main/extractor.c:176
+msgid "track number"
+msgstr ""
+
+#: src/main/extractor.c:177
+msgid "international standard recording code"
+msgstr ""
+
+#: src/main/extractor.c:178
+#, fuzzy
+msgid "disc number"
+msgstr "IDOSIYE Umubare"
+
+#: src/main/extractor.c:598
#, fuzzy, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Bya Byanze"
-#: src/main/extractor.c:683
+#: src/main/extractor.c:752
#, 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:712
+#: src/main/extractor.c:781
#, fuzzy, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Byanze"
-#: src/main/extractor.c:917
+#: src/main/extractor.c:986
#, fuzzy, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Byanze"
@@ -1014,608 +1027,608 @@
msgid "Kernel routines"
msgstr ""
-#: src/plugins/mp3extractor.c:50 src/plugins/qtextractor.c:30
+#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:30
msgid "Blues"
msgstr ""
-#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:31
+#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:31
msgid "Classic Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:32
+#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:32
msgid "Country"
msgstr "Igihugu"
-#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:33
+#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:33
msgid "Dance"
msgstr ""
-#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:34
+#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:34
msgid "Disco"
msgstr ""
-#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:35
+#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:35
msgid "Funk"
msgstr ""
-#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:36
+#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:36
msgid "Grunge"
msgstr ""
-#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:37
+#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:37
msgid "Hip-Hop"
msgstr ""
-#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:38
+#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:38
msgid "Jazz"
msgstr ""
-#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:39
+#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:39
msgid "Metal"
msgstr "Icyuma"
-#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:40
+#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:40
msgid "New Age"
msgstr ""
-#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:41
+#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:41
msgid "Oldies"
msgstr ""
-#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:42
+#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:42
msgid "Other"
msgstr "Ikindi"
-#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:43
+#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:43
msgid "Pop"
msgstr ""
-#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:44
+#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:44
msgid "R&B"
msgstr ""
-#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:45
+#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:45
msgid "Rap"
msgstr ""
-#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:46
+#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:46
msgid "Reggae"
msgstr ""
-#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:47
+#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:47
msgid "Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:48
+#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:48
msgid "Techno"
msgstr ""
-#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:49
+#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:49
msgid "Industrial"
msgstr ""
-#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:50
+#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:50
msgid "Alternative"
msgstr ""
-#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:51
+#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:51
msgid "Ska"
msgstr ""
-#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:52
+#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:52
msgid "Death Metal"
msgstr ""
-#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:53
+#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:53
msgid "Pranks"
msgstr ""
-#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:54
+#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:54
msgid "Soundtrack"
msgstr ""
-#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:55
+#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:55
msgid "Euro-Techno"
msgstr ""
-#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:56
+#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:56
msgid "Ambient"
msgstr ""
-#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:57
+#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:57
msgid "Trip-Hop"
msgstr ""
-#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:58
+#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:58
msgid "Vocal"
msgstr ""
-#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:59
+#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:59
msgid "Jazz+Funk"
msgstr ""
-#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:60
+#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:60
msgid "Fusion"
msgstr ""
-#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:61
+#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:61
msgid "Trance"
msgstr ""
-#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:62
+#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:62
msgid "Classical"
msgstr ""
-#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:63
+#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:63
msgid "Instrumental"
msgstr ""
-#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:64
+#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:64
msgid "Acid"
msgstr ""
-#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:65
+#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:65
msgid "House"
msgstr ""
-#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:66
+#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:66
msgid "Game"
msgstr ""
-#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:67
+#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:67
msgid "Sound Clip"
msgstr ""
-#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:68
+#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:68
msgid "Gospel"
msgstr ""
-#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:69
+#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:69
msgid "Noise"
msgstr ""
-#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:70
+#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:70
msgid "Alt. Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:71
+#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:71
msgid "Bass"
msgstr ""
-#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:72
+#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:72
msgid "Soul"
msgstr ""
-#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:73
+#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:73
msgid "Punk"
msgstr ""
-#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:74
+#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:74
msgid "Space"
msgstr "Umwanya"
-#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:75
+#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:75
msgid "Meditative"
msgstr ""
-#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:76
+#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:76
msgid "Instrumental Pop"
msgstr ""
-#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:77
+#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:77
msgid "Instrumental Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:78
+#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:78
msgid "Ethnic"
msgstr ""
-#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:79
+#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:79
msgid "Gothic"
msgstr "Ikinyagotike"
-#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:80
+#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:80
msgid "Darkwave"
msgstr ""
-#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:81
+#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:81
msgid "Techno-Industrial"
msgstr ""
-#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:82
+#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:82
msgid "Electronic"
msgstr "elegitoroniki"
-#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:83
+#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:83
msgid "Pop-Folk"
msgstr ""
-#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:84
+#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:84
msgid "Eurodance"
msgstr ""
-#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:85
+#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:85
msgid "Dream"
msgstr ""
-#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:86
+#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:86
msgid "Southern Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:87
+#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:87
msgid "Comedy"
msgstr ""
-#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:88
+#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:88
msgid "Cult"
msgstr ""
-#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:89
+#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:89
msgid "Gangsta Rap"
msgstr ""
-#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:90
+#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:90
msgid "Top 40"
msgstr ""
-#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:91
+#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:91
msgid "Christian Rap"
msgstr ""
-#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:92
+#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:92
msgid "Pop/Funk"
msgstr ""
-#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:93
+#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:93
msgid "Jungle"
msgstr ""
-#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:94
+#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:94
msgid "Native American"
msgstr ""
-#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:95
+#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:95
msgid "Cabaret"
msgstr ""
-#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:96
+#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:96
msgid "New Wave"
msgstr ""
-#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:97
+#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:97
msgid "Psychedelic"
msgstr ""
-#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:98
+#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:98
msgid "Rave"
msgstr ""
-#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:99
+#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:99
msgid "Showtunes"
msgstr ""
-#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:100
+#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:100
msgid "Trailer"
msgstr ""
-#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:101
+#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:101
msgid "Lo-Fi"
msgstr ""
-#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:102
+#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:102
msgid "Tribal"
msgstr ""
-#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:103
+#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:103
msgid "Acid Punk"
msgstr ""
-#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:104
+#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:104
msgid "Acid Jazz"
msgstr ""
-#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:105
+#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:105
msgid "Polka"
msgstr ""
-#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:106
+#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:106
msgid "Retro"
msgstr ""
-#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:107
+#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:107
msgid "Musical"
msgstr ""
-#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:108
+#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:108
msgid "Rock & Roll"
msgstr ""
-#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:109
+#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:109
msgid "Hard Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:110
+#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:110
msgid "Folk"
msgstr ""
-#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:111
+#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:111
msgid "Folk/Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:112
+#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:112
msgid "National Folk"
msgstr ""
-#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:113
+#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:113
msgid "Swing"
msgstr ""
-#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:114
+#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:114
msgid "Fast-Fusion"
msgstr ""
-#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:115
+#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:115
msgid "Bebob"
msgstr ""
-#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:116
+#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:116
msgid "Latin"
msgstr "Ikiratini"
-#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:117
+#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:117
msgid "Revival"
msgstr ""
-#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:118
+#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:118
msgid "Celtic"
msgstr ""
-#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:119
+#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:119
msgid "Bluegrass"
msgstr ""
-#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:120
+#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:120
msgid "Avantgarde"
msgstr ""
-#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:121
+#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:121
msgid "Gothic Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:122
+#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:122
msgid "Progressive Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:123
+#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:123
msgid "Psychedelic Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:124
+#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:124
msgid "Symphonic Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:125
+#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:125
msgid "Slow Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:126
+#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:126
msgid "Big Band"
msgstr ""
-#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:127
+#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:127
msgid "Chorus"
msgstr ""
-#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:128
+#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:128
msgid "Easy Listening"
msgstr ""
-#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:129
+#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:129
msgid "Acoustic"
msgstr ""
-#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:130
+#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:130
msgid "Humour"
msgstr ""
-#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:131
+#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:131
msgid "Speech"
msgstr ""
-#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:132
+#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:132
msgid "Chanson"
msgstr ""
-#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:133
+#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:133
msgid "Opera"
msgstr ""
-#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:134
+#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:134
msgid "Chamber Music"
msgstr ""
-#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:135
+#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:135
msgid "Sonata"
msgstr ""
-#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:136
+#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:136
msgid "Symphony"
msgstr ""
-#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:137
+#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:137
msgid "Booty Bass"
msgstr ""
-#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:138
+#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:138
msgid "Primus"
msgstr ""
-#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:139
+#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:139
msgid "Porn Groove"
msgstr ""
-#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:140
+#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:140
msgid "Satire"
msgstr ""
-#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:141
+#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:141
msgid "Slow Jam"
msgstr ""
-#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:142
+#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:142
msgid "Club"
msgstr ""
-#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:143
+#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:143
msgid "Tango"
msgstr ""
-#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:144
+#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:144
msgid "Samba"
msgstr ""
-#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:145
+#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:145
msgid "Folklore"
msgstr ""
-#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:146
+#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:146
msgid "Ballad"
msgstr ""
-#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:147
+#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:147
msgid "Power Ballad"
msgstr ""
-#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:148
+#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:148
msgid "Rhythmic Soul"
msgstr ""
-#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:149
+#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:149
msgid "Freestyle"
msgstr ""
-#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:150
+#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:150
msgid "Duet"
msgstr ""
-#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:151
+#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:151
msgid "Punk Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:152
+#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:152
msgid "Drum Solo"
msgstr ""
-#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:153
+#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:153
#, fuzzy
msgid "A Cappella"
msgstr "A"
-#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:154
+#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:154
msgid "Euro-House"
msgstr ""
-#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:155
+#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:155
msgid "Dance Hall"
msgstr ""
-#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:156
+#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:156
msgid "Goa"
msgstr ""
-#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:157
+#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:157
msgid "Drum & Bass"
msgstr ""
-#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:158
+#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:158
msgid "Club-House"
msgstr ""
-#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:159
+#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:159
msgid "Hardcore"
msgstr ""
-#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:160
+#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:160
msgid "Terror"
msgstr ""
-#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:161
+#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:161
msgid "Indie"
msgstr ""
-#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:162
+#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:162
msgid "BritPop"
msgstr ""
-#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:163
+#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:163
msgid "Negerpunk"
msgstr ""
-#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:164
+#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:164
msgid "Polsk Punk"
msgstr ""
-#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:165
+#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:165
msgid "Beat"
msgstr ""
-#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:166
+#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:166
msgid "Christian Gangsta Rap"
msgstr ""
-#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:167
+#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:167
msgid "Heavy Metal"
msgstr ""
-#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:168
+#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:168
msgid "Black Metal"
msgstr ""
-#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:169
+#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:169
msgid "Crossover"
msgstr ""
-#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:170
+#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:170
msgid "Contemporary Christian"
msgstr ""
-#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:171
+#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:171
msgid "Christian Rock"
msgstr ""
-#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:172
+#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:172
msgid "Merengue"
msgstr ""
-#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:173
+#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:173
msgid "Salsa"
msgstr ""
-#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:174
+#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:174
msgid "Thrash Metal"
msgstr ""
-#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:175
+#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:175
msgid "Anime"
msgstr ""
-#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:176
+#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:176
msgid "JPop"
msgstr ""
-#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:177
+#: src/plugins/mp3extractor.c:198 src/plugins/qtextractor.c:177
msgid "Synthpop"
msgstr ""
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "stereo"
msgstr ""
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "mono"
msgstr ""
-#: src/plugins/mp3extractor.c:434
+#: src/plugins/mp3extractor.c:445
#, fuzzy
msgid "(variable bps)"
msgstr "(IMPINDURAGACIRO"
@@ -1806,10 +1819,6 @@
#~ msgstr "Imiterere Ikosa"
#, fuzzy
-#~ msgid "Bad file number"
-#~ msgstr "IDOSIYE Umubare"
-
-#, fuzzy
#~ msgid "Resource unavailable or operation would block, try again"
#~ msgstr "Cyangwa Funga"
Modified: Extractor/po/sv.po
===================================================================
--- Extractor/po/sv.po 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/po/sv.po 2008-03-21 06:00:52 UTC (rev 6581)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: libextractor 0.5.18a\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-01-07 08:48-0700\n"
+"POT-Creation-Date: 2008-03-20 23:53-0600\n"
"PO-Revision-Date: 2007-08-09 20:38+0100\n"
"Last-Translator: Daniel Nylander <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -114,12 +114,12 @@
msgid "Extract metadata from files."
msgstr "Extrahera metadata från filer."
-#: src/main/extract.c:190 src/main/extractor.c:1444
+#: src/main/extract.c:190 src/main/extractor.c:1513
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (binär)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1449
+#: src/main/extract.c:201 src/main/extractor.c:1518
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "OGILTIG TYP - %s\n"
@@ -678,12 +678,25 @@
msgid "filesize"
msgstr "filstorlek"
-#: src/main/extractor.c:529
+#: src/main/extractor.c:176
+msgid "track number"
+msgstr ""
+
+#: src/main/extractor.c:177
+msgid "international standard recording code"
+msgstr ""
+
+#: src/main/extractor.c:178
+#, fuzzy
+msgid "disc number"
+msgstr "disclaimer"
+
+#: src/main/extractor.c:598
#, c-format
msgid "Initialization of plugin mechanism failed: %s!\n"
msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
-#: src/main/extractor.c:683
+#: src/main/extractor.c:752
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -692,12 +705,12 @@
"Uppslag av symbol \"%s\" i bibliotek \"%s\" misslyckades så jag försökte med "
"\"%s\" men det misslyckades också. Felen är: \"%s\" och \"%s\".\n"
-#: src/main/extractor.c:712
+#: src/main/extractor.c:781
#, c-format
msgid "Loading `%s' plugin failed: %s\n"
msgstr "Inläsning av instick \"%s\" misslyckades: %s\n"
-#: src/main/extractor.c:917
+#: src/main/extractor.c:986
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Urläsning av instick \"%s\" misslyckades!\n"
@@ -824,607 +837,607 @@
msgid "Kernel routines"
msgstr "Kärnrutiner"
-#: src/plugins/mp3extractor.c:50 src/plugins/qtextractor.c:30
+#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:30
msgid "Blues"
msgstr "Blues"
-#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:31
+#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:31
msgid "Classic Rock"
msgstr "Klassisk rock"
-#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:32
+#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:32
msgid "Country"
msgstr "Country"
-#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:33
+#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:33
msgid "Dance"
msgstr "Dans"
-#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:34
+#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:34
msgid "Disco"
msgstr "Disco"
-#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:35
+#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:35
msgid "Funk"
msgstr "Funk"
-#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:36
+#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:36
msgid "Grunge"
msgstr "Grunge"
-#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:37
+#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:37
msgid "Hip-Hop"
msgstr "Hip-Hop"
-#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:38
+#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:38
msgid "Jazz"
msgstr "Jazz"
-#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:39
+#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:39
msgid "Metal"
msgstr "Metal"
-#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:40
+#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:40
msgid "New Age"
msgstr "New Age"
-#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:41
+#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:41
msgid "Oldies"
msgstr "Gamla godingar"
-#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:42
+#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:42
msgid "Other"
msgstr "Övrigt"
-#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:43
+#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:43
msgid "Pop"
msgstr "Pop"
-#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:44
+#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:44
msgid "R&B"
msgstr "R&B"
-#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:45
+#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:45
msgid "Rap"
msgstr "Rap"
-#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:46
+#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:46
msgid "Reggae"
msgstr "Reggae"
-#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:47
+#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:47
msgid "Rock"
msgstr "Rock"
-#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:48
+#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:48
msgid "Techno"
msgstr "Techno"
-#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:49
+#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:49
msgid "Industrial"
msgstr "Industriell"
-#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:50
+#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:50
msgid "Alternative"
msgstr "Alternativ"
-#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:51
+#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:51
msgid "Ska"
msgstr "Ska"
-#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:52
+#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:52
msgid "Death Metal"
msgstr "Death Metal"
-#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:53
+#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:53
msgid "Pranks"
msgstr "Skämt"
-#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:54
+#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:54
msgid "Soundtrack"
msgstr "Soundtrack"
-#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:55
+#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:55
msgid "Euro-Techno"
msgstr "Euro-Techno"
-#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:56
+#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:56
msgid "Ambient"
msgstr "Ambient"
-#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:57
+#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:57
msgid "Trip-Hop"
msgstr "Trip-Hop"
-#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:58
+#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:58
msgid "Vocal"
msgstr "Vocal"
-#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:59
+#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:59
msgid "Jazz+Funk"
msgstr "Jazz+Funk"
-#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:60
+#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:60
msgid "Fusion"
msgstr "Fusion"
-#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:61
+#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:61
msgid "Trance"
msgstr "Trance"
-#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:62
+#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:62
msgid "Classical"
msgstr "Klassisk"
-#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:63
+#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:63
msgid "Instrumental"
msgstr "Instrumental"
-#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:64
+#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:64
msgid "Acid"
msgstr "Acid"
-#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:65
+#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:65
msgid "House"
msgstr "House"
-#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:66
+#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:66
msgid "Game"
msgstr "Spel"
-#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:67
+#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:67
msgid "Sound Clip"
msgstr "Ljudklipp"
-#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:68
+#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:68
msgid "Gospel"
msgstr "Gospel"
-#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:69
+#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:69
msgid "Noise"
msgstr "Noise"
-#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:70
+#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:70
msgid "Alt. Rock"
msgstr "Alt. Rock"
-#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:71
+#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:71
msgid "Bass"
msgstr "Bas"
-#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:72
+#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:72
msgid "Soul"
msgstr "Soul"
-#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:73
+#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:73
msgid "Punk"
msgstr "Punk"
-#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:74
+#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:74
msgid "Space"
msgstr "Space"
-#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:75
+#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:75
msgid "Meditative"
msgstr "Meditativ"
-#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:76
+#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:76
msgid "Instrumental Pop"
msgstr "Instrumental Pop"
-#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:77
+#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:77
msgid "Instrumental Rock"
msgstr "Instrumental Rock"
-#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:78
+#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:78
msgid "Ethnic"
msgstr "Ethnic"
-#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:79
+#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:79
msgid "Gothic"
msgstr "Gothic"
-#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:80
+#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:80
msgid "Darkwave"
msgstr "Darkwave"
-#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:81
+#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:81
msgid "Techno-Industrial"
msgstr "Techno-Industrial"
-#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:82
+#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:82
msgid "Electronic"
msgstr "Elektronisk"
-#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:83
+#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:83
msgid "Pop-Folk"
msgstr "Pop-Folk"
-#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:84
+#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:84
msgid "Eurodance"
msgstr "Eurodance"
-#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:85
+#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:85
msgid "Dream"
msgstr "Dream"
-#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:86
+#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:86
msgid "Southern Rock"
msgstr "Southern Rock"
-#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:87
+#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:87
msgid "Comedy"
msgstr "Komedi"
-#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:88
+#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:88
msgid "Cult"
msgstr "Kult"
-#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:89
+#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:89
msgid "Gangsta Rap"
msgstr "Gangsta Rap"
-#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:90
+#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:90
msgid "Top 40"
msgstr "Topp 40"
-#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:91
+#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:91
msgid "Christian Rap"
msgstr "Kristen rap"
-#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:92
+#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:92
msgid "Pop/Funk"
msgstr "Pop/Funk"
-#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:93
+#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:93
msgid "Jungle"
msgstr "Jungle"
-#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:94
+#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:94
msgid "Native American"
msgstr "Native American"
-#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:95
+#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:95
msgid "Cabaret"
msgstr "Kabaret"
-#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:96
+#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:96
msgid "New Wave"
msgstr "New Wave"
-#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:97
+#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:97
msgid "Psychedelic"
msgstr "Psykadelisk"
-#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:98
+#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:98
msgid "Rave"
msgstr "Rave"
-#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:99
+#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:99
msgid "Showtunes"
msgstr "Showtunes"
-#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:100
+#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:100
msgid "Trailer"
msgstr "Trailer"
-#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:101
+#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:101
msgid "Lo-Fi"
msgstr "Lo-Fi"
-#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:102
+#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:102
msgid "Tribal"
msgstr "Tribal"
-#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:103
+#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:103
msgid "Acid Punk"
msgstr "Acid Punk"
-#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:104
+#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:104
msgid "Acid Jazz"
msgstr "Acid Jazz"
-#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:105
+#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:105
msgid "Polka"
msgstr "Polka"
-#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:106
+#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:106
msgid "Retro"
msgstr "Retro"
-#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:107
+#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:107
msgid "Musical"
msgstr "Musikal"
-#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:108
+#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:108
msgid "Rock & Roll"
msgstr "Rock & Roll"
-#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:109
+#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:109
msgid "Hard Rock"
msgstr "Hårdrock"
-#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:110
+#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:110
msgid "Folk"
msgstr "Folk"
-#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:111
+#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:111
msgid "Folk/Rock"
msgstr "Folk/Rock"
-#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:112
+#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:112
msgid "National Folk"
msgstr "National Folk"
-#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:113
+#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:113
msgid "Swing"
msgstr "Swing"
-#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:114
+#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:114
msgid "Fast-Fusion"
msgstr "Fast-Fusion"
-#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:115
+#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:115
msgid "Bebob"
msgstr "Bebob"
-#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:116
+#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:116
msgid "Latin"
msgstr "Latin"
-#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:117
+#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:117
msgid "Revival"
msgstr "Revival"
-#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:118
+#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:118
msgid "Celtic"
msgstr "Keltisk"
-#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:119
+#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:119
msgid "Bluegrass"
msgstr "Bluegrass"
-#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:120
+#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:120
msgid "Avantgarde"
msgstr "Avantgarde"
-#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:121
+#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:121
msgid "Gothic Rock"
msgstr "Gothisk rock"
-#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:122
+#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:122
msgid "Progressive Rock"
msgstr "Progressiv rock"
-#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:123
+#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:123
msgid "Psychedelic Rock"
msgstr "Psykedelisk rock"
-#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:124
+#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:124
msgid "Symphonic Rock"
msgstr "Symfonisk rock"
-#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:125
+#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:125
msgid "Slow Rock"
msgstr "Långsam rock"
-#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:126
+#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:126
msgid "Big Band"
msgstr "Storband"
-#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:127
+#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:127
msgid "Chorus"
msgstr "Chorus"
-#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:128
+#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:128
msgid "Easy Listening"
msgstr "Lättsam lyssning"
-#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:129
+#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:129
msgid "Acoustic"
msgstr "Ackustisk"
-#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:130
+#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:130
msgid "Humour"
msgstr "Humor"
-#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:131
+#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:131
msgid "Speech"
msgstr "Tal"
-#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:132
+#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:132
msgid "Chanson"
msgstr "Chanson"
-#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:133
+#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:133
msgid "Opera"
msgstr "Opera"
-#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:134
+#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:134
msgid "Chamber Music"
msgstr "Kammarmusik"
-#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:135
+#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:135
msgid "Sonata"
msgstr "Sonata"
-#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:136
+#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:136
msgid "Symphony"
msgstr "Symfoni"
-#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:137
+#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:137
msgid "Booty Bass"
msgstr "Booty Bass"
-#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:138
+#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:138
msgid "Primus"
msgstr "Primus"
-#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:139
+#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:139
msgid "Porn Groove"
msgstr "Porn Groove"
-#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:140
+#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:140
msgid "Satire"
msgstr "Satir"
-#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:141
+#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:141
msgid "Slow Jam"
msgstr "Slow Jam"
-#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:142
+#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:142
msgid "Club"
msgstr "Club"
-#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:143
+#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:143
msgid "Tango"
msgstr "Tango"
-#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:144
+#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:144
msgid "Samba"
msgstr "Samba"
-#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:145
+#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:145
msgid "Folklore"
msgstr "Folklore"
-#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:146
+#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:146
msgid "Ballad"
msgstr "Ballad"
-#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:147
+#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:147
msgid "Power Ballad"
msgstr "Power Ballad"
-#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:148
+#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:148
msgid "Rhythmic Soul"
msgstr "Rhythmic Soul"
-#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:149
+#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:149
msgid "Freestyle"
msgstr "Freestyle"
-#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:150
+#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:150
msgid "Duet"
msgstr "Duet"
-#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:151
+#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:151
msgid "Punk Rock"
msgstr "Punk Rock"
-#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:152
+#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:152
msgid "Drum Solo"
msgstr "Trumsolo"
-#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:153
+#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:153
msgid "A Cappella"
msgstr "A cappella"
-#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:154
+#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:154
msgid "Euro-House"
msgstr "Euro-House"
-#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:155
+#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:155
msgid "Dance Hall"
msgstr "Dance Hall"
-#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:156
+#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:156
msgid "Goa"
msgstr "Goa"
-#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:157
+#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:157
msgid "Drum & Bass"
msgstr "Drum & Bass"
-#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:158
+#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:158
msgid "Club-House"
msgstr "Club-House"
-#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:159
+#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:159
msgid "Hardcore"
msgstr "Hardcore"
-#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:160
+#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:160
msgid "Terror"
msgstr "Terror"
-#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:161
+#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:161
msgid "Indie"
msgstr "Indie"
-#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:162
+#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:162
msgid "BritPop"
msgstr "BritPop"
-#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:163
+#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:163
msgid "Negerpunk"
msgstr "Negerpunk"
-#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:164
+#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:164
msgid "Polsk Punk"
msgstr "Polsk Punk"
-#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:165
+#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:165
msgid "Beat"
msgstr "Beat"
-#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:166
+#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:166
msgid "Christian Gangsta Rap"
msgstr "Christian Gangsta Rap"
-#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:167
+#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:167
msgid "Heavy Metal"
msgstr "Heavy Metal"
-#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:168
+#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:168
msgid "Black Metal"
msgstr "Black Metal"
-#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:169
+#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:169
msgid "Crossover"
msgstr "Crossover"
-#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:170
+#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:170
msgid "Contemporary Christian"
msgstr "Contemporary Christian"
-#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:171
+#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:171
msgid "Christian Rock"
msgstr "Kristen rock"
-#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:172
+#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:172
msgid "Merengue"
msgstr "Merengue"
-#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:173
+#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:173
msgid "Salsa"
msgstr "Salsa"
-#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:174
+#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:174
msgid "Thrash Metal"
msgstr "Thrash Metal"
-#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:175
+#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:175
msgid "Anime"
msgstr "Anime"
-#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:176
+#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:176
msgid "JPop"
msgstr "JPop"
-#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:177
+#: src/plugins/mp3extractor.c:198 src/plugins/qtextractor.c:177
msgid "Synthpop"
msgstr "Synthpop"
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "stereo"
msgstr "stereo"
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "mono"
msgstr "mono"
-#: src/plugins/mp3extractor.c:434
+#: src/plugins/mp3extractor.c:445
msgid "(variable bps)"
msgstr "(variabel bithastighet)"
Modified: Extractor/po/vi.po
===================================================================
--- Extractor/po/vi.po 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/po/vi.po 2008-03-21 06:00:52 UTC (rev 6581)
@@ -2,12 +2,12 @@
# Copyright © 2007 Free Software Foundation, Inc.
# Copyright © 2006 Christian Grothoff
# Clytie Siddall <address@hidden>, 2005-2007.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: libextractor 0.5.18a\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-01-07 08:48-0700\n"
+"POT-Creation-Date: 2008-03-20 23:53-0600\n"
"PO-Revision-Date: 2007-07-09 16:23+0930\n"
"Last-Translator: Clytie Siddall <address@hidden>\n"
"Language-Team: Vietnamese <address@hidden>\n"
@@ -99,8 +99,7 @@
#: src/main/extract.c:152
msgid "use keyword splitting (loads split-extractor plugin)"
-msgstr ""
-"dùng khả năng xẻ từ khoá (thì tải bổ sung « split-extractor » [rút xẻ])"
+msgstr "dùng khả năng xẻ từ khoá (thì tải bổ sung « split-extractor » [rút
xẻ])"
#: src/main/extract.c:154
msgid "print the version number"
@@ -124,12 +123,12 @@
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:1444
+#: src/main/extract.c:190 src/main/extractor.c:1513
#, c-format
msgid "%s - (binary)\n"
msgstr "%s - (nhị phân)\n"
-#: src/main/extract.c:201 src/main/extractor.c:1449
+#: src/main/extract.c:201 src/main/extractor.c:1518
#, c-format
msgid "INVALID TYPE - %s\n"
msgstr "KIỂU KHÔNG HỢP LỆ — %s\n"
@@ -688,12 +687,25 @@
msgid "filesize"
msgstr "cỡ tập tin"
-#: src/main/extractor.c:529
+#: src/main/extractor.c:176
+msgid "track number"
+msgstr ""
+
+#: src/main/extractor.c:177
+msgid "international standard recording code"
+msgstr ""
+
+#: src/main/extractor.c:178
+#, fuzzy
+msgid "disc number"
+msgstr "từ chối trách nhiệm"
+
+#: src/main/extractor.c:598
#, 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:683
+#: src/main/extractor.c:752
#, c-format
msgid ""
"Resolving symbol `%s' in library `%s' failed, so I tried `%s', but that "
@@ -702,12 +714,12 @@
"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:712
+#: src/main/extractor.c:781
#, 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:917
+#: src/main/extractor.c:986
#, c-format
msgid "Unloading plugin `%s' failed!\n"
msgstr "Việc bỏ tải bổ sung « %s » bị lỗi.\n"
@@ -834,607 +846,607 @@
msgid "Kernel routines"
msgstr "Thao tác hạt nhân"
-#: src/plugins/mp3extractor.c:50 src/plugins/qtextractor.c:30
+#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:30
msgid "Blues"
msgstr "Blu"
-#: src/plugins/mp3extractor.c:51 src/plugins/qtextractor.c:31
+#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:31
msgid "Classic Rock"
msgstr "Rốc cổ điển"
-#: src/plugins/mp3extractor.c:52 src/plugins/qtextractor.c:32
+#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:32
msgid "Country"
msgstr "Quốc gia"
-#: src/plugins/mp3extractor.c:53 src/plugins/qtextractor.c:33
+#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:33
msgid "Dance"
msgstr "Khiêu vũ"
-#: src/plugins/mp3extractor.c:54 src/plugins/qtextractor.c:34
+#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:34
msgid "Disco"
msgstr "Đít-xcô"
-#: src/plugins/mp3extractor.c:55 src/plugins/qtextractor.c:35
+#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:35
msgid "Funk"
msgstr "Sôi nổi"
-#: src/plugins/mp3extractor.c:56 src/plugins/qtextractor.c:36
+#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:36
msgid "Grunge"
msgstr "Vỡ mộng"
-#: src/plugins/mp3extractor.c:57 src/plugins/qtextractor.c:37
+#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:37
msgid "Hip-Hop"
msgstr "Hít-họt"
-#: src/plugins/mp3extractor.c:58 src/plugins/qtextractor.c:38
+#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:38
msgid "Jazz"
msgstr "Ja"
-#: src/plugins/mp3extractor.c:59 src/plugins/qtextractor.c:39
+#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:39
msgid "Metal"
msgstr "Kim"
-#: src/plugins/mp3extractor.c:60 src/plugins/qtextractor.c:40
+#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:40
msgid "New Age"
msgstr "Thời kỳ mới"
-#: src/plugins/mp3extractor.c:61 src/plugins/qtextractor.c:41
+#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:41
msgid "Oldies"
msgstr "Cũ"
-#: src/plugins/mp3extractor.c:62 src/plugins/qtextractor.c:42
+#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:42
msgid "Other"
msgstr "Khác"
-#: src/plugins/mp3extractor.c:63 src/plugins/qtextractor.c:43
+#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:43
msgid "Pop"
msgstr "Pốp"
-#: src/plugins/mp3extractor.c:64 src/plugins/qtextractor.c:44
+#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:44
msgid "R&B"
msgstr "Nhịp điệu và blu"
-#: src/plugins/mp3extractor.c:65 src/plugins/qtextractor.c:45
+#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:45
msgid "Rap"
msgstr "Rap"
-#: src/plugins/mp3extractor.c:66 src/plugins/qtextractor.c:46
+#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:46
msgid "Reggae"
msgstr "Re-gê"
-#: src/plugins/mp3extractor.c:67 src/plugins/qtextractor.c:47
+#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:47
msgid "Rock"
msgstr "Rốc"
-#: src/plugins/mp3extractor.c:68 src/plugins/qtextractor.c:48
+#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:48
msgid "Techno"
msgstr "Kỹ thuật"
-#: src/plugins/mp3extractor.c:69 src/plugins/qtextractor.c:49
+#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:49
msgid "Industrial"
msgstr "Công nghiệp"
-#: src/plugins/mp3extractor.c:70 src/plugins/qtextractor.c:50
+#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:50
msgid "Alternative"
msgstr "Sự chọn khác"
-#: src/plugins/mp3extractor.c:71 src/plugins/qtextractor.c:51
+#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:51
msgid "Ska"
msgstr "Ska"
-#: src/plugins/mp3extractor.c:72 src/plugins/qtextractor.c:52
+#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:52
msgid "Death Metal"
msgstr "Kim chết"
-#: src/plugins/mp3extractor.c:73 src/plugins/qtextractor.c:53
+#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:53
msgid "Pranks"
msgstr "Trò chơi ác"
-#: src/plugins/mp3extractor.c:74 src/plugins/qtextractor.c:54
+#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:54
msgid "Soundtrack"
msgstr "Nhạc của phím"
-#: src/plugins/mp3extractor.c:75 src/plugins/qtextractor.c:55
+#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:55
msgid "Euro-Techno"
msgstr "Kỹ thuật Âu"
-#: src/plugins/mp3extractor.c:76 src/plugins/qtextractor.c:56
+#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:56
msgid "Ambient"
msgstr "Chung quanh"
-#: src/plugins/mp3extractor.c:77 src/plugins/qtextractor.c:57
+#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:57
msgid "Trip-Hop"
msgstr "Tợ-rít-Hot"
-#: src/plugins/mp3extractor.c:78 src/plugins/qtextractor.c:58
+#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:58
msgid "Vocal"
msgstr "Thanh nhạc"
-#: src/plugins/mp3extractor.c:79 src/plugins/qtextractor.c:59
+#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:59
msgid "Jazz+Funk"
msgstr "Ja và Sôi nổi"
-#: src/plugins/mp3extractor.c:80 src/plugins/qtextractor.c:60
+#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:60
msgid "Fusion"
msgstr "Nóng chảy"
-#: src/plugins/mp3extractor.c:81 src/plugins/qtextractor.c:61
+#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:61
msgid "Trance"
msgstr "Hôn mê"
-#: src/plugins/mp3extractor.c:82 src/plugins/qtextractor.c:62
+#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:62
msgid "Classical"
msgstr "Cổ điển"
-#: src/plugins/mp3extractor.c:83 src/plugins/qtextractor.c:63
+#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:63
msgid "Instrumental"
msgstr "Bằng nhạc khí"
-#: src/plugins/mp3extractor.c:84 src/plugins/qtextractor.c:64
+#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:64
msgid "Acid"
msgstr "Axit"
-#: src/plugins/mp3extractor.c:85 src/plugins/qtextractor.c:65
+#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:65
msgid "House"
msgstr "Nhà"
-#: src/plugins/mp3extractor.c:86 src/plugins/qtextractor.c:66
+#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:66
msgid "Game"
msgstr "Trò chơi"
-#: src/plugins/mp3extractor.c:87 src/plugins/qtextractor.c:67
+#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:67
msgid "Sound Clip"
msgstr "Trích đoạn âm thanh"
-#: src/plugins/mp3extractor.c:88 src/plugins/qtextractor.c:68
+#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:68
msgid "Gospel"
msgstr "Phúc âm"
-#: src/plugins/mp3extractor.c:89 src/plugins/qtextractor.c:69
+#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:69
msgid "Noise"
msgstr "Ồn"
-#: src/plugins/mp3extractor.c:90 src/plugins/qtextractor.c:70
+#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:70
msgid "Alt. Rock"
msgstr "Rốc thay thế"
-#: src/plugins/mp3extractor.c:91 src/plugins/qtextractor.c:71
+#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:71
msgid "Bass"
msgstr "Trầm"
-#: src/plugins/mp3extractor.c:92 src/plugins/qtextractor.c:72
+#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:72
msgid "Soul"
msgstr "Hồn"
-#: src/plugins/mp3extractor.c:93 src/plugins/qtextractor.c:73
+#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:73
msgid "Punk"
msgstr "Rốc dữ dội"
-#: src/plugins/mp3extractor.c:94 src/plugins/qtextractor.c:74
+#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:74
msgid "Space"
msgstr "Khoảng"
-#: src/plugins/mp3extractor.c:95 src/plugins/qtextractor.c:75
+#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:75
msgid "Meditative"
msgstr "Tĩnh tọa"
-#: src/plugins/mp3extractor.c:96 src/plugins/qtextractor.c:76
+#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:76
msgid "Instrumental Pop"
msgstr "Pốp bằng nhac khí"
-#: src/plugins/mp3extractor.c:97 src/plugins/qtextractor.c:77
+#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:77
msgid "Instrumental Rock"
msgstr "Rốc bằng nhạc khí"
-#: src/plugins/mp3extractor.c:98 src/plugins/qtextractor.c:78
+#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:78
msgid "Ethnic"
msgstr "Dân tộc"
-#: src/plugins/mp3extractor.c:99 src/plugins/qtextractor.c:79
+#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:79
msgid "Gothic"
msgstr "Gô-tích"
-#: src/plugins/mp3extractor.c:100 src/plugins/qtextractor.c:80
+#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:80
msgid "Darkwave"
msgstr "Sóng bóng"
-#: src/plugins/mp3extractor.c:101 src/plugins/qtextractor.c:81
+#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:81
msgid "Techno-Industrial"
msgstr "Kỹ thuật - Công nghiệp"
-#: src/plugins/mp3extractor.c:102 src/plugins/qtextractor.c:82
+#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:82
msgid "Electronic"
msgstr "Điện"
-#: src/plugins/mp3extractor.c:103 src/plugins/qtextractor.c:83
+#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:83
msgid "Pop-Folk"
msgstr "Pốp - Dân ca"
-#: src/plugins/mp3extractor.c:104 src/plugins/qtextractor.c:84
+#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:84
msgid "Eurodance"
msgstr "Khiêu vũ Âu"
-#: src/plugins/mp3extractor.c:105 src/plugins/qtextractor.c:85
+#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:85
msgid "Dream"
msgstr "Mơ mộng"
-#: src/plugins/mp3extractor.c:106 src/plugins/qtextractor.c:86
+#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:86
msgid "Southern Rock"
msgstr "Rốc Nam"
-#: src/plugins/mp3extractor.c:107 src/plugins/qtextractor.c:87
+#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:87
msgid "Comedy"
msgstr "Kịch vui"
-#: src/plugins/mp3extractor.c:108 src/plugins/qtextractor.c:88
+#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:88
msgid "Cult"
msgstr "Giáo phái"
-#: src/plugins/mp3extractor.c:109 src/plugins/qtextractor.c:89
+#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:89
msgid "Gangsta Rap"
msgstr "Rap Kẻ cướp"
-#: src/plugins/mp3extractor.c:110 src/plugins/qtextractor.c:90
+#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:90
msgid "Top 40"
msgstr "40 tốt nhất"
-#: src/plugins/mp3extractor.c:111 src/plugins/qtextractor.c:91
+#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:91
msgid "Christian Rap"
msgstr "Ráp Cơ-đốc"
-#: src/plugins/mp3extractor.c:112 src/plugins/qtextractor.c:92
+#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:92
msgid "Pop/Funk"
msgstr "Pốp/Sôi nổi"
-#: src/plugins/mp3extractor.c:113 src/plugins/qtextractor.c:93
+#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:93
msgid "Jungle"
msgstr "Rừng"
-#: src/plugins/mp3extractor.c:114 src/plugins/qtextractor.c:94
+#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:94
msgid "Native American"
msgstr "Mỹ bản xứ"
-#: src/plugins/mp3extractor.c:115 src/plugins/qtextractor.c:95
+#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:95
msgid "Cabaret"
msgstr "Ca-ba-rê"
-#: src/plugins/mp3extractor.c:116 src/plugins/qtextractor.c:96
+#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:96
msgid "New Wave"
msgstr "Sóng mới"
-#: src/plugins/mp3extractor.c:117 src/plugins/qtextractor.c:97
+#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:97
msgid "Psychedelic"
msgstr "Tạo ảo giác"
-#: src/plugins/mp3extractor.c:118 src/plugins/qtextractor.c:98
+#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:98
msgid "Rave"
msgstr "Rít"
-#: src/plugins/mp3extractor.c:119 src/plugins/qtextractor.c:99
+#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:99
msgid "Showtunes"
msgstr "Điệu kịch"
-#: src/plugins/mp3extractor.c:120 src/plugins/qtextractor.c:100
+#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:100
msgid "Trailer"
msgstr "Quảng cáo trước phím"
-#: src/plugins/mp3extractor.c:121 src/plugins/qtextractor.c:101
+#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:101
msgid "Lo-Fi"
msgstr "Độ trung thực thấp"
-#: src/plugins/mp3extractor.c:122 src/plugins/qtextractor.c:102
+#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:102
msgid "Tribal"
msgstr "Bộ lạc"
-#: src/plugins/mp3extractor.c:123 src/plugins/qtextractor.c:103
+#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:103
msgid "Acid Punk"
msgstr "Rốc dữ dội axit"
-#: src/plugins/mp3extractor.c:124 src/plugins/qtextractor.c:104
+#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:104
msgid "Acid Jazz"
msgstr "Ja axit"
-#: src/plugins/mp3extractor.c:125 src/plugins/qtextractor.c:105
+#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:105
msgid "Polka"
msgstr "Pôn-ca"
-#: src/plugins/mp3extractor.c:126 src/plugins/qtextractor.c:106
+#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:106
msgid "Retro"
msgstr "Lại sau"
-#: src/plugins/mp3extractor.c:127 src/plugins/qtextractor.c:107
+#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:107
msgid "Musical"
msgstr "Kịch nhạc"
-#: src/plugins/mp3extractor.c:128 src/plugins/qtextractor.c:108
+#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:108
msgid "Rock & Roll"
msgstr "Rốc en rôn"
-#: src/plugins/mp3extractor.c:129 src/plugins/qtextractor.c:109
+#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:109
msgid "Hard Rock"
msgstr "Rốc cứng"
-#: src/plugins/mp3extractor.c:130 src/plugins/qtextractor.c:110
+#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:110
msgid "Folk"
msgstr "Dân ca"
-#: src/plugins/mp3extractor.c:131 src/plugins/qtextractor.c:111
+#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:111
msgid "Folk/Rock"
msgstr "Dân ca/Rốc"
-#: src/plugins/mp3extractor.c:132 src/plugins/qtextractor.c:112
+#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:112
msgid "National Folk"
msgstr "Dân ca quốc gia"
-#: src/plugins/mp3extractor.c:133 src/plugins/qtextractor.c:113
+#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:113
msgid "Swing"
msgstr "Xuynh"
-#: src/plugins/mp3extractor.c:134 src/plugins/qtextractor.c:114
+#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:114
msgid "Fast-Fusion"
msgstr "Nóng chạy nhanh"
-#: src/plugins/mp3extractor.c:135 src/plugins/qtextractor.c:115
+#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:115
msgid "Bebob"
msgstr "Bí-bọt"
-#: src/plugins/mp3extractor.c:136 src/plugins/qtextractor.c:116
+#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:116
msgid "Latin"
msgstr "Dân tộc Tây-ban-nha"
-#: src/plugins/mp3extractor.c:137 src/plugins/qtextractor.c:117
+#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:117
msgid "Revival"
msgstr "Phục âm nhấn mạnh"
-#: src/plugins/mp3extractor.c:138 src/plugins/qtextractor.c:118
+#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:118
msgid "Celtic"
msgstr "Xen-tơ"
-#: src/plugins/mp3extractor.c:139 src/plugins/qtextractor.c:119
+#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:119
msgid "Bluegrass"
msgstr "Cỏ xanh"
-#: src/plugins/mp3extractor.c:140 src/plugins/qtextractor.c:120
+#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:120
msgid "Avantgarde"
msgstr "Đi tiên phong"
-#: src/plugins/mp3extractor.c:141 src/plugins/qtextractor.c:121
+#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:121
msgid "Gothic Rock"
msgstr "Rốc Gô-tích"
-#: src/plugins/mp3extractor.c:142 src/plugins/qtextractor.c:122
+#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:122
msgid "Progressive Rock"
msgstr "Rốc tiến lên"
-#: src/plugins/mp3extractor.c:143 src/plugins/qtextractor.c:123
+#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:123
msgid "Psychedelic Rock"
msgstr "Rốc tạo ảo giác"
-#: src/plugins/mp3extractor.c:144 src/plugins/qtextractor.c:124
+#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:124
msgid "Symphonic Rock"
msgstr "Rốc giao hưởng"
-#: src/plugins/mp3extractor.c:145 src/plugins/qtextractor.c:125
+#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:125
msgid "Slow Rock"
msgstr "Rốc chậm"
-#: src/plugins/mp3extractor.c:146 src/plugins/qtextractor.c:126
+#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:126
msgid "Big Band"
msgstr "Dàn nhạc To"
-#: src/plugins/mp3extractor.c:147 src/plugins/qtextractor.c:127
+#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:127
msgid "Chorus"
msgstr "Hợp xướng"
-#: src/plugins/mp3extractor.c:148 src/plugins/qtextractor.c:128
+#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:128
msgid "Easy Listening"
msgstr "Nghe dễ dàng"
-#: src/plugins/mp3extractor.c:149 src/plugins/qtextractor.c:129
+#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:129
msgid "Acoustic"
msgstr "Độ trung thực âm thanh"
-#: src/plugins/mp3extractor.c:150 src/plugins/qtextractor.c:130
+#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:130
msgid "Humour"
msgstr "Hài hước"
-#: src/plugins/mp3extractor.c:151 src/plugins/qtextractor.c:131
+#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:131
msgid "Speech"
msgstr "Nói tiếng"
-#: src/plugins/mp3extractor.c:152 src/plugins/qtextractor.c:132
+#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:132
msgid "Chanson"
msgstr "Bài hát kiểu Pháp"
-#: src/plugins/mp3extractor.c:153 src/plugins/qtextractor.c:133
+#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:133
msgid "Opera"
msgstr "Hát kịch"
-#: src/plugins/mp3extractor.c:154 src/plugins/qtextractor.c:134
+#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:134
msgid "Chamber Music"
msgstr "Nhạc phòng"
-#: src/plugins/mp3extractor.c:155 src/plugins/qtextractor.c:135
+#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:135
msgid "Sonata"
msgstr "Bản xô-nat"
-#: src/plugins/mp3extractor.c:156 src/plugins/qtextractor.c:136
+#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:136
msgid "Symphony"
msgstr "Giao hưởng"
-#: src/plugins/mp3extractor.c:157 src/plugins/qtextractor.c:137
+#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:137
msgid "Booty Bass"
msgstr "Trầm Booty"
-#: src/plugins/mp3extractor.c:158 src/plugins/qtextractor.c:138
+#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:138
msgid "Primus"
msgstr "Pri-mus"
-#: src/plugins/mp3extractor.c:159 src/plugins/qtextractor.c:139
+#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:139
msgid "Porn Groove"
msgstr "Porn Groove"
-#: src/plugins/mp3extractor.c:160 src/plugins/qtextractor.c:140
+#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:140
msgid "Satire"
msgstr "Châm biếm"
-#: src/plugins/mp3extractor.c:161 src/plugins/qtextractor.c:141
+#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:141
msgid "Slow Jam"
msgstr "Ứng tác chậm"
-#: src/plugins/mp3extractor.c:162 src/plugins/qtextractor.c:142
+#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:142
msgid "Club"
msgstr "Hội"
-#: src/plugins/mp3extractor.c:163 src/plugins/qtextractor.c:143
+#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:143
msgid "Tango"
msgstr "Tan-gô"
-#: src/plugins/mp3extractor.c:164 src/plugins/qtextractor.c:144
+#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:144
msgid "Samba"
msgstr "Sam-ba"
-#: src/plugins/mp3extractor.c:165 src/plugins/qtextractor.c:145
+#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:145
msgid "Folklore"
msgstr "Truyền thống dân gian"
-#: src/plugins/mp3extractor.c:166 src/plugins/qtextractor.c:146
+#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:146
msgid "Ballad"
msgstr "Khúc balat"
-#: src/plugins/mp3extractor.c:167 src/plugins/qtextractor.c:147
+#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:147
msgid "Power Ballad"
msgstr "Khúc balat năng lực"
-#: src/plugins/mp3extractor.c:168 src/plugins/qtextractor.c:148
+#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:148
msgid "Rhythmic Soul"
msgstr "Hồn nhịp nhàng"
-#: src/plugins/mp3extractor.c:169 src/plugins/qtextractor.c:149
+#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:149
msgid "Freestyle"
msgstr "Kiểu tự do"
-#: src/plugins/mp3extractor.c:170 src/plugins/qtextractor.c:150
+#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:150
msgid "Duet"
msgstr "Bản nhạc cho bộ đôi"
-#: src/plugins/mp3extractor.c:171 src/plugins/qtextractor.c:151
+#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:151
msgid "Punk Rock"
msgstr "Rốc - rốc dữ dội"
-#: src/plugins/mp3extractor.c:172 src/plugins/qtextractor.c:152
+#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:152
msgid "Drum Solo"
msgstr "Trống diễn đơn"
-#: src/plugins/mp3extractor.c:173 src/plugins/qtextractor.c:153
+#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:153
msgid "A Cappella"
msgstr "Hát không có nhạc hỗ trợ"
-#: src/plugins/mp3extractor.c:174 src/plugins/qtextractor.c:154
+#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:154
msgid "Euro-House"
msgstr "Nhà Âu"
-#: src/plugins/mp3extractor.c:175 src/plugins/qtextractor.c:155
+#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:155
msgid "Dance Hall"
msgstr "Phòng khiêu vũ"
-#: src/plugins/mp3extractor.c:176 src/plugins/qtextractor.c:156
+#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:156
msgid "Goa"
msgstr "Goa"
-#: src/plugins/mp3extractor.c:177 src/plugins/qtextractor.c:157
+#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:157
msgid "Drum & Bass"
msgstr "Trống và Trầm"
-#: src/plugins/mp3extractor.c:178 src/plugins/qtextractor.c:158
+#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:158
msgid "Club-House"
msgstr "Nhà hội"
-#: src/plugins/mp3extractor.c:179 src/plugins/qtextractor.c:159
+#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:159
msgid "Hardcore"
msgstr "Lõi cứng"
-#: src/plugins/mp3extractor.c:180 src/plugins/qtextractor.c:160
+#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:160
msgid "Terror"
msgstr "Kinh hãi"
-#: src/plugins/mp3extractor.c:181 src/plugins/qtextractor.c:161
+#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:161
msgid "Indie"
msgstr "In-đi"
-#: src/plugins/mp3extractor.c:182 src/plugins/qtextractor.c:162
+#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:162
msgid "BritPop"
msgstr "Pốp quốc Anh"
-#: src/plugins/mp3extractor.c:183 src/plugins/qtextractor.c:163
+#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:163
msgid "Negerpunk"
msgstr "Rốc dữ dội đen"
-#: src/plugins/mp3extractor.c:184 src/plugins/qtextractor.c:164
+#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:164
msgid "Polsk Punk"
msgstr "Rốc dữ dội Ba-lan"
-#: src/plugins/mp3extractor.c:185 src/plugins/qtextractor.c:165
+#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:165
msgid "Beat"
msgstr "Nhịp phách"
-#: src/plugins/mp3extractor.c:186 src/plugins/qtextractor.c:166
+#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:166
msgid "Christian Gangsta Rap"
msgstr "Rap kẻ cướp Cơ đốc"
-#: src/plugins/mp3extractor.c:187 src/plugins/qtextractor.c:167
+#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:167
msgid "Heavy Metal"
msgstr "Kim nặng"
-#: src/plugins/mp3extractor.c:188 src/plugins/qtextractor.c:168
+#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:168
msgid "Black Metal"
msgstr "Kim đen"
-#: src/plugins/mp3extractor.c:189 src/plugins/qtextractor.c:169
+#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:169
msgid "Crossover"
msgstr "Xuyên chéo"
-#: src/plugins/mp3extractor.c:190 src/plugins/qtextractor.c:170
+#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:170
msgid "Contemporary Christian"
msgstr "Cơ-đốc đương thời"
-#: src/plugins/mp3extractor.c:191 src/plugins/qtextractor.c:171
+#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:171
msgid "Christian Rock"
msgstr "Rốc Cơ-đốc"
-#: src/plugins/mp3extractor.c:192 src/plugins/qtextractor.c:172
+#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:172
msgid "Merengue"
msgstr "Me-ren-gê"
-#: src/plugins/mp3extractor.c:193 src/plugins/qtextractor.c:173
+#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:173
msgid "Salsa"
msgstr "San-sa"
-#: src/plugins/mp3extractor.c:194 src/plugins/qtextractor.c:174
+#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:174
msgid "Thrash Metal"
msgstr "Kim quẫy đập"
-#: src/plugins/mp3extractor.c:195 src/plugins/qtextractor.c:175
+#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:175
msgid "Anime"
msgstr "A-ni-mê"
-#: src/plugins/mp3extractor.c:196 src/plugins/qtextractor.c:176
+#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:176
msgid "JPop"
msgstr "JPốp"
-#: src/plugins/mp3extractor.c:197 src/plugins/qtextractor.c:177
+#: src/plugins/mp3extractor.c:198 src/plugins/qtextractor.c:177
msgid "Synthpop"
msgstr "Pốp tổng hợp"
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "stereo"
msgstr "âm lập thể"
-#: src/plugins/mp3extractor.c:433 src/plugins/wavextractor.c:119
+#: src/plugins/mp3extractor.c:444 src/plugins/wavextractor.c:119
msgid "mono"
msgstr "một nguồn"
-#: src/plugins/mp3extractor.c:434
+#: src/plugins/mp3extractor.c:445
msgid "(variable bps)"
msgstr "(bit/giây thay đổi)"
Modified: Extractor/src/include/extractor.h
===================================================================
--- Extractor/src/include/extractor.h 2008-03-21 05:47:55 UTC (rev 6580)
+++ Extractor/src/include/extractor.h 2008-03-21 06:00:52 UTC (rev 6581)
@@ -32,7 +32,7 @@
* 0.2.6-1 => 0x00020601
* 4.5.2-0 => 0x04050200
*/
-#define EXTRACTOR_VERSION 0x00051901
+#define EXTRACTOR_VERSION 0x00052000
#include <stdio.h>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6581 - in Extractor: . contrib doc po src/include,
gnunet <=