[xiph-commits] r9477 - trunk/vorbis-tools/po

[thomasvs at motherfish-iii.xiph.org]

Author: thomasvs
Date: 2005-06-18 09:36:46 -0700 (Sat, 18 Jun 2005)
New Revision: 9477

Added:
   trunk/vorbis-tools/po/Makevars
Modified:
   trunk/vorbis-tools/po/
   trunk/vorbis-tools/po/be.po
   trunk/vorbis-tools/po/cs.po
   trunk/vorbis-tools/po/da.po
   trunk/vorbis-tools/po/es.po
   trunk/vorbis-tools/po/fr.po
   trunk/vorbis-tools/po/hr.po
   trunk/vorbis-tools/po/hu.po
   trunk/vorbis-tools/po/nl.po
   trunk/vorbis-tools/po/ro.po
   trunk/vorbis-tools/po/ru.po
   trunk/vorbis-tools/po/sv.po
   trunk/vorbis-tools/po/uk.po
   trunk/vorbis-tools/po/vorbis-tools.pot
Log:
update translations
ignore more files in po/



Property changes on: trunk/vorbis-tools/po
___________________________________________________________________
Name: svn:ignore
   - Makefile.in

   + Makefile.in
remove-potcdate.sin
*.sed
Makefile
Rules-quot
insert-header.sin
POTFILES
stamp-fo
en*.header


Added: trunk/vorbis-tools/po/Makevars
===================================================================
--- trunk/vorbis-tools/po/Makevars	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/Makevars	2005-06-18 16:36:46 UTC (rev 9477)
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = http://trac.xiph.org/
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =

Modified: trunk/vorbis-tools/po/be.po
===================================================================
--- trunk/vorbis-tools/po/be.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/be.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2003-10-21 11:45+0300\n"
 "Last-Translator: Ales Nyakhaychyk <nab at mail.by>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
@@ -16,74 +17,76 @@
 "X-Generator: KBabel 0.9.6\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Памылка: нестае памяці ў malloc_action().\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Памылка: немагчыма атрымаць памяць у malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Памылка: прылада недасяжная.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr ""
 "Памылка: %s патрабуе каб назва файла вываду была задана з выбарам -f.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Памылка: дадатковае значэньне выбру не падтрымліваецца прыладай %s.\n"
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Памылка: немагчыма адчыніць прыладу %s.\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Памылка: памылка прылады %s.\n"
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Памылка: файл вываду не павінен ужывацца для прылады %s.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Памылка: немагчыма адчыніць файл %s на запіс.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Памылка: файл %s ужо йснуе.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr ""
 "Памылка: гэтая памылка ніколі не павінна здарацца (%d).\n"
 "Хавайся ў бульбу!\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Памылка: нестае памяці ў new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Памылка: нестае памяці ў new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Памылка: нестае памяці ў new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Памылка: нестае памяці ў decoder_buffered_metadata_callback().\n"
 
@@ -96,56 +99,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Памылка разбору: %s у радку %d з %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Назва"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Апісаньне"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Від"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Дапомна"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr "ніякі"
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr "лягічаскі"
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr "знакавы"
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr "радковы"
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr "цэлалікавы"
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr "сапраўнды"
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr "double"
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr "іншы"
 
@@ -153,9 +159,9 @@
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(ніякі)"
 
@@ -183,16 +189,16 @@
 msgid "Unknown error"
 msgstr "Невядомая памылка"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "Унутраная памылка разбору выбараў загаднага радка.\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Памер буфэра ўводу меншы за найменшы памер, роўны %d Кб."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -201,44 +207,44 @@
 "=== Памылка \"%s\" разбору выбараў, вызначаных у загадным радку.\n"
 "=== Выбар: %s\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Магчымыя выбары:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Няма такой прылады: %s.\n"
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Драйвэр %s ня выводзіць у файл.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "=== Нельга вызначаць файл вываду, ня вызначыўшы драйвэр.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Недакладны фармат выбара: %s.\n"
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Недапушчальнае значэньне прэбуфэра. Прамежак: 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 з %s %s\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Немагчыма граць кожны 0-вы кавалак!\n"
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -246,18 +252,22 @@
 "--- Немагчыма граць кожны кавалак 0 разоў.\n"
 "--- Каб праверыць дэкаваньне, выкарыстоўвайце драйвэр вываду null.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr ""
 "--- Немагчыма прачытаць сьпіс файлаў %s для прайграваньня. Прапушчана.\n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Драйвэр %s, які вызначаны ў файле наладак, недапушчальны.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -265,7 +275,7 @@
 "=== Немагчыма загрузіць дапомны драйвэр і няма вызначэньня драйвэра ў файле\n"
 "наладак. Выхад.\n"
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -290,26 +300,28 @@
 "    Магчамыя прылады ('*'=жывая, '@'=файл):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=назва_файла       Усталёўвае назву файла вываду для папярэдне\n"
 "                             вызначанай прылады file (з дапамогай -d).\n"
@@ -332,24 +344,25 @@
 "на працягу s мілісэкундаў прымушаюць ogg123 выйсьці.\n"
 "  -l, --delay=s              Усталяваць s [мілісэкунды] (дапомна 500).\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Памылка: нестае памяці.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Памылка: немагчыма атрымаць памяць у malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Памылка: немагчыма вызначыць маску сыгнала."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Памылка: немагчыма стварыць буфэр уводу.\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "дапомная прылада вываду"
@@ -358,7 +371,7 @@
 msgid "shuffle playlist"
 msgstr "выпадковае прайграваньне"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -368,94 +381,94 @@
 "\n"
 "Прылада аўдыё:   %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Стваральнік:   %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "Камэнтары: %s"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Увага: немагчыма прачытаць тэчку %s.\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Памылка: немагчыма стварыць аўдыёбуфэр.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Немагчыма адшукаць модуль, каб чытаць з %s.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Немагчыма адчыніць %s.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Фармат файла %s не падтрымліваецца.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 "Памылка адчыненьня %s з дапамогай модуля %s.  Магчыма файл пашкоджаны.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Прайграваньне: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Немагчыма абмінуць %f сэкундаў."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Памылка: памылка дэкадаваньня.\n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Зроблена."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Дзірка ў плыні; магчыма, гэта бясшкодна\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Бібліятэка Vorbis паведаміла пра памылку плыні.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Бітавая плыня: %d канал(ы), %ldГц"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr "Падказкі бітрэйту: верхні=%ld пачатковы=%ld ніжні=%ld вакно=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Закадавана ўжываючы: %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
+#, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Памылка: нестае памяці ў create_playlist_member().\n"
 
@@ -465,6 +478,7 @@
 msgstr "Папярэджаньне ад сьпісу %s: немагчыма прачытаць тэчку %s.\n"
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
+#, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Памылка: нестае памяці ў playlist_to_array().\n"
 
@@ -485,6 +499,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Памылка атрыманьня памяці ў stats_init()\n"
 
@@ -518,78 +533,100 @@
 msgid " Output Buffer %5.1f%%"
 msgstr " Буфэр вываду %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Памылка: немагчыма атрымаць памяць у malloc_data_source_stats()\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "Чытач файлаў WAV"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "Чытач файлаў AIFF/AIFC"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "Чытач файлаў WAV"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "Чытач файлаў WAV"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўка WAV.\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Пропуск кавалка віду \"%s\", даўжынёй %d.\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўку AIFF.\n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Увага: ня знойдзена ніводнага агульнага кавалка ў AIFF файле.\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Увага: няпоўны агульны кавалак у загалоўку AIFF.\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўку AIFF.\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Увага: няпоўны загаловак AIFF-C.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Увага: сьціснутыя AIFF-C не падтрымліваюцца.\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Увага: кавалак SSND ня знойдзены ў AIFF файле.\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Увага: сапсаваны кавалак SSND у загалоўку AIFF.\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўку AIFF.\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "Увага: oggenc не падтрымлівае гэткі від файлаў AIFF/AIFC.\n"
 " Мае быць 8-мі ці 16-ці бітавым ІКМ.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Увага: нераспазнаны фармат кавалка ў загалоўку WAV.\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -597,7 +634,8 @@
 "Увага: недапушчальны фармат кавалка ў загалоўку WAV.\n"
 " Усё адно спраба прачытаць (магчыма не спрацуе)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
@@ -605,8 +643,8 @@
 "ПАМЫЛКА: від WAV файла не падтрымліваецца (мае быць стандартны ІКМ\n"
 "ці ІКМ 3-га віду з незамацаванай коскай.\n"
 
-#: oggenc/audio.c:466
-#, fuzzy
+#: oggenc/audio.c:480
+#, fuzzy, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
@@ -614,16 +652,18 @@
 "ПАМЫЛКА: падфармат файла WAV не падтрымліваецца (мае быць 16 бітавы\n"
 "ІКМ ці ІКМ з незамацаванай коскай.\n"
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
@@ -632,63 +672,78 @@
 "абрэзаны.\n"
 "Калі ласка, паведаміце пра гэта распрацоўнікам праграмы.\n"
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Немагчыма распачаць рэсэмплер.\n"
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Пашыраны выбар \"%s\" кадавальніка ўсталяваны ў %s.\n"
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Часьціня зьмененая з %f кГц у %f кГц.\n"
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Невядомы дадатковы выбар \"%s\".\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
 msgstr ""
 "255 каналаў павінна хапіць кожнаму. (Нажаль vorbis не падтрымлівае болей)\n"
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Запыт найменшага ці найбольшага бітрэйту патрабуе \"--managed\".\n"
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Няўдалае распачынаньне рэжыму: недапушчальнае значэньне якасьці.\n"
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "Няўдалае распачынаньне рэжыму: недапушчальнае значэньне бітрэйту.\n"
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Няўдалы запіс загалоўку ў плыню вываду.\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Няўдалы запіс даньняў у плыню вываду.\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [засталось %2d хв %.2d с] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tКадаваньне [%2d хв %.2d с пакуль] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -699,7 +754,8 @@
 "\n"
 "Файл \"%s\" закадаваны.\n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -709,7 +765,7 @@
 "\n"
 "Кадаваньне скончана.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -718,17 +774,17 @@
 "\n"
 "\tДаўжыня файла:  %d хв %04.1f с.\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tПрайшло часу: %d хв %04.1f с.\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tХуткасьць:         %.4f.\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -737,7 +793,7 @@
 "\tСярэдні бітрэйт: %.1f Кбіт/с.\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -748,17 +804,17 @@
 "         %s%s%s \n"
 "зь сярэднім бітрэйтам %d кбіт/с"
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "стандартны ўвод"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "стандартны вывад"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -769,7 +825,7 @@
 "         %s%s%s \n"
 "з прыблізным бітрэйтам %d Кбіт/с (з выкарыстаньнем VBR)\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -780,7 +836,7 @@
 "         %s%s%s \n"
 "з узроўнем якасьці %2.2f ужываючы вымушаны VBR "
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -791,7 +847,7 @@
 "         %s%s%s \n"
 "зь якасьцю %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -802,7 +858,7 @@
 "         %s%s%s \n"
 "выкарыстоўваючы кіраваньне бітрэйтам "
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -811,11 +867,13 @@
 "%s%s\n"
 "ПАМЫЛКА: ня вызначаныя файлы ўводу. Паспрабуце -h для даведкі.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "Памылка: некалькі файлаў вызначана пры ўжываньні стандартнага ўводу.\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
@@ -823,26 +881,27 @@
 "ПАМЫЛКА: некалькі файлаў уводу з вызначанай назвай файла вываду;\n"
 "лепей выкарыстоўвайце -n\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ПАМЫЛКА: немагчыма адкрыць файл уводу \"%s\": %s\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Адкрыцьцё модулем %s: %s\n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "ПАМЫЛКА: фармат файла ўводу \"%s\" не падтрымліваецца.\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "УВАГА: няма назвы файла, дапомная назва \"default.ogg\".\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
@@ -850,30 +909,37 @@
 "ПАМЫЛКА: немагчыма стварыць падтэчкі, патрэбныя для назвы файла вываду \"%s"
 "\".\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr "Назвы файлаў уводу й вываду не павінны супадаць\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ПАМЫЛКА: немагчыма адкрыць файл вываду \"%s\": %s\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Рэсэмплінг уводу з %d Гц да %d Гц.\n"
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Пераўтварэньне якасьці са стэрэа ў мона.\n"
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, fuzzy, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "ПАМЫЛКА: зьмяненьне немагчымае, апроч са стэрэа ў мона.\n"
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -883,6 +949,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -890,25 +957,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -956,8 +1040,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1077,107 +1162,118 @@
 "дапамогай -o.\n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr "УВАГА: праігнараваны няправільны запабежны знак '%c' у фармаце імя\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "Задзейнічаньне мэханізму кіраваньня бітрэйтам\n"
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "УВАГА: вызначаны парадак байтаў для няпростых даных. Лічым уваход простым.\n"
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "УВАГА: немагчыма прачытаць парамэтар парадку байтаў \"%s\"\n"
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "УВАГА: немагчыма прачытаць часьціню рэсэмплінгу \"%s\"\n"
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr "Увага: вызначана часьціня рэсэмплінгу %d Hz. Мелася на ўвазе %d Hz?\n"
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Увага: немагчыма прачытаць тэчку %s.\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Ня знойдзена значэньне для зададзенай пашыранай опцыі кадаваньніка\n"
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Нутраная памылка разбору опцый каманднага радка\n"
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Увага: няправільны камэнтар (\"%s\"), праігнараваны.\n"
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Увага: намінальны бітрэйт \"%s\" не распазнаны\n"
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Увага: мінімальны бітрэйт \"%s\" не распазнаны\n"
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Увага: максымальны бітрэйт \"%s\" не распазнаны\n"
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Не распазнаная опцыя якасьці \"%s\", праігнараваная\n"
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr "УВАГА: запытана завысокая якасьць, устаноўлена ў максымальную.\n"
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "УВАГА: вызначана колькі фарматаў імя, ужыты апошні\n"
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr "УВАГА: вызначана колькі фільтраў фармату імя, ужыты апошні\n"
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr "УВАГА: вызначана колькі фільтраў замены фармату імя, ужыты апошні\n"
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr "УВАГА: вызначана колькі выходных файлаў, лепей ужывай -n\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "УВАГА: вызначаныя біты на сэмпл для няпростых даных. Лічым уваход простым.\n"
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "УВАГА: вызначаныя біты на сэмпл няправільныя, прынята 16.\n"
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
@@ -1185,31 +1281,35 @@
 "УВАГА: вызначаная колькасьць каналаў для няпростых даных. Лічым уваход "
 "простым.\n"
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "УВАГА: вызначаная няправільная колькасьць каналаў, прынята 2.\n"
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "УВАГА: вызначаная часьціня для няпростых даных. Лічым уваход простым.\n"
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr "УВАГА: вызначаная няправільная часьціня, прынята 44100.\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "УВАГА: вызначана невядомая опцыя, праігнараваная->\n"
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Немагчыма сканвэртаваць камэнтар у UTF-8, немагчыма дадаць\n"
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr "УВАГА: вызначана замала загалоўкаў, даўнімаецца апошні загаловак.\n"
 
@@ -1228,15 +1328,173 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Памылка: сэгмэнт шляху \"%s\" не зьяўляецца каталёгам\n"
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
+#, fuzzy, c-format
+msgid ""
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
+msgstr ""
+"Увага: камэнтар %d ў патоку %d няправільна адфарматаваны, ня ўтрымлівае '=': "
+"\"%s\"\n"
+
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+"Увага: імя поля камэнтара ў камэнтары %d (паток %d) няправільнае: \"%s\"\n"
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+"Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): "
+"маркер даўжыні няправільны\n"
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+"Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): "
+"замала байтаў\n"
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+"Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): "
+"няправільная пасьлядоўнасьць\n"
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr "Увага: памылка ў дэкодэры utf8. Павінна быць немагчымым\n"
+
+#: ogginfo/ogginfo2.c:318
+#, fuzzy, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+"Увага: немагчыма раскадаваць пакет загалоўку vorbis - няправільны паток "
+"vorbis (%d)\n"
+
+#: ogginfo/ogginfo2.c:325
+#, fuzzy, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
+msgstr ""
+"Увага: паток Vorbis %d утрымлівае няправільна акантаваныя загалоўкі. Апошняя "
+"старонка загалоўкаў утрымлівае дадатковыя пакеты ці granulepos ня роўнае "
+"нулю\n"
+
+#: ogginfo/ogginfo2.c:329
+#, fuzzy, c-format
+msgid "Theora headers parsed for stream %d, information follows...\n"
+msgstr "Загалоўкі Vorbis разабраныя ў патоку %d, зьвесткі ніжэй...\n"
+
+#: ogginfo/ogginfo2.c:332
+#, fuzzy, c-format
+msgid "Version: %d.%d.%d\n"
+msgstr "Вэрсія: %d\n"
+
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
+#, c-format
+msgid "Vendor: %s\n"
+msgstr "Распаўсюднік: %s\n"
+
+#: ogginfo/ogginfo2.c:335
+#, c-format
+msgid "Width: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:336
+#, fuzzy, c-format
+msgid "Height: %d\n"
+msgstr "Вэрсія: %d\n"
+
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
+msgid "User comments section follows...\n"
+msgstr "Камэнтары карыстальніка йдуць ніжэй...\n"
+
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+#, fuzzy
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "Увага: granulepos у патоку %d зьмяншаецца ад "
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, fuzzy, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr "Увага: granulepos у патоку %d зьмяншаецца ад "
+
+#: ogginfo/ogginfo2.c:432
+#, fuzzy
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Плыня Vorbis %d:\n"
+"\tАгульная даўжыня даньняў: %ld байтаў\n"
+"\tДаўжыня прайграваньня: %ldm:%02ld s.\n"
+"\tСярэдні бітрэйт: %f кбіт/с\n"
+
+#: ogginfo/ogginfo2.c:438
+#, fuzzy, c-format
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Плыня Vorbis %d:\n"
+"\tАгульная даўжыня даньняў: %ld байтаў\n"
+"\tДаўжыня прайграваньня: %ldm:%02ld s.\n"
+"\tСярэдні бітрэйт: %f кбіт/с\n"
+
+#: ogginfo/ogginfo2.c:466
+#, c-format
+msgid ""
 "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 "Увага: немагчыма раскадаваць пакет загалоўку vorbis - няправільны паток "
 "vorbis (%d)\n"
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
 "Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
@@ -1246,32 +1504,27 @@
 "старонка загалоўкаў утрымлівае дадатковыя пакеты ці granulepos ня роўнае "
 "нулю\n"
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:477
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Загалоўкі Vorbis разабраныя ў патоку %d, зьвесткі ніжэй...\n"
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Вэрсія: %d\n"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Распаўсюднік: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:183
+#: ogginfo/ogginfo2.c:492
 #, c-format
-msgid "Vendor: %s\n"
-msgstr "Распаўсюднік: %s\n"
-
-#: ogginfo/ogginfo2.c:184
-#, c-format
 msgid "Channels: %d\n"
 msgstr "Каналаў: %d\n"
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1280,152 +1533,108 @@
 "Ступень: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:188
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Пачатковы бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:191
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Пачатковы бітрэйт ня вызначаны\n"
 
-#: ogginfo/ogginfo2.c:194
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Найбольшы бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:197
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Найбольшы бітрэйт ня вызначаны\n"
 
-#: ogginfo/ogginfo2.c:200
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Найменшы бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:203
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Найменшы бітрэйт ня вызначаны\n"
 
-#: ogginfo/ogginfo2.c:206
-msgid "User comments section follows...\n"
-msgstr "Камэнтары карыстальніка йдуць ніжэй...\n"
-
-#: ogginfo/ogginfo2.c:218
-#, c-format
+#: ogginfo/ogginfo2.c:539
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Negative granulepos on vorbis stream outside of headers. This file was "
+"created by a buggy encoder\n"
 msgstr ""
-"Увага: камэнтар %d ў патоку %d няправільна адфарматаваны, ня ўтрымлівае '=': "
-"\"%s\"\n"
 
-#: ogginfo/ogginfo2.c:227
-#, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Увага: імя поля камэнтара ў камэнтары %d (паток %d) няправільнае: \"%s\"\n"
-
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
-#, c-format
+#: ogginfo/ogginfo2.c:561
+#, fuzzy
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): "
-"маркер даўжыні няправільны\n"
+"Плыня Vorbis %d:\n"
+"\tАгульная даўжыня даньняў: %ld байтаў\n"
+"\tДаўжыня прайграваньня: %ldm:%02ld s.\n"
+"\tСярэдні бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:275
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): "
-"замала байтаў\n"
-
-#: ogginfo/ogginfo2.c:336
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
-msgstr ""
-"Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): "
-"няправільная пасьлядоўнасьць\n"
-
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr "Увага: памылка ў дэкодэры utf8. Павінна быць немагчымым\n"
-
-#: ogginfo/ogginfo2.c:366
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-msgstr "Увага: granulepos у патоку %d зьмяншаецца ад "
-
-#: ogginfo/ogginfo2.c:369
+#: ogginfo/ogginfo2.c:567
 #, fuzzy, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
-msgstr "Увага: granulepos у патоку %d зьмяншаецца ад "
-
-#: ogginfo/ogginfo2.c:375
 msgid ""
-"Negative granulepos on vorbis stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:395
-#, c-format
-msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 "Плыня Vorbis %d:\n"
 "\tАгульная даўжыня даньняў: %ld байтаў\n"
 "\tДаўжыня прайграваньня: %ldm:%02ld s.\n"
 "\tСярэдні бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Увага: канец-патоку ня вызначаны ў патоку %d\n"
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Увага: Няправільная старонка загалоўкаў, ня знойдзена пакетаў\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 "Увага: няправільная старонка загалоўкаў у патоку %d, утрымлівае колькі "
 "пакетаў\n"
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 #, fuzzy
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr "Увага: Дзірка ў даных знойдзена на прыблізнай адлегласьці "
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, fuzzy, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr "Увага: Дзірка ў даных знойдзена на прыблізнай адлегласьці "
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Памылка адкрыцьця файла ўводу \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1434,25 +1643,25 @@
 "Апрацоўка файла \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Немагчыма знайсьці апрацоўшчыка для патока, bailing\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, fuzzy, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -1461,22 +1670,22 @@
 "Увага: недапушчальна разьмешчаныя старонкі ў лягічным патоку %d\n"
 "Гэта сьведчыць аб пашкоджанасьці файла ogg.\n"
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Новы лягічны паток (#%d, нумар: %08x): тып %s\n"
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Увага: сьцяг пачатку патока не ўстаноўлены ў патоку %d\n"
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "Увага: сьцяг пачатку патока знойдзены ў сярэдзіне патока %d\n"
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
@@ -1485,12 +1694,12 @@
 "Увага: прабел у нумарах пасьлядоўнасьцяў у патоку %d. Атрыманая старонка %"
 "ld, але чакалася старонка %ld. Сьведчыць пра адсутнасьць даных.\n"
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Лягічная плыня %d скончылася\n"
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1499,11 +1708,11 @@
 "Памылка: ня знойдзена даных ogg у файле \"%s\".\n"
 "Уваход, магчыма, ня ogg.\n"
 
-#: ogginfo/ogginfo2.c:713
-#, fuzzy
+#: ogginfo/ogginfo2.c:905
+#, fuzzy, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1528,7 +1737,8 @@
 "         для некаторых тыпаў патокаў.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1542,7 +1752,8 @@
 "і дыягназаваньня іхных праблем.\n"
 "Поўная даведка адлюстроўваецца па \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:763
+#: ogginfo/ogginfo2.c:955
+#, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Ня вызначана ўваходных файлаў. \"ogginfo -h\" для даведкі\n"
 
@@ -1566,19 +1777,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: опцыя `%s' патрабуе парамэтар\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: нераспазнаная опцыя `--%s'\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: нераспазнаная опцыя `%c%s'\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1589,7 +1797,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: няправільная опцыя -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1606,34 +1813,37 @@
 msgstr "%s: опцыя `-W %s' не павінная мець парамэтра\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Памылка старонкі. Пашкоджаны ўваход.\n"
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Памылка бітавагай плыні, працяг...\n"
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "Знодзены канец-плыні раней за пункт разрэзкі.\n"
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Устаноўка канца плыні: абнаўленьне сынхра вернула 0\n"
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Пункт разрэзкі па-за плыняй. Другі файл будзе пустым\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Некіраваны асобны выпадак: першы файл занадта кароткі?\n"
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -1642,43 +1852,52 @@
 "         старонку ogg. Файл можа няправільна дэкадавацца.\n"
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Памылка бітавай плыні якую можна выправіць\n"
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr "Памылка бітавай плыні\n"
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr "Абнаўленьне сынхра вернула 0, усталяваньне канца плыні\n"
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "Увод - ня ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "Памылка на першай старонцы\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "Памылка ў першым скрутку\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Памылка ў першасным загалоўку: ня vorbis?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Пашкоджаны другасны загаловак\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "EOF (канец файла) ў загалоўках\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr ""
@@ -1686,6 +1905,7 @@
 "пункт_разрэзкі\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1721,18 +1941,22 @@
 msgstr "Апрацоўка: разрэз ля %lld\n"
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr "Памылка апрацоўкі\n"
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr "Памылка чатаньня загалоўкаў\n"
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr "Памылка запісу першага файла вываду\n"
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr "Памылка запісу другога файла вываду\n"
 
@@ -1768,43 +1992,40 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "Пашкоджаныя ці прапушчаныя даньні, працяг..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 "Памылка запісу плыні ў вывад. Выходная плынь можа быць пашкоджана ці "
 "абрэзана."
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Няўдалае адчыненьне файла як vorbis: %s\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Кепскі камэнтар: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "кепскі камэнтар: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Памылка запісу камэнтароў у файл вываду: %s\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr "дзеяньне ня вызначана\n"
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr "Немагчыма пераўтварыць камэнтар у UTF8, немагчыма дадаць\n"
-
-#: vorbiscomment/vcomment.c:287
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1824,7 +2045,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1853,44 +2074,49 @@
 "   ужываньні vorbiscomment у сцэнарах. Аднак, гэтага не дастаткова\n"
 "   для поўнага абарачэньня камэнтароў ва ўсіх выпадках.\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Унутраная памылка апрацоўкі выбараў загаду\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Памылка адкрыцьця файла ўводу \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Назвы файлаў уводу й вываду не павінны супадаць\n"
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Памылка адкрыцьця файла вываду \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Памылка адкрыцьця файла камэнтараў \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Памылка адкрыцьця файла камэнтараў \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Памылка выдаленьня старога файла %s\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Памылка перайменаваньня \"%s\" у \"%s\"\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr "Немагчыма пераўтварыць камэнтар у UTF8, немагчыма дадаць\n"
+
 #~ msgid "malloc"
 #~ msgstr "malloc"
 

Modified: trunk/vorbis-tools/po/cs.po
===================================================================
--- trunk/vorbis-tools/po/cs.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/cs.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2003-04-30 22:59+0200\n"
 "Last-Translator: Miloslav Trmac <mitr at volny.cz>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
@@ -15,71 +16,73 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Chyba: Nedostatek paměti v malloc_action().\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Chyba: Nemohu alokovat paměť v malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Chyba: Zařízení není dostupné.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr "Chyba: %s vyžaduje určení názvu souboru výstupu pomocí -f.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Chyba: Nepodporovaná hodnota přepínače zařízení %s.\n"
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Chyba: Nemohu otevřít zařízení %s.\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Chyba: Selhání zařízení %s.\n"
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Chyba: Výstupní soubor nemůže být pro zařízení %s zadán.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Chyba: Nemohu otevřít soubor %s pro zápis.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Chyba: Soubor %s již existuje.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Chyba: Tato chyba by se neměla nikdy stát (%d). Panikařím!\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Chyba: Nedostatek paměti v new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Chyba: Nedostatek paměti v new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Chyba: Nedostatek paměti v new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Chyba: Nedostatek paměti v decoder_buffered_metadata_callback().\n"
 
@@ -92,56 +95,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Chyba zpracování: %s na řádku %d souboru %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Název"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Popis"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Typ"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Implicitní"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr "žádný"
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr "bool"
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr "char"
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr "string"
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr "int"
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr "float"
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr "double"
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr "jiný"
 
@@ -149,9 +155,9 @@
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(žádný)"
 
@@ -179,17 +185,17 @@
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "Interní chyba při zpracovávání přepínačů na příkazovém řádku.\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr ""
 "Velikost vstupní vyrovnávací paměti menší než minimální velikost %d kB."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -199,44 +205,44 @@
 "řádku.\n"
 "=== Přepínač byl: %s\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Dostupné přepínače:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Takové zařízení %s neexistuje.\n"
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Ovladač %s není ovladač výstupu do souboru.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "=== Nelze určit výstupní soubor bez určení ovladače.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Nesprávný formát přepínače: %s.\n"
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Hodnota prebuffer neplatná. Rozsah je 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 z %s %s\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Nemohu přehrávat každý nultý úsek!\n"
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -244,17 +250,21 @@
 "--- Nemohu každý úsek přehrávat nulakrát.\n"
 "--- Pro provedení testovacího dekódování použijte výstupní ovladač null.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Nemohu otevřít soubor seznamu skladeb %s. Přeskočeno.\n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Ovladač %s zadaný v konfiguračním souboru je neplatný.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -262,7 +272,7 @@
 "=== Nemohu načíst implicitní ovladač a v konfiguračním souboru není určen "
 "žádný ovladač. Končím.\n"
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -287,26 +297,28 @@
 "      Možná zařízení jsou ('*'=živě, '@'=soubor):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=názevsouboru  Nastavit název souboru výstupu pro dříve určené\n"
 "      zařízení souboru (pomocí -d).\n"
@@ -327,24 +339,25 @@
 "s milisekund způsobí ukončení ogg123.\n"
 "  -l, --delay=s  nastavit s [milisekund] (implicitnÄ› 500).\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Chyba: Nedostatek paměti.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Chyba: Nemohu alokovat paměť v malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Chyba: Nemohu nastavit masku signálů."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Chyba: Nemohu vytvořit vstupní vyrovnávací paměť.\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "implicitní výstupní zařízení"
@@ -353,7 +366,7 @@
 msgid "shuffle playlist"
 msgstr "promíchat seznam skladeb"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -362,93 +375,93 @@
 "\n"
 "Zařízení zvuku: %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Autor:    %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "Poznámky: %s"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Varování: Nemohu číst adresář %s.\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Chyba: Nemohu vytvořit vyrovnávací paměť zvuku.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Nebyl nalezen žádný modul pro čtení z %s.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Nemohu otevřít %s.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Formát souboru %s není podporován.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr "Chyba při otevírání %s pomocí modulu %s. Soubor je možná poškozen.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Přehrávám: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Nemohu přeskočit %f vteřin zvuku."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Chyba: Selhání dekódování.\n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Hotovo."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Díra v proudu; pravděpodobně neškodná\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Knihovna vorbis ohlásila chybu proudu.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Bitový proud je %d kanálů, %ldHz"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr "Nápovědy bitrate: vyšší=%ld nominální=%ld nižší=%ld okno=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Kódováno s: %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
+#, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Chyba: Nedostatek paměti v create_playlist_member().\n"
 
@@ -458,6 +471,7 @@
 msgstr "Varování ze seznamu skladeb %s: Nemohu číst adresář %s.\n"
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
+#, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Chyba: Nedostatek paměti v playlist_to_array().\n"
 
@@ -478,6 +492,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Chyba alokace paměti v stats_init()\n"
 
@@ -511,78 +526,100 @@
 msgid " Output Buffer %5.1f%%"
 msgstr " Výstupní vyrovnávací paměť %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Chyba: Nemohu alokovat paměť v malloc_data_source_stats()\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "Čteč souborů WAV"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "Čteč souborů AIFF/AIFC"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "Čteč souborů WAV"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "Čteč souborů WAV"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Varování: Neočekávaný EOF při čtení hlavičky WAV\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Přeskakuji úsek typu \"%s\", délka %d\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Varování: Neočekávaný EOF v úseku AIFF\n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Varování: V souboru AIFF nenalezen žádný společný úsek\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Varování: Useknutý společný úsek v hlavičce AIFF\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Varování: Neočekávaný EOF při čtení hlavičky AIFF\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Varování: Hlavička AIFF-C useknuta.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Varování: Neumím obsloužit komprimované AIFF-C\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Varování: V souboru AIFF nenalezen úsek SSND\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Varování: V hlavičce AIFF nalezen poškozený úsek SSND\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Varování: Neočekávaný EOF při čtení hlavičky AIFF\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "Varování: OggEnc nepodporuje tento typ souboru AIFF/AIFC\n"
 " Musí to být osmi nebo šestnáctibitový PCM.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Varování: Úsek nerozpoznaného formátu v hlavičce WAV\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -590,7 +627,8 @@
 "Varování: Úsek NEPLATNÉHO formátu v hlavičce wav.\n"
 " Zkouším přesto číst (možná nebude fungovat)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
@@ -598,8 +636,8 @@
 "CHYBA: Soubor wav je nepodporovaného typu (musí být standardní PCM\n"
 " nebo PCM s plovoucí desetinnou čárku typu 3\n"
 
-#: oggenc/audio.c:466
-#, fuzzy
+#: oggenc/audio.c:480
+#, fuzzy, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
@@ -607,16 +645,18 @@
 "CHYBA> Soubor wav je nepodporované subformátu (musí být šestnáctibitový\n"
 "PCM nebo PCM s plovoucí desetinnou čárkou\n"
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
@@ -624,63 +664,78 @@
 "CHYBA: Dostal jsem nula vzorků z převzorkovávače: váš soubor bude useknut. "
 "Nahlaste toto prosím.\n"
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Nemohu inicializovat převzorkovávač\n"
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Nastavuji pokročilý přepínač \"%s\" enkodéru na %s\n"
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Změněna frekvence lowpass z %f kHz na %f kHz\n"
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Nerozpoznaný pokročilý přepínač \"%s\"\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
 msgstr ""
 "255 kanálů by mělo být dost pro všechny. (Lituji, vorbis nepodporuje více)\n"
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Požadování minimální nebo maximální bitrate vyžaduje --managed\n"
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Inicializace režimu selhala: neplatné parametry pro kvalitu\n"
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "Inicializace režimu selhala: neplatné parametry pro bitrate\n"
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Nemohu zapsat hlavičku do výstupního proudu\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Nemohu zapisovat data do výstupního proudu\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [%2dm%.2ds zbývá] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tKóduji [zatím %2dm%.2ds] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -691,7 +746,8 @@
 "\n"
 "Kódování souboru \"%s\" hotovo\n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -701,7 +757,7 @@
 "\n"
 "Kódování hotovo.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -710,17 +766,17 @@
 "\n"
 "\tDélka souboru:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tStrávený čas: %dm %04.1fs\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tPoměr:        %.4f\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -729,7 +785,7 @@
 "\tPrůměr bitrate:  %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -740,17 +796,17 @@
 "         %s%s%s \n"
 "při průměrné bitrate %d kb/s "
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "standardní vstup"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "standardní výstup"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -761,7 +817,7 @@
 "       %s%s%s \n"
 "při průměrné bitrate %d kb/s (VBR kódování povoleno)\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -772,7 +828,7 @@
 "       %s%s%s \n"
 "při úrovni kvality %2.2f s použitím omezeného VBR "
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -783,7 +839,7 @@
 "       %s%s%s \n"
 "při kvalitě %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -794,7 +850,7 @@
 "       %s%s%s \n"
 "s použitím správy bitrate "
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -803,11 +859,13 @@
 "%s%s\n"
 "CHYBA: Neurčeny vstupní soubory. Použijte -h pro nápovědu.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "CHYBA: Při použití stdin určeno více souborů\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
@@ -815,26 +873,27 @@
 "CHYBA: Více vstupních souborů s určeným názvem souboru výstupu: doporučuji "
 "použít -n\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "CHYBA: Nemohu otevřít vstupní soubor \"%s\": %s\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Otevírám pomocí modulu %s: %s\n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "CHYBA: Vstupní soubor \"%s\" není v podporovaném formátu\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "VAROVÁNÍ: Žádný název souboru, implicitně \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
@@ -842,30 +901,38 @@
 "CHYBA: Nemohu vytvořit požadované podadresáře pro jméno souboru výstupu \"%s"
 "\"\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr ""
+"Název vstupního souboru nemůže být stejný jako název výstupního souboru\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "CHYBA: Nemohu otevřít výstupní soubor \"%s\": %s\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Převzorkovávám vstup z %d Hz do %d Hz\n"
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Mixuji stereo na mono\n"
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, fuzzy, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "CHYBA: Neumím mixovat kromě stereo do mono\n"
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -875,6 +942,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -882,25 +950,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -948,8 +1033,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1053,111 +1139,122 @@
 " pomocí -o\n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr "VAROVÁNÍ: Ignoruji neplatný znak '%c' ve formátu názvu\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "Povoluji systém správy bitrate\n"
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "VAROVÁNÍ: Přímá endianness zadána pro nepřímá data. Předpokládám, že vstup "
 "je přímý.\n"
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "VAROVÁNÍ: Nemohu přečíst argument endianness \"%s\"\n"
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "VAROVÁNÍ: Nemohu přečíst frekvenci převzorkování \"%s\"\n"
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 "Varování: Frekvence převzorkování zadána jako %d Hz. Mysleli jste %d Hz?\n"
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Varování: Nemohu číst adresář %s.\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Nenalezena žádná hodnota pro pokročilý přepínač enkodéru\n"
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Interní chyba při zpracovávání přepínačů příkazového řádku\n"
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Varování: Použita neplatná poznámka (\"%s\"), ignoruji.\n"
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Varování: nominální bitrate \"%s\" nerozpoznána\n"
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Varování: minimální bitrate \"%s\" nerozpoznána\n"
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Varování: maximální bitrate \"%s\" nerozpoznána\n"
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Přepínač kvality \"%s\" nerozpoznán, ignoruji jej\n"
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 "VAROVÁNÍ: nastavení kvality příliš vysoké, nastavuji na maximální kvalitu.\n"
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "VAROVÁNÍ: Zadáno více formátů názvu, používám poslední\n"
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr "VAROVÁNÍ: Zadáno více filtrů formátu názvu, používám poslední\n"
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr "VAROVÁNÍ: Zadáno více náhrad filtr formátu názvu, používám poslední\n"
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr "VAROVÁNÍ: Zadáno více výstupních souborů, doporučuji použít -n\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "VAROVÁNÍ: Přímý počet bitů/vzorek zadán pro nepřímá data. Předpokládám, že "
 "vstup je přímý.\n"
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "VAROVÁNÍ: Zadán neplatný počet bitů/vzorek, předpokládám 16.\n"
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
@@ -1165,32 +1262,36 @@
 "VAROVÁNÍ: Přímý počet kanálů zadán po nepřímá data. Předpokládám, že vstup "
 "je přím.\n"
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "VAROVÁNÍ: Zadán neplatný počet kanálů, předpokládám 2.\n"
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "VAROVÁNÍ: Přímá vzorkovací frekvence zadána pro nepřímá data. Předpokládám, "
 "že vstup je přímý.\n"
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr "VAROVÁNÍ: Určena neplatná vzorkovací frekvence, předpokládám 44100.\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "VAROVÁNÍ: Zadán neplatný přepínač, ignoruji->\n"
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Nemohu převést poznámku do UTF-8, nemohu ji přidat\n"
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 "VAROVÁNÍ: Zadáno nedostatečně názvů, implicitně používám poslední název.\n"
@@ -1210,15 +1311,172 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Chyba: segment cesty \"%s\" není adresář\n"
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
+#, fuzzy, c-format
+msgid ""
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
+msgstr ""
+"Varování: Poznámka %d v proudu %d je neplatně formátovaná, neobsahuje '=': "
+"\"%s\"\n"
+
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+"Varování: Neplatný název pole poznámky v poznámce %d (proud %d): \"%s\"\n"
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+"Varování: Neplatná sekvence UTF-8 v poznámce %d (proud %d): špatná značka "
+"délky\n"
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+"Varování: Neplatná sekvence UTF-8 v poznámce %d (proud %d): příliš málo "
+"bajtů\n"
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+"Varování: Neplatná sekvence UTF-8 v poznámce %d (proud %d): neplatná "
+"sekvence\n"
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr "Varování: Selhání v dekodéru utf8. To by nemělo být možné\n"
+
+#: ogginfo/ogginfo2.c:318
+#, fuzzy, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+"Varování: Nemohu dekódovat paket hlavičky vorbis - neplatný proud vorbis (%"
+"d)\n"
+
+#: ogginfo/ogginfo2.c:325
+#, fuzzy, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
+msgstr ""
+"Varování: Proud vorbis %d nemá hlavičky správně umístěné v rámech. Poslední "
+"strana hlavičky obsahuje další pakety nebo má nenulovou granulepos\n"
+
+#: ogginfo/ogginfo2.c:329
+#, fuzzy, c-format
+msgid "Theora headers parsed for stream %d, information follows...\n"
+msgstr "Hlavičky vorbis zpracovány pro proud %d, následují informace...\n"
+
+#: ogginfo/ogginfo2.c:332
+#, fuzzy, c-format
+msgid "Version: %d.%d.%d\n"
+msgstr "Verze: %d\n"
+
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
+#, c-format
+msgid "Vendor: %s\n"
+msgstr "Dodavatel: %s\n"
+
+#: ogginfo/ogginfo2.c:335
+#, c-format
+msgid "Width: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:336
+#, fuzzy, c-format
+msgid "Height: %d\n"
+msgstr "Verze: %d\n"
+
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
+msgid "User comments section follows...\n"
+msgstr "Následuje oblast poznámek uživatele...\n"
+
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+#, fuzzy
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "Varování: granulepos v proudu %d se snižuje z "
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, fuzzy, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr "Varování: granulepos v proudu %d se snižuje z "
+
+#: ogginfo/ogginfo2.c:432
+#, fuzzy
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Proud vorbis %d:\n"
+"\tCelková délka dat: %ld bajtů\n"
+"\tDélka přehrávání: %ldm:%02lds\n"
+"\tPrůměrná bitrate: %f kb/s\n"
+
+#: ogginfo/ogginfo2.c:438
+#, fuzzy, c-format
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Proud vorbis %d:\n"
+"\tCelková délka dat: %ld bajtů\n"
+"\tDélka přehrávání: %ldm:%02lds\n"
+"\tPrůměrná bitrate: %f kb/s\n"
+
+#: ogginfo/ogginfo2.c:466
+#, c-format
+msgid ""
 "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 "Varování: Nemohu dekódovat paket hlavičky vorbis - neplatný proud vorbis (%"
 "d)\n"
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
 "Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
@@ -1227,32 +1485,27 @@
 "Varování: Proud vorbis %d nemá hlavičky správně umístěné v rámech. Poslední "
 "strana hlavičky obsahuje další pakety nebo má nenulovou granulepos\n"
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:477
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Hlavičky vorbis zpracovány pro proud %d, následují informace...\n"
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Verze: %d\n"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Dodavatel: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:183
+#: ogginfo/ogginfo2.c:492
 #, c-format
-msgid "Vendor: %s\n"
-msgstr "Dodavatel: %s\n"
-
-#: ogginfo/ogginfo2.c:184
-#, c-format
 msgid "Channels: %d\n"
 msgstr "Kanálů: %d\n"
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1261,150 +1514,106 @@
 "Frekvence: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:188
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Nominální bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:191
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Nominální bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:194
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Vyšší bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:197
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Vyšší bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:200
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Nižší bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:203
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Nižší bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:206
-msgid "User comments section follows...\n"
-msgstr "Následuje oblast poznámek uživatele...\n"
-
-#: ogginfo/ogginfo2.c:218
-#, c-format
+#: ogginfo/ogginfo2.c:539
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Negative granulepos on vorbis stream outside of headers. This file was "
+"created by a buggy encoder\n"
 msgstr ""
-"Varování: Poznámka %d v proudu %d je neplatně formátovaná, neobsahuje '=': "
-"\"%s\"\n"
 
-#: ogginfo/ogginfo2.c:227
-#, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Varování: Neplatný název pole poznámky v poznámce %d (proud %d): \"%s\"\n"
-
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
-#, c-format
+#: ogginfo/ogginfo2.c:561
+#, fuzzy
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Varování: Neplatná sekvence UTF-8 v poznámce %d (proud %d): špatná značka "
-"délky\n"
+"Proud vorbis %d:\n"
+"\tCelková délka dat: %ld bajtů\n"
+"\tDélka přehrávání: %ldm:%02lds\n"
+"\tPrůměrná bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:275
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Varování: Neplatná sekvence UTF-8 v poznámce %d (proud %d): příliš málo "
-"bajtů\n"
-
-#: ogginfo/ogginfo2.c:336
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
-msgstr ""
-"Varování: Neplatná sekvence UTF-8 v poznámce %d (proud %d): neplatná "
-"sekvence\n"
-
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr "Varování: Selhání v dekodéru utf8. To by nemělo být možné\n"
-
-#: ogginfo/ogginfo2.c:366
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-msgstr "Varování: granulepos v proudu %d se snižuje z "
-
-#: ogginfo/ogginfo2.c:369
+#: ogginfo/ogginfo2.c:567
 #, fuzzy, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
-msgstr "Varování: granulepos v proudu %d se snižuje z "
-
-#: ogginfo/ogginfo2.c:375
 msgid ""
-"Negative granulepos on vorbis stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:395
-#, c-format
-msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 "Proud vorbis %d:\n"
 "\tCelková délka dat: %ld bajtů\n"
 "\tDélka přehrávání: %ldm:%02lds\n"
 "\tPrůměrná bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Varování: EOS nenastaveno v proudu %d\n"
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Varování: Neplatná strana hlavičky, nenalezen paket\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr "Varování: Neplatná strana hlavičky v proudu %d, obsahuje více paketů\n"
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 #, fuzzy
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr "Varování: V datech nalezena díra na přibližném posunutí "
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, fuzzy, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr "Varování: V datech nalezena díra na přibližném posunutí "
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Chyba při otevírání vstupního souboru \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1413,25 +1622,25 @@
 "Zpracovávám soubor \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Nemohu najít obsluhu pro proud, vzdávám to\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, fuzzy, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -1440,22 +1649,22 @@
 "Varování: neplatně umístěná stránka (stránky) pro logický proud %d\n"
 "To indikuje poškozený soubor ogg.\n"
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Nový logický proud (#%d, sériové: %08x): type %s\n"
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Varování: příznak začátku proudu nenastaven na proudu %d\n"
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "Varování: příznak začátku proudu nalezen uvnitř proudu %d\n"
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
@@ -1464,12 +1673,12 @@
 "Varování: mezera čísel sekvence v proudu %d. Dostal jsem stranu %ld, když "
 "jsem očekával stranu %ld. To indikuje chybějící data.\n"
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Logický proud %d skončil\n"
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1479,11 +1688,11 @@
 "Vstup pravděpodobně není ogg.\n"
 
 # FIXME: s/files1/file1/
-#: ogginfo/ogginfo2.c:713
-#, fuzzy
+#: ogginfo/ogginfo2.c:905
+#, fuzzy, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1506,7 +1715,8 @@
 "\t   pro některé typy proudů.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1520,7 +1730,8 @@
 "a pro diagnostiku problémů s nimi.\n"
 "Úplná nápověda je zobrazena pomocí \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:763
+#: ogginfo/ogginfo2.c:955
+#, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Nezadány vstupní soubory. \"ogginfo -h\" pro nápovědu\n"
 
@@ -1544,19 +1755,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: přepínač `%s' vyžaduje argument\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: neznámý přepínač `--%s'\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: neznámý přepínač `%c%s'\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1567,7 +1775,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: neznámý přepínač -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1584,34 +1791,37 @@
 msgstr "%s: přepínač `-W %s' musí být zadán bez argumentu\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Chyba strany. Poškozený vstup.\n"
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Chyba bitového proudu, pokračuji\n"
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "Našel jsem EOS před místem řezu.\n"
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Nastavuji eso: aktualizace synchronizace vrátila 0\n"
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Místo řezu není uvnitř proudu. Druhý soubor bude prázdný\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Neobsloužený speciální případ: první soubor příliš krátký?\n"
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -1620,48 +1830,58 @@
 "       strany ogg. Soubor se možná nebude dekódovat správně.\n"
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Zotavitelná chyba bitového proudu\n"
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr "Chyba bitového proudu\n"
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr "Aktualizace synchronizace vrátila 0, nastavuji eos\n"
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "Vstup není ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "Chyba v první straně\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "chyba v prvním paketu\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Chyba v primární hlavičce: není to vorbis?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Sekundární hlavička poškozena\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "EOF v hlavičkách\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr "Použití: vcut vstup.ogg výstupní1.ogg výstupní2.ogg bodřezu\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1697,18 +1917,22 @@
 msgstr "Zpracovávám: Řežu na %lld\n"
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr "Zpracování selhalo\n"
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr "Chyba při čtení hlaviček\n"
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr "Chyba při zapisování prvního souboru výstupu\n"
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr "Chyba při zapisování druhého souboru výstupu\n"
 
@@ -1744,43 +1968,40 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "Poškozená nebo chybějící data, pokračuji..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 "Chyba při zapisování proudu na výstup. Výstupní proud může být poškozený "
 "nebo useknutý."
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Nemohu otevřít soubor jako vorbis: %s\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Špatná poznámka: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "špatná poznámka: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Nemohu zapsat poznámky do výstupního souboru: %s\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr "neurčena žádná akce\n"
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr "Nemohu převést poznámku do UTF8, nemohu ji přidat\n"
-
-#: vorbiscomment/vcomment.c:287
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1800,7 +2021,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1830,45 +2051,50 @@
 "   užitečné pro používání vorbiscomment ve skriptech. Není to ale\n"
 "   dostatečné pro obecný pohyb poznámek ve všech případech.\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Interní chyba při zpracovávání přepínačů příkazu\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Chyba při otevírání vstupního souboru '%s'.\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr ""
 "Název vstupního souboru nemůže být stejný jako název výstupního souboru\n"
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Chyba při otevírání výstupního souboru '%s'.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Chyba při otevírání souboru poznámek '%s'.\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Chyba při otevírání souboru poznámek '%s'\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Chyba při odstraňování starého souboru %s\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Chyba při přejmenovávání %s na %s\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr "Nemohu převést poznámku do UTF8, nemohu ji přidat\n"
+
 # FIXME: should not be translatable
 #~ msgid "malloc"
 #~ msgstr "malloc"

Modified: trunk/vorbis-tools/po/da.po
===================================================================
--- trunk/vorbis-tools/po/da.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/da.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 0.99.1.3.1\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2002-11-09 14:59+0100\n"
 "Last-Translator: Keld Simonsen <keld at dkuug.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -14,71 +15,73 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Fejl: Slut på hukommelse i malloc_action().\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Fejl: Kunne ikke reservere hukommelse i malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Fejl: Enhed ikke tilgængelig.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr "Fejl: %s behøver et udfilnavn angivet med -f.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Fejl: Ukendt flagværdi til enhed %s.\n"
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Fejl: Kan ikke åbne enhed %s.\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Fejl: Fejl på enhed %s.\n"
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Fejl: Udfil kan ikke angives for %s-enhed.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Fejl: Kan ikke åbne filen %s for at skrive.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Fejl: Fil %s findes allerede.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Fejl: Denne fejl bør aldrig ske (%d). Panik!\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Fejl: Slut på hukommelse i new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Fejl: Slut på hukommelse i new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Fejl: Slut på hukommelse i new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Fejl: Slut på hukommelse i decoder_buffered_metadata_callback().\n"
 
@@ -91,56 +94,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Tolkningsfejl: %s på linje %d i %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Navn"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Beskrivelse"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Type"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Standardværdi"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr ""
 
@@ -148,9 +154,9 @@
 msgid "(NULL)"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(ingen)"
 
@@ -178,17 +184,17 @@
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 #, fuzzy
 msgid "Internal error parsing command line options.\n"
 msgstr "Intern fejl ved tolkning af kommandoflag\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Ind-bufferens størrelse mindre end minimumstørrelsen %dkB."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -197,44 +203,44 @@
 "=== Fejl \"%s\" under tolkning af konfigurationsflag fra kommandolinjen.\n"
 "=== Flaget var: %s\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Tilgængelige flag:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Ingen enhed %s.\n"
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Drivrutine %s er ikke for filer.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "== Kan ikke angive udfil uden at angiv drivrutine.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Fejlagtigt format på argument: %s.\n"
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Ugyldig værdi til prebuffer. Muligt interval er 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 fra %s %s\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Kan ikke spille hver 0'te blok!\n"
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -242,17 +248,21 @@
 "--- Kan ikke spille hver blok 0 gange.\n"
 "--- For at lave en testafkodning, brug null-driveren for uddata.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, fuzzy, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "FEJL: Kan ikke åbne indfil \"%s\": %s\n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Drivrutine %s angivet i konfigurationsfil ugyldig.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -260,7 +270,7 @@
 "=== Kunne ikke indlæse standard-drivrutine, og ingen er specificeret i "
 "konfigurationsfilen. Afslutter.\n"
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, fuzzy, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -285,26 +295,28 @@
 "      Mulige enheder er ('*'=direkte, '@'=fil):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=filnavn  Angiv udfilens navn for tidligere valgt \n"
 "        filenhed (med -d).\n"
@@ -324,24 +336,25 @@
 "inden for s millisekunder gør at ogg123 afsluttes.\n"
 "  -l, --delay=s  sæt s [millisekunder] (standard 500).\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Fejl: Slut på hukommelse.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Fejl: Kunne ikke reservere hukommelse i malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Fejl: Kunne ikke sætte signalmaske."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Fejl: Kan ikke oprette ind-buffer\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "forvalgt udenhed"
@@ -350,7 +363,7 @@
 msgid "shuffle playlist"
 msgstr "bland spillelisten"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -359,94 +372,93 @@
 "\n"
 "Enhed:    %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Forfatter:   %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, fuzzy, c-format
 msgid "Comments: %s"
 msgstr "Kommentarer: %s\n"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, fuzzy, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Kunne ikke oprette katalog \"%s\": %s\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Fejl: Kan ikke oprette lydbuffer.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Finder intet modul til at læse fra %s.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Kan ikke åbne %s.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Filformatet på %s understøttes ikke.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr "Fejl under åbning af %s med %s-modulet.  Filen kan være beskadiget.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Spiller: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Mislykkedes at overspringe %f sekunder lyd."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Fejl: Afkodning mislykkedes.\n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Færdig."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Hul i strømmen; nok ufarligt\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Vorbis-biblioteket rapporterede en fejl i strømmen.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Bitstrømmen har %d kanaler, %ldHz"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr "Forslag for bithastigheder: øvre=%ld nominel=%ld nedre=%ld vindue=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Kodet af: %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
-#, fuzzy
+#, fuzzy, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Fejl: Slut på hukommelse i new_status_message_arg().\n"
 
@@ -456,7 +468,7 @@
 msgstr ""
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
-#, fuzzy
+#, fuzzy, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Fejl: Slut på hukommelse i malloc_action().\n"
 
@@ -477,6 +489,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Hukommelsestildelingsfejl i stats_init()\n"
 
@@ -510,78 +523,100 @@
 msgid " Output Buffer %5.1f%%"
 msgstr " Udbuffer %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Fejl: Kunne ikke reservere hukommelse i malloc_data_source_stats()\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "WAV-fillæser"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "AIFF/AIFC-fillæser"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "WAV-fillæser"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "WAV-fillæser"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Advarsel: Uventet EOF under læsning af WAV-hoved\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Overspringer bid af type \"%s\", længde %d\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Advarsel: Uventet EOF i AIFF-blok\n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Advarsel: Ingen fælles blok i AIFF-fil\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Advarsel: Afkortet fælles blok i AIFF-hoved\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Advarsel: Uventet EOF under læsning af AIFF-hoved\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Advarsel: AIFF-C-hoved afkortet.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Advarsel: Kan ikke håndtere komprimeret AIFF-C\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Advarsel: Finder ingen SSND-blok i AIFF-fil\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Advarsel: Fejlagtig SSND-blok i AIFF-hoved\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Advarsel: Uventet EOF under læsning af AIFF-hoved\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "Advarsel: OggEnc understøtter ikke denne type AIFF/AIFC-fil.\n"
 "Skal være 8 eller 16 bit PCM.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Advarsel: ukendt format på blok i Wav-hoved\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -589,89 +624,108 @@
 "Advarsel: UGYLDIGT format på blok i wav-hoved.\n"
 " Forsøger at læse alligevel (fungerer måske ikke)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:466
+#: oggenc/audio.c:480
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
 msgstr ""
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr ""
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr ""
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr ""
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, fuzzy, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "%s: ukendt flag \"--%s\"\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
 msgstr ""
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr ""
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Mislykkedes at skrive hoved til udstrømmen\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Mislykkedes at skrive data til udstrømmen\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [%2dm%.2ds resterer] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tKoder [%2dm%.2ds til nu] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -682,7 +736,8 @@
 "\n"
 "Kodning af \"%s\" færdig\n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -692,7 +747,7 @@
 "\n"
 "Kodning klar.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -701,17 +756,17 @@
 "\n"
 "\tFillængde:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tForløbet tid: %dm %04.1fs\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tHastighed:    %.4f\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -720,7 +775,7 @@
 "\tGennemsnitlig bithastighed: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -730,17 +785,17 @@
 "Koder %s%s%s til \n"
 "         %s%s%s med kvalitet %2.2f\n"
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "standard ind"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "standard ud"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -751,7 +806,7 @@
 "         %s%s%s med bithastighed %d kbps,\n"
 "med komplet bithastighedhåndteringsmotor\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -761,7 +816,7 @@
 "Koder %s%s%s til \n"
 "         %s%s%s med kvalitet %2.2f\n"
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -771,7 +826,7 @@
 "Koder %s%s%s til \n"
 "         %s%s%s med kvalitet %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -782,7 +837,7 @@
 "         %s%s%s med bithastighed %d kbps,\n"
 "med komplet bithastighedhåndteringsmotor\n"
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -791,65 +846,75 @@
 "%s%s\n"
 "FEJL: Ingen indfil angivet. Brug -h for hjælp.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "FEJL: Flere filer angivne med stdin\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
 msgstr "FEJL: Flere indfiler med angivet udfilnavn: anbefaler at bruge -n\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "FEJL: Kan ikke åbne indfil \"%s\": %s\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Åbner med %s-modul: %s\n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "FEJL: Indfil \"%s\" er ikke i et kendt format\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "ADVARSEL: Intet filnavn, bruger forvalgt navn \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
 msgstr "FEJL: Kunne ikke oprette kataloger nødvendige for udfil \"%s\"\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr "FEJL: Kunne ikke oprette kataloger nødvendige for udfil \"%s\"\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "FEJL: Kan ikke åbne udfil \"%s\": %s\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr ""
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -859,6 +924,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -866,25 +932,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -932,8 +1015,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1020,134 +1104,149 @@
 " tilstand går uddata til stdout hvis intet filnavn angives med -o\n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr "ADVARSEL: Ignorerer ikke tilladt specialtegn '%c' i navneformat\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr ""
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Kunne ikke tolke skærepunkt \"%s\"\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr ""
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr ""
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr ""
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
 msgstr ""
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr ""
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 
@@ -1166,186 +1265,276 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid ""
-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
-"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:318
+#, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:325
+#, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
 "header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:329
 #, c-format
-msgid "Vorbis headers parsed for stream %d, information follows...\n"
+msgid "Theora headers parsed for stream %d, information follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:332
 #, fuzzy, c-format
-msgid "Version: %d\n"
+msgid "Version: %d.%d.%d\n"
 msgstr "Version: %s"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
 #, fuzzy, c-format
-msgid "Vendor: %s (%s)\n"
-msgstr "leverandør=%s\n"
-
-#: ogginfo/ogginfo2.c:183
-#, fuzzy, c-format
 msgid "Vendor: %s\n"
 msgstr "leverandør=%s\n"
 
-#: ogginfo/ogginfo2.c:184
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Channels: %d\n"
+msgid "Width: %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:336
 #, fuzzy, c-format
-msgid ""
-"Rate: %ld\n"
-"\n"
-msgstr "Dato: %s"
+msgid "Height: %d\n"
+msgstr "Version: %s"
 
-#: ogginfo/ogginfo2.c:188
-#, fuzzy, c-format
-msgid "Nominal bitrate: %f kb/s\n"
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
 msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:191
-msgid "Nominal bitrate not set\n"
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:194
-#, fuzzy, c-format
-msgid "Upper bitrate: %f kb/s\n"
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
 msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:197
-msgid "Upper bitrate not set\n"
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:200
-#, fuzzy, c-format
-msgid "Lower bitrate: %f kb/s\n"
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
 msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:203
-msgid "Lower bitrate not set\n"
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:206
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
 msgid "User comments section follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:218
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
 #, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:432
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:227
+#: ogginfo/ogginfo2.c:438
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
+#: ogginfo/ogginfo2.c:466
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:275
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:336
+#: ogginfo/ogginfo2.c:477
 #, c-format
+msgid "Vorbis headers parsed for stream %d, information follows...\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:480
+#, fuzzy, c-format
+msgid "Version: %d\n"
+msgstr "Version: %s"
+
+#: ogginfo/ogginfo2.c:484
+#, fuzzy, c-format
+msgid "Vendor: %s (%s)\n"
+msgstr "leverandør=%s\n"
+
+#: ogginfo/ogginfo2.c:492
+#, c-format
+msgid "Channels: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:493
+#, fuzzy, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+"Rate: %ld\n"
+"\n"
+msgstr "Dato: %s"
+
+#: ogginfo/ogginfo2.c:496
+#, fuzzy, c-format
+msgid "Nominal bitrate: %f kb/s\n"
 msgstr ""
+"\tGennemsnitlig bithastighed: %.1f kb/s\n"
+"\n"
 
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+#: ogginfo/ogginfo2.c:499
+msgid "Nominal bitrate not set\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:366
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+#: ogginfo/ogginfo2.c:502
+#, fuzzy, c-format
+msgid "Upper bitrate: %f kb/s\n"
 msgstr ""
+"\tGennemsnitlig bithastighed: %.1f kb/s\n"
+"\n"
 
-#: ogginfo/ogginfo2.c:369
-#, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
+#: ogginfo/ogginfo2.c:505
+msgid "Upper bitrate not set\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:375
+#: ogginfo/ogginfo2.c:508
+#, fuzzy, c-format
+msgid "Lower bitrate: %f kb/s\n"
+msgstr ""
+"\tGennemsnitlig bithastighed: %.1f kb/s\n"
+"\n"
+
+#: ogginfo/ogginfo2.c:511
+msgid "Lower bitrate not set\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:539
 msgid ""
 "Negative granulepos on vorbis stream outside of headers. This file was "
 "created by a buggy encoder\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:395
+#: ogginfo/ogginfo2.c:561
+msgid ""
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:567
 #, c-format
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, fuzzy, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Fejl ved åbning af indfil \"%s\".\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, fuzzy, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1355,70 +1544,71 @@
 "\n"
 "Kodning af \"%s\" færdig\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 #, fuzzy
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Kunne ikke åbne %s for læsning\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
 "This indicates a corrupt ogg file: %s.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
 "ld. Indicates missing data.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
 "Input probably not ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:713
+#: ogginfo/ogginfo2.c:905
+#, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1430,7 +1620,8 @@
 "\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1439,8 +1630,8 @@
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:763
-#, fuzzy
+#: ogginfo/ogginfo2.c:955
+#, fuzzy, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""
 "%s%s\n"
@@ -1466,19 +1657,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flag \"%s\" kræver et argument\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ukendt flag \"--%s\"\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ukendt flag \"%c%s\"\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1489,7 +1677,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ugyldigt flag -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1506,82 +1693,95 @@
 msgstr "%s: flaget `-W %s' tager intet argument\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr ""
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr ""
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr ""
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr ""
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Skærepunkt uden for strømmen. Anden fil vil være tom\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr ""
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
 msgstr ""
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr ""
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr ""
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr ""
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "Inddata ikke ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "Fejl på første side\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "fejl i første pakke\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Fejl i primært hoved: ikke vorbis?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Sekundært hoved fejlagtigt\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "EOF i hoved\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr "Brug: vcut indfil.ogg udfil1.ogg udfil2.ogg skærepunkt\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1617,18 +1817,22 @@
 msgstr ""
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr ""
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr ""
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr ""
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr ""
 
@@ -1664,42 +1868,38 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "Data ødelagt eller mangler, fortsætter..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr "Fejl under skrivning af udstrøm. Kan være ødelagt eller trunkeret."
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Mislykkedes at åbne fil som vorbis-type: %s\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Fejlagtig kommentar: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "fejlagtig kommentar: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Mislykkedes at skrive kommentar til udfil: %s\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr "Kunne ikke konvertere til UTF8, kan ikke tilføje\n"
-
-#: vorbiscomment/vcomment.c:287
-#, fuzzy
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1719,7 +1919,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1743,44 +1943,49 @@
 "   (når du bruger dette flag er læsning fra kommentarfil eller\n"
 "   stdin deaktiveret)\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Intern fejl ved tolkning af kommandoflag\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Fejl ved åbning af indfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Fejl ved åbning af udfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Fejl ved åbning af kommentarfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Fejl ved åbning af kommentarfil \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, fuzzy, c-format
 msgid "Error removing old file %s\n"
 msgstr "Fejl ved åbning af kommentarfil \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, fuzzy, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Fejl ved åbning af indfil \"%s\".\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr "Kunne ikke konvertere til UTF8, kan ikke tilføje\n"
+
 #~ msgid "Internal error: long option given when none expected.\n"
 #~ msgstr "Intern fejl: langt flag brugt når det ikke forventedes.\n"
 

Modified: trunk/vorbis-tools/po/es.po
===================================================================
--- trunk/vorbis-tools/po/es.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/es.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2003-01-03 22:48+0100\n"
 "Last-Translator: Enric Martínez <exter at wanadoo.es>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -15,76 +16,78 @@
 "X-Generator: KBabel 0.9.6\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Error: Memoria insuficiente en malloc_action().\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Error: No se ha podido reservar memoria en malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Error: Dispositivo no disponible.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr ""
 "Error: %s requiere un nombre de fichero de salida que se ha de indicar con -"
 "f.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Error: Valor de opción no soportado por el dispositivo %s.\n"
 
 # ¿Es correcto usar el artículo ? A mi me parece más elegante en castellano. - EM
 # Yo creo que en castellano hay que usarlo. -Quique
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Error: No se ha podido abrir el dispositivo %s\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Error: Fallo del dispositivo %s.\n"
 
 # asignarse / asignársele ??? (esto ya es de RAE, pero bueno...) EM
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Error: No se puede asignar un fichero de salida al dispositivo %s.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Error: No se ha podido abrir el fichero %s para escritura.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Error: El fichero %s ya existe.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Error: Este error nunca debería ocurrir (%d). ¡Pánico!\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Error: Memoria insuficiente en new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Error: Memoria insuficiente en new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Error: Memoria insuficiente en new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Error: Memoria insuficiente en decoder_buffered_metadata_callback().\n"
 
@@ -98,56 +101,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Error de análisis sintáctico: %s en la línea %d de %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Nombre"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Descripción"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Tipo"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Predeterminado"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr "ninguno"
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr "booleano"
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr "carácter"
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr "cadena"
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr "entero"
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr "coma flotante"
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr "doble precisión"
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr "otro"
 
@@ -156,9 +162,9 @@
 msgid "(NULL)"
 msgstr "(NULO)"
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(ninguno)"
 
@@ -189,17 +195,17 @@
 msgstr "Error desconocido"
 
 # "pasada" por que evidentemente se ha pasado un par,ba(Bmetro incorrecto - EM
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr ""
 "Error interno durante el análisis de las opciones de línea de órdenes.\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "El tamaño del búfer de entrada es menor que el tamaño mínimo (%d kB)."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -209,30 +215,30 @@
 "línea de órdenes.\n"
 "=== La opción era: %s\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Opciones disponibles:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== No existe el dispositivo %s.\n"
 
 # ¿"... de salida a fichero?" - EM
 # Yo tampoco lo tengo nada claro -Quique
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== El controlador %s no es un controlador de salida de ficheros.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr ""
 "=== No se puede especificar un fichero de salida sin indicar un "
 "controlador.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Formato de opción incorrecto: %s.\n"
@@ -241,22 +247,22 @@
 # margen o intervalo es más correcto
 # "rango" lo he visto en libros de texto, incluso universitarios
 # Lo cambio a intervalo. Como bien dices, un rango es otra cosa.
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Valor de prebúfer no válido. El intervalo es de 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 de %s %s\n"
 
 # ¿chunk? literalmente es un grupo suelto, montón o pelota de barro, deben haber traducciones anteriores de esto
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- ¡No se pueden reproducir todos los \"ceroenos\" fragmentos!\n"
 
 # chunk = trozo ???
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -265,19 +271,23 @@
 "--- Para hacer una decodificación de prueba use el controlador de salida "
 "nula.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr ""
 "--- No se puede abrir el fichero con la lista de reproducción %s.  Omitido.\n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr ""
 "--- El controlador %s indicado en el fichero de configuración no es válido.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -286,7 +296,7 @@
 "controladores en el fichero de configuración. Saliendo.\n"
 
 # "Possible devices" por "las posibilidades..." para no alargar la línea demasiado
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -311,26 +321,28 @@
 "      Las posibilidades son ('*'=en vivo, '@'=a fichero):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=fichero  indica el nombre de salida\n"
 "        de un dispositivo de fichero previamente indicado (con -d).\n"
@@ -351,24 +363,25 @@
 "en 's' milisegundos hacen que ogg123 termine.\n"
 " -l, --delay=s  ajusta 's' [milisegundos] (predeterminado 500)\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Error: Memoria insuficiente.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Error: Imposible reservar memoria en malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Error: Imposible establecer máscara de señal."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Error: Imposible crear búfer de entrada.\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "dispositivo de salida predefinido"
@@ -379,7 +392,7 @@
 msgid "shuffle playlist"
 msgstr "ordenar la lista de reproducción al azar"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -388,100 +401,100 @@
 "\n"
 "Dispositivo de sonido:   %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Autor:   %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "Comentarios: %s"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Aviso: Imposible leer el directorio %s.\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Error: Imposible crear búfer de audio.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Imposible hallar un módulo para leer de %s.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Imposible abrir %s.\n"
 
 # supported / soportado, puagh - EM
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "El formato del fichero %s no está soportado.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 "Error en la apertura de %s usando el módulo %s.  El fichero puede estar "
 "dañado.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Reproduciendo: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Imposible saltar %f segundos de audio."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Error: Fallo de decodificación \n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Hecho."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Hueco en el flujo de datos; probablemente inofensivo\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== La biblioteca Vorbis indica un error en el flujo de datos.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "El flujo de bits es de %d canal(es), %ldHz"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
 # ventana / márgen / intervalo ??? EM
 # ni idea :( y kbabel señala un "error en la ecuación" :-?
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr ""
 "Sugerencia para la tasa de transferencia: superior=%ld nominal=%ld inferior=%"
 "ld intervalo=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Codificado por: %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
+#, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Error: Memoria insuficiente en new_print_statistics_arg().\n"
 
@@ -492,6 +505,7 @@
 "Aviso de la lista de reproducción %s: Imposible leer el directorio %s.\n"
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
+#, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Error: Memoria insuficiente en playlist_to_array().\n"
 
@@ -512,6 +526,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Error de asignación de memoria en stats_init()\n"
 
@@ -545,78 +560,100 @@
 msgid " Output Buffer %5.1f%%"
 msgstr " Búfer de Salida %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Error: Imposible asignar memoria en malloc_data_source_stats()\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "Lector de ficheros WAV"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "Lector de ficheros AIFF/AIFC"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "Lector de ficheros WAV"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "Lector de ficheros WAV"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "AVISO: Final de fichero inesperado al leer la cabecera WAV\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Omitiendo fragmento del tipo \"%s\", longitud %d\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "AVISO: Final de fichero inesperado en fragmento de AIFF \n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "AVISO: No se han hallado fragmentos comunes en el fichero AIFF\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "AVISO: Fragmento común truncado en la cabecera AIFF\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "AVISO: Fin de fichero inesperado al leer la cabecera AIFF\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "AVISO: Cabecera AIFF-C truncada.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "AVISO: Imposible manipular fichero AIFF-C comprimido\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "AVISO: Fragmento SSND no encontrado en fichero AIFF\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "AVISO: Fragmento SSND dañado en la cabecera AIFF\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "AVISO: Fin de fichero inesperado al leer cabecera AIFF\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "AVISO: OggEnc no puede manejar este tipo de ficheros AIFF/AIFC\n"
 " Tiene que ser de 8 o 16 bits PCM.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "AVISO: Fragmento de formato desconocido en cabecera WAV\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -624,7 +661,8 @@
 "AVISO: Fragmento con formato NO VÁLIDO en la cabecera WAV.\n"
 " Intentando leer de todas formas (puede no funcionar)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
@@ -632,8 +670,8 @@
 "ERROR: Fichero WAV de tipo no soportado (tiene que ser PCM estándar\n"
 " o PCM de coma flotante de tipo 3\n"
 
-#: oggenc/audio.c:466
-#, fuzzy
+#: oggenc/audio.c:480
+#, fuzzy, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
@@ -642,16 +680,18 @@
 "de 16 bits\n"
 "o PCM en coma flotante\n"
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
@@ -663,12 +703,13 @@
 # "muestra" se usa sin embargo bastante en lugar de "sample"
 # así que "remuestreador" puede sonar algo casposo,
 # pero da más info sobre qué es ¿Ideas? EM
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Imposible inicializar resampler\n"
 
 # encoder / codificador ??? EM
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Definiendo opción avanzada del codificador \"%s\" a %s\n"
@@ -676,17 +717,18 @@
 # este fuzzy es sólo para que revisseís
 # lowpass es en castellano un filtro de paso bajo
 # lo entiende todo el mundo, creo EM
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Cambiada frecuencia de paso bajo de %f KHz a %f KHz\n"
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Opción avanzada \"%s\" no reconocida\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
@@ -696,38 +738,51 @@
 
 # he cambiado bastante el texto ¿es OK? EM
 # He cambiado indicar por solicitar. -Quique
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Solicitar una tasa de bits mínima o máxima requiere --managed\n"
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Fallo en la inicialización de modo: parámetro de calidad no válido\n"
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 "Fallo en la inicialización de modo: parámetro de tasa de bits no válido\n"
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Fallo al escribir la cabecera en el flujo de salida\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Fallo al escribir datos en el flujo de salida\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [quedan %2dm%.2ds ] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tCodificando [%2dm%.2ds hasta ahora] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -738,7 +793,8 @@
 "\n"
 "Codificación del fichero finalizada \"%s\"\n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -748,7 +804,7 @@
 "\n"
 "Codificación finalizada.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -757,17 +813,17 @@
 "\n"
 "\tLongitud del fichero:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tTiempo consumido: %dm %04.1fs\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tTasa:         %.4f\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -776,7 +832,7 @@
 "\tTasa de bits media: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -787,17 +843,17 @@
 "         %s%s%s \n"
 "con tasa de bits media %d kbps "
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "salida estándar"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -808,7 +864,7 @@
 "         %s%s%s \n"
 "a una tasa de bits media aproximada de %d kbps (codificación VBR activada)\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -819,7 +875,7 @@
 "         %s%s%s \n"
 "con nivel de calidad %2.2f usando VBR restringido "
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -830,7 +886,7 @@
 "         %s%s%s \n"
 "con calidad %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -841,7 +897,7 @@
 "         %s%s%s \n"
 "usando gestión de transferencia de bits"
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -850,11 +906,13 @@
 "%s%s\n"
 "ERROR: No se han indicado ficheros de entrada. Use -h para obtener ayuda.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "ERROR: Se han indicado varios ficheros al usar la entrada estándar\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
@@ -862,29 +920,30 @@
 "ERROR: Múltiples ficheros de entrada con indicación de nombre de fichero de "
 "salida: se sugiere usar -n\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ERROR: Imposible abrir fichero de entrada \"%s\": %s\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Abriendo con el módulo %s: %s\n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr ""
 "ERROR: El fichero de entrada \"%s\" no está en ningún formato soportado\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr ""
 "AVISO: No se indicó nombre de fichero, usando el predeterminado \"default.ogg"
 "\"\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
@@ -892,30 +951,38 @@
 "ERROR: Imposible crear los subdirectorios necesarios para el fichero de "
 "salida \"%s\"\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr ""
+"Puede que el nombre de fichero de entrada no sea el mismo que el de salida.\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ERROR: Imposible abrir fichero de salida \"%s\": %s\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Entrada de remuestreo de %d Hz a %d Hz\n"
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Mezclando a la baja de estéreo a mono\n"
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, fuzzy, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "ERROR: Imposible remezclar a la baja excepto de estéreo a mono\n"
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -925,6 +992,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -932,25 +1000,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -998,8 +1083,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1128,116 +1214,127 @@
 " fichero de salida con -o\n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 "AVISO: Ignorando carácter de escape ilegal '%c' en el formato del nombre\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "Activando motor de gestión de transferencia de bits\n"
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "AVISO: Indicado bit más significativo del modo 'en bruto' con datos que no "
 "están en ese modo. Se asume entrada 'en bruto'.\n"
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "AVISO: Imposible leer argumento de endianness \"%s\"\n"
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "AVISO: Imposible leer frecuencia de remuestreo \"%s\"\n"
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 "Aviso: Velocidad de remuestreo especificada como %d Hz. ¿Se refería a %d "
 "Hz?\n"
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Aviso: Imposible leer el directorio %s.\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "No se halló valor alguno para las opciones avanzadas del codificador\n"
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Error interno al analizar las opciones de la línea de ordenes\n"
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Aviso: Se ha usado un comentario no permitido (\"%s\"), ignorándolo.\n"
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "AVISO: Tasa de bits nominal \"%s\" no reconocida\n"
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Aviso: Tasa de bits mínima \"%s\" no reconocida\n"
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Aviso: Tasa de bits máxima \"%s\" no reconocida\n"
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Opción de calidad \"%s\" no reconocida, ignorada\n"
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 "AVISO: Indicación de calidad demasiado alta, cambiando a calidad máxima.\n"
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "AVISO: Indicados múltiples formatos de nombre, usando el final\n"
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 "AVISO: Indicados múltiples filtros de formato de nombre, usando el final\n"
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 "AVISO: Indicados múltiples filtros de formato de nombre de reemplazo, usando "
 "el final\n"
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr "AVISO: Indicados varios ficheros de salida, se sugiere usar -n\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "AVISO: Indicados bits/muestras en bruto para datos que no están en ese modo. "
 "Asumiendo entrada en bruto.\n"
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "AVISO: Valor de bits/muestras no válido, asumiendo 16.\n"
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
@@ -1245,33 +1342,37 @@
 "AVISO: Indicado número de canales para modo en bruto para datos que no están "
 "ese modo. Asumiendo entrada en bruto.\n"
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "AVISO: Indicada cantidad de canales no válida, asumiendo 2.\n"
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "AVISO: Especificada velocidad de muestreo para datos que no están en formato "
 "bruto. Asumiendo entrada en bruto.\n"
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 "Aviso: Especificada Velocidad de muestreo no válida, asumiendo 44100.\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "AVISO: Especificada opción desconocida, ignorada->\n"
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Imposible convertir comentario a UTF-8, no se puede añadir\n"
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 "AVISO: No se indicaron suficientes títulos, usando ultimo título por "
@@ -1292,15 +1393,176 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Error: El segmento de ruta \"%s\" no es un directorio\n"
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
+#, fuzzy, c-format
+msgid ""
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
+msgstr ""
+"Aviso: Comentario %d en el flujo %d tiene un formato no válido, no contiene "
+"'=': \"%s\"\n"
+
+# estoy por dejar "stream" EM
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+"Aviso: Nombre de campo de comentario no válido en comentario %d (stream %d): "
+"\"%s\"\n"
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+"Aviso: Secuencia UTF-8 no válida en el comentario %d (flujo %d): marcador de "
+"longitud erróneo\n"
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+"Aviso: Secuencia UTF-8 no válida en el comentario %d (flujo %d): "
+"insuficientes bytes\n"
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+"Aviso: Secuencia UTF-8 no válida en el comentario %d (flujo %d): secuencia "
+"no válida\n"
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr "Aviso: Fallo en el decodificador de UTF8. Esto debería ser imposible\n"
+
+#: ogginfo/ogginfo2.c:318
+#, fuzzy, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+"Aviso: Imposible decodificar el paquete de cabecera vorbis - flujo vorbis no "
+"válido (%d)\n"
+
+#: ogginfo/ogginfo2.c:325
+#, fuzzy, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
+msgstr ""
+"Aviso: El flujo vorbis %d no tiene las cabeceras correctamente enmarcadas. "
+"La página de cabeceras de terminal contiene paquetes adicionales o tiene un "
+"valor de granulepos distinto de cero\n"
+
+#: ogginfo/ogginfo2.c:329
+#, fuzzy, c-format
+msgid "Theora headers parsed for stream %d, information follows...\n"
+msgstr ""
+"Cabeceras vorbis analizadas para flujo %d, información a continuación...\n"
+
+#: ogginfo/ogginfo2.c:332
+#, fuzzy, c-format
+msgid "Version: %d.%d.%d\n"
+msgstr "Versión: %d\n"
+
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
+#, c-format
+msgid "Vendor: %s\n"
+msgstr "Distribuidor: %s\n"
+
+#: ogginfo/ogginfo2.c:335
+#, c-format
+msgid "Width: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:336
+#, fuzzy, c-format
+msgid "Height: %d\n"
+msgstr "Versión: %d\n"
+
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
+msgid "User comments section follows...\n"
+msgstr "Sigue la sección de comentarios del usuario...\n"
+
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+#, fuzzy
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "Aviso: granulepos en el flujo %d se decrementa desde "
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, fuzzy, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr "Aviso: granulepos en el flujo %d se decrementa desde "
+
+#: ogginfo/ogginfo2.c:432
+#, fuzzy
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Flujo Vorbis %d:\n"
+"\tLongitud total de los datos: %ld bytes\n"
+"\tLongitud de reproducción: %ldm:%02lds\n"
+"\tTasa de bits promedio: %f kbps\n"
+
+#: ogginfo/ogginfo2.c:438
+#, fuzzy, c-format
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Flujo Vorbis %d:\n"
+"\tLongitud total de los datos: %ld bytes\n"
+"\tLongitud de reproducción: %ldm:%02lds\n"
+"\tTasa de bits promedio: %f kbps\n"
+
+#: ogginfo/ogginfo2.c:466
+#, c-format
+msgid ""
 "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 "Aviso: Imposible decodificar el paquete de cabecera vorbis - flujo vorbis no "
 "válido (%d)\n"
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
 "Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
@@ -1310,33 +1572,28 @@
 "La página de cabeceras de terminal contiene paquetes adicionales o tiene un "
 "valor de granulepos distinto de cero\n"
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:477
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr ""
 "Cabeceras vorbis analizadas para flujo %d, información a continuación...\n"
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Versión: %d\n"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Distribuidor: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:183
+#: ogginfo/ogginfo2.c:492
 #, c-format
-msgid "Vendor: %s\n"
-msgstr "Distribuidor: %s\n"
-
-#: ogginfo/ogginfo2.c:184
-#, c-format
 msgid "Channels: %d\n"
 msgstr "Canales: %d\n"
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1345,155 +1602,109 @@
 "Tasa de transferencia: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:188
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Tasa de bits nominal: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:191
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Tasa de bits nominal no especificada\n"
 
-#: ogginfo/ogginfo2.c:194
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Tasa de bits máxima: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:197
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Tasa de transferencia de bits máxima no especificada\n"
 
 # algo largo EM
-#: ogginfo/ogginfo2.c:200
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Tasa de transferencia de bits mínima: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:203
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Tasa de transferencia de bits mínima no especificada\n"
 
-#: ogginfo/ogginfo2.c:206
-msgid "User comments section follows...\n"
-msgstr "Sigue la sección de comentarios del usuario...\n"
-
-#: ogginfo/ogginfo2.c:218
-#, c-format
+#: ogginfo/ogginfo2.c:539
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Negative granulepos on vorbis stream outside of headers. This file was "
+"created by a buggy encoder\n"
 msgstr ""
-"Aviso: Comentario %d en el flujo %d tiene un formato no válido, no contiene "
-"'=': \"%s\"\n"
 
-# estoy por dejar "stream" EM
-#: ogginfo/ogginfo2.c:227
-#, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Aviso: Nombre de campo de comentario no válido en comentario %d (stream %d): "
-"\"%s\"\n"
-
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
-#, c-format
+#: ogginfo/ogginfo2.c:561
+#, fuzzy
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Aviso: Secuencia UTF-8 no válida en el comentario %d (flujo %d): marcador de "
-"longitud erróneo\n"
+"Flujo Vorbis %d:\n"
+"\tLongitud total de los datos: %ld bytes\n"
+"\tLongitud de reproducción: %ldm:%02lds\n"
+"\tTasa de bits promedio: %f kbps\n"
 
-#: ogginfo/ogginfo2.c:275
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Aviso: Secuencia UTF-8 no válida en el comentario %d (flujo %d): "
-"insuficientes bytes\n"
-
-#: ogginfo/ogginfo2.c:336
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
-msgstr ""
-"Aviso: Secuencia UTF-8 no válida en el comentario %d (flujo %d): secuencia "
-"no válida\n"
-
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr "Aviso: Fallo en el decodificador de UTF8. Esto debería ser imposible\n"
-
-#: ogginfo/ogginfo2.c:366
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-msgstr "Aviso: granulepos en el flujo %d se decrementa desde "
-
-#: ogginfo/ogginfo2.c:369
+#: ogginfo/ogginfo2.c:567
 #, fuzzy, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
-msgstr "Aviso: granulepos en el flujo %d se decrementa desde "
-
-#: ogginfo/ogginfo2.c:375
 msgid ""
-"Negative granulepos on vorbis stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:395
-#, c-format
-msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 "Flujo Vorbis %d:\n"
 "\tLongitud total de los datos: %ld bytes\n"
 "\tLongitud de reproducción: %ldm:%02lds\n"
 "\tTasa de bits promedio: %f kbps\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Aviso: Falta indicador EOS en el flujo %d\n"
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Aviso: Página de cabecera no válida, no se halló el paquete\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 "AVISO: Página de cabeceras no valida en el flujo de datos %d, contiene "
 "múltiples paquetes\n"
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 #, fuzzy
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr "Aviso: encontrado vacío en los datos en el offset aproximado "
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, fuzzy, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr "Aviso: encontrado vacío en los datos en el offset aproximado "
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "ERROR: Imposible abrir fichero de entrada \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1502,25 +1713,25 @@
 "Procesando fichero \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Imposible encontrar un procesador para el flujo de datos, liberando\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, fuzzy, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -1530,23 +1741,23 @@
 "d\n"
 "Esto indica un fichero ogg corrupto.\n"
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Nuevo flujo de datos lógico (#%d, serie: %08x): tipo %s\n"
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Aviso: Falta señal de comienzo de flujo en el flujo de datos %d\n"
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr ""
 "Aviso: Hallada señal de comienzo de flujo a mitad del flujo de datos %d\n"
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
@@ -1555,12 +1766,12 @@
 "Aviso: Hueco en los números de secuencia del flujo de datos %d. Se obtuvo la "
 "página %ld cuando se esperaba la %ld. Esto significa pérdida de datos.\n"
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Flujo lógico %d finalizado\n"
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1570,11 +1781,11 @@
 "La entrada probablemente no sea ogg.\n"
 
 # no soporte "support" :P
-#: ogginfo/ogginfo2.c:713
-#, fuzzy
+#: ogginfo/ogginfo2.c:905
+#, fuzzy, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1598,7 +1809,8 @@
 "\t   de algunos tipos de flujos de datos.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1612,7 +1824,8 @@
 "y para diagnosticar problemas.\n"
 "La ayuda completa se obtiene con \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:763
+#: ogginfo/ogginfo2.c:955
+#, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""
 "No se han indicado ficheros de entrada. Use \"ogginfo -h\" para obtener "
@@ -1638,19 +1851,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción `%s' requiere un argumento\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida `--%s'\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida `%c%s'\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1661,7 +1871,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción inválida -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1678,36 +1887,39 @@
 msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Error de paginación. Entrada dañada.\n"
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Error en el flujo de bits, continuando\n"
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "Final de flujo encontrado antes del punto de corte.\n"
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr ""
 "Estableciendo final de flujo: el refresco de sincronización ha devuelto 0\n"
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr ""
 "El punto de corte no está dentro del flujo. El segundo fichero estará vacío\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Caso especial no contemplado: ¿primer fichero demasiado corto?\n"
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -1716,49 +1928,59 @@
 "       única página ogg. El fichero puede no decodificarse correctamente.\n"
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Error recuperable en la transferencia\n"
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr "Error en la transferencia\n"
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr ""
 "La actualización de sincronización ha devuelto 0, fijando final de fichero\n"
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "El fichero de entrada no es ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "Error en la primera página\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "error en el primer paquete\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Error en cabecera primaria: ¿No es vorbis?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Cabecera secundaria dañada\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "Fin de fichero (EOF) en las cabeceras\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr "Uso: vcut entrada.ogg salida1.ogg salida2.ogg punto_de_corte\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1795,18 +2017,22 @@
 msgstr "Procesando: Cortando en %lld\n"
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr "Procesamiento fallido\n"
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr "Error de lectura de cabeceras\n"
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr "Error al escribir el primer fichero de salida\n"
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr "Error al escribir el segundo fichero de salida\n"
 
@@ -1842,43 +2068,40 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "Datos dañados o faltan datos, continuando..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 "Error al escribir la salida. El flujo de salida puede estar dañado o "
 "truncado."
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Error al abrir el fichero como vorbis: %s\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Comentario defectuoso: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "comentario defectuoso: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Error al escribir los comentarios en el fichero de salida: %s\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr "no se ha indicado ninguna acción\n"
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr "Imposible convertir comentario a UTF8, no se puede ser añadir\n"
-
-#: vorbiscomment/vcomment.c:287
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1898,7 +2121,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1933,45 +2156,50 @@
 "todos\n"
 "   los casos.\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Error interno al analizar las opciones de la línea de órdenes.\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Error de apertura del fichero de entrada '%s'.\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr ""
 "Puede que el nombre de fichero de entrada no sea el mismo que el de salida.\n"
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Error de apertura del fichero de salida '%s'.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Error de apertura del fichero de comentarios '%s'.\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Error de apertura del fichero de comentarios '%s'\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Error al borrar el fichero antiguo %s\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Error al cambiar el nombre de %s a %s\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr "Imposible convertir comentario a UTF8, no se puede ser añadir\n"
+
 #~ msgid "malloc"
 #~ msgstr "malloc"
 

Modified: trunk/vorbis-tools/po/fr.po
===================================================================
--- trunk/vorbis-tools/po/fr.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/fr.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -28,7 +28,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2003-03-06 15:15+0100\n"
 "Last-Translator: Martin Quinson <Martin.Quinson at ens-lyon.fr>\n"
 "Language-Team: French <traduc at traduc.org>\n"
@@ -37,74 +38,76 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Erreur : Plus de mémoire dans malloc_action().\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr ""
 "Erreur : Impossible d'allouer de la mémoire dans malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Erreur : Périphérique indisponible.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr "Erreur : %s a besoin d'un fichier de sortie à spécifier avec -f.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Erreur : Valeur d'option invalide pour le périphérique %s.\n"
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Erreur : Impossible d'ouvrir le périphérique %s.\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Erreur : Erreur de périphérique %s.\n"
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr ""
 "Erreur : Impossible d'attribuer un fichier de sortie pour le périphérique %"
 "s.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Erreur : Impossible d'ouvrir le fichier %s en écriture.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Erreur : Le fichier %s existe déjà.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Erreur : Cette erreur ne devrait jamais se produire (%d). Panique !\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Erreur : Plus de mémoire dans new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Erreur : Plus de mémoire dans new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Erreur : Plus de mémoire dans new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Erreur : Plus de mémoire dans decoder_buffered_metadata_callback().\n"
 
@@ -117,56 +120,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Erreur d'analyse : %s à la ligne %d de %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Nom"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Description"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Type"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Par défaut"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr "aucun"
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr "booléen"
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr "caractère"
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr "chaîne"
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr "entier"
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr "flottant"
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr "double"
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr "Autre"
 
@@ -174,9 +180,9 @@
 msgid "(NULL)"
 msgstr "(NUL)"
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(aucun)"
 
@@ -204,16 +210,16 @@
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "Erreur interne lors de l'analyse des options de la ligne de commande\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Le tampon d'entré est plus petit que le minimum valide (%dkO)."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -223,45 +229,45 @@
 "commande\n"
 "=== L'option était : %s\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Options disponibles :\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Pas de tel périphérique %s.\n"
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Le pilote %s n'est pas un pilote de fichier de sortie.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr ""
 "=== Impossible de spécifier quel fichier de sortie utiliser sans pilote.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Format d'option incorrecte : %s.\n"
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Valeur de prétampon invalide. L'intervalle est 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 de %s %s\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Impossible de jouer tous les « zéroièmes » tronçons !\n"
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -269,18 +275,22 @@
 "--- Impossible de jouer chaque tronçon zéro fois.\n"
 "--- Pour tester un décodeur, utilisez le pilote de sortie null.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- impossible d'ouvrir le fichier de liste %s.  Omis. \n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr ""
 "--- Le pilote %s indiqué dans le fichier de configuration est invalide.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -289,7 +299,7 @@
 "indiqué dans le fichier de configuration. Terminaison.\n"
 
 # Ce « live » est la sortie audio de la machine (par opposition à sortie fichier)
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -314,26 +324,28 @@
 "      Les périphériques possibles sont ('*'=live, '@'=fichier):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=fichier                 Spécifie le fichier de sortie pour un "
 "périphérique de\n"
@@ -357,25 +369,26 @@
 "Deux SIGINT en moins de s millisecondes et ogg123 s'arrêtera.\n"
 "  -l, --delay=s  Fixe s [millisecondes] (500 par défaut).\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Erreur : Plus de mémoire.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr ""
 "Erreur : Impossible d'allouer de la mémoire dans malloc_decoder_stat()\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Erreur : Impossible de fixer le masque de signal."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Erreur : Impossible de créer le tampon d'entrée.\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "pilote de sortie par défaut"
@@ -384,7 +397,7 @@
 msgid "shuffle playlist"
 msgstr "mélange la liste des morceaux"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -393,95 +406,95 @@
 "\n"
 "Périphérique audio : %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Auteur : %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "Commentaires : %s"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Attention : Impossible de lire le répertoire %s.\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Erreur : Impossible de créer les tampons audio.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Aucun module à lire depuis %s.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Impossible d'ouvrir %s.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Le format de fichier de %s n'est pas supporté.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 "Erreur lors de l'ouverture de %s avec le module %s. Le fichier est peut-être "
 "corrompu.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Écoute de : %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Impossible d'omettre %f secondes d'audio."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Erreur : Échec du décodage.\n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Terminé."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Trou dans le flux ; sans doute inoffensif\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== La bibliothèque Vorbis indique une erreur de flux.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Le flux a %d canaux, %ldHz"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr "Débit : max=%ld nominal=%ld min=%ld fenêtre=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Encodé par : %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
+#, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Erreur : Plus de mémoire dans create_playlist_member().\n"
 
@@ -491,6 +504,7 @@
 msgstr "Attention : dans la liste %s, impossible de lire le répertoire %s.\n"
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
+#, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Erreur : Plus de mémoire dans playlist_to_array().\n"
 
@@ -511,6 +525,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Erreur d'allocation mémoire dans stats_init()\n"
 
@@ -544,80 +559,102 @@
 msgid " Output Buffer %5.1f%%"
 msgstr " Tampon de sortie %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr ""
 "Erreur : Impossible d'allouer de la mémoire dans malloc_data_source_stats()\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "lecteur de fichier WAV"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "lecteur de fichier AIFF/AIFC"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "lecteur de fichier WAV"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "lecteur de fichier WAV"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr ""
 "Attention : fin de fichier inattendue lors de la lecture des entêtes WAV\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Omition d'un tronçon de type « %s » et de longueur %d\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Attention : fin de fichier inattendue dans un tronçon AIFF\n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Attention : aucun tronçon commun dans le fichier AIFF\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Attention : tronçon commun tronqué dans l'entête AIFF\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Attention : fin de fichier inattendue dans l'entête AIFF\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Attention : l'entête AIFF-C est tronqué.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Attention : Je ne sais pas gérer l'AIFF-C compressé\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Attention : le fichier AIFF ne contient pas de tronçon SSND\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Attention : tronçon SSND corrompu dans l'entête AIFF\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Attention : fin de fichier inattendue dans l'entête AIFF\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "Attention : OggEnc ne supporte pas ce type de fichier AIFF/AIFC\n"
 " Il doit s'agir de PCM en 8 ou 16 bits.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Attention : format de tronçon inconnu dans l'entête WAV\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -625,7 +662,8 @@
 "Attention : format de tronçon invalide dans l'entête WAV.\n"
 " Tentative de lecture malgrès tout (cela peut ne pas marcher)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
@@ -633,8 +671,8 @@
 "Erreur : Fichier WAV de type non supporté (doit être un PCM standard,\n"
 " ou un PCM en virgule flottante de type 3\n"
 
-#: oggenc/audio.c:466
-#, fuzzy
+#: oggenc/audio.c:480
+#, fuzzy, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
@@ -642,16 +680,18 @@
 "Erreur : Fichier WAV de sous-type non supporté (doit être un PCM 16 bits,\n"
 " ou un PCM en nombre flottant\n"
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
@@ -660,26 +700,28 @@
 "tronqué.\n"
 "Veuillez rapporter ce problème.\n"
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Impossible d'initialiser le rééchantilloneur\n"
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Réglage de l'option avancée « %s » à %s\n"
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Modification de la fréquence passe-bas de %f kHz à %f kHz\n"
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Option avancée « %s » inconnue\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
@@ -687,38 +729,51 @@
 "255 canaux devrait être suffisant pour tous. (désolé, vorbis ne permet pas "
 "d'en utiliser plus)\n"
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Demander un débit minimum ou maximum impose l'usage de --managed\n"
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Échec de l'initialisation du mode : paramètres de qualité invalides\n"
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 "Échec de l'initialisation du mode : paramètres invalides pour le débit\n"
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Écriture d'entêtes du flux de sortie infructueuse\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Écriture dans le flux de sortie infructueuse\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [%2dm%.2ds restant] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tEncodage [%2dm%.2ds pour l'instant] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -729,7 +784,8 @@
 "\n"
 "Fin de l'encodage du fichier « %s »\n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -739,7 +795,7 @@
 "\n"
 "Fin de l'encodage.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -748,17 +804,17 @@
 "\n"
 "\tLongueur de fichier :  %dm %04.1fs\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tTemps écoulé : %dm %04.1fs\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tTaux:         %.4f\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -767,7 +823,7 @@
 "\tDébit moyen : %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -778,17 +834,17 @@
 "         en %s%s%s \n"
 "au débit moyen de %d kbps "
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "entrée standard"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "sortie standard"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -799,7 +855,7 @@
 "         en %s%s%s \n"
 "au débit approximatif de %d kbps (encodage VBR en cours)\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -810,7 +866,7 @@
 "         en %s%s%s \n"
 "au niveau de qualité %2.2f en utilisant un VBR contraint "
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -821,7 +877,7 @@
 "         en %s%s%s \n"
 "à la qualité %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -832,7 +888,7 @@
 "         en %s%s%s \n"
 "en utilisant la gestion du débit "
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -841,11 +897,13 @@
 "%s%s\n"
 "Erreur : aucun fichier d'entrée n'a été spécifié. Voir -h pour de l'aide.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "Erreur : plusieurs fichiers spécifiés lors de l'usage de stdin\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
@@ -853,28 +911,29 @@
 "Erreur : plusieurs fichiers d'entrée pour le fichier de sortie spécifié : \n"
 " vous devriez peut-être utiliser -n\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "Erreur : impossible d'ouvrir le fichier d'entrée « %s » : %s\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Ouverture avec le module %s : %s\n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "Erreur : le fichier d'entrée « %s » n'est pas dans un format reconnu\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr ""
 "Attention : pas de nom de fichier. Utilisation de « default.ogg » par "
 "défaut.\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
@@ -882,31 +941,38 @@
 "Erreur : impossible de créer les sous répertoires nécessaires pour le "
 "fichier de sortie « %s »\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr "Le fichier de sortie doit être différent du fichier d'entrée\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "Erreur : impossible d'ouvrir le fichier de sortie « %s » : %s\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Rééchantillonage de l'entrée de %d Hz à %d Hz\n"
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Démultiplexage de la stéréo en mono\n"
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, fuzzy, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr ""
 "ERREUR : impossible de démultiplexer autre chose que de la stéréo en mono\n"
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -916,6 +982,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -923,25 +990,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -989,8 +1073,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1124,128 +1209,139 @@
 "   -o. \n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 "Attention : omition du caractère d'échappement illégal « %c » dans le nom de "
 "format\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "Mise en route du mécanisme de gestion du débit\n"
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "ATTENTION : nombre de canaux bruts spécifiés pour des données non-brutes. \n"
 " Les données sont supposées brutes.\n"
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr ""
 "ATTENTION : impossible de lire l'argument « %s » indiquant si le flux doit\n"
 "être petit ou grand boutiste (little ou big endian)\n"
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr ""
 "ATTENTION : Impossible de lire la fréquence de rééchantillonage « %s »\n"
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 "Attention : le taux de rééchantillonage spécifié est %d Hz. Vouliez vous "
 "dire %d Hz ?\n"
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Attention : Impossible de lire le répertoire %s.\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Valeur pour l'option avancée d'encodage introuvable\n"
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr ""
 "Erreur interne lors de l'analyse des options sur la ligne de commande\n"
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Attention : commande illégale (« %s »). ignorée.\n"
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Attention : le débit nominal « %s » n'est pas reconnu\n"
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Attention : le débit minimum « %s » n'est pas reconnu\n"
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Attention : le débit maximum « %s » n'est pas reconnu\n"
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Option de qualité « %s » inconnue, ignorée\n"
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 "ATTENTION : le réglage de la qualité est trop haut, retour au maximum "
 "possible.\n"
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 "ATTENTION : plusieurs noms de formats spécifiés. Utilisation du dernier\n"
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 "ATTENTION : plusieurs noms de filtres de formats spécifiés. Utilisation du "
 "dernier\n"
 
 # JCPCAP
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 "ATTENTION : plusieurs noms de filtres de formats en remplacement spécifiés. "
 "Utilisation du dernier\n"
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 "ATTENTION : Plusieurs fichiers de sortie spécifiés, vous devriez peut-être \n"
 "utiliser -n\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "ATTENTION : bits/échantillon bruts spécifiés pour des données non-brutes. \n"
 " Les données sont supposées brutes.\n"
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr ""
 "ATTENTION : le bits/échantillon spécifié est invalide. Utilisation de 16.\n"
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
@@ -1253,12 +1349,13 @@
 "ATTENTION : nombre de canaux bruts spécifiés pour des données non-brutes. \n"
 " Les données sont supposées brutes.\n"
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "Attention : Nombre de canaux invalide. Utilisation de 2.\n"
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
@@ -1266,24 +1363,27 @@
 "brutes.\n"
 " Les données sont supposées brutes.\n"
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 "Attention : Le taux d'échantillonage spécifié n'est pas valide. Utilisation "
 "de 44100.\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "Attention : Option inconnue donnée, ignorée ->\n"
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 "Impossible de convertir les commentaires en UTF-8. Impossible de les "
 "ajouter\n"
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 "Attention : pas assez de titres spécifiés, utilisation du dernier par "
@@ -1304,16 +1404,177 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Erreur : le segment de chemin « %s » n'est pas un répertoire\n"
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
+#, fuzzy, c-format
+msgid ""
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
+msgstr ""
+"Attention le commentaire %d dans le flux %d est mal formaté car il ne "
+"contient pas '=' : « %s »\n"
+
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+"Attention : nom de champ invalide dans le commentaire %d du flux %d : « %s "
+"»\n"
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+"Attention : séquence UTF-8 illégale dans le commentaire %d du flux %d : "
+"mauvais marqueur de longueur\n"
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+"Attention : séquence UTF-8 illégale dans le commentaire %d du flux %d : trop "
+"peu d'octets\n"
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+"Attention : séquence UTF-8 illégale dans le commentaire %d du flux %d : "
+"séquence invalide\n"
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr ""
+"Attention : échec dans le décodeur utf8. Cela devrait être impossible\n"
+
+#: ogginfo/ogginfo2.c:318
+#, fuzzy, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+"Attention : Impossible de décoder l'entête du paquet vorbis - flux vorbis "
+"invalide (%d)\n"
+
+# FIXME
+#: ogginfo/ogginfo2.c:325
+#, fuzzy, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
+msgstr ""
+"Attention : paquets des entêtes du flux Vorbis %d malformés. La dernière "
+"page des entêtes contient des paquets supplémentaires ou a un granulepos non-"
+"nul.\n"
+
+#: ogginfo/ogginfo2.c:329
+#, fuzzy, c-format
+msgid "Theora headers parsed for stream %d, information follows...\n"
+msgstr "Entêtes Vorbis du flux %d analysés, les informations suivent...\n"
+
+#: ogginfo/ogginfo2.c:332
+#, fuzzy, c-format
+msgid "Version: %d.%d.%d\n"
+msgstr "Version : %d\n"
+
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
+#, c-format
+msgid "Vendor: %s\n"
+msgstr "Vendeur : %s\n"
+
+#: ogginfo/ogginfo2.c:335
+#, c-format
+msgid "Width: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:336
+#, fuzzy, c-format
+msgid "Height: %d\n"
+msgstr "Version : %d\n"
+
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
+msgid "User comments section follows...\n"
+msgstr "Les commentaires de l'utilisateur suivent...\n"
+
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+#, fuzzy
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "Attention : le granulepos du flux %d a décru de "
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, fuzzy, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr "Attention : le granulepos du flux %d a décru de "
+
+#: ogginfo/ogginfo2.c:432
+#, fuzzy
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Flux Vorbis %d :\n"
+"\tLongueur totale des données : %ld octets\n"
+"\tDurée totale : %ldm:%02lds\n"
+"\tDébit moyen : %f kbps\n"
+
+#: ogginfo/ogginfo2.c:438
+#, fuzzy, c-format
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Flux Vorbis %d :\n"
+"\tLongueur totale des données : %ld octets\n"
+"\tDurée totale : %ldm:%02lds\n"
+"\tDébit moyen : %f kbps\n"
+
+#: ogginfo/ogginfo2.c:466
+#, c-format
+msgid ""
 "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 "Attention : Impossible de décoder l'entête du paquet vorbis - flux vorbis "
 "invalide (%d)\n"
 
 # FIXME
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
 "Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
@@ -1323,32 +1584,27 @@
 "page des entêtes contient des paquets supplémentaires ou a un granulepos non-"
 "nul.\n"
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:477
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Entêtes Vorbis du flux %d analysés, les informations suivent...\n"
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Version : %d\n"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Vendeur : %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:183
+#: ogginfo/ogginfo2.c:492
 #, c-format
-msgid "Vendor: %s\n"
-msgstr "Vendeur : %s\n"
-
-#: ogginfo/ogginfo2.c:184
-#, c-format
 msgid "Channels: %d\n"
 msgstr "Canaux : %d\n"
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1357,154 +1613,108 @@
 "Taux : %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:188
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Débit nominal : %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:191
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Pas de débit nominal indiqué\n"
 
-#: ogginfo/ogginfo2.c:194
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Débit maximal : %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:197
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Pas de débit maximal indiqué\n"
 
-#: ogginfo/ogginfo2.c:200
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Débit minimal : %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:203
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Pas de débit minimal indiqué\n"
 
-#: ogginfo/ogginfo2.c:206
-msgid "User comments section follows...\n"
-msgstr "Les commentaires de l'utilisateur suivent...\n"
-
-#: ogginfo/ogginfo2.c:218
-#, c-format
+#: ogginfo/ogginfo2.c:539
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Negative granulepos on vorbis stream outside of headers. This file was "
+"created by a buggy encoder\n"
 msgstr ""
-"Attention le commentaire %d dans le flux %d est mal formaté car il ne "
-"contient pas '=' : « %s »\n"
 
-#: ogginfo/ogginfo2.c:227
-#, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Attention : nom de champ invalide dans le commentaire %d du flux %d : « %s "
-"»\n"
-
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
-#, c-format
+#: ogginfo/ogginfo2.c:561
+#, fuzzy
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Attention : séquence UTF-8 illégale dans le commentaire %d du flux %d : "
-"mauvais marqueur de longueur\n"
+"Flux Vorbis %d :\n"
+"\tLongueur totale des données : %ld octets\n"
+"\tDurée totale : %ldm:%02lds\n"
+"\tDébit moyen : %f kbps\n"
 
-#: ogginfo/ogginfo2.c:275
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Attention : séquence UTF-8 illégale dans le commentaire %d du flux %d : trop "
-"peu d'octets\n"
-
-#: ogginfo/ogginfo2.c:336
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
-msgstr ""
-"Attention : séquence UTF-8 illégale dans le commentaire %d du flux %d : "
-"séquence invalide\n"
-
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr ""
-"Attention : échec dans le décodeur utf8. Cela devrait être impossible\n"
-
-#: ogginfo/ogginfo2.c:366
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-msgstr "Attention : le granulepos du flux %d a décru de "
-
-#: ogginfo/ogginfo2.c:369
+#: ogginfo/ogginfo2.c:567
 #, fuzzy, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
-msgstr "Attention : le granulepos du flux %d a décru de "
-
-#: ogginfo/ogginfo2.c:375
 msgid ""
-"Negative granulepos on vorbis stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:395
-#, c-format
-msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 "Flux Vorbis %d :\n"
 "\tLongueur totale des données : %ld octets\n"
 "\tDurée totale : %ldm:%02lds\n"
 "\tDébit moyen : %f kbps\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Attention: EOS non positionné dans le flux %d\n"
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Attention : Page d'entête invalide, aucun paquet trouvé\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 "Attention : Page d'entête invalide pour le flux %d, elle contient plusieurs "
 "paquets\n"
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 #, fuzzy
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr "Attention : trou trouvé dans les données après environ "
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, fuzzy, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr "Attention : trou trouvé dans les données après environ "
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Erreur lors de l'ouverture du fichier d'entrée « %s » : %s\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1513,25 +1723,25 @@
 "Traitement du fichier « %s »...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Impossible de trouver un processeur pour le flux, parachute déployé\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, fuzzy, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -1540,23 +1750,23 @@
 "Attention : page(s) mal placée(s) dans le flux logique %d\n"
 "Ceci indique un fichier ogg corrompu.\n"
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Nouveau flux logique (n°%d, n° de série : %08x) : type %s\n"
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr ""
 "Attention : le fanion de début de flux n'est pas positionné dans le flux %d\n"
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "Attention : fanion de début de flux au milieu du flux %d\n"
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
@@ -1565,12 +1775,12 @@
 "Attention : trou dans les séquences du flux %d. Reçu la page %ld à la place "
 "de la page %ld escomptée. Il manque des données.\n"
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Fin du flux logique %d\n"
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1579,11 +1789,11 @@
 "Erreur : aucune donnée ogg trouvée dans le fichier « %s ».\n"
 "L'entrée n'est sans doute pas au format ogg.\n"
 
-#: ogginfo/ogginfo2.c:713
-#, fuzzy
+#: ogginfo/ogginfo2.c:905
+#, fuzzy, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1606,7 +1816,8 @@
 "           détaillés pour certains types de flux.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1621,7 +1832,8 @@
 "concernant.\n"
 "Pour avoir toute l'aide, faites « ogginfo -h ».\n"
 
-#: ogginfo/ogginfo2.c:763
+#: ogginfo/ogginfo2.c:955
+#, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""
 "Aucun fichier d'entrée n'a été spécifié. Faites « ogginfo -h » pour de "
@@ -1647,19 +1859,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s : l'option « %s » nécessite un argument\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s : option « --%s » inconnue\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s : option « %c%s » inconnue\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1670,7 +1879,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s : option invalide -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1687,34 +1895,37 @@
 msgstr "%s : l'option « -W %s » n'admet pas d'argument\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Erreur de page. Entrée corrompue.\n"
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Erreur de flux, on continue\n"
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "Fin de flux trouvée avant le point de césure.\n"
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Placement de eos : la mise à jour de sync a retourné 0\n"
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Point de césure au delà du flux. Le second fichier sera vide\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Cas spécial non traité : le premier fichier est il trop petit ?\n"
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -1723,43 +1934,52 @@
 "         Il sera peut-être impossible de décoder ce fichier.\n"
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Erreur non fatale dans le flux\n"
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr "Erreur dans le flux\n"
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr "La mise à jour de sync a retourné 0, positionnement de eos\n"
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "L'entrée n'est pas un ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "Erreur à la première page\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "erreur dans le premier paquet\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Erreur dans l'entête primaire : pas du vorbis ?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Entête secondaire corrompu\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "EOF dans les entêtes\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr ""
@@ -1767,6 +1987,7 @@
 "césure\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1803,18 +2024,22 @@
 msgstr "Traitement : Coupure à %lld\n"
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr "Échec du traitement\n"
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr "Erreur lors de la lecture des entêtes\n"
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr "Erreur lors de l'écriture du premier fichier de sortie\n"
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr "Erreur lors de l'écriture du second fichier de sortie\n"
 
@@ -1850,43 +2075,39 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "Données corrompues ou manquantes, on continue..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 "Échec de l'écriture du flux. Le flux de sortie peut être corrompu ou tronqué."
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Impossible d'ouvrir le fichier comme un vorbis : %s\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Mauvais commentaire : « %s »\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "mauvais commentaire : « %s »\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Impossible d'écrire les commentaires dans le fichier de sortie : %s\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr "Pas d'action spécifiée\n"
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr ""
-"Impossible de convertir les commentaires en UTF8, impossible de les ajouter\n"
-
-#: vorbiscomment/vcomment.c:287
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1906,7 +2127,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1937,44 +2158,51 @@
 "      ce n'est pas suffisant pour résoudre les problèmes d'encodage dans\n"
 "      tous les cas.\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Erreur interne lors de l'analyse des options de commande.\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Erreur lors de l'ouverture du fichier d'entrée « %s ».\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Le fichier de sortie doit être différent du fichier d'entrée\n"
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Erreur lors de l'ouverture du fichier de sortie « %s ».\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Erreur lors de l'ouverture du fichier de commentaires « %s ».\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Erreur lors de l'ouverture du fichier de commentaires « %s »\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Erreur lors de la suppression du vieux fichier %s\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Erreur lors du renommage de %s en %s\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr ""
+#~ "Impossible de convertir les commentaires en UTF8, impossible de les "
+#~ "ajouter\n"
+
 #~ msgid "malloc"
 #~ msgstr "malloc"
 

Modified: trunk/vorbis-tools/po/hr.po
===================================================================
--- trunk/vorbis-tools/po/hr.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/hr.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 0.99.1.3.1\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2002-06-16 02:15-01\n"
 "Last-Translator: Vlatko Kosturjak <kost at linux.hr>\n"
 "Language-Team: Croatian <lokalizacija at linux.hr>\n"
@@ -16,71 +17,73 @@
 "X-Generator: TransDict server\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr ""
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr ""
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr ""
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr ""
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr ""
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr ""
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr ""
 
@@ -93,56 +96,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr ""
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Ime"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Opis"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Tip"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Uobičajeno"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr "ništa"
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr "niz znakova"
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr "dvostruki"
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr "drugi"
 
@@ -150,9 +156,9 @@
 msgid "(NULL)"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(nijedan)"
 
@@ -180,82 +186,86 @@
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr ""
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
 "=== Option was: %s\n"
 msgstr ""
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Raspoložive opcije:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 iz %s %s\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -270,46 +280,49 @@
 "        "
 msgstr ""
 
-#: ogg123/cmdline_options.c:279
+#: ogg123/cmdline_options.c:306
 #, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Greška: Nedovoljno memorije.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr ""
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr ""
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr ""
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr ""
@@ -318,101 +331,100 @@
 msgid "shuffle playlist"
 msgstr ""
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
 "Audio Device:   %s"
 msgstr ""
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Autor:   %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, fuzzy, c-format
 msgid "Comments: %s"
 msgstr "Komentari: %s\n"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Ne mogu otvoriti %s.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Reproduciram: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr ""
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr ""
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Gotovo."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Enkodirao: %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
-#, fuzzy
+#, fuzzy, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Greška: Nedovoljno memorije.\n"
 
@@ -422,7 +434,7 @@
 msgstr ""
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
-#, fuzzy
+#, fuzzy, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Greška: Nedovoljno memorije.\n"
 
@@ -443,6 +455,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr ""
 
@@ -476,163 +489,203 @@
 msgid " Output Buffer %5.1f%%"
 msgstr ""
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr ""
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr ""
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr ""
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+msgid "FLAC file reader"
+msgstr ""
+
+#: oggenc/audio.c:52
+msgid "Ogg FLAC file reader"
+msgstr ""
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr ""
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr ""
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr ""
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr ""
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr ""
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr ""
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr ""
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:323
+#: oggenc/audio.c:336
+#, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr ""
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
 msgstr ""
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:466
+#: oggenc/audio.c:480
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
 msgstr ""
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr ""
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr ""
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr ""
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, fuzzy, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "%s: neprepoznata opcija `--%s'\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
 msgstr ""
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr ""
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:349
+#: oggenc/encode.c:381
 #, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr ""
 
-#: oggenc/encode.c:359
+#: oggenc/encode.c:391
 #, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr ""
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -640,38 +693,39 @@
 "Done encoding file \"%s\"\n"
 msgstr ""
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Done encoding.\n"
 msgstr ""
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
 "\tFile length:  %dm %04.1fs\n"
 msgstr ""
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr ""
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr ""
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
 "\n"
 msgstr ""
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -679,17 +733,17 @@
 "at average bitrate %d kbps "
 msgstr ""
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr ""
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr ""
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -697,7 +751,7 @@
 "at approximate bitrate %d kbps (VBR encoding enabled)\n"
 msgstr ""
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -705,7 +759,7 @@
 "at quality level %2.2f using constrained VBR "
 msgstr ""
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -713,7 +767,7 @@
 "at quality %2.2f\n"
 msgstr ""
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -721,72 +775,82 @@
 "using bitrate management "
 msgstr ""
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
 "ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr ""
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr ""
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
 #, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr ""
+
+#: oggenc/oggenc.c:289
+#, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr ""
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, c-format
 msgid ""
 "%s%s\n"
@@ -796,6 +860,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -803,25 +868,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -869,8 +951,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -883,134 +966,149 @@
 "\n"
 msgstr ""
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr ""
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr ""
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr ""
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr ""
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
 msgstr ""
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr ""
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 
@@ -1029,249 +1127,340 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid ""
-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
-"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:225
 #, c-format
-msgid "Vorbis headers parsed for stream %d, information follows...\n"
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:172
-#, fuzzy, c-format
-msgid "Version: %d\n"
-msgstr "Inačica: %s"
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:318
 #, c-format
-msgid "Vendor: %s (%s)\n"
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:183
+#: ogginfo/ogginfo2.c:325
+#, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:329
+#, c-format
+msgid "Theora headers parsed for stream %d, information follows...\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:332
 #, fuzzy, c-format
+msgid "Version: %d.%d.%d\n"
+msgstr "Inačica: %s"
+
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
+#, fuzzy, c-format
 msgid "Vendor: %s\n"
 msgstr "Žanr: %s"
 
-#: ogginfo/ogginfo2.c:184
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Channels: %d\n"
+msgid "Width: %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:336
 #, fuzzy, c-format
-msgid ""
-"Rate: %ld\n"
-"\n"
-msgstr "Nadnevak: %s"
+msgid "Height: %d\n"
+msgstr "Inačica: %s"
 
-#: ogginfo/ogginfo2.c:188
+#: ogginfo/ogginfo2.c:337
 #, c-format
-msgid "Nominal bitrate: %f kb/s\n"
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:191
-msgid "Nominal bitrate not set\n"
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:194
-#, c-format
-msgid "Upper bitrate: %f kb/s\n"
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:197
-msgid "Upper bitrate not set\n"
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:200
+#: ogginfo/ogginfo2.c:347
 #, c-format
-msgid "Lower bitrate: %f kb/s\n"
+msgid "Framerate %d/%d (%f fps)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:203
-msgid "Lower bitrate not set\n"
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:206
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
 msgid "User comments section follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:218
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
 #, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:432
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:227
+#: ogginfo/ogginfo2.c:438
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
+#: ogginfo/ogginfo2.c:466
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:275
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:336
+#: ogginfo/ogginfo2.c:477
 #, c-format
+msgid "Vorbis headers parsed for stream %d, information follows...\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:480
+#, fuzzy, c-format
+msgid "Version: %d\n"
+msgstr "Inačica: %s"
+
+#: ogginfo/ogginfo2.c:484
+#, c-format
+msgid "Vendor: %s (%s)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:492
+#, c-format
+msgid "Channels: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:493
+#, fuzzy, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+"Rate: %ld\n"
+"\n"
+msgstr "Nadnevak: %s"
+
+#: ogginfo/ogginfo2.c:496
+#, c-format
+msgid "Nominal bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+#: ogginfo/ogginfo2.c:499
+msgid "Nominal bitrate not set\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:366
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+#: ogginfo/ogginfo2.c:502
+#, c-format
+msgid "Upper bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:369
+#: ogginfo/ogginfo2.c:505
+msgid "Upper bitrate not set\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:508
 #, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
+msgid "Lower bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:375
+#: ogginfo/ogginfo2.c:511
+msgid "Lower bitrate not set\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:539
 msgid ""
 "Negative granulepos on vorbis stream outside of headers. This file was "
 "created by a buggy encoder\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:395
+#: ogginfo/ogginfo2.c:561
+msgid ""
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:567
 #, c-format
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
 "\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
 "This indicates a corrupt ogg file: %s.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
 "ld. Indicates missing data.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
 "Input probably not ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:713
+#: ogginfo/ogginfo2.c:905
+#, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1283,7 +1472,8 @@
 "\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1292,7 +1482,8 @@
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:763
+#: ogginfo/ogginfo2.c:955
+#, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""
 
@@ -1316,19 +1507,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opcija `%s' zahtijeva argument\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: neprepoznata opcija `--%s'\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: neprepoznata opcija `%c%s'\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1339,7 +1527,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: nedozvoljena opcija -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1356,81 +1543,95 @@
 msgstr "%s: opcija `-W %s' ne dopušta argument\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr ""
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr ""
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr ""
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr ""
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr ""
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr ""
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
 msgstr ""
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr ""
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr ""
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr ""
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr ""
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr ""
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr ""
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr ""
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr ""
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr ""
 
 #: vcut/vcut.c:468
+#, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr ""
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1463,18 +1664,22 @@
 msgstr ""
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr ""
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr ""
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr ""
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr ""
 
@@ -1510,41 +1715,38 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr ""
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:287
+#: vorbiscomment/vcomment.c:292
+#, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1564,47 +1766,49 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
 "   cases.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr ""

Modified: trunk/vorbis-tools/po/hu.po
===================================================================
--- trunk/vorbis-tools/po/hu.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/hu.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools-0.99.1.3.1\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2002-08-05 11:38GMT\n"
 "Last-Translator: Gábor István <stive at mezobereny.hu>\n"
 "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -15,71 +16,73 @@
 "X-Generator: KBabel 0.9.5\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Hiba: Elfogyott a memória a malloc_action() -ban.\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Hiba: Nem lehet lefoglalni memóriát malloc_buffer_stats()-ban\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Hiba: Eszköz nem áll rendelkezésre.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr "Hiba: %s-nek szükséges egy kimeneti fájlnevet meghatározni a -f el.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Hiba:Nem támogatott opció a %s eszközön.\n"
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Hiba: Nem lehet megnyitni a %s eszközt.\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Hiba: %s eszköz hibás.\n"
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Hiba: A kimeneti fájlt nem lehet átadni a %s eszköznek.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Hiba: A %s fájlt nem lehet megnyitni írásra.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Hiba: A %s fájl már létezik.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Hiba: Ez a hiba soha nem történhet meg(%d). Baj van!\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Hiba: Elfogyott a  memória a new_audio_reopen_arg() ban.\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Hiba: Elfogyott a  memória a new_print_statistics_arg() ban .\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Hiba: Elfogyott a  memória a new_status_message_arg() ban .\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr ""
 "Hiba: Elfogyott a  memória a decoder_buffered_metadata_callback() ban .\n"
@@ -93,56 +96,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Értelmezési hiba: %s sorban a %d ban %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Név"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Leírás"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Típus"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Alapértelmezett"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr "nincs"
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr "bool"
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr "karakter"
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr "karakterlánc"
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr "egész"
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr "lengõpontos szám"
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr "dupla"
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr "más"
 
@@ -150,9 +156,9 @@
 msgid "(NULL)"
 msgstr "(NULLA)"
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(nincs)"
 
@@ -180,17 +186,17 @@
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 #, fuzzy
 msgid "Internal error parsing command line options.\n"
 msgstr "Belsõ hiba a parancs sori opció elemzése során\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Bevitel puffer mérete kisebb méret mint %dkB."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -199,45 +205,45 @@
 "===Hiba \"%s\" a parancs sori opciók értelmezése közben\n"
 "===Opció %s volt\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Rendelkezésre álló opciók:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Nem ilyen eszköz: %s.\n"
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Meghajtó %s nem kimeneti fájlba irányítható meghajtó.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr ""
 "=== Nem lehet meghatározni a kimeneti fájlt meghajtó meghatározása nélkül.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "==== Érvénytelen kimeneti formátum: %s.\n"
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "---  Elõbuffer érték érvénytelen. Érvényes tartomány: 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 a %s %s -ból\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Nem lehet lejátszani a 0-dik csonkokat!\n"
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -245,18 +251,22 @@
 "--- Nem lehet lejátszani a nulla csonkokat.\n"
 "--- A kódólás kipróbálásához használja a null kimeneti meghatjót.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, fuzzy, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s fájlt\n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr ""
 "--- A konfigurációs állmányban meghatározott %s meghajtó érvénytelen.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -264,7 +274,7 @@
 "=== Nem lehet betölteni az alapértelmezés szerinti meghajtót és nincs "
 "meghajtó meghatározva a beállítás fájlban. Kilép.\n"
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, fuzzy, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -289,26 +299,28 @@
 "      Lehetséges eszközök ('*'=live, '@'=file):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=fájlnév  Beállítja a kiemeneti fájlnevet az elõzõleg\n"
 "      meghatározott eszközhöz (a '-d'-vel).\n"
@@ -329,24 +341,25 @@
 "s ezredmásodpercen belül akkor megszakad az ogg123 futása.\n"
 "  -l, --delay=s  beállítja s [ezredmásodperc] (alapból 500).\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Hiba: Elfogyott a memória.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Hiba: Nem lehet lefoglalni memóriát a malloc_decoder_stats() -ban\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Hiba: Nem lehet beállítani a szignál maszkot."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Hiba: Nem lehet létrehozni a bemeneti puffert.\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "alapértelmezés szerinti kimenet eszköz"
@@ -355,7 +368,7 @@
 msgid "shuffle playlist"
 msgstr "véletelen lejátszási lista"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -364,96 +377,95 @@
 "\n"
 "Eszköz:   %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Szerzõ:   %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, fuzzy, c-format
 msgid "Comments: %s"
 msgstr "Megjegyzések: %s\n"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, fuzzy, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Nem lehet létrehozni a könyvtárat \"%s\": %s\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Hiba: Nem lehet létrehozni a audio puffert.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Nem találtam modult a %s belovasása során.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Nem lehet megnyitni a %s-t.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "A %s fájl formátum nem támogatott.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 "Hiba a %s megnyitása közben ami a %s modult használna. A fájl lehet, hogy "
 "sérült.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Lejátszás: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Nem lehet átugrani %f másodpercet ."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Hiba: Visszakódólás nem sikerült.\n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Kész."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Lyuk a adatfolyamban, lehet hogy ártalmatlan\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== a vorbis programozói könyvtár adatfolyam hibát jelentett.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Bitfolyam %d csatornán, %ldHz"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr "Bitráta adatok: felsõ=%ld névleges=%ld alsó=%ld ablak=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Kódolva: %s-el"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
-#, fuzzy
+#, fuzzy, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Hiba: Elfogyott a  memória a new_status_message_arg() ban .\n"
 
@@ -463,7 +475,7 @@
 msgstr ""
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
-#, fuzzy
+#, fuzzy, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Hiba: Elfogyott a memória a malloc_action() -ban.\n"
 
@@ -484,6 +496,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Memória kiosztás hiba a stats_init()-ban\n"
 
@@ -517,79 +530,101 @@
 msgid " Output Buffer %5.1f%%"
 msgstr "Kimeneti puffer %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr ""
 "Hiba: Nem tudom lefoglalni a memóriát a malloc_data_source_stats()-ban\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "WAV fájl olvasó"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "AIFF/AIFC fájl olvasó"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "WAV fájl olvasó"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "WAV fájl olvasó"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Figyelmeztetés: Váratlan fájl vég a WAV fejlécben\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "\"%s\" típusú csonk átugrása, hossz: %d\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Figyelmeztetés: Váratlan fájl vég az AIFF csonkban\n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Figyelmeztetés: Nem találtam közös csonkot az AIFF fájlban\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Figyelmeztetés: Csonkított közös csonk az AIFF fejlécben\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Figyelmeztetés: Váratlan fájl vég az AIFF fejlécben\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Figyelmeztetés: AIFF-C fejléc csonkított.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Figyelmeztetés: Nem tudom kezelni a tömörített AIFF-C-t\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Figyelmeztetés: Nem találtam SSND csonkot az AIFF fájlban\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Figyelmeztetés: Sérült az SSND csonk az AIFF fájlban\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Figyelmeztetés: Váratlan fájlvég az AIFF fejlécben\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "Figyelmeztetés: Az OggEnc nem támogatja ezt a típusú AIFF/AIFC fájlt\n"
 " 8 vagy 16 bit-es PCM kell hogy legyen.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Figyelmeztetés: Ismeretlen formátumú csonk a WAV fejlécben\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -597,7 +632,8 @@
 "Figyelmeztetés:  ÉRVÉNYTELEN formátumú csonk a wav fejlécben\n"
 " Megprobálom mindenkép elolvasni (lehet hogy nem fog mûködni)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
@@ -605,8 +641,8 @@
 "HIBA: A Wav fájl nem támogatott típusú (normális PCM\n"
 " vagy 5-as típusú lebegõ pontos PCM)\n"
 
-#: oggenc/audio.c:466
-#, fuzzy
+#: oggenc/audio.c:480
+#, fuzzy, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
@@ -614,79 +650,96 @@
 "HIBA: A WAV fájl nem támogatott alformátumott tartalmazz( 16-bites PCM \n"
 "vagy lebegõ pontos PCM-nek kell lennie)\n"
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
 msgstr ""
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr ""
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr ""
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr ""
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, fuzzy, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "%s: a `--%s' kapcsoló ismeretlen\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
 msgstr ""
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr ""
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 "Mód installáció nem sikerült: ennek a minõségnek érvénytelen a paramétere\n"
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 "Mód installáció nem sikerült: ennek a bitrátának érvénytelen a paramétere\n"
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Nem sikerült a fejléc kiírása\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Nem sikerült az adatfolyam írása\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [%2dm%.2ds átnevezés] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tKódólás [%2dm%.2ds ] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -697,7 +750,8 @@
 "\n"
 "Kész a \"%s\" fájl kódolása \n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -707,7 +761,7 @@
 "\n"
 "Kódólás kész.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -716,17 +770,17 @@
 "\n"
 "\tFájl mérete:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tHátralévõ idõ: %dm %04.1fs\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tRáta:         %.4f\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -735,7 +789,7 @@
 "\tÁtlagos bitráta: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -745,17 +799,17 @@
 "Kódólás %s%s%s  \n"
 "         %s%s%s midõségben %2.2f\n"
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "szabványos bemenet"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "szabványos kimenet"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -766,7 +820,7 @@
 "         %s%s%s bitráta %d kbps,\n"
 "teljes bitrátakezelõ motort használom\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -776,7 +830,7 @@
 "Kódólás %s%s%s  \n"
 "         %s%s%s midõségben %2.2f\n"
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -786,7 +840,7 @@
 "Kódólás %s%s%s  \n"
 "         %s%s%s midõségben %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -797,7 +851,7 @@
 "         %s%s%s bitráta %d kbps,\n"
 "teljes bitrátakezelõ motort használom\n"
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -806,11 +860,13 @@
 "%s%s\n"
 "HIBA: Nincs bemeneti fájl meghatározva. Használja a '-h' segítségért.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "HIBA: Több fájlt határozott meg amikor az stdin-t használta\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
@@ -818,58 +874,67 @@
 "HIBA: Több bemeneti fájlt adott meg mikor határozta a kimeneti fájlnevet, "
 "javaslom használja a '-n'-t\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s fájlt\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "A %s megnyitása %s modullal \n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "HIBA Bemeneti fájl \"%s\" formátuma nem támogatott\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr ""
 "FIGYELEM: Nem határozott meg fájlnevet, az alapértelmezés szerinti \"default."
 "ogg\"-t használom\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
 msgstr ""
 "HIBA: Nem lehet létrehozni az igényelt könyvtárat a '%s' kimeneti fájlnak\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr ""
+"HIBA: Nem lehet létrehozni az igényelt könyvtárat a '%s' kimeneti fájlnak\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s kimenet fájlt\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr ""
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -879,6 +944,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -886,25 +952,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -952,8 +1035,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1054,116 +1138,126 @@
 "a '-o'-val hatázhatja meg\n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr "FIGYELEM: Érvénytelen eszkép karakter a '%c' a névben\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "A bitrára kezelés motor engedélyezése\n"
 
-#: oggenc/oggenc.c:581
-#, fuzzy
+#: oggenc/oggenc.c:605
+#, fuzzy, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "FIGYELEM:Nyers csatorna számlálót határozott meg nem nyers adatra. A "
 "bemenetet nyersként használom.\n"
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Nem tudom értelmezni a vágásipontot\"%s\"\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr ""
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Belsõ hiba a parancs sori opció elemzése során\n"
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Figyelmeztetés: névleges \"%s\" nem értelmezhetõ\n"
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Figyelmeztetés: minimális \"%s\" nem értelmezhetõ\n"
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Figyelmeztetés: maximális \"%s\" nem értelmezhetõ\n"
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Minõség opciók \"%s\" nem értelmezhetõ\n"
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 "FIGYELEM: a minõség túl magasra lett állítva, a maximálisra beállítva.\n"
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 "FIGYELEM: Többszörös név formátumot hatázott meg, az utolsót használom\n"
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 "FIGYELEM: Többszörös név formátum szûröt hatázott meg, az utolsót használom\n"
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 "FIGYELEM: Többszörös név formátum szûrõ cserét hatázott meg, az utolsót "
 "használom\n"
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr "FIGYELEM: Több kimeneti fájlt hatázott meg használja a '-n'-t\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "FIGYELEM:Nyers bitmintát határozott meg nem nyers adatra. A bemenetet "
 "nyersként használom.\n"
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr ""
 "FIGYELEM: Érénytelen mintavételezést határozott meg, 16-ost használom.\n"
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
@@ -1171,35 +1265,39 @@
 "FIGYELEM:Nyers csatorna számlálót határozott meg nem nyers adatra. A "
 "bemenetet nyersként használom.\n"
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr ""
 "FIGYELEM: Érvénytelen csatorna számlálót határozott meg, 2-est használom.\n"
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "FIGYELEM:Nyers mintavételezést határozott meg nem nyers adatra. A bemenetet "
 "nyersként használom.\n"
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 "FIGYELEM: Événytelen mintavételezést határott meg 44100-at használom.\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "FIGYELEM Ismeretlen opciót határozott meg, elutasítva->\n"
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 "Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n"
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr "FIGYELEM: Kevés címet adott meg, az utolsó címet használom.\n"
 
@@ -1218,257 +1316,348 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Hiba: az útvonal \"%s\" része nem könyvtár\n"
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid ""
-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
-"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:318
+#, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:325
+#, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
 "header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:329
 #, c-format
-msgid "Vorbis headers parsed for stream %d, information follows...\n"
+msgid "Theora headers parsed for stream %d, information follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:332
 #, fuzzy, c-format
-msgid "Version: %d\n"
+msgid "Version: %d.%d.%d\n"
 msgstr "Verzió: %s"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
 #, fuzzy, c-format
-msgid "Vendor: %s (%s)\n"
-msgstr "forgalmazó=%s\n"
-
-#: ogginfo/ogginfo2.c:183
-#, fuzzy, c-format
 msgid "Vendor: %s\n"
 msgstr "forgalmazó=%s\n"
 
-#: ogginfo/ogginfo2.c:184
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Channels: %d\n"
+msgid "Width: %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:336
 #, fuzzy, c-format
-msgid ""
-"Rate: %ld\n"
-"\n"
-msgstr "Dátum: %s"
+msgid "Height: %d\n"
+msgstr "Verzió: %s"
 
-#: ogginfo/ogginfo2.c:188
-#, fuzzy, c-format
-msgid "Nominal bitrate: %f kb/s\n"
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
 msgstr ""
-"\tÁtlagos bitráta: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:191
-#, fuzzy
-msgid "Nominal bitrate not set\n"
-msgstr "Figyelmeztetés: névleges \"%s\" nem értelmezhetõ\n"
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
+msgstr ""
 
-#: ogginfo/ogginfo2.c:194
-#, fuzzy, c-format
-msgid "Upper bitrate: %f kb/s\n"
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
 msgstr ""
-"\tÁtlagos bitráta: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:197
-msgid "Upper bitrate not set\n"
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:200
-#, fuzzy, c-format
-msgid "Lower bitrate: %f kb/s\n"
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
 msgstr ""
-"\tÁtlagos bitráta: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:203
-msgid "Lower bitrate not set\n"
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:206
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
 msgid "User comments section follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:218
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
 #, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:432
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:227
+#: ogginfo/ogginfo2.c:438
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
+#: ogginfo/ogginfo2.c:466
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:275
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:336
+#: ogginfo/ogginfo2.c:477
 #, c-format
+msgid "Vorbis headers parsed for stream %d, information follows...\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:480
+#, fuzzy, c-format
+msgid "Version: %d\n"
+msgstr "Verzió: %s"
+
+#: ogginfo/ogginfo2.c:484
+#, fuzzy, c-format
+msgid "Vendor: %s (%s)\n"
+msgstr "forgalmazó=%s\n"
+
+#: ogginfo/ogginfo2.c:492
+#, c-format
+msgid "Channels: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:493
+#, fuzzy, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+"Rate: %ld\n"
+"\n"
+msgstr "Dátum: %s"
+
+#: ogginfo/ogginfo2.c:496
+#, fuzzy, c-format
+msgid "Nominal bitrate: %f kb/s\n"
 msgstr ""
+"\tÁtlagos bitráta: %.1f kb/s\n"
+"\n"
 
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+#: ogginfo/ogginfo2.c:499
+#, fuzzy
+msgid "Nominal bitrate not set\n"
+msgstr "Figyelmeztetés: névleges \"%s\" nem értelmezhetõ\n"
+
+#: ogginfo/ogginfo2.c:502
+#, fuzzy, c-format
+msgid "Upper bitrate: %f kb/s\n"
 msgstr ""
+"\tÁtlagos bitráta: %.1f kb/s\n"
+"\n"
 
-#: ogginfo/ogginfo2.c:366
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+#: ogginfo/ogginfo2.c:505
+msgid "Upper bitrate not set\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:369
-#, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
+#: ogginfo/ogginfo2.c:508
+#, fuzzy, c-format
+msgid "Lower bitrate: %f kb/s\n"
 msgstr ""
+"\tÁtlagos bitráta: %.1f kb/s\n"
+"\n"
 
-#: ogginfo/ogginfo2.c:375
+#: ogginfo/ogginfo2.c:511
+msgid "Lower bitrate not set\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:539
 msgid ""
 "Negative granulepos on vorbis stream outside of headers. This file was "
 "created by a buggy encoder\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:395
+#: ogginfo/ogginfo2.c:561
+msgid ""
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:567
 #, c-format
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, fuzzy, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Hiba a '%s' bemeneti fájl megnyitása során.\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, fuzzy, c-format
 msgid ""
 "Processing file \"%s\"...\n"
 "\n"
 msgstr "Feldolgozás sikertelen\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 #, fuzzy
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "A '%s'-t nem lehet megnyitni olvasásra\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
 "This indicates a corrupt ogg file: %s.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, fuzzy, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Figyelmeztetés: maximális \"%s\" nem értelmezhetõ\n"
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
 "ld. Indicates missing data.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
 "Input probably not ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:713
+#: ogginfo/ogginfo2.c:905
+#, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1480,7 +1669,8 @@
 "\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1489,8 +1679,8 @@
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:763
-#, fuzzy
+#: ogginfo/ogginfo2.c:955
+#, fuzzy, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""
 "%s%s\n"
@@ -1516,19 +1706,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: a `%s' kapcsolóhoz argumentum szükséges\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: a `--%s' kapcsoló ismeretlen\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: a `%c%s' kapcsoló ismeretlen\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1539,7 +1726,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: érvénytelen kapcsoló -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1556,34 +1742,37 @@
 msgstr "%s: a `-W %s' kapcsoló nem enged meg argumentumot\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Lap hiba. Sérült bemenet.\n"
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Bitfolyamat hiba, folyatatás\n"
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "EOS-t találtam a kivágási pont elõtt.\n"
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr "EOS beállítás: szinkronizálás 0-val tért vissza\n"
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Nincs kivágási pont az adatfolyamban. A második fájl üres lesz\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Kezelhetlen speciális eset: az elsõ fájl túl rövid?\n"
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -1592,48 +1781,58 @@
 "         ogg lapra helyezni. A fájl visszakódólás nem helyes.\n"
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Helyrehozható adatfolyam hiba\n"
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr "Adatfolyam hiba\n"
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr "A szinkronizálás 0-val tért vissza, EOS beállítása\n"
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "A bemenet nem ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "Hiba  elsõ oldalon\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "hiba az elsõ csomagban\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Hiba az elsõdleges fejlécben: lehet, hogy nem vorbis?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Másodlagos fejléc sérült\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "Fájl vég jel a fejlécben\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr "Használat: vcut befájl.ogg kifájl1.ogg kifájl2.ogg vágásipont\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1669,18 +1868,22 @@
 msgstr "Feldolgozás: Vágás a %lld -nél\n"
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr "Feldolgozás sikertelen\n"
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr "Hiba a fejléc olvasása közben\n"
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr "Hiba az elsõ kimeneti fájl írása közben\n"
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr "Hiba az második kimeneti fájl írása közben\n"
 
@@ -1716,45 +1919,40 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "Sérült vagy hiányzó adatok, folytatás..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 "Hiba az adatfolyam írása közben. A kimeneti adatfolyam lehet hogy sérült "
 "vagy megcsonkított."
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Sikertelen a '%s' fájl megnyitása mint vorbis\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Rossz megjegyzés: '%s'\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "rossz megjegyzés: '%s'\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Nem sikerült  megjegyzések írása a '%s' kimeneti fájlba\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr "nem határozott meg mûveletet\n"
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr ""
-"Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n"
-
-#: vorbiscomment/vcomment.c:287
-#, fuzzy
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1774,7 +1972,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1799,44 +1997,50 @@
 "   (megjegyzés ha ezt a lehetõséget használja, akkor a fájlból olvasás\n"
 "   vagy az stdin használata le van tiltva)\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Belsõ hiba a parancs opciójának az értelmezése során\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Hiba a '%s' bemeneti fájl megnyitása során.\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Hiba a '%s' kimeneti fájl megnyitása során.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, fuzzy, c-format
 msgid "Error removing old file %s\n"
 msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, fuzzy, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Hiba a fejléc olvasása közben\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr ""
+#~ "Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n"
+
 #~ msgid "malloc"
 #~ msgstr "malloc"
 

Modified: trunk/vorbis-tools/po/nl.po
===================================================================
--- trunk/vorbis-tools/po/nl.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/nl.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -8,7 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2003-08-04 22:23+0100\n"
 "Last-Translator: Elros Cyriatan <cyriatan at fastmail.fm>\n"
 "Language-Team: Dutch <vertaling at nl.linux.org>\n"
@@ -17,71 +18,73 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Fout: geheugentekort in malloc_action().\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Fout: kon geen geheugen reserveren in malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Fout: apparaat niet beschikbaar.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr "Fout: %s heeft een uitvoer bestandsnaam nodig, aangegeven met -f.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Fout: niet ondersteunde optiewaarde naar apparaat %s.\n"
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Fout: kan apparaat %s niet openen.\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Fout: apparaat %s mislukking.\n"
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Fout: een uitvoerbestand kan voor apparaat %s niet worden gegeven.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Fout: kan bestand %s niet openen in schrijfmodus.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Fout: bestand %s bestaat al.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Fout: deze fout hoort niet voor te komen (%d).  Paniek!\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Fout: geheugentekort in new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Fout: geheugentekort in new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Fout: geheugentekort in new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Fout: geheugentekort in decoder_buffered_metadata_callback().\n"
 
@@ -94,56 +97,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Leesfout: %s op regel %d van %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Naam"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Beschrijving"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Soort"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Standaard"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr "geen"
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr "bool"
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr "char"
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr "string"
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr "int"
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr "float"
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr "double"
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr "anders"
 
@@ -151,9 +157,9 @@
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(geen)"
 
@@ -181,16 +187,16 @@
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "Interne fout bij inlezen opdrachtregel opties\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Invoerbuffer grootte kleiner dan minimum grootte van %dkB."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -199,46 +205,46 @@
 "=== Fout \"%s\" bij lezen configuratie optie van opdrachtregel.\n"
 "=== Optie was: %s\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Beschikbare opties:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Zo'n apparaat bestaat niet, %s.\n"
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Stuurprogramma %s is geen bestandsuitvoer stuurprogramma.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr ""
 "=== Kan uitvoerbestand niet aangeven zonder een uitvoer stuurprogramma aan "
 "te geven.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Onjuist optie formaat: %s.\n"
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Voorbuffer waarde onjuist. Bereik is 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 van %s %s\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Kan niet elk 0de stuk afspelen!\n"
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -247,17 +253,21 @@
 "--- Om het decoderen te testen, kan je het null uitvoer stuurprogramma "
 "gebruiken.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Kan afspeellijst bestand %s niet openen.  Overgeslagen.\n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Aangegeven stuurprogramma %s in configuratiebestand is onjuist.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -265,7 +275,7 @@
 "=== Kon standaard stuurprogramma niet laden, en geen stuurprogramma "
 "aangegeven in configuratiebestand. Afsluiten.\n"
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -290,26 +300,28 @@
 "      Mogelijke apparaten zijn ('*'=live, '@'=bestand):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=bestandsnaam    de bestandsnaam voor uitvoer instellen voor\n"
 "      een eerder aangegeven bestandsapparaat (met -d).\n"
@@ -330,24 +342,25 @@
 "binnen s milliseconden breekt ogg123 af.\n"
 "  -l, --delay=s              s instellen [milliseconden] (standaard 500).\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Fout: geheugentekort.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Fout: kon geen geheugen reserveren in malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Fout: kon signaal masker niet instellen."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Error: kan geen invoerbuffer maken.\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "standaard uitvoer apparaat"
@@ -356,7 +369,7 @@
 msgid "shuffle playlist"
 msgstr "afspeellijst schudden"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -365,94 +378,94 @@
 "\n"
 "Audio apparaat:   %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Auteur:   %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "Opmerkingen: %s"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Waarschuwing: Kon map %s niet lezen.\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Fout: kon geen audio buffer maken.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Kon geen module vinden om %s te lezen.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Kan %s niet openen.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Het bestandsformaat van %s wordt niet ondersteund.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 "Fout bij openen %s met module %s.  Mogelijk is het bestand beschadigd.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Afspelen: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Kon niet %f seconden overslaan."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Fout: decoderen mislukt.\n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Klaar."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Gat in stroom; waarschijnlijk niet erg\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Vorbis bibliotheek heeft stroomfout gerapporteerd.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Bitstroom is %d kanaals, %ldHz"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr "Bitrate aanwijzingen: boven=%ld nominaal=%ld onder=%ld venster=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Gecodeerd door: %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
+#, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Fout: Geheugentekort in create_playlist_member().\n"
 
@@ -462,6 +475,7 @@
 msgstr "Waarschuwing over afspeellijst %s: Kon map %s niet lezen.\n"
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
+#, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Fout: Geheugentekort in playlist_to_array().\n"
 
@@ -482,6 +496,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Geheugen reserveringsfout in stats_init()\n"
 
@@ -515,78 +530,100 @@
 msgid " Output Buffer %5.1f%%"
 msgstr " Uitvoerbuffer %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Fout: kon geen geheugen reserveren in malloc_data_source_stats()\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "WAV bestandslezer"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "AIFF/AIFC bestandslezer"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "WAV bestandslezer"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "WAV bestandslezer"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Waarschuwing: onverwachte EOF bij lezen WAV kop\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Overslaan stuk van soort \"%s\", lengte %d\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Waarschuwing: onverwacht EOF in AIFF stuk\n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Waarschuwing: geen algemeen stuk gevonden in AIFF bestand\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Waarschuwing: afgekapt algemeen stuk in AIFF kop\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Waarschuwing: onverwacht EOF bij lezen AIFF kop\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Waarschuwing: AIFF-C kop afgekapt.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Waarschuwing: kan ingepakt AIFF-C niet verwerken\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Waarschuwing: geen SSND stuk gevonden in AIFF bestand\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Waarschuwing: beschadigd SSND stuk in AIFF kop\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Waarschuwing: onverwacht EOF bij lezen AIFF kop\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "Waarschuwing: OggEnc ondersteunt deze soort AIFF/AIFC bestanden niet\n"
 " Het moet 8 of 16 bit PCM zijn.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Waarschuwing: stuk in WAV kop met niet herkend formaat\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -594,7 +631,8 @@
 "Waarschuwing: stuk in WAV kop met ONJUIST formaat.\n"
 " Toch proberen te lezen (werkt mogelijk niet)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
@@ -602,8 +640,8 @@
 "FOUT: soort WAV bestand is niet ondersteund (moet standaard PCM\n"
 " of soort 3 floating point PCM zijn\n"
 
-#: oggenc/audio.c:466
-#, fuzzy
+#: oggenc/audio.c:480
+#, fuzzy, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
@@ -611,16 +649,18 @@
 "FOUT: WAV bestand heeft niet ondersteund subformaat (moet 16 bit PCM\n"
 "of floating point PCM zijn\n"
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
@@ -628,26 +668,28 @@
 "Programmeerfout: Nul monsters ontvangen van herbemonsteraar: uw bestand zal "
 "worden afgekapt. Rapporteer dit alstublieft.\n"
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Kon herbemonsteraar niet initialiseren\n"
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Instellen geavanceerde codeeroptie \"%s\" op %s\n"
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Laagdoorlaat frequentie gewijzigd van %f kHz naar %f kHz\n"
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Niet herkende geavanceerde optie \"%s\"\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
@@ -655,37 +697,50 @@
 "255 kanalen zouden voor iedereen genoeg moeten zijn. (Sorry, vorbis "
 "ondersteunt niet meer)\n"
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Een minimum of maximum bitrate verzoeken vereist --managed\n"
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Initialiseren modus mislukt: onjuiste parameters voor kwaliteit\n"
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "Initialiseren modus mislukt: onjuiste parameters voor bitrate\n"
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Schrijven kop naar uitvoerstroom mislukt\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Schrijven gegevens naar uitvoerstroom mislukt\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [%2dm%.2ds over] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tCoderen [%2dm%.2ds tot nu toe] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -696,7 +751,8 @@
 "\n"
 "Coderen bestand voltooid \"%s\"\n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -706,7 +762,7 @@
 "\n"
 "Coderen voltooid.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -715,17 +771,17 @@
 "\n"
 "\tBestandslengte:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tTijd voorbij: %dm %04.1fs\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tRate:         %.4f\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -734,7 +790,7 @@
 "\tGemiddelde bitrate: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -745,17 +801,17 @@
 "        %s%s%s \n"
 "met gemiddelde bitrate %d kbps "
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "standaard invoer"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "standaard uitvoer"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -766,7 +822,7 @@
 "        %s%s%s \n"
 "bij geschatte bitrate %d kbps (met VBR codering)\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -777,7 +833,7 @@
 "        %s%s%s \n"
 "met kwaliteitsniveau %2.2f met beperkte VBR "
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -788,7 +844,7 @@
 "        %s%s%s \n"
 "met kwaliteit %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -799,7 +855,7 @@
 "        %s%s%s \n"
 "met bitrate beheer "
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -808,11 +864,13 @@
 "%s%s\n"
 "FOUT: Geen invoerbestanden aangegeven. Gebruik -h voor hulp.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "FOUT: Meerdere bestanden aangegeven bij gebruik stdin\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
@@ -820,57 +878,65 @@
 "FOUT: Meerdere invoerbestanden met aangegeven uitvoer bestandsnaam: "
 "misschien -n gebruiken\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "FOUT: Kan invoerbestand \"%s\" niet openen: %s\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Openen met %s module: %s\n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "FOUT: Invoerbestand \"%s\" is niet van een ondersteund formaat\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr ""
 "WAARSCHUWING: Geen bestandsnaam, gebruik nu standaard \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
 msgstr ""
 "FOUT: Kon niet benodigde submappen maken voor uitvoer bestandsnaam \"%s\"\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr "Invoerbestandsnaam mag niet hetzelfde zijn als uitvoerbestandsnaam\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "FOUT: Kan niet uitvoerbestand \"%s\" openen: %s\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Herbemonsteren invoer van %d Hz naar %d Hz\n"
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Terugbrengen stereo naar mono\n"
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, fuzzy, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "FOUT: Kan alleen terugbrengen van stereo naar mono\n"
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -880,6 +946,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -887,25 +954,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -953,8 +1037,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1085,120 +1170,131 @@
 " uitvoer bestandsnaam is aangegeven met -o\n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 "WAARSCHUWING: Onjuist escape teken '%c' wordt genegeerd in naam formaat\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "De bitrate beheer-engine wordt aan gezet\n"
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "WAARSCHUWING: Ruwe endianness aangegeven voor niet-ruwe gegevens. Er wordt "
 "aangenomen dat invoer ruw is.\n"
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "WAARSCHUWING: Kon endianness argument \"%s\" niet lezen\n"
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "WAARSCHUWING: Kon herbemonster frequentie \"%s\" niet lezen\n"
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 "Waarschuwing: Herbemonsterfrequentie aangegeven als %d Hz. Bedoelde u %d "
 "Hz?\n"
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Waarschuwing: Kon map %s niet lezen.\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Geen waarde gevonden voor geavanceerde codeeroptie\n"
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Interne fout bij inlezen opdrachtregel opties\n"
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Waarschuwing: Onjuiste opmerking gebruikt (\"%s\"), genegeerd.\n"
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Waarschuwing: nominale bitrate \"%s\" wordt niet herkend\n"
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Waarschuwing: minimale bitrate \"%s\" wordt niet herkend\n"
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Waarschuwing: maximale bitrate \"%s\" wordt niet herkend\n"
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Kwaliteitsoptie \"%s\" wordt niet herkend en genegeerd\n"
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 "WAARSCHUWING: kwaliteitsinstelling te hoog, maximale kwaliteit wordt "
 "gebruikt.\n"
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 "WAARSCHUWING: Meerdere naam formaten aangegeven, de laatste wordt gebruikt\n"
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 "WAARSCHUWING: Meerdere naam formaat filters aangegeven, de laatste wordt "
 "gebruikt\n"
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 "WAARSCHUWING: Meerdere naam formaat filter vervangingen aangegeven, de "
 "laatste wordt gebruikt\n"
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 "WAARSCHUWING: Meerdere uitvoerbestanden aangegeven, misschien is -n nodig?\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "WAARSCHUWING: Ruw bits/monster aangegeven voor niet-ruwe gegevens. Er wordt "
 "aangenomen dat invoer ruw is.\n"
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "WAARSCHUWING: Onjuiste bits/monster aangeven, 16 wordt gekozen.\n"
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
@@ -1206,34 +1302,38 @@
 "WAARSCHUWING: Ruw kanaal aantal aangegeven voor niet-ruwe gegevens. Er wordt "
 "aangenomen dat invoer ruw is.\n"
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "WAARSCHUWING: Onjuist kanaal aantal aangegeven, 2 wordt gekozen.\n"
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "WAARSCHUWING: Ruwe bemonsteringsfrequentie aangegeven voor niet-ruwe "
 "gegevens. Er wordt aangenomen dat invoer ruw is.\n"
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 "WAARSCHUWING: Onjuiste bemonsteringsfrequentie aangegeven, 44100 wordt "
 "gekozen.\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "WAARSCHUWING: Onbekende optie aangegeven, wordt genegeerd->\n"
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Kon opmerking niet converteren naar UTF-8, toevoegen onmogelijk\n"
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 "WAARSCHUWING: Te weinig titels aangegeven, laatste titel wordt de "
@@ -1254,15 +1354,172 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Fout: pad deel \"%s\" is geen map\n"
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
+#, fuzzy, c-format
+msgid ""
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
+msgstr ""
+"Waarschuwing: Opmerking %d in stroom %d is niet juist opgemaakt, bevat geen "
+"'='; \"%s\"\n"
+
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr "Waarschuwing: Onjuiste veldnaam in opmerking %d (stroom %d): \"%s\"\n"
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+"Waarschuwing: Onjuiste UTF-8 codes in opmerking %d (stroom %d): lengte-"
+"markering onjuist\n"
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+"Waarschuwing: Onjuiste UTF-8 codes in opmerking %d (stroom %d): te weinig "
+"bytes\n"
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+"Waarschuwing: Onjuiste UTF-8 codes in opmerking %d (stroom %d): onjuiste "
+"opvolging van codes\n"
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr "Waarschuwing: Fout in utf8 decoder. Dit zou onmogelijk moeten zijn\n"
+
+#: ogginfo/ogginfo2.c:318
+#, fuzzy, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+"Waarschuwing: Kon vorbis koppakket niet decoderen - onjuiste vorbis stroom (%"
+"d)\n"
+
+#: ogginfo/ogginfo2.c:325
+#, fuzzy, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
+msgstr ""
+"Waarschuwing: Vorbis stroom %d heeft de koppen niet op de goede manier in "
+"frames staan. Afsluitende koppagina bevat meer pakketten of heeft niet-nul "
+"granulepos\n"
+
+#: ogginfo/ogginfo2.c:329
+#, fuzzy, c-format
+msgid "Theora headers parsed for stream %d, information follows...\n"
+msgstr "Vorbis koppen ingelezen voor stroom %d, informatie volgt...\n"
+
+#: ogginfo/ogginfo2.c:332
+#, fuzzy, c-format
+msgid "Version: %d.%d.%d\n"
+msgstr "Versie: %d\n"
+
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
+#, c-format
+msgid "Vendor: %s\n"
+msgstr "Maker: %s\n"
+
+#: ogginfo/ogginfo2.c:335
+#, c-format
+msgid "Width: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:336
+#, fuzzy, c-format
+msgid "Height: %d\n"
+msgstr "Versie: %d\n"
+
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
+msgid "User comments section follows...\n"
+msgstr "Gebruikersopmerkingen deel volgt...\n"
+
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+#, fuzzy
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "Waarschuwing: granulepos in stroom %d neemt af van "
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, fuzzy, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr "Waarschuwing: granulepos in stroom %d neemt af van "
+
+#: ogginfo/ogginfo2.c:432
+#, fuzzy
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Vorbis stroom %d:\n"
+"\tTotale gegevenslengte: %ld bytes\n"
+"\tAfspeellengte: %ldm:%02lds\n"
+"\tGemiddelde bitrate: %f kbps\n"
+
+#: ogginfo/ogginfo2.c:438
+#, fuzzy, c-format
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Vorbis stroom %d:\n"
+"\tTotale gegevenslengte: %ld bytes\n"
+"\tAfspeellengte: %ldm:%02lds\n"
+"\tGemiddelde bitrate: %f kbps\n"
+
+#: ogginfo/ogginfo2.c:466
+#, c-format
+msgid ""
 "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 "Waarschuwing: Kon vorbis koppakket niet decoderen - onjuiste vorbis stroom (%"
 "d)\n"
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
 "Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
@@ -1272,32 +1529,27 @@
 "frames staan. Afsluitende koppagina bevat meer pakketten of heeft niet-nul "
 "granulepos\n"
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:477
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Vorbis koppen ingelezen voor stroom %d, informatie volgt...\n"
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Versie: %d\n"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Maker: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:183
+#: ogginfo/ogginfo2.c:492
 #, c-format
-msgid "Vendor: %s\n"
-msgstr "Maker: %s\n"
-
-#: ogginfo/ogginfo2.c:184
-#, c-format
 msgid "Channels: %d\n"
 msgstr "Kanalen: %d\n"
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1306,150 +1558,107 @@
 "Frequentie: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:188
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Nominale bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:191
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Nominale bitrate niet ingesteld\n"
 
-#: ogginfo/ogginfo2.c:194
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Bovengrens bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:197
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Bovengrens bitrate niet ingesteld\n"
 
-#: ogginfo/ogginfo2.c:200
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Ondergrens bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:203
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Ondergrens bitrate niet ingesteld\n"
 
-#: ogginfo/ogginfo2.c:206
-msgid "User comments section follows...\n"
-msgstr "Gebruikersopmerkingen deel volgt...\n"
-
-#: ogginfo/ogginfo2.c:218
-#, c-format
+#: ogginfo/ogginfo2.c:539
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Negative granulepos on vorbis stream outside of headers. This file was "
+"created by a buggy encoder\n"
 msgstr ""
-"Waarschuwing: Opmerking %d in stroom %d is niet juist opgemaakt, bevat geen "
-"'='; \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:227
-#, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr "Waarschuwing: Onjuiste veldnaam in opmerking %d (stroom %d): \"%s\"\n"
-
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
-#, c-format
+#: ogginfo/ogginfo2.c:561
+#, fuzzy
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Waarschuwing: Onjuiste UTF-8 codes in opmerking %d (stroom %d): lengte-"
-"markering onjuist\n"
+"Vorbis stroom %d:\n"
+"\tTotale gegevenslengte: %ld bytes\n"
+"\tAfspeellengte: %ldm:%02lds\n"
+"\tGemiddelde bitrate: %f kbps\n"
 
-#: ogginfo/ogginfo2.c:275
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Waarschuwing: Onjuiste UTF-8 codes in opmerking %d (stroom %d): te weinig "
-"bytes\n"
-
-#: ogginfo/ogginfo2.c:336
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
-msgstr ""
-"Waarschuwing: Onjuiste UTF-8 codes in opmerking %d (stroom %d): onjuiste "
-"opvolging van codes\n"
-
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr "Waarschuwing: Fout in utf8 decoder. Dit zou onmogelijk moeten zijn\n"
-
-#: ogginfo/ogginfo2.c:366
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-msgstr "Waarschuwing: granulepos in stroom %d neemt af van "
-
-#: ogginfo/ogginfo2.c:369
+#: ogginfo/ogginfo2.c:567
 #, fuzzy, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
-msgstr "Waarschuwing: granulepos in stroom %d neemt af van "
-
-#: ogginfo/ogginfo2.c:375
 msgid ""
-"Negative granulepos on vorbis stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:395
-#, c-format
-msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 "Vorbis stroom %d:\n"
 "\tTotale gegevenslengte: %ld bytes\n"
 "\tAfspeellengte: %ldm:%02lds\n"
 "\tGemiddelde bitrate: %f kbps\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Waarschuwing: EOS niet ingesteld voor stroom %d\n"
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Waarschuwing: Onjuiste koppagina, geen pakket gevonden\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 "Waarschuwing: Onjuiste koppagina in stroom %d, bevat meerdere pakketten\n"
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 #, fuzzy
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr "Waarschuwing: Gat in gegevens gevonden op plaats (ongeveer) "
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, fuzzy, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr "Waarschuwing: Gat in gegevens gevonden op plaats (ongeveer) "
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Fout bij openen invoerbestand \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1458,25 +1667,25 @@
 "Verwerken bestand \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Kon geen verwerker vinden voor stroom, afsluiten\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, fuzzy, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -1485,22 +1694,22 @@
 "Waarschuwing: onjuist geplaatste pagina(s) voor logische stroom %d\n"
 "Dit geeft een slecht ogg bestand aan.\n"
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Nieuwe logische stroom (#%d, serienr: %08x): soort %s\n"
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Waarschuwing: startaanduiding stroom niet ingesteld voor stroom %d\n"
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "Waarschuwing: start-aanduiding stroom gevonden midden in stroom %d\n"
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
@@ -1509,12 +1718,12 @@
 "Waarschuwing: gat gevonden in nummering fragmenten in stroom %d. Pagina %ld "
 "ontvangen, %ld verwacht. Geeft ontbrekende gegevens aan.\n"
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Logische stroom %d geëindigd\n"
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1523,11 +1732,11 @@
 "Fout: Geen ogg gegevens gevonden in bestand \"%s\".\n"
 "Invoer is waarschijnlijk geen ogg.\n"
 
-#: ogginfo/ogginfo2.c:713
-#, fuzzy
+#: ogginfo/ogginfo2.c:905
+#, fuzzy, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1553,7 +1762,8 @@
 "\t   voor sommige soorten stromen.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1567,7 +1777,8 @@
 "en helpt bij het vinden van problemen met die bestanden.\n"
 "Volledige hulp wordt weergegeven met \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:763
+#: ogginfo/ogginfo2.c:955
+#, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Geen invoerbestanden aangegeven. \"ogginfo -h\" voor hulp.\n"
 
@@ -1591,19 +1802,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: optie `%s' heeft een argument nodig\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: niet herkende optie `--%s'\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: niet herkende optie `%c%s'\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1614,7 +1822,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: onjuiste optie -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1631,34 +1838,37 @@
 msgstr "%s: optie `-W %s' heeft geen argumenten\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Pagina fout. Beschadigde invoer.\n"
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Bitstroom fout, doorgaan\n"
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "EOS gevonden voor knippunt.\n"
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr "EOS instellen: bijwerkingssynchronisatie gaf 0\n"
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Knippunt niet binnen stroom. Tweede bestand zal leeg zijn\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Niet behandelde speciale situatie: eerste bestand te kort?\n"
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -1667,48 +1877,58 @@
 "      pagina. Mogelijk decodeert het bestand niet juist.\n"
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Herstelbare bitstroom fout\n"
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr "Bitstroom fout\n"
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr "Bijwerkingssynchronisatie gaf 0, EOS instellen\n"
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "Invoer niet ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "Fout in eerste pagina\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "fout in eerste pakket\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Fout in eerste kop: niet vorbis?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Tweede kop beschadigd\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "EOF in koppen\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr "Gebruik: vcut inbestand.ogg uitbestand1.ogg uitbestand2.ogg knippunt\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1744,18 +1964,22 @@
 msgstr "Verwerken: knippen bij %lld\n"
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr "Verwerken mislukt\n"
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr "Fout bij lezen koppen\n"
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr "Fout bij schrijven eerste uitvoerbestand\n"
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr "Fout bij schrijven tweede uitvoerbestand\n"
 
@@ -1791,43 +2015,40 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "Beschadigde of missende gegevens, doorgaan..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 "Fout bij schrijven stroom naar uitvoer. Uitvoerstroom is mogelijk beschadigd "
 "of afgekapt."
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Openen bestand als vorbis mislukt: %s\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Foute opmerking: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "foute opmerking: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Fout bij schrijven opmerkingen naar uitvoerbestand: %s\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr "geen actie aangegeven\n"
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr "Kon opmerking niet converteren naar UTF-8, toevoegen onmogelijk\n"
-
-#: vorbiscomment/vcomment.c:287
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1847,7 +2068,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1878,44 +2099,49 @@
 "   als vorbiscomment in scripts wordt gebruikt. Het is alleen niet genoeg\n"
 "   voor het rondsturen van opmerkingen in alle gevallen.\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Interne fout bij lezen opdracht opties\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Fout bij openen invoerbestand '%s'.\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Invoerbestandsnaam mag niet hetzelfde zijn als uitvoerbestandsnaam\n"
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Fout bij openen uitvoerbestand '%s'.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Fout bij openen opmerkingen bestand '%s'.\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Fout bij openen opmerkingen bestand '%s'\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Fout bij verwijderen oude bestand %s\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Fout bij hernoemen %s naar %s\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr "Kon opmerking niet converteren naar UTF-8, toevoegen onmogelijk\n"
+
 #~ msgid "malloc"
 #~ msgstr "malloc"
 

Modified: trunk/vorbis-tools/po/ro.po
===================================================================
--- trunk/vorbis-tools/po/ro.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/ro.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2003-04-14 06:17+0000\n"
 "Last-Translator: Eugen Hoanca <eugenh at urban-grafx.ro>\n"
 "Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@ -14,71 +15,73 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Eroare: memorie plinã în malloc_action().\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Eroare: nu s-a putut aloca memorie în malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Eroare: Dispozitiv(device) indisponibil.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr "Eroare: %s necesitã un fiºier de output specificat cu -f.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Eroare: valoare opþiune nesuportatã pentru device-ul %s.\n"
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Eroare: nu am putut deschide dispozitivul %s\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Eroare: Probleme dispozitiv %s.\n"
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Eroare: un fiºier de output nu a putut fi dat pentru device-ul %s.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Eroare: nu s-a putut deschide fiºierul %s pentru scriere.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Eroare: Fiºierul %s existã deja.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Eroare: Aceastã eroare nu ar fi trebuit sã se producã (%d).  Alertã!\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Eroare: Memorie plinã în new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Eroare: Memorie plinã în new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Eroare: Memorie plinã în new_status_message_arg.\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Eroare: Memorie plinã în decoder_buffered_metadata_callback().\n"
 
@@ -91,56 +94,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Eroare de analizã: %s în linia %d din %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Nume"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Descriere"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Tip"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Implicit"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr "nimic"
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr "bool"
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr "char"
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr "ºir"
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr "int"
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr "float"
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr "double"
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr "altul"
 
@@ -148,9 +154,9 @@
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(nimic)"
 
@@ -178,16 +184,16 @@
 msgid "Unknown error"
 msgstr "Eroare necunoscutã"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "Eroare internã in analizã opþiuni linie comandã.\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Buffer de intrare mai mic decât mãrimea minimã de %dkB."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -196,45 +202,45 @@
 "=== Eroare \"%s\" în analizã opþiuni configurare linie comandã.\n"
 "=== Opþiunea a fost: %s\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Opþiuni disponibile:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Nu existã device-ul %s.\n"
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Driverul %s nu este un driver de fiºier pentru output.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr ""
 "=== Nu se poate specifica fiºier de output fãrã specificare de driver.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Format opþiune incorect: %s.\n"
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Valoare prebuffer invalidã. Intervalul este 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 de la %s %s\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Nu se poate cânta fiecare 0 fiºier!\n"
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -242,17 +248,21 @@
 "--- Nu se poate cânta o bucatã de 0 ori.\n"
 "--- To do a test decode, use the null output driver.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Nu se poate deschide playlistul %s.  Omis.\n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Driver invalid %s specificat in fiºierul de configurare.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -260,7 +270,7 @@
 "=== Nu s-a putut incãrca driverul implicit ºi nu s-a specificat nici un "
 "driver in fiºierul de configurare. Ieºire.\n"
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -285,26 +295,28 @@
 "      Device-uri posibile sunt ('*'=live, '@'=fiºier):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=nume fiºier  Setare nume fiºier ieºire pentru un fiºier\n"
 "      device specificat anterior  (cu -d).\n"
@@ -325,24 +337,25 @@
 "s milisecunde va opri ogg123.\n"
 "  -l, --delay=s  setare întârziere s [milisecunde] (implicit 500).\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Eroare: memorie plinã.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Eroare: nu s-a putut aloca memorie în malloc_decoder_Stats()\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Eroare: Nu s-a putut seta mask semnal."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Eroare: Nu s-a putut crea buffer de intrare.\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "device de ieºire implicit"
@@ -351,7 +364,7 @@
 msgid "shuffle playlist"
 msgstr "playlist amestecat"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -360,95 +373,95 @@
 "\n"
 "Dispozitiv Audio:   %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Autor:   %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "Comentarii: %s"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Avertisment: Nu s-a putut citi directorul %s.\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Eroare: Nu s-a putut crea bufferul audio.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Nu s-a gãsit nici un modul din care sa se citeascã %s.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Nu s-a putut deschide %s.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Formatul de fiºier %s nu este suportat.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 "Eroare la deschiderea %s utilizând modulul %s.  Fiºierul poate sã fie "
 "corupt.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "În rulare: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Nu s-au putut omite %f secunde de audio."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Eroare: Decodare eºuatã.\n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Finalizat."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Pauzã în stream; probabil nedãunãtoare\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Biblioteca Vorbis a raportat o eroare de stream.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Bitstreamul este canal %d, %ldHz"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr "Sfaturi bitrate: superior=%ld nominal=%ld inferior=%ld fereastrã=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Encodat de: %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
+#, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Eroare: Memorie plinã în create_playlist_member().\n"
 
@@ -458,6 +471,7 @@
 msgstr "Avertisment din playlistul %s: Nu se poate citi directorul %s.\n"
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
+#, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Eroare: Memorie plinã în playlist_to_array().\n"
 
@@ -478,6 +492,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Eroare alocare memorie in stats_init()\n"
 
@@ -511,78 +526,100 @@
 msgid " Output Buffer %5.1f%%"
 msgstr "Buffer ieºire %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Eroare: Nu s-a putut aloca memorie în malloc_data_source_stats()\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "cititor fiºiere WAV"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "cititor fiºiere AIFF/AIFC"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "cititor fiºiere WAV"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "cititor fiºiere WAV"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Avertisment: EOF neaºteptat în citirea headerului WAV\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Omitere bucatã tip \"%s\", lungime %d\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Avertisment: EOF neaºteptat în bucatã AIFF\n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Avertisment: Nu s-a gãsit nici o bucatã obiºnuitã in fiºier AIFF\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Avertisment: Bucatã obiºnuitã trunchiatã în header AIFF\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Avertismnet: EOF neaºteptat în citirea headerului AIFF\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Avertisment: Header AIFF-C trunchiat.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Avertisment: Nu se poate manipula AIFF-C compresat.\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Avertisment: Nu s-a gãsit nici o bucatã SSND in fiºierul AIFF\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Avertisment: Bucatã SSND coruptã în header AIFF\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Avertisment: EOF neaºteptat în citirea headerului AIFF\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "Avertisment: OggEnc nu suportã acest tip de fiºier AIFF/AIFC\n"
 "Trebuie sã fie 8 sau 16 biþi PCM.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Avertisment: Format bucata nerecunoscut în header WAV\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -590,7 +627,8 @@
 "Avertisment: format bucatã INVALID în header wav.\n"
 " Se încearcã oricum citirea (s-ar putea sã nu meargã)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
@@ -598,8 +636,8 @@
 "EROARE: Fiºier wav în format nesuportat (trebuie sã fie standard PCM)\n"
 " sau tip 3 floating point PCM\n"
 
-#: oggenc/audio.c:466
-#, fuzzy
+#: oggenc/audio.c:480
+#, fuzzy, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
@@ -607,16 +645,18 @@
 "EROARE: Fiºier wav în format nesuportat (trebuie sã fie 16 biþi PCM)\n"
 "sau floating point PCM\n"
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
@@ -624,26 +664,28 @@
 "BUG: S-au primit exemple zero din resampler: fiºierul va fi trunchiat. Vã "
 "rugãm raportaþi asta.\n"
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Nu s-a putut iniþializa resampler\n"
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Setãri opþiuni avansate encoder \"%s\" la %s\n"
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Schimbare frecvenþã lowpass de la %f kHZ la %f kHz\n"
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Opþiune avansatã nerecunoscutã \"%s\"\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
@@ -651,37 +693,50 @@
 "255 de canale ar trebui  sã ajungã la oricine. (Ne pare rãu, vorbis nu "
 "permite mai mult)\n"
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Cererea de bitrate minim sau maxim necesitã --managed\n"
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Iniþializare mod eºuatã: parametri invalizi pentru calitate\n"
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "Iniþializare mod eºuatã: parametri invalizi pentru bitrate\n"
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Nu s-a putut scrie headerul spre streamul de ieºire\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Nu s-au putut scrie date spre streamul de ieºire\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [%2dm%.2ds rãmase] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tEncodare [%2dm%.2ds pânã acum] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -692,7 +747,8 @@
 "\n"
 "Encodare fiºier finalizatã \"%s\"\n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -702,7 +758,7 @@
 "\n"
 "Encodare finalizatã.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -711,17 +767,17 @@
 "\n"
 "\tDuratã fiºier:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tTimp trecut: %dm %04.1fs\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tRatã:         %.4f\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -730,7 +786,7 @@
 "\tBitrate mediu: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -741,17 +797,17 @@
 "         %s%s%s \n"
 "la bitrate mediu de %d kbps "
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "intrare standard"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "ieºire standard"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -762,7 +818,7 @@
 "         %s%s%s \n"
 "la bitrate de aproximativ %d kbps (encodare VBR activatã)\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -773,7 +829,7 @@
 "         %s%s%s \n"
 "la nivel de calitate %2.2f  utilizând VBR constrâns"
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -784,7 +840,7 @@
 "         %s%s%s \n"
 "la calitate %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -795,7 +851,7 @@
 "         %s%s%s \n"
 "folosind management de bitrate"
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -804,11 +860,13 @@
 "%s%s\n"
 "EROARE: Nici un fiºier de intrare specificat. Folosiþi -h pentru help.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "EROARE: Fiºiere multiple specificate pentru utilizare stdin\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
@@ -816,26 +874,27 @@
 "EROARE: Fiºiere intrare multiple cu fiºier ieºire specificat: sugerãm "
 "folosirea lui -n\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "EROARE: nu s-a putut deschide fiºierul \"%s\":%s\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Deschidere cu modulul %s: %s\n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "EROARE: Fiºierul de intrare \"%s\" nu este un format suportat\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "AVERTISMENT: Nici un nume de fiºier, implicit în \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
@@ -843,30 +902,38 @@
 "EROARE: Nu s-au putut crea subdirectoarele necesare pentru nume fiºier "
 "ieºire \"%s\"\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr ""
+"Numele fiºierului de intrare poate sã nu fie acelaºi cu al celui de ieºire\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "EROARE: Nu s-a putut scrie fiºierul de ieºire \"%s\": %s\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Convertire (resampling) intrare din %d Hz în %d Hz\n"
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Demixare stereo în mono\n"
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, fuzzy, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "EROARE: Nu se poate demixa exceptând stereo în mono\n"
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -876,6 +943,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -883,25 +951,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -949,8 +1034,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1067,120 +1153,131 @@
 " cu -o\n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 "AVERTISMENT: Se ignorã caracterul ilegal de escape '%c' în formatul de nume\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "Activare motor management bitrate\n"
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "AVERTISMENT: Endianess brut specificat pentru date non-brute. Se presupune "
 "intrare brutã.\n"
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "AVERTISMENT: Nu s-a putut citi argumentul de endianess \"%s\"\n"
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr ""
 "AVERTISMENT: nu s-a putut citi frecvenþa de remixare (resampling) \"%s\"\n"
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 "Avertisment: Ratã remixare (resample) specificatã la %d Hz. Doriþi cumva %d "
 "Hz?\n"
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Avertisment: Nu s-a putut citi directorul %s.\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Nu s-a gãsit nici o valoare pentru opþiunea avansatã de encoder\n"
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Eroare internã la analiza opþiunilor din linia de comandã\n"
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Avertisment: Comentariu invalid utilizat (\"%s\"), ignorat.\n"
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Avertisment: bitrate nominal \"%s\" nerecunoscut\n"
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Avertisment: bitrate minim \"%s\" nerecunoscut.\n"
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Avertisment: bitrate maxim \"%s\" nerecunoscut\n"
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Opþiune de calitate \"%s\" nerecunoscuta, ignoratã\n"
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 "AVERTISMENT: setare de calitate prea mare, se seteazã la calitate maximã.\n"
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 "AVERTISMENT: Nume formaturi multiple specificate, se foloseºte cel final\n"
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 "AVERTISMENT: Nume multiple formate filtre specificate, se utilizeazã cel "
 "final\n"
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 "AVERTISMENT: Nume multiple de înlocuiri formate filtre specificate, se "
 "utilizeazã cel final\n"
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 "AVERTISMENT: Fiºiere de ieºire multiple specificate, sugerãm sa folosiþi -n\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "AVERTISMENT: Biþi/sample bruþi specificaþi pentru date non-brute. Se "
 "presupune intrare brutã.\n"
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "AVERTISMENT: Numãr biþi/sample invalid, se presupune 16.\n"
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
@@ -1188,32 +1285,36 @@
 "AVERTISMENT: Numãrare canal brutã specificatã pentru date non-brute. Se "
 "presupune intrare brutã.\n"
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "AVERTISMENT: Numãrare canal specificatã invalidã, se presupune 2.\n"
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "AVERTISMENT: Ratã de sample specificatã brutã pentru date non-brute. Se "
 "presupune intrare brutã.\n"
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr "AVERTISMENT: Ratã sample specificatã invalidã, se presupune 44100.\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "AVERTISMENT: Opþiune necunoscutã specificatã, se ignorã->\n"
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Nu se poate converti comentariu înb UTF-8, nu se poate adãuga\n"
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 "AVERTISMENT: Titluri insuficiente specificate, implicit se ia titlul final.\n"
@@ -1233,15 +1334,175 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Eroare: calea segmentului \"%s\" nu este director\n"
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
+#, fuzzy, c-format
+msgid ""
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
+msgstr ""
+"Avertisment: Comentariul %d în streamul %d este formatat invalid, nu conþine "
+"'=': \"%s\"\n"
+
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+"Avertisment: Nume câmp comentariu invalid în comentariul %d (stream %d): \"%s"
+"\"\n"
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+"Avertisment: Secvenþã UTF-8 invalidã în comentariul %d (stream %d): marker "
+"de lungime greºit\n"
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+"Avertisment: Secvenþã UTF-8 invalidã în comentariul %d (stream %d): prea "
+"puþini octeþi\n"
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+"Avertisment: Secvenþã UTF-8 invalidã în comentariul %d (stream %d): secvenþã "
+"invalidã\n"
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr ""
+"Avertisment: Eroare în decodorul utf8. Asta n-ar trebui sa fie posibilã.\n"
+
+#: ogginfo/ogginfo2.c:318
+#, fuzzy, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+"Avertisment: Nu s-a putut decoda header-ul packetului vorbis -- stream "
+"vorbis invalid (%d)\n"
+
+#: ogginfo/ogginfo2.c:325
+#, fuzzy, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
+msgstr ""
+"Avertisment: Streamul vorbis %d nu are headerele corect încadrate.Pagina de "
+"headere terminalã conþine pachete adiþionale sau granule (granulepos) "
+"diferite de zero\n"
+
+#: ogginfo/ogginfo2.c:329
+#, fuzzy, c-format
+msgid "Theora headers parsed for stream %d, information follows...\n"
+msgstr "Headerele vorbis analizate pentru streamul %d, urmeazã informaþie...\n"
+
+#: ogginfo/ogginfo2.c:332
+#, fuzzy, c-format
+msgid "Version: %d.%d.%d\n"
+msgstr "Versiune: %d\n"
+
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
+#, c-format
+msgid "Vendor: %s\n"
+msgstr "Vânzãtor: %s\n"
+
+#: ogginfo/ogginfo2.c:335
+#, c-format
+msgid "Width: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:336
+#, fuzzy, c-format
+msgid "Height: %d\n"
+msgstr "Versiune: %d\n"
+
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
+msgid "User comments section follows...\n"
+msgstr "Urmeaza secþiunea comentariilor utilizator..\n"
+
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+#, fuzzy
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "Avertisment: granulele (granulepos) în streamul %d scad din "
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, fuzzy, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr "Avertisment: granulele (granulepos) în streamul %d scad din "
+
+#: ogginfo/ogginfo2.c:432
+#, fuzzy
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Stream Vorbis %d:\n"
+"\tLungime totalã date: %ld octeþi\n"
+"\tLungime playback: %ldm:%02lds\n"
+"\tBitrate mediu: %f kbps\n"
+
+#: ogginfo/ogginfo2.c:438
+#, fuzzy, c-format
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Stream Vorbis %d:\n"
+"\tLungime totalã date: %ld octeþi\n"
+"\tLungime playback: %ldm:%02lds\n"
+"\tBitrate mediu: %f kbps\n"
+
+#: ogginfo/ogginfo2.c:466
+#, c-format
+msgid ""
 "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 "Avertisment: Nu s-a putut decoda header-ul packetului vorbis -- stream "
 "vorbis invalid (%d)\n"
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
 "Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
@@ -1251,32 +1512,27 @@
 "headere terminalã conþine pachete adiþionale sau granule (granulepos) "
 "diferite de zero\n"
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:477
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Headerele vorbis analizate pentru streamul %d, urmeazã informaþie...\n"
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Versiune: %d\n"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Vânzãtor: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:183
+#: ogginfo/ogginfo2.c:492
 #, c-format
-msgid "Vendor: %s\n"
-msgstr "Vânzãtor: %s\n"
-
-#: ogginfo/ogginfo2.c:184
-#, c-format
 msgid "Channels: %d\n"
 msgstr "Canale: %d\n"
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1285,153 +1541,107 @@
 "Ratã: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:188
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Bitrate nominal: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:191
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Bitrate nominal nesetat\n"
 
-#: ogginfo/ogginfo2.c:194
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Bitrate superior: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:197
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Bitrate superior nesetat\n"
 
-#: ogginfo/ogginfo2.c:200
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Bitrate inferior: %fkb/s\n"
 
-#: ogginfo/ogginfo2.c:203
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Bitrate inferior nesetat\n"
 
-#: ogginfo/ogginfo2.c:206
-msgid "User comments section follows...\n"
-msgstr "Urmeaza secþiunea comentariilor utilizator..\n"
-
-#: ogginfo/ogginfo2.c:218
-#, c-format
+#: ogginfo/ogginfo2.c:539
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Negative granulepos on vorbis stream outside of headers. This file was "
+"created by a buggy encoder\n"
 msgstr ""
-"Avertisment: Comentariul %d în streamul %d este formatat invalid, nu conþine "
-"'=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:227
-#, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Avertisment: Nume câmp comentariu invalid în comentariul %d (stream %d): \"%s"
-"\"\n"
-
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
-#, c-format
+#: ogginfo/ogginfo2.c:561
+#, fuzzy
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Avertisment: Secvenþã UTF-8 invalidã în comentariul %d (stream %d): marker "
-"de lungime greºit\n"
+"Stream Vorbis %d:\n"
+"\tLungime totalã date: %ld octeþi\n"
+"\tLungime playback: %ldm:%02lds\n"
+"\tBitrate mediu: %f kbps\n"
 
-#: ogginfo/ogginfo2.c:275
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Avertisment: Secvenþã UTF-8 invalidã în comentariul %d (stream %d): prea "
-"puþini octeþi\n"
-
-#: ogginfo/ogginfo2.c:336
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
-msgstr ""
-"Avertisment: Secvenþã UTF-8 invalidã în comentariul %d (stream %d): secvenþã "
-"invalidã\n"
-
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr ""
-"Avertisment: Eroare în decodorul utf8. Asta n-ar trebui sa fie posibilã.\n"
-
-#: ogginfo/ogginfo2.c:366
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-msgstr "Avertisment: granulele (granulepos) în streamul %d scad din "
-
-#: ogginfo/ogginfo2.c:369
+#: ogginfo/ogginfo2.c:567
 #, fuzzy, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
-msgstr "Avertisment: granulele (granulepos) în streamul %d scad din "
-
-#: ogginfo/ogginfo2.c:375
 msgid ""
-"Negative granulepos on vorbis stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:395
-#, c-format
-msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 "Stream Vorbis %d:\n"
 "\tLungime totalã date: %ld octeþi\n"
 "\tLungime playback: %ldm:%02lds\n"
 "\tBitrate mediu: %f kbps\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Avertisment: EOS nesetat în streamul %d\n"
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Avertisment: Paginã header invalid, nici un pachet gasit\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 "Avertisment: Paginã header invalid în streamul %d, conþine pachete multiple\n"
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 #, fuzzy
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr "Avertisment: Lipsã de date la offsetul aproximativ"
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, fuzzy, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr "Avertisment: Lipsã de date la offsetul aproximativ"
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Eroare în deschiderea fiºierului de intrare \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1440,25 +1650,25 @@
 "Procesare fiºier \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Nu s-a gãsit procesor pentru stream, se merge pe încredere\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, fuzzy, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -1467,24 +1677,24 @@
 "Avertisment: paginã(i) plasate invalid pentru streamul logic %d\n"
 "Aceasta indicã un fiºier ogg corupt.\n"
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Stream logic nou (# %d, serial %08x): tip %s\n"
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Avertisment: Marcajul(flag) de început al stream-ului %d nesetat\n"
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr ""
 "Avertisment: Marcajul(flag) de început al stream-ului %d gãsit la mijlocul "
 "stream-ului\n"
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
@@ -1493,12 +1703,12 @@
 "Avertisment: pauzã numãr secvenþã în stream-ul %d. S-a gãsit pagina %ld în "
 "loc de pagina % ld. Indicã date lipsã.\n"
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Stream logic %d terminat.\n"
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1507,11 +1717,11 @@
 "Eroare: Nu s-au gasit date ogg în fiºierul \"%s\".\n"
 "Intrare probabil non-ogg.\n"
 
-#: ogginfo/ogginfo2.c:713
-#, fuzzy
+#: ogginfo/ogginfo2.c:905
+#, fuzzy, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1534,7 +1744,8 @@
 "\t   detaliate pentru mai multe tipuri de stream-uri.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1548,7 +1759,8 @@
 "fiºierele ogg ºi pentru diagnozarea problemelor acestora.\n"
 "Helpul întreg se afiºeazã cu \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:763
+#: ogginfo/ogginfo2.c:955
+#, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Nici un fiºier de intrare specificat. \"ogginfo -h\" pentru ajutor\n"
 
@@ -1572,19 +1784,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: opþiunea `%s' necesitã un parametru\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s opþiune nerecunoscuta `--%s'\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opþiune nerecunoscutã `%c%s'\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1595,7 +1804,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opþiune invalidã -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1612,35 +1820,38 @@
 msgstr "%s: opþiunea `-W %s' nu permite parametri\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Eroare paginã. Intrare coruptã.\n"
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Eroare bitstream, se continuã\n"
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "S-a gãsit EOS înainte de punctul de secþiune(cut point).\n"
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Setare eos: update-sync a returnat valoarea 0.\n"
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr ""
 "Punctul de secþiune(cutpoint) nu este în stream. Al doilea fiºier va fi gol\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Caz special: primul fiºier prea scurt?\n"
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -1649,43 +1860,52 @@
 "      paginã ogg. Fiºierul s-ar putea sã nu se decodeze corect.\n"
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Eroare bitstream recuperabilã\n"
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr "Eroare bitstream\n"
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr "Update sync a returnat 0, setând eos\n"
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "Intrare non ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "Eroare în prima paginã\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "eroare în primul pachet\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Eroare în headerul primar: non vorbis?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Header secundar corupt\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "EOF în headere\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr ""
@@ -1693,6 +1913,7 @@
 "punct_secþiune\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1729,18 +1950,22 @@
 msgstr "Procesare: Secþionare la %lld\n"
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr "Procesare eºuatã\n"
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr "Eroare în citirea headerelor\n"
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr "Eroare în scrierea primului fiºier de ieºire\n"
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr "Eroare în scrierea celui de-al doilea fiºier de ieºire\n"
 
@@ -1776,43 +2001,40 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "Date corupte sau lipsã, se continuã..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 "Eroare în scrierea streamului spre ieºire. Streamul de ieºire poate fi "
 "corupt sau trunchiat. "
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Nu s-a putut deschide fiºierul ca vorbis: %s\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Comentariu greºit: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "comentariu greºit: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Nu s-au putut scrie comentarii în fiºierul de ieºire: %s\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr "nici o acþiune specificatã\n"
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr "Nu s-a putut converti comentariul în UTF8, nu s-a putut adãuga\n"
-
-#: vorbiscomment/vcomment.c:287
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1832,7 +2054,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1864,45 +2086,50 @@
 "toate\n"
 "   cazurile.\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Eroare internã în analiza opþiunilor din linia comandã\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Eroare în deschiderea fiºierului '%s'.\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr ""
 "Numele fiºierului de intrare poate sã nu fie acelaºi cu al celui de ieºire\n"
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Eroare în deschiderea fiºierului de ieºire '%s'.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Eroare în deschiderea fiºierului de comentarii '%s'.\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Eroare în deschiderea fiºierului de comentarii '%s'\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Eroare in ºtergerea fiºierului vechi %s\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Eroare în redenumirea %s în %s\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr "Nu s-a putut converti comentariul în UTF8, nu s-a putut adãuga\n"
+
 #~ msgid "malloc"
 #~ msgstr "malloc"
 

Modified: trunk/vorbis-tools/po/ru.po
===================================================================
--- trunk/vorbis-tools/po/ru.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/ru.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2003-02-08 23:16+0300\n"
 "Last-Translator: Dmitry D. Stasjuck <stdms at land.ru>\n"
 "Language-Team: Russian <ru at li.org>\n"
@@ -14,75 +15,77 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "ïÛÉÂËÁ: îÅ ÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ malloc_action().\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr ""
 "ïÛÉÂËÁ: îÅ ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÐÁÍÑÔØ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "ïÛÉÂËÁ: õÓÔÒÏÊÓÔ×Ï ÎÅ ÄÏÓÔÕÐÎÏ.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr ""
 "ïÛÉÂËÁ: ÄÌÑ %s ÎÅÏÂÈÏÄÉÍÏ ÕËÁÚÁÎÉÅ ÉÍÅÎÉ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ × ÐÁÒÁÍÅÔÒÅ -f.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "ïÛÉÂËÁ: îÅÐÏÄÄÅÒÖÉ×ÁÅÍÏÅ ÚÎÁÞÅÎÉÅ ÐÁÒÁÍÅÔÒÁ ÄÌÑ ÕÓÔÒÏÊÓÔ×Á %s.\n"
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "ïÛÉÂËÁ: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÕÓÔÒÏÊÓÔ×Ï %s.\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "ïÛÉÂËÁ: óÂÏÊ ÕÓÔÒÏÊÓÔ×Á %s.\n"
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "ïÛÉÂËÁ: äÌÑ ÕÓÔÒÏÊÓÔ×Á %s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÚÁÄÁÎ ×ÙÈÏÄÎÏÊ ÆÁÊÌ.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "ïÛÉÂËÁ: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s ÄÌÑ ÚÁÐÉÓÉ.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "ïÛÉÂËÁ: æÁÊÌ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "ïÛÉÂËÁ: üÔÁ ÏÛÉÂËÁ ÎÉËÏÇÄÁ ÎÅ ÄÏÌÖÎÁ ÂÙÌÁ ÐÒÏÉÚÏÊÔÉ (%d). ðÁÎÉËÁ!\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "ïÛÉÂËÁ: îÅ ÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr ""
 "ïÛÉÂËÁ: îÅ ÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr ""
 "ïÛÉÂËÁ: îÅ ÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr ""
 "ïÛÉÂËÁ: îÅ ÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ "
@@ -97,56 +100,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== ïÛÉÂËÁ ÒÁÚÂÏÒÁ: %s × ÓÔÒÏËÅ %d ÉÚ %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "éÍÑ"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "ïÐÉÓÁÎÉÅ"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "ôÉÐ"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "ðÏ ÕÍÏÌÞÁÎÉÀ"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr "ÄÒÕÇÏÊ"
 
@@ -154,9 +160,9 @@
 msgid "(NULL)"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr ""
 
@@ -184,16 +190,16 @@
 msgid "Unknown error"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÒÁÚÂÏÒÁ ÐÁÒÁÍÅÔÒÏ× ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ.\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "òÁÚÍÅÒ ×ÈÏÄÎÏÇÏ ÂÕÆÅÒÁ ÍÅÎØÛÅ ÍÉÎÉÍÁÌØÎÏÇÏ - %dëÂ."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -203,44 +209,44 @@
 "ÓÔÒÏËÉ.\n"
 "=== ïÛÉÂËÕ ×ÙÚ×ÁÌ ÐÁÒÁÍÅÔÒ: %s\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "äÏÓÔÕÐÎÙÅ ÐÁÒÁÍÅÔÒÙ:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== õÓÔÒÏÊÓÔ×Ï %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ.\n"
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== äÒÁÊ×ÅÒ %s ÎÅ Ñ×ÌÑÅÔÓÑ ÄÒÁÊ×ÅÒÏÍ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "=== îÅ×ÏÚÍÏÖÎÏ ÕËÁÚÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ, ÎÅ ÕËÁÚÁ× ÄÒÁÊ×ÅÒ.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== îÅËÏÒÒÅËÔÎÙÊ ÆÏÒÍÁÔ ÐÁÒÁÍÅÔÒÁ: %s.\n"
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- îÅÐÒÁ×ÉÌØÎÏÅ ÚÎÁÞÅÎÉÅ ÒÁÚÍÅÒÁ ÐÒÅ-ÂÕÆÅÒÁ. äÉÁÐÁÚÏÎ 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 ÉÚ %s %s\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- ÷ÏÓÐÒÏÉÚ×ÅÓÔÉ ËÁÖÄÙÊ 0-Ê ÆÒÁÇÍÅÎÔ ÎÅ×ÏÚÍÏÖÎÏ!\n"
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -249,17 +255,21 @@
 "--- äÌÑ ÐÒÏ×ÅÄÅÎÉÑ ÔÅÓÔÏ×ÏÇÏ ÄÅËÏÄÉÒÏ×ÁÎÉÑ ÉÓÐÏÌØÚÕÊÔÅ ×ÙÈÏÄÎÏÊ ÄÒÁÊ×ÅÒ "
 "null.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ ÓÐÉÓËÁ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ %s.  ðÒÏÐÕÝÅÎ.\n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- õËÁÚÁÎÎÙÊ × ÆÁÊÌÅ ËÏÎÆÉÇÕÒÁÃÉÉ ÄÒÁÊ×ÅÒ %s ÎÅÐÒÁ×ÉÌÅÎ.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -267,7 +277,7 @@
 "=== îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ ÄÒÁÊ×ÅÒ ÐÏ ÕÍÏÌÞÁÎÉÀ, Á × ÆÁÊÌÅ ËÏÎÆÉÇÕÒÁÃÉÉ "
 "ÎÉËÁËÏÊ ÄÒÁÊ×ÅÒ ÎÅ ÕËÁÚÁÎ. úÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ.\n"
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -292,26 +302,28 @@
 "      äÏÐÕÓÔÉÍÙÅ ÕÓÔÒÏÊÓÔ×Á ('*'=ÖÉ×ÏÅ, '@'=ÆÁÊÌ):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=ÉÍÑ_ÆÁÊÌÁ  õÓÔÁÎÏ×ÉÔØ ÉÍÑ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ ÄÌÑ ÒÁÎÅÅ ÕËÁÚÁÎÎÏÇÏ\n"
 "      ÆÁÊÌÁ ÕÓÔÒÏÊÓÔ×Á (Ó ÏÐÃÉÅÊ -d).\n"
@@ -333,25 +345,26 @@
 "  -l, --delay=s  ÕÓÔÁÎÁ×ÌÉ×ÁÅÔ ÚÎÁÞÅÎÉÅ s [× ÍÉÌÌÉÓÅËÕÎÄÁÈ] (ÐÏ ÕÍÏÌÞÁÎÉÀ "
 "500).\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "ïÛÉÂËÁ: îÅ ÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr ""
 "ïÛÉÂËÁ: îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÐÁÍÑÔØ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "ïÛÉÂËÁ: îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÍÁÓËÕ ÓÉÇÎÁÌÁ."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "ïÛÉÂËÁ: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÈÏÄÎÏÊ ÂÕÆÅÒ.\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "ÕÓÔÒÏÊÓÔ×Ï ×Ù×ÏÄÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
@@ -360,7 +373,7 @@
 msgid "shuffle playlist"
 msgstr "ÐÅÒÅÍÅÛÁÔØ ÓÐÉÓÏË ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -369,93 +382,93 @@
 "\n"
 "ú×ÕËÏ×ÏÅ õÓÔÒÏÊÓÔ×Ï:   %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "á×ÔÏÒ:    %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "ëÏÍÍÅÎÔÁÒÉÉ: %s"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "÷ÎÉÍÁÎÉÅ: îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ËÁÔÁÌÏÇ %s.\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "ïÛÉÂËÁ: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÂÕÆÅÒ ÄÌÑ Ú×ÕËÁ.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "îÅ ÎÁÊÄÅÎÙ ÍÏÄÕÌÉ ÄÌÑ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "æÏÒÍÁÔ ÆÁÊÌÁ %s ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ %s ÍÏÄÕÌÅÍ %s.  æÁÊÌ ÍÏÖÅÔ ÂÙÔØ ÐÏ×ÒÅÖÄÅÎ.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "÷ÏÓÐÒÏÉÚ×ÅÄÅÎÉÅ: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÐÕÓÔÉÔØ %f ÓÅËÕÎÄ Ú×ÕËÁ."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "ïÛÉÂËÁ: äÅËÏÄÉÒÏ×ÁÎÉÅ ÎÅ ÕÄÁÌÏÓØ.\n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "úÁ×ÅÒÛÅÎÏ."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- ÷ ÐÏÔÏËÅ ÐÕÓÔÏ; ×ÏÚÍÏÖÎÏ, ÎÉÞÅÇÏ ÓÔÒÁÛÎÏÇÏ\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== âÉÂÌÉÏÔÅËÁ Vorbis ÓÏÏÂÝÉÌÁ Ï ÏÛÉÂËÅ ÐÏÔÏËÁ.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "âÉÔÏ×ÙÊ ÐÏÔÏË - ÜÔÏ %d ËÁÎÁÌ, %ldçÃ"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr "úÎÁÞÅÎÉÑ ÂÉÔÒÅÊÔÁ: ×ÅÒÈÎÅÅ=%ld ÎÏÍÉÎÁÌØÎÏÅ=%ld ÎÉÖÎÅÅ=%ld ÏËÎÏ=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "ëÏÄÉÒÏ×ÁÎÉÅ: %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
+#, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr ""
 "ïÛÉÂËÁ: îÅ ÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ create_playlist_member().\n"
@@ -468,6 +481,7 @@
 "s.\n"
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
+#, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "ïÛÉÂËÁ: îÅ ÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ playlist_to_array().\n"
 
@@ -488,6 +502,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "ïÛÉÂËÁ ×ÙÄÅÌÅÎÉÑ ÐÁÍÑÔÉ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ stats_init()\n"
 
@@ -521,80 +536,102 @@
 msgid " Output Buffer %5.1f%%"
 msgstr " ÷ÙÈÏÄÎÏÊ âÕÆÅÒ %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr ""
 "ïÛÉÂËÁ: îÅ×ÏÚÍÏÖÎÏ ×ÙÄÅÌÉÔØ ÐÁÍÑÔØ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ malloc_data_source_stats"
 "()\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "þÔÅÎÉÅ ÆÁÊÌÏ× WAV"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "þÔÅÎÉÅ ÆÁÊÌÏ× AIFF/AIFC"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "þÔÅÎÉÅ ÆÁÊÌÏ× WAV"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "þÔÅÎÉÅ ÆÁÊÌÏ× WAV"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "÷ÎÉÍÁÎÉÅ: îÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÒÉ ÞÔÅÎÉÉ ÚÁÇÏÌÏ×ËÁ WAV\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "ðÒÏÐÕÓËÁÅÍ ÆÒÁÇÍÅÎÔ ÔÉÐÁ \"%s\", ÄÌÉÎÁ %d\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "÷ÎÉÍÁÎÉÅ: îÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ×Ï ÆÒÁÇÍÅÎÔÅ AIFF\n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÷ ÆÁÊÌÅ AIFF ÎÅ ÎÁÊÄÅÎ ÏÂÝÉÊ ÆÒÁÇÍÅÎÔ\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ïÂÒÅÚÁÎÎÙÊ ÏÂÝÉÊ ÆÒÁÇÍÅÎÔ × ÚÁÇÏÌÏ×ËÅ AIFF\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "÷ÎÉÍÁÎÉÅ: îÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÒÉ ÞÔÅÎÉÉ ÚÁÇÏÌÏ×ËÁ AIFF\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "÷ÎÉÍÁÎÉÅ: úÁÇÏÌÏ×ÏË AIFF-C ÏÂÒÅÚÁÎ.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "÷ÎÉÍÁÎÉÅ: îÅ×ÏÚÍÏÖÎÏ ÏÂÒÁÂÏÔÁÔØ ÓÖÁÔÙÊ AIFF-C\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÷ ÆÁÊÌÅ AIFF ÎÅ ÎÁÊÄÅÎ SSND-ÆÒÁÇÍÅÎÔ\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÷ ÚÁÇÏÌÏ×ËÅ AIFF ÐÏ×ÒÅÖÄÅÎ SSND-ÆÒÁÇÍÅÎÔ\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "÷ÎÉÍÁÎÉÅ: îÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ ÐÒÉ ÞÔÅÎÉÉ ÚÁÇÏÌÏ×ËÁ AIFF\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "÷ÎÉÍÁÎÉÅ: OggEnc ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÜÔÏÔ ÔÉÐ AIFF/AIFC ÆÁÊÌÁ\n"
 " äÏÌÖÅÎ ÂÙÔØ 8- ÉÌÉ 16- ÂÉÔÎÙÊ PCM.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "÷ÎÉÍÁÎÉÅ: æÏÒÍÁÔ ÆÒÁÇÍÅÎÔÁ × ÚÁÇÏÌÏ×ËÅ WAV ÎÅ ÒÁÓÐÏÚÎÁÎ\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -602,7 +639,8 @@
 "÷ÎÉÍÁÎÉÅ: îåëïòòåëôîùê ÆÏÒÍÁÔ ÆÒÁÇÍÅÎÔÁ × ÚÁÇÏÌÏ×ËÅ wav.\n"
 "ôÅÍ ÎÅ ÍÅÎÅÅ, ÐÙÔÁÅÍÓÑ ÐÒÏÞÉÔÁÔØ (ÍÏÖÅÔ ÎÅ ÓÒÁÂÏÔÁÔØ)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
@@ -610,8 +648,8 @@
 "ïûéâëá: æÁÊÌ wav ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÏÇÏ ÔÉÐÁ (ÄÏÌÖÅÎ ÂÙÔØ ÓÔÁÎÄÁÒÔÎÙÊ PCM\n"
 " ÉÌÉ ÔÉÐ 3 PCM Ó ÐÌÁ×ÁÀÝÅÊ ÔÏÞËÏÊ)\n"
 
-#: oggenc/audio.c:466
-#, fuzzy
+#: oggenc/audio.c:480
+#, fuzzy, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
@@ -619,16 +657,18 @@
 "ïûéâëá: æÁÊÌ wav ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÏÇÏ ÐÏÄÆÏÒÍÁÔÁ (ÄÏÌÖÅÎ ÂÙÔØ 16-ÂÉÔÎÙÊ PCM\n"
 "ÉÌÉ PCM Ó ÐÌÁ×ÁÀÝÅÊ ÔÏÞËÏÊ)\n"
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
@@ -636,26 +676,28 @@
 "çìàë: ïÔ ÒÅÓÜÍÐÌÅÒÁ ÐÏÌÕÞÅÎÏ ÎÕÌÅ×ÏÅ ÞÉÓÌÏ ËÁÄÒÏ×: ×ÁÛ ÆÁÊÌ ÂÕÄÅÔÏÂÒÅÚÁÎ. "
 "ðÏÖÁÌÕÊÓÔÁ, ÓÏÏÂÝÉÔÅ Ï ÜÔÏÍ Á×ÔÏÒÕ.\n"
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "îÅ ×ÏÚÍÏÖÎÏ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÒÅÓÜÍÐÌÅÒ\n"
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "õÓÔÁÎÏ×ËÁ ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ ÐÁÒÁÍÅÔÒÁ ËÏÄÉÒÏ×ÝÉËÁ \"%s\" × %s\n"
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "éÚÍÅÎÅÎÉÅ ÎÉÖÎÅÊ ÇÒÁÎÉÃÙ ÞÁÓÔÏÔÙ Ó %f ÄÏ %f ËçÃ\n"
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "îÅÒÁÓÐÏÚÎÁ×ÁÅÍÙÊ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ÐÁÒÁÍÅÔÒ \"%s\"\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
@@ -663,38 +705,51 @@
 "255 ËÁÎÁÌÏ× ÄÏÌÖÎÏ ÂÙÔØ ÄÏÓÔÁÔÏÞÎÏ ÄÌÑ ×ÓÅÈ. (éÚ×ÉÎÉÔÅ, ÎÏ vorbis ÎÅ "
 "ÐÏÄÄÅÒÖÉ×ÁÅÔ ÂÏÌØÛÅ)\n"
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr ""
 "äÌÑ ÚÁÐÒÏÓÁ ÍÉÎÉÍÁÌØÎÏÇÏ ÉÌÉ ÍÁËÓÉÍÁÌØÎÏÇÏ ÂÉÔÒÅÊÔÁ ÔÒÅÂÕÅÔÓÑ --managed\n"
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "óÂÏÊ ÒÅÖÉÍÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ: ÎÅËÏÒÒÅËÔÎÙÅ ÐÁÒÁÍÅÔÒÙ ÄÌÑ ËÁÞÅÓÔ×Á\n"
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "óÂÏÊ ÒÅÖÉÍÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ: ÎÅËÏÒÒÅËÔÎÙÅ ÐÁÒÁÍÅÔÒÙ ÄÌÑ ÂÉÔÒÅÊÔÁ\n"
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "óÂÏÊ ÐÒÉ ÚÁÐÉÓÉ ÚÁÇÏÌÏ×ËÁ × ×ÙÈÏÄÎÏÊ ÐÏÔÏË\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "óÂÏÊ ÐÒÉ ÚÁÐÉÓÉ ÄÁÎÎÙÈ × ×ÙÈÏÄÎÏÊ ÐÏÔÏË\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [ÏÓÔÁÌÏÓØ %2dÍ%.2dÓ] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tëÏÄÉÒÏ×ÁÎÉÅ [ÇÏÔÏ×Ï %2dÍ%.2dÓ] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -705,7 +760,8 @@
 "\n"
 "ëÏÄÉÒÏ×ÁÎÉÅ ÆÁÊÌÁ \"%s\" ÚÁ×ÅÒÛÅÎÏ\n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -715,7 +771,7 @@
 "\n"
 "ëÏÄÉÒÏ×ÁÎÉÅ ÚÁ×ÅÒÛÅÎÏ.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -724,17 +780,17 @@
 "\n"
 "\täÌÉÎÁ ÆÁÊÌÁ:  %dÍ %04.1fÓ\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tïÓÔÁ×ÛÅÅÓÑ ×ÒÅÍÑ: %dÍ %04.1fÓ\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\t÷ÙÂÏÒËÁ:      %.4f\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -743,7 +799,7 @@
 "\tóÒÅÄÎÉÊ ÂÉÔÒÅÊÔ: %.1f ëÂ/Ó\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -754,17 +810,17 @@
 "         %s%s%s \n"
 "ÓÏ ÓÒÅÄÎÉÍ ÂÉÔÒÅÊÔÏÍ %d ëÂ/Ó "
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -775,7 +831,7 @@
 "         %s%s%s \n"
 "Ó ÐÒÉÂÌÉÚÉÔÅÌØÎÙÍ ÂÉÔÒÅÊÔÏÍ %d ëÂ/ÓÅË (×ËÌÀÞÅÎÏ ËÏÄÉÒÏ×ÁÎÉÅ Ó VBR)\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -786,7 +842,7 @@
 "         %s%s%s \n"
 "Ó ÕÒÏ×ÎÅÍ ËÁÞÅÓÔ×Á %2.2f Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÏÇÒÁÎÉÞÅÎÎÏÇÏ VBR "
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -797,7 +853,7 @@
 "         %s%s%s \n"
 "Ó ËÁÞÅÓÔ×ÏÍ %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -808,7 +864,7 @@
 "         %s%s%s \n"
 "Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÕÐÒÁ×ÌÅÎÉÑ ÂÉÔÒÅÊÔÏÍ "
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -817,11 +873,13 @@
 "%s%s\n"
 "ïûéâëá: îÅ ÕËÁÚÁÎÙ ×ÈÏÄÎÙÅ ÆÁÊÌÙ. äÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÒÁ×ËÉ -h.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "ïûéâëá: õËÁÚÁÎÏ ÎÅÓËÏÌØËÏ ÆÁÊÌÏ×, × ÔÏ ×ÒÅÍÑ ËÁË ÉÓÐÏÌØÚÕÅÔÓÑ stdin\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
@@ -829,26 +887,27 @@
 "ïûéâëá: îÅÓËÏÌØËÏ ×ÈÏÄÎÙÈ ÆÁÊÌÏ× ÐÒÉ ÕËÁÚÁÎÎÏÍ ÉÍÅÎÉ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ: "
 "ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÎÉÅ - n\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ïûéâëá: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÈÏÄÎÏÊ ÆÁÊÌ \"%s\": %s\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "ïÔËÒÙÔÉÅ Ó ÍÏÄÕÌÅÍ %s: %s\n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "ïûéâëá: ÷ÈÏÄÎÏÊ ÆÁÊÌ \"%s\" × ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÏÍ ÆÏÒÍÁÔÅ\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "÷îéíáîéå: îÅ ÕËÁÚÁÎÏ ÉÍÑ ÆÁÊÌÁ, ÉÓÐÏÌØÚÕÅÔÓÑ \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
@@ -856,30 +915,37 @@
 "ïûéâëá: îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÎÅÏÂÈÏÄÉÍÙÅ ÐÏÄËÁÔÁÌÏÇÉ ÄÌÑ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ \"%s"
 "\"\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr "éÍÑ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ ÎÅ ÍÏÖÅÔ ÓÏ×ÐÁÄÁÔØ Ó ÉÍÅÎÅÍ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ïûéâëá: îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ \"%s\": %s\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "éÚÍÅÎÅÎÉÅ ÞÁÓÔÏÔÙ ×ÙÂÏÒËÉ ×ÈÏÄÎÙÈ ÆÁÊÌÏ× Ó %d ÄÏ %d çÃ\n"
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "óÍÅÛÅÎÉÅ ÓÔÅÒÅÏ × ÍÏÎÏ\n"
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, fuzzy, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "ïûéâëá: óÍÅÛÅÎÉÅ ÓÉÇÎÁÌÏ× ×ÏÚÍÏÖÎÏ ÔÏÌØËÏ ÉÚ ÓÔÅÒÅÏ × ÍÏÎÏ\n"
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -889,6 +955,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -896,25 +963,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -962,8 +1046,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1078,120 +1163,131 @@
 "ÆÁÊÌÁ ÏÐÃÉÅÊ -o\n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 "÷îéíáîéå: îÅËÏÒÒÅËÔÎÙÊ ÕÐÒÁ×ÌÑÀÝÉÊ ÓÉÍ×ÏÌ '%c' × ÆÏÒÍÁÔÅ ÉÍÅÎÉ, "
 "ÉÇÎÏÒÉÒÕÅÔÓÑ\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "÷ËÌÀÞÅÎÉÅ ÍÅÈÁÎÉÚÍÁ ÕÐÒÁ×ÌÅÎÉÑ ÂÉÔÒÅÊÔÏÍ\n"
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "÷îéíáîéå: õËÁÚÁÎ ÐÏÒÑÄÏË ÂÁÊÔ ÓÙÒÙÈ ÄÁÎÎÙÈ ÄÌÑ ÎÅ-ÓÙÒÙÈ ÄÁÎÎÙÈ. "
 "ðÏÄÒÁÚÕÍÅ×ÁÅÍ ÓÙÒÙÅ ÄÁÎÎÙÅ.\n"
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr ""
 "÷îéíáîéå: îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÁÒÇÕÍÅÎÔ \"%s\" × ÐÏÒÑÄËÅ ÓÌÅÄÏ×ÁÎÉÑ ÂÁÊÔ\n"
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "÷îéíáîéå: îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÉÚÍÅÎÅÎÉÅ ÞÁÓÔÏÔÙ \"%s\"\n"
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 "÷ÎÉÍÁÎÉÅ: õËÁÚÁÎÏ ÉÚÍÅÎÅÎÉÅ ÞÁÓÔÏÔÙ ×ÙÂÏÒËÉ %d çÃ. ÷Ù ÉÍÅÌÉ × ×ÉÄÕ %d çÃ?\n"
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "÷ÎÉÍÁÎÉÅ: îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ËÁÔÁÌÏÇ %s.\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "îÅ ÎÁÊÄÅÎÏ ÚÎÁÞÅÎÉÅ ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ ÐÁÒÁÍÅÔÒÁ ËÏÄÉÒÏ×ÝÉËÁ\n"
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÒÁÚÂÏÒÁ ÐÁÒÁÍÅÔÒÏ× ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ\n"
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr ""
 "÷ÎÉÍÁÎÉÅ: éÓÐÏÌØÚÏ×ÁÎ ÎÅËÏÒÒÅËÔÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ (\"%s\"), ÉÇÎÏÒÉÒÕÅÔÓÑ.\n"
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÎÏÍÉÎÁÌØÎÙÊ ÂÉÔÒÅÊÔ \"%s\" ÎÅ ÏÐÏÚÎÁÎ\n"
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÍÉÎÉÍÁÌØÎÙÊ ÂÉÔÒÅÊÔ \"%s\" ÎÅ ÏÐÏÚÎÁÎ\n"
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÍÁËÓÉÍÁÌØÎÙÊ ÂÉÔÒÅÊÔ \"%s\" ÎÅ ÏÐÏÚÎÁÎ\n"
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "ïÐÃÉÑ ËÁÞÅÓÔ×Á \"%s\" ÎÅ ÏÐÏÚÎÁÎÁ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n"
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 "÷îéíáîéå: ÕÓÔÁÎÏ×ÌÅÎÏ ÓÌÉÛËÏÍ ×ÙÓÏËÏÅ ËÁÞÅÓÔ×Ï, ÏÇÒÁÎÉÞÅÎÏ ÄÏ ÍÁËÓÉÍÁÌØÎÏÇÏ\n"
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "÷îéíáîéå: õËÁÚÁÎÏ ÎÅÓËÏÌØËÏ ÆÏÒÍÁÔÏ× ÉÍÅÎÉ, ÉÓÐÏÌØÚÕÅÔÓÑ ÐÏÓÌÅÄÎÉÊ\n"
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 "÷îéíáîéå: õËÁÚÁÎÏ ÎÅÓËÏÌØËÏ ÆÉÌØÔÒÏ× ÆÏÒÍÁÔÏ× ÉÍÅÎÉ, ÉÓÐÏÌØÚÕÅÔÓÑ ÐÏÓÌÅÄÎÉÊ\n"
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 "÷îéíáîéå: õËÁÚÁÎÏ ÎÅÓËÏÌØËÏ ÚÁÍÅÎ ÆÉÌØÔÒÏ× ÆÏÒÍÁÔÏ× ÉÍÅÎÉ, ÉÓÐÏÌØÚÕÅÔÓÑ "
 "ÐÏÓÌÅÄÎÑÑ\n"
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 "÷îéíáîéå: õËÁÚÁÎÏ ÎÅÓËÏÌØËÏ ×ÙÈÏÄÎÙÈ ÆÁÊÌÏ×, ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÎÉÅ "
 "ÐÁÒÁÍÅÔÒÁ -n\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "÷îéíáîéå: õËÁÚÁÎÏ ÚÎÁÞÅÎÉÅ ÓÙÒÙÈ ÂÉÔ/ËÁÄÒ ÄÌÑ ÎÅ-ÓÙÒÙÈ ÄÁÎÎÙÈ. "
 "ðÒÅÄÐÏÌÁÇÁÅÔÓÑ ÓÙÒÏÊ ××ÏÄ.\n"
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "÷îéíáîéå: õËÁÚÁÎÏ ÎÅËÏÒÒÅËÔÎÏÅ ÚÎÁÞÅÎÉÅ ÂÉÔ/ËÁÄÒ, ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ 16.\n"
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
@@ -1199,34 +1295,38 @@
 "÷îéíáîéå: õËÁÚÁÎÏ ÞÉÓÌÏ ÓÙÒÙÈ ËÁÎÁÌÏ× ÄÌÑ ÎÅ-ÓÙÒÙÈ ÄÁÎÎÙÈ. ðÒÅÄÐÏÌÁÇÁÅÔÓÑ "
 "ÓÙÒÏÊ ××ÏÄ.\n"
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "÷îéíáîéå: õËÁÚÁÎÏ ÎÅ×ÅÒÎÏÅ ÞÉÓÌÏ ËÁÎÁÌÏ×, ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ 2.\n"
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "÷îéíáîéå: õËÁÚÁÎÁ ÓÙÒÁÑ ÞÁÓÔÏÔÁ ×ÙÂÏÒËÉ ÄÌÑ ÎÅ-ÓÙÒÙÈ ÄÁÎÎÙÈ. ðÒÅÄÐÏÌÁÇÁÅÔÓÑ "
 "ÓÙÒÏÊ ××ÏÄ.\n"
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 "÷îéíáîéå: õËÁÚÁÎÏ ÎÅËÏÒÒÅËÔÎÏÅ ÚÎÁÞÅÎÉÅ ÞÁÓÔÏÔÙ ×ÙÂÏÒËÉ, ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ "
 "44100.\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "÷îéíáîéå: õËÁÚÁÎ ÎÅÉÚ×ÅÓÔÎÙÊ ÐÁÒÁÍÅÔÒ, ÉÇÎÏÒÉÒÕÅÔÓÑ->\n"
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÅÏÂÒÁÚÏ×ÁÔØ ËÏÍÍÅÎÔÁÒÉÊ × UTF-8, ÄÏÂÁ×ÌÑÔØ ÎÅÌØÚÑ\n"
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 "÷îéíáîéå: õËÁÚÁÎÏ ÎÅÄÏÓÔÁÔÏÞÎÏÅ ËÏÌÉÞÅÓÔ×Ï ÚÁÇÏÌÏ×ËÏ×, ÕÓÔÁÎÏ×ÌÅÎÙ ÐÏÓÌÅÄÎÉÅ "
@@ -1247,15 +1347,174 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "ïÛÉÂËÁ: ÓÅÇÍÅÎÔ ÐÕÔÉ \"%s\" ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ\n"
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
+#, fuzzy, c-format
+msgid ""
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
+msgstr ""
+"÷ÎÉÍÁÎÉÅ: ëÏÍÍÅÎÔÁÒÉÊ %d × ÐÏÔÏËÅ %d ÎÅËÏÒÒÅËÔÎÏ ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎ. ïÎ ÎÅ "
+"ÓÏÄÅÒÖÉÔ '=': \"%s\"\n"
+
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+"÷ÎÉÍÁÎÉÅ: îÅËÏÒÒÅËÔÎÏÅ ÉÍÑ ÐÏÌÑ ËÏÍÍÅÎÔÁÒÉÑ × ËÏÍÍÅÎÔÁÒÉÉ %d (ÐÏÔÏË %d): \"%s"
+"\"\n"
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+"÷ÎÉÍÁÎÉÅ: îÅËÏÒÒÅËÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ UTF-8 × ËÏÍÍÅÎÔÁÒÉÉ %d (ÐÏÔÏË %d): "
+"ÎÅÐÒÁ×ÉÌØÎÙÊ ÍÁÒËÅÒ ÄÌÉÎÙ\n"
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+"÷ÎÉÍÁÎÉÅ: îÅËÏÒÒÅËÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ UTF-8 × ËÏÍÍÅÎÔÁÒÉÉ %d (ÐÏÔÏË %d): "
+"ÓÌÉÛËÏÍ ÍÁÌÏ ÂÁÊÔ\n"
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+"÷ÎÉÍÁÎÉÅ: îÅËÏÒÒÅËÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ UTF-8 × ËÏÍÍÅÎÔÁÒÉÉ %d (ÐÏÔÏË %d): "
+"ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ\n"
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr "÷ÎÉÍÁÎÉÅ: óÂÏÊ × ÄÅËÏÄÅÒÅ utf8. ÷ÏÏÂÝÅ-ÔÏ ÜÔÏ ÄÏÌÖÎÏ ÂÙÔØ ÎÅ×ÏÚÍÏÖÎÏ\n"
+
+#: ogginfo/ogginfo2.c:318
+#, fuzzy, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+"÷ÎÉÍÁÎÉÅ: îÅ×ÏÚÍÏÖÎÏ ÄÅËÏÄÉÒÏ×ÁÔØ ÐÁËÅÔ ÚÁÇÏÌÏ×ËÁ vorbis - ÎÅËÏÒÒÅËÔÎÙÊ "
+"ÐÏÔÏË vorbis (%d)\n"
+
+#: ogginfo/ogginfo2.c:325
+#, fuzzy, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
+msgstr ""
+"÷ÎÉÍÁÎÉÅ: úÁÇÏÌÏ×ËÉ × ÐÏÔÏËÅ Vorbis %d ÒÁÚÄÅÌÅÎÙ ÎÅËÏÒÒÅËÔÎÏ. ðÏÓÌÅÄÎÑÑ "
+"ÓÔÒÁÎÉÃÁ ÚÁÇÏÌÏ×ËÁ ÓÏÄÅÒÖÉÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ ÉÌÉ ÉÍÅÅÔ ÎÅ-ÎÕÌÅ×ÏÊ "
+"granulepos\n"
+
+#: ogginfo/ogginfo2.c:329
+#, fuzzy, c-format
+msgid "Theora headers parsed for stream %d, information follows...\n"
+msgstr "úÁÇÏÌÏ×ËÉ vorbis ÏÂÒÁÂÏÔÁÎÙ ÄÌÑ ÐÏÔÏËÁ %d, ÄÁÌÅÅ ÉÎÆÏÒÍÁÃÉÑ...\n"
+
+#: ogginfo/ogginfo2.c:332
+#, fuzzy, c-format
+msgid "Version: %d.%d.%d\n"
+msgstr "÷ÅÒÓÉÑ: %d\n"
+
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
+#, c-format
+msgid "Vendor: %s\n"
+msgstr "ðÏÓÔÁ×ÝÉË: %s\n"
+
+#: ogginfo/ogginfo2.c:335
+#, c-format
+msgid "Width: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:336
+#, fuzzy, c-format
+msgid "Height: %d\n"
+msgstr "÷ÅÒÓÉÑ: %d\n"
+
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
+msgid "User comments section follows...\n"
+msgstr "óÅËÃÉÑ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÈ ËÏÍÍÅÎÔÁÒÉÅ× ÓÌÅÄÕÅÔ ÚÁ...\n"
+
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+#, fuzzy
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "÷ÎÉÍÁÎÉÅ: granulepos × ÐÏÔÏËÅ %d ÕÍÅÎØÛÉÌÏÓØ Ó "
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, fuzzy, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr "÷ÎÉÍÁÎÉÅ: granulepos × ÐÏÔÏËÅ %d ÕÍÅÎØÛÉÌÏÓØ Ó "
+
+#: ogginfo/ogginfo2.c:432
+#, fuzzy
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"ðÏÔÏË vorbis %d:\n"
+"\tïÂÝÁÑ ÄÌÉÎÁ ÄÁÎÎÙÈ: %ld ÂÁÊÔ\n"
+"\t÷ÒÅÍÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ: %ldÍ:%02ldÓ\n"
+"\tóÒÅÄÎÉÊ ÂÉÔÒÅÊÔ: %f ëÂÉÔ/Ó\n"
+
+#: ogginfo/ogginfo2.c:438
+#, fuzzy, c-format
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"ðÏÔÏË vorbis %d:\n"
+"\tïÂÝÁÑ ÄÌÉÎÁ ÄÁÎÎÙÈ: %ld ÂÁÊÔ\n"
+"\t÷ÒÅÍÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ: %ldÍ:%02ldÓ\n"
+"\tóÒÅÄÎÉÊ ÂÉÔÒÅÊÔ: %f ëÂÉÔ/Ó\n"
+
+#: ogginfo/ogginfo2.c:466
+#, c-format
+msgid ""
 "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 "÷ÎÉÍÁÎÉÅ: îÅ×ÏÚÍÏÖÎÏ ÄÅËÏÄÉÒÏ×ÁÔØ ÐÁËÅÔ ÚÁÇÏÌÏ×ËÁ vorbis - ÎÅËÏÒÒÅËÔÎÙÊ "
 "ÐÏÔÏË vorbis (%d)\n"
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
 "Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
@@ -1265,32 +1524,27 @@
 "ÓÔÒÁÎÉÃÁ ÚÁÇÏÌÏ×ËÁ ÓÏÄÅÒÖÉÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ ÉÌÉ ÉÍÅÅÔ ÎÅ-ÎÕÌÅ×ÏÊ "
 "granulepos\n"
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:477
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "úÁÇÏÌÏ×ËÉ vorbis ÏÂÒÁÂÏÔÁÎÙ ÄÌÑ ÐÏÔÏËÁ %d, ÄÁÌÅÅ ÉÎÆÏÒÍÁÃÉÑ...\n"
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "÷ÅÒÓÉÑ: %d\n"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "ðÏÓÔÁ×ÝÉË: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:183
+#: ogginfo/ogginfo2.c:492
 #, c-format
-msgid "Vendor: %s\n"
-msgstr "ðÏÓÔÁ×ÝÉË: %s\n"
-
-#: ogginfo/ogginfo2.c:184
-#, c-format
 msgid "Channels: %d\n"
 msgstr "ëÁÎÁÌÙ: %d\n"
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1299,153 +1553,108 @@
 "âÉÔÒÅÊÔ: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:188
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "îÏÍÉÎÁÌØÎÙÊ ÂÉÔÒÅÊÔ: %f ëÂ/Ó\n"
 
-#: ogginfo/ogginfo2.c:191
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "îÏÍÉÎÁÌØÎÙÊ ÂÉÔÒÅÊÔ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: ogginfo/ogginfo2.c:194
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "íÁËÓÉÍÁÌØÎÙÊ ÂÉÔÒÅÊÔ: %f ëÂ/Ó\n"
 
-#: ogginfo/ogginfo2.c:197
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "íÁËÓÉÍÁÌØÎÙÊ ÂÉÔÒÅÊÔ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: ogginfo/ogginfo2.c:200
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "íÉÎÉÍÁÌØÎÙÊ ÂÉÔÒÅÊÔ: %f ëÂ/Ó\n"
 
-#: ogginfo/ogginfo2.c:203
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "íÉÎÉÍÁÌØÎÙÊ ÂÉÔÒÅÊÔ ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: ogginfo/ogginfo2.c:206
-msgid "User comments section follows...\n"
-msgstr "óÅËÃÉÑ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÈ ËÏÍÍÅÎÔÁÒÉÅ× ÓÌÅÄÕÅÔ ÚÁ...\n"
-
-#: ogginfo/ogginfo2.c:218
-#, c-format
+#: ogginfo/ogginfo2.c:539
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Negative granulepos on vorbis stream outside of headers. This file was "
+"created by a buggy encoder\n"
 msgstr ""
-"÷ÎÉÍÁÎÉÅ: ëÏÍÍÅÎÔÁÒÉÊ %d × ÐÏÔÏËÅ %d ÎÅËÏÒÒÅËÔÎÏ ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎ. ïÎ ÎÅ "
-"ÓÏÄÅÒÖÉÔ '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:227
-#, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"÷ÎÉÍÁÎÉÅ: îÅËÏÒÒÅËÔÎÏÅ ÉÍÑ ÐÏÌÑ ËÏÍÍÅÎÔÁÒÉÑ × ËÏÍÍÅÎÔÁÒÉÉ %d (ÐÏÔÏË %d): \"%s"
-"\"\n"
-
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
-#, c-format
+#: ogginfo/ogginfo2.c:561
+#, fuzzy
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"÷ÎÉÍÁÎÉÅ: îÅËÏÒÒÅËÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ UTF-8 × ËÏÍÍÅÎÔÁÒÉÉ %d (ÐÏÔÏË %d): "
-"ÎÅÐÒÁ×ÉÌØÎÙÊ ÍÁÒËÅÒ ÄÌÉÎÙ\n"
+"ðÏÔÏË vorbis %d:\n"
+"\tïÂÝÁÑ ÄÌÉÎÁ ÄÁÎÎÙÈ: %ld ÂÁÊÔ\n"
+"\t÷ÒÅÍÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ: %ldÍ:%02ldÓ\n"
+"\tóÒÅÄÎÉÊ ÂÉÔÒÅÊÔ: %f ëÂÉÔ/Ó\n"
 
-#: ogginfo/ogginfo2.c:275
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"÷ÎÉÍÁÎÉÅ: îÅËÏÒÒÅËÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ UTF-8 × ËÏÍÍÅÎÔÁÒÉÉ %d (ÐÏÔÏË %d): "
-"ÓÌÉÛËÏÍ ÍÁÌÏ ÂÁÊÔ\n"
-
-#: ogginfo/ogginfo2.c:336
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
-msgstr ""
-"÷ÎÉÍÁÎÉÅ: îÅËÏÒÒÅËÔÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ UTF-8 × ËÏÍÍÅÎÔÁÒÉÉ %d (ÐÏÔÏË %d): "
-"ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ\n"
-
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr "÷ÎÉÍÁÎÉÅ: óÂÏÊ × ÄÅËÏÄÅÒÅ utf8. ÷ÏÏÂÝÅ-ÔÏ ÜÔÏ ÄÏÌÖÎÏ ÂÙÔØ ÎÅ×ÏÚÍÏÖÎÏ\n"
-
-#: ogginfo/ogginfo2.c:366
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-msgstr "÷ÎÉÍÁÎÉÅ: granulepos × ÐÏÔÏËÅ %d ÕÍÅÎØÛÉÌÏÓØ Ó "
-
-#: ogginfo/ogginfo2.c:369
+#: ogginfo/ogginfo2.c:567
 #, fuzzy, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
-msgstr "÷ÎÉÍÁÎÉÅ: granulepos × ÐÏÔÏËÅ %d ÕÍÅÎØÛÉÌÏÓØ Ó "
-
-#: ogginfo/ogginfo2.c:375
 msgid ""
-"Negative granulepos on vorbis stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:395
-#, c-format
-msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 "ðÏÔÏË vorbis %d:\n"
 "\tïÂÝÁÑ ÄÌÉÎÁ ÄÁÎÎÙÈ: %ld ÂÁÊÔ\n"
 "\t÷ÒÅÍÑ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÉÑ: %ldÍ:%02ldÓ\n"
 "\tóÒÅÄÎÉÊ ÂÉÔÒÅÊÔ: %f ëÂÉÔ/Ó\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÄÌÑ ÐÏÔÏËÁ %d ÎÅ ÕÓÔÁÎÏ×ÌÅÎ ÍÁÒËÅÒ ÅÇÏ ËÏÎÃÁ\n"
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "÷ÎÉÍÁÎÉÅ: îÅÐÒÁ×ÉÌØÎÁÑ ÓÔÒÁÎÉÃÁ ÚÁÇÏÌÏ×ËÁ, ÎÅ ÎÁÊÄÅÎ ÐÁËÅÔ\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 "÷ÎÉÍÁÎÉÅ: îÅÐÒÁ×ÉÌØÎÁÑ ÓÔÒÁÎÉÃÁ ÚÁÇÏÌÏ×ËÁ × ÐÏÔÏËÅ %d, ÓÏÄÅÒÖÉÔ ÍÎÏÖÅÓÔ×Ï "
 "ÐÁËÅÔÏ×\n"
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 #, fuzzy
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ïÂÎÁÒÕÖÅÎÁ ÄÙÒÁ × ÄÁÎÎÙÈ ÓÏ ÓÍÅÝÅÎÉÅÍ ÐÒÉÂÌÉÚÉÔÅÌØÎÏ "
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, fuzzy, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ïÂÎÁÒÕÖÅÎÁ ÄÙÒÁ × ÄÁÎÎÙÈ ÓÏ ÓÍÅÝÅÎÉÅÍ ÐÒÉÂÌÉÚÉÔÅÌØÎÏ "
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1454,25 +1663,25 @@
 "ïÂÒÁÂÏÔËÁ ÆÁÊÌÁ \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÏÂÒÁÂÏÔÞÉË ÄÌÑ ÐÏÔÏËÁ. úÁÄÁÎÉÅ ÏÔÌÏÖÅÎÏ\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, fuzzy, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -1481,22 +1690,22 @@
 "÷ÎÉÍÁÎÉÅ: ÎÅÐÒÁ×ÉÌØÎÏ ÒÁÓÐÏÌÏÖÅÎÙ ÓÔÒÁÎÉÃÙ ÄÌÑ ÌÏÇÉÞÅÓËÏÇÏ ÐÏÔÏËÁ %d\n"
 "üÔÏ ÓÉÇÎÁÌÉÚÉÒÕÅÔ Ï ÐÏ×ÒÅÖÄÅÎÉÉ ÆÁÊÌÁ ogg.\n"
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "îÏ×ÙÊ ÌÏÇÉÞÅÓËÉÊ ÐÏÔÏË (#%d, ÓÅÒÉÊÎÙÊ ÎÏÍÅÒ: %08x): ÔÉÐ %s\n"
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÄÌÑ ÐÏÔÏËÁ %d ÎÅ ÕÓÔÁÎÏ×ÌÅÎ ÆÌÁÇ ÅÇÏ ÎÁÞÁÌÁ\n"
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "÷ÎÉÍÁÎÉÅ: × ÓÅÒÅÄÉÎÅ ÐÏÔÏËÁ %d ÎÁÊÄÅÎ ÆÌÁÇ ÎÁÞÁÌÁ ÐÏÔÏËÁ\n"
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
@@ -1505,12 +1714,12 @@
 "÷ÎÉÍÁÎÉÅ: ÐÒÏÐÕÝÅÎ ÐÏÒÑÄËÏ×ÙÊ ÎÏÍÅÒ × ÐÏÔÏËÅ %d. ðÏÌÕÞÅÎÁ ÓÔÒÁÎÉÃÁ %ld ËÏÇÄÁ "
 "ÏÖÉÄÁÌÁÓØ %ld. ó×ÉÄÅÔÅÌØÓÔ×ÕÅÔ Ï ÐÒÏÐÕÓËÅ ÄÁÎÎÙÈ.\n"
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "ìÏÇÉÞÅÓËÉÊ ÐÏÔÏË %d ÚÁ×ÅÒÛÅÎ\n"
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1519,11 +1728,11 @@
 "ïÛÉÂËÁ: äÁÎÎÙÅ ogg ÎÅ ÎÁÊÄÅÎÙ × ÆÁÊÌÅ \"%s\".\n"
 "÷ÈÏÄÎÙÅ ÄÁÎÎÙÅ, ×ÅÒÏÑÔÎÏ, ÎÅ × ÆÏÒÍÁÔÅ ogg.\n"
 
-#: ogginfo/ogginfo2.c:713
-#, fuzzy
+#: ogginfo/ogginfo2.c:905
+#, fuzzy, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1546,7 +1755,8 @@
 "\t   ÄÏÓÔÕÐÎÙÍÉ ÂÏÌÅÅ ÄÅÔÁÌØÎÙÅ ÐÒÏ×ÅÒËÉ ÄÌÑ ÎÅËÏÔÏÒÙÈ ÔÉÐÏ× ÐÏÔÏËÏ×.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1560,7 +1770,8 @@
 "É ÄÌÑ ÄÉÁÇÎÏÓÔÉËÉ ÐÒÏÂÌÅÍ Ó ÎÉÍÉ.\n"
 "ðÏÌÎÁÑ ÓÐÒÁ×ËÁ ÏÔÏÂÒÁÖÁÅÔÓÑ ÐÏ ËÏÍÁÎÄÅ \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:763
+#: ogginfo/ogginfo2.c:955
+#, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""
 "îÅ ÕËÁÚÁÎÙ ×ÈÏÄÎÙÅ ÆÁÊÌÙ. äÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÒÁ×ËÉ ÉÓÐÏÌØÚÕÊÔÅ \"ogginfo -h\"\n"
@@ -1585,19 +1796,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: ÄÌÑ ÐÁÒÁÍÅÔÒÁ `%s' ÎÅÏÂÈÏÄÉÍ ÁÒÇÕÍÅÎÔ\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: ÎÅÏÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ `--%s'\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: ÎÅÏÐÏÚÎÁÎÎÙÊ ÐÁÒÁÍÅÔÒ `%c%s'\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1608,7 +1816,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ÎÅÐÒÁ×ÉÌØÎÙÊ ÐÁÒÁÍÅÔÒ -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1625,34 +1832,37 @@
 msgstr "%s: ÄÌÑ ÐÁÒÁÍÅÔÒÁ `-W %s' ÎÅ ÄÏÐÕÓÔÉÍÙ ÁÒÇÕÍÅÎÔÙ\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "ïÛÉÂËÁ ÓÔÒÁÎÉÃÙ. ÷ÈÏÄÎÙÅ ÄÁÎÎÙÅ ÐÏ×ÒÅÖÄÅÎÙ.\n"
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "ïÛÉÂËÁ ÂÉÔÏ×ÏÇÏ ÐÏÔÏËÁ, ÐÒÏÄÏÌÖÅÎÉÅ ÒÁÂÏÔÙ\n"
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "ëÏÎÅà ÐÏÔÏËÁ ÎÁÊÄÅÎ ÄÏ ÔÏÞËÉ ÏÔÒÅÚÁ.\n"
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr "õÓÔÁÎÏ×ËÁ ÆÌÁÇÁ ËÏÎÃÁ ÐÏÔÏËÁ: 0 ËÏÄ ×ÏÚ×ÒÁÔÁ ÐÏÐÙÔËÉ ÏÂÎÏ×ÌÅÎÉÑ\n"
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "ôÏÞËÁ ÏÔÒÅÚÁ ÎÅ ×ÎÕÔÒÉ ÐÏÔÏËÁ. ÷ÔÏÒÏÊ ÆÁÊÌ ÂÕÄÅÔ ÐÕÓÔÏÊ\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "îÅÏÂÒÁÂÏÔÁÎÎÙÊ ÏÓÏÂÙÊ ÓÌÕÞÁÊ: ÐÅÒ×ÙÊ ÆÁÊÌ ÓÌÉÛËÏÍ ËÏÒÏÔËÉÊ?\n"
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -1661,48 +1871,58 @@
 "        ÓÔÒÁÎÉÃÕ ogg. æÁÊÌ ÎÅ ÍÏÖÅÔ ÂÙÔØ ËÏÒÒÅËÔÎÏ ÄÅËÏÄÉÒÏ×ÁÎ.\n"
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "éÓÐÒÁ×ÉÍÁÑ ÏÛÉÂËÁ ÂÉÔÏ×ÏÇÏ ÐÏÔÏËÁ\n"
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr "ïÛÉÂËÁ ÂÉÔÏ×ÏÇÏ ÐÏÔÏËÁ\n"
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr "ðÏÐÙÔËÁ ÏÂÎÏ×ÌÅÎÉÑ ×ÅÒÎÕÌÁ 0, ÕÓÔÁÎÏ×ËÁ eos\n"
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "÷ÈÏÄÎÙÅ ÄÁÎÎÙÅ ÎÅ × ÆÏÒÍÁÔÅ ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "ïÛÉÂËÁ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÅ\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "ÏÛÉÂËÁ × ÐÅÒ×ÏÍ ÐÁËÅÔÅ\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "ïÛÉÂËÁ × ÏÓÎÏ×ÎÏÍ ÚÁÇÏÌÏ×ËÅ: ÎÅ vorbis?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "÷ÔÏÒÉÞÎÙÊ ÚÁÇÏÌÏ×ÏË ÐÏ×ÒÅÖÄÅÎ\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "÷ ÚÁÇÏÌÏ×ËÁÈ ÏÂÎÁÒÕÖÅÎ ËÏÎÅà ÆÁÊÌÁ\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr "÷ÙÚÏ×: vcut ×È_ÆÁÊÌ.ogg ×ÙÈ_ÆÁÊÌ1.ogg ×ÙÈ_ÆÁÊÌ2.ogg ÔÏÞËÁ_ÏÔÒÅÚÁ\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1738,18 +1958,22 @@
 msgstr "ïÂÒÁÂÏÔËÁ: ÷ÙÒÅÚÁÎÉÅ × ÐÏÚÉÃÉÉ %lld\n"
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr "ïÂÒÁÂÏÔËÁ ÎÅ ÕÄÁÌÁÓØ\n"
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÚÁÇÏÌÏ×ËÏ×\n"
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÐÅÒ×ÏÇÏ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ\n"
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ×ÔÏÒÏÇÏ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ\n"
 
@@ -1785,43 +2009,40 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "ðÏ×ÒÅÖÄÅÎÙ ÉÌÉ ÏÔÓÕÔÓÔ×ÕÀÔ ÄÁÎÎÙÅ, ÐÒÏÄÏÌÖÅÎÉÅ ÒÁÂÏÔÙ..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 "ïÛÉÂËÁ ÚÁÐÉÓÉ ×ÙÈÏÄÎÏÇÏ ÐÏÔÏËÁ. ÷ÙÈÏÄÎÏÊ ÐÏÔÏË ÍÏÖÅÔ ÂÙÔØ ÐÏ×ÒÅÖÄÅÎ ÉÌÉ "
 "ÏÂÒÅÚÁÎ."
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ ËÁË ÆÁÊÌÁ vorbis: %s\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÙÊ ËÏÍÍÅÎÔÁÒÉÊ: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÐÉÓÉ ËÏÍÍÅÎÔÁÒÉÅ× × ×ÙÈÏÄÎÏÊ ÆÁÊÌ: %s\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr "ÄÅÊÓÔ×ÉÅ ÎÅ ÕËÁÚÁÎÏ\n"
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ËÏÎ×ÅÒÔÉÒÏ×ÁÔØ ËÏÍÍÅÎÔÁÒÉÊ × UTF8, ÎÅÌØÚÑ ÄÏÂÁ×ÌÑÔØ\n"
-
-#: vorbiscomment/vcomment.c:287
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1841,7 +2062,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1873,44 +2094,49 @@
 "   ÐÒÉ ÉÓÐÏÌØÚÏ×ÁÎÉÉ vorbiscomment × ÓÃÅÎÁÒÉÑÈ. ïÄÎÁËÏ, ÜÔÏÇÏ ÎÅ ÄÏÓÔÁÔÏÞÎÏ\n"
 "   ÄÌÑ ÏÓÎÏ×ÎÏÊ ÏÂÒÁÂÏÔËÉ ËÏÍÍÅÎÔÁÒÉÅ× ×Ï ×ÓÅÈ ÓÌÕÞÁÑÈ.\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÒÁÚÂÏÒÁ ÐÁÒÁÍÅÔÒÏ× ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ '%s'.\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr "éÍÑ ×ÈÏÄÎÏÇÏ ÆÁÊÌÁ ÎÅ ÍÏÖÅÔ ÓÏ×ÐÁÄÁÔØ Ó ÉÍÅÎÅÍ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ\n"
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ '%s'.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ ËÏÍÍÅÎÔÁÒÉÅ× '%s'.\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ ËÏÍÍÅÎÔÁÒÉÅ× '%s'\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "ïÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÓÔÁÒÏÇÏ ÆÁÊÌÁ %s\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "ïÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ %s × %s\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr "îÅ×ÏÚÍÏÖÎÏ ËÏÎ×ÅÒÔÉÒÏ×ÁÔØ ËÏÍÍÅÎÔÁÒÉÊ × UTF8, ÎÅÌØÚÑ ÄÏÂÁ×ÌÑÔØ\n"
+
 #~ msgid "Track number:"
 #~ msgstr "îÏÍÅÒ ÄÏÒÏÖËÉ:"
 

Modified: trunk/vorbis-tools/po/sv.po
===================================================================
--- trunk/vorbis-tools/po/sv.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/sv.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 0.99.1.3.1\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2002-02-20 14:59+0100\n"
 "Last-Translator: Mikael Hedin <mikael.hedin at irf.se>\n"
 "Language-Team: Swedish <sv at li.org>\n"
@@ -14,71 +15,73 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Fel: Slut på minne i malloc_action().\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Fel: Kunde inte reservera minne i malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Fel: Enhet inte tillgänglig.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr "Fel: %s behöver ett utfilnamn angivet med -f.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Fel: Okänt flaggvärde till enhet %s.\n"
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Fel: Kan inte öppna enhet %s.\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Fel: Fel på enhet %s.\n"
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Fel: Utfil kan inte anges för %s-enhet.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Fel: Kan inte öppna filen %s för att skriva.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Fel: Fil %s finns redan.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Fel: Detta fel skall aldrig inträffa (%d). Panik!\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Fel: Slut på minne i new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Fel: Slut på minne i new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Fel: Slut på minne i new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Fel: Slut på minne i decoder_buffered_metadata_callback().\n"
 
@@ -91,56 +94,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Tolkningsfel: %s på rad %d i %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Namn"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Beskrivning"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Typ"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Standardvärde"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr ""
 
@@ -148,9 +154,9 @@
 msgid "(NULL)"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr ""
 
@@ -178,17 +184,17 @@
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 #, fuzzy
 msgid "Internal error parsing command line options.\n"
 msgstr "Internt fel vid tolkning av kommandoflaggor\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "In-buffertens storlek mindre än minimistorkeken %dkB."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -197,44 +203,44 @@
 "=== Fel \"%s\" under tolkning av konfigurationsflaggor från kommandoraden.\n"
 "=== Flaggan var: %s\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Tillgängliga flaggor:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Ingen enhet %s.\n"
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Drivrutin %s är inte för filer.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "== Kan inte ange utfil utan att ange drivrutin.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Felaktigt format på argument: %s.\n"
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Ogiltigt värde till prebuffer. Möjligt intervall är 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 från %s %s\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Kan inte spela var 0:te block!\n"
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -242,17 +248,21 @@
 "--- Kan inte spela varje block 0 gånger.\n"
 "--- För att göra en testavkodning, använd null-drivern för utdata.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, fuzzy, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "FEL: Kan inte öppna infil \"%s\": %s\n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Drivrutin %s angiven i konfigurationsfil ogiltig.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -260,7 +270,7 @@
 "=== Kunde inte ladda standard-drivrutin, och ingen är specificerad i "
 "konfigurationsfilen. Avslutar.\n"
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, fuzzy, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -285,26 +295,28 @@
 "      Möjliga enheter är ('*'=direkt, '@'=fil):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=filename  Ange utfilens namn för tidigar vald \n"
 "        filenhet (med -d).\n"
@@ -324,24 +336,25 @@
 "inom s millisekunder gör att ogg123 avslutas.\n"
 "  -l, --delay=s  sätt s [millisekunder] (standard 500).\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Fel: Slut på minne.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Fel: Kunde inte reservera minne i malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Fel: Kunde inte sätta signalmask."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Fel: Kan inte skapa in-buffer\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "förvald utenhet"
@@ -350,7 +363,7 @@
 msgid "shuffle playlist"
 msgstr "blanda spellistan"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -359,95 +372,94 @@
 "\n"
 "Enhet:    %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Författare:   %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, fuzzy, c-format
 msgid "Comments: %s"
 msgstr "Kommentarer: %s\n"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, fuzzy, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Kunde inte skapa katalog \"%s\": %s\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Fel: Kan inte skapa ljudbuffer.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Hittar ingen modul för att läsa från %s.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Kan inte öppna %s.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Filformatet på %s stöds inte.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr "Fel under öppnandet av %s med %s-modulen.  Filen kan vara skadad.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Spelar: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Misslyckades med att hoppa över %f sekunder ljud."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Fel: Avkodning misslyckades.\n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Klar."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Hål i strömmen; antagligen ofarligt\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Vorbis-biblioteket rapporterade ett fel i strömmen.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Bitströmmen har %d kanal(er), %ldHz"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr ""
 "Förslag för bithastigheter: övre=%ld nominell=%ld undre=%ld fönster=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Kodad av: %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
-#, fuzzy
+#, fuzzy, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Fel: Slut på minne i new_status_message_arg().\n"
 
@@ -457,7 +469,7 @@
 msgstr ""
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
-#, fuzzy
+#, fuzzy, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Fel: Slut på minne i malloc_action().\n"
 
@@ -478,6 +490,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Minnestilldelningsfel i stats_init()\n"
 
@@ -511,78 +524,100 @@
 msgid " Output Buffer %5.1f%%"
 msgstr " Utbuffer %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Fel: Kunde inte reservera minne i malloc_data_source_stats()\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "WAV-filläsare"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "AIFF/AIFC-filläsare"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "WAV-filläsare"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "WAV-filläsare"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Varning: Oväntad EOF under läsning av WAV-huvud\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Hoppar över bit av typ \"%s\", längd %d\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Varning: Oväntad EOF i AIFF-block\n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Varning: Ingen gemensamt block i AIFF-fil\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Varning: Stympat gemensamt block i AIFF-huvud\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Varning: Oväntad EOF under läsning av AIFF-huvud\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Varning: AIFF-C-huvud stympat.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Varning: Kan inte hantera komprimerad AIFF-C\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Varning: Hittar inget SSND-block i AIFF-fil\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Varning: Felaktigt SSND-block i AIFF-huvud\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Varinig: Oväntad EOF under läsning av AIFF-huvud\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "Varning: OggEnc stödjer inte denna typ AIFF/AIFC-fil.\n"
 "Måste vara 8 eller 16 bitars PCM.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Varning: okänt format på block i Wav-huvud\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -590,89 +625,108 @@
 "Varning: OGILTIGT format på block i wav-huvud.\n"
 " Försöker läsa i alla fall (kanske inte fungerar)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:466
+#: oggenc/audio.c:480
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
 msgstr ""
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr ""
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr ""
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr ""
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, fuzzy, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
 msgstr ""
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr ""
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Mislyckades att skriva huvud till utströmmen\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Misslyckades att skriva data till utströmmen\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [%2dm%.2ds återstår] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tKodar [%2dm%.2ds hittills] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -683,7 +737,8 @@
 "\n"
 "Kodning av \"%s\" klar\n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -693,7 +748,7 @@
 "\n"
 "Kodning klar.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -702,17 +757,17 @@
 "\n"
 "\tFillängd:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tFörlupen tid: %dm %04.1fs\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tFörhålland:         %.4f\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -721,7 +776,7 @@
 "\tGenomsnittlig bithastighet: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -731,17 +786,17 @@
 "Kodar %s%s%s till \n"
 "         %s%s%s med kvalitet %2.2f\n"
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "standard in"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "standard ut"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -752,7 +807,7 @@
 "         %s%s%s med bithastighet %d kbps,\n"
 "med komplett bithastighethanteringsmotor\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -762,7 +817,7 @@
 "Kodar %s%s%s till \n"
 "         %s%s%s med kvalitet %2.2f\n"
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -772,7 +827,7 @@
 "Kodar %s%s%s till \n"
 "         %s%s%s med kvalitet %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -783,7 +838,7 @@
 "         %s%s%s med bithastighet %d kbps,\n"
 "med komplett bithastighethanteringsmotor\n"
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -792,66 +847,76 @@
 "%s%s\n"
 "FEL: Ingen infil angiven. Använd -h för hjälp.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "FEL: Flera filer angivna med stdin\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
 msgstr ""
 "FEL: Flera infiler med angivet utfilnamn: rekommenderar att använda -n\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "FEL: Kan inte öppna infil \"%s\": %s\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Öppnar med %s-modul: %s\n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "FEL: Infil \"%s\" är inte i ett känt format\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "VARNING: Inget filnamn, använder förvalt namn \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
 msgstr "FEL: Kunde inte skapa kataloger nödvändiga för utfil \"%s\"\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr "FEL: Kunde inte skapa kataloger nödvändiga för utfil \"%s\"\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "FEL: Kan inte öppna utfil \"%s\": %s\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr ""
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -861,6 +926,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -868,25 +934,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -934,8 +1017,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1022,134 +1106,149 @@
 " läge går utdata till stdout om inget filnamn anges med -o\n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr "VARNING: Ignorerar otillåtet specialtecken '%c' i namnformat\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr ""
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Kunde inte tolka skärpunkt \"%s\"\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr ""
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr ""
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr ""
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
 msgstr ""
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr ""
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 
@@ -1168,186 +1267,276 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid ""
-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
-"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:318
+#, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:325
+#, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
 "header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:329
 #, c-format
-msgid "Vorbis headers parsed for stream %d, information follows...\n"
+msgid "Theora headers parsed for stream %d, information follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:332
 #, fuzzy, c-format
-msgid "Version: %d\n"
+msgid "Version: %d.%d.%d\n"
 msgstr "Version: %s"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
 #, fuzzy, c-format
-msgid "Vendor: %s (%s)\n"
-msgstr "säljare=%s\n"
-
-#: ogginfo/ogginfo2.c:183
-#, fuzzy, c-format
 msgid "Vendor: %s\n"
 msgstr "säljare=%s\n"
 
-#: ogginfo/ogginfo2.c:184
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Channels: %d\n"
+msgid "Width: %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:336
 #, fuzzy, c-format
-msgid ""
-"Rate: %ld\n"
-"\n"
-msgstr "Datum: %s"
+msgid "Height: %d\n"
+msgstr "Version: %s"
 
-#: ogginfo/ogginfo2.c:188
-#, fuzzy, c-format
-msgid "Nominal bitrate: %f kb/s\n"
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
 msgstr ""
-"\tGenomsnittlig bithastighet: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:191
-msgid "Nominal bitrate not set\n"
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:194
-#, fuzzy, c-format
-msgid "Upper bitrate: %f kb/s\n"
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
 msgstr ""
-"\tGenomsnittlig bithastighet: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:197
-msgid "Upper bitrate not set\n"
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:200
-#, fuzzy, c-format
-msgid "Lower bitrate: %f kb/s\n"
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
 msgstr ""
-"\tGenomsnittlig bithastighet: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:203
-msgid "Lower bitrate not set\n"
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:206
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
 msgid "User comments section follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:218
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
 #, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:432
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:227
+#: ogginfo/ogginfo2.c:438
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
+#: ogginfo/ogginfo2.c:466
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:275
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:336
+#: ogginfo/ogginfo2.c:477
 #, c-format
+msgid "Vorbis headers parsed for stream %d, information follows...\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:480
+#, fuzzy, c-format
+msgid "Version: %d\n"
+msgstr "Version: %s"
+
+#: ogginfo/ogginfo2.c:484
+#, fuzzy, c-format
+msgid "Vendor: %s (%s)\n"
+msgstr "säljare=%s\n"
+
+#: ogginfo/ogginfo2.c:492
+#, c-format
+msgid "Channels: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:493
+#, fuzzy, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+"Rate: %ld\n"
+"\n"
+msgstr "Datum: %s"
+
+#: ogginfo/ogginfo2.c:496
+#, fuzzy, c-format
+msgid "Nominal bitrate: %f kb/s\n"
 msgstr ""
+"\tGenomsnittlig bithastighet: %.1f kb/s\n"
+"\n"
 
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+#: ogginfo/ogginfo2.c:499
+msgid "Nominal bitrate not set\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:366
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+#: ogginfo/ogginfo2.c:502
+#, fuzzy, c-format
+msgid "Upper bitrate: %f kb/s\n"
 msgstr ""
+"\tGenomsnittlig bithastighet: %.1f kb/s\n"
+"\n"
 
-#: ogginfo/ogginfo2.c:369
-#, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
+#: ogginfo/ogginfo2.c:505
+msgid "Upper bitrate not set\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:375
+#: ogginfo/ogginfo2.c:508
+#, fuzzy, c-format
+msgid "Lower bitrate: %f kb/s\n"
+msgstr ""
+"\tGenomsnittlig bithastighet: %.1f kb/s\n"
+"\n"
+
+#: ogginfo/ogginfo2.c:511
+msgid "Lower bitrate not set\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:539
 msgid ""
 "Negative granulepos on vorbis stream outside of headers. This file was "
 "created by a buggy encoder\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:395
+#: ogginfo/ogginfo2.c:561
+msgid ""
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:567
 #, c-format
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, fuzzy, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Misslyckades att öppna infil \"%s\".\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, fuzzy, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1357,70 +1546,71 @@
 "\n"
 "Kodning av \"%s\" klar\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 #, fuzzy
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Kunde inte öppna %s för att läsa\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
 "This indicates a corrupt ogg file: %s.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
 "ld. Indicates missing data.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
 "Input probably not ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:713
+#: ogginfo/ogginfo2.c:905
+#, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1432,7 +1622,8 @@
 "\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1441,8 +1632,8 @@
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:763
-#, fuzzy
+#: ogginfo/ogginfo2.c:955
+#, fuzzy, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""
 "%s%s\n"
@@ -1468,19 +1659,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1491,7 +1679,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1508,82 +1695,95 @@
 msgstr "%s: flaggan `-W %s' tar inget argument\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr ""
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr ""
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr ""
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr ""
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Skärpunkt utanför strömmen.  Andra filen kommer att vara tom\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr ""
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
 msgstr ""
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr ""
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr ""
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr ""
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "Indata inte ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "Fel på första sidan\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "fel i första paketet\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Fel i primärt huvud: inte vorbis?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Sekundärt huvud felaktigt\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "EOF i huvud\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr "Användning: vcut infil.ogg utfil1.ogg utfil2.ogg skärpunkt\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1619,18 +1819,22 @@
 msgstr ""
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr ""
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr ""
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr ""
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr ""
 
@@ -1666,42 +1870,38 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "Data felaktigt eller saknas, fortsätter..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr "Fel under skrivande av utström.  Kan vara felaktig eller stympad."
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Misslyckades att öppna fil som vorbis-typ: %s\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Felaktig kommentar: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "felaktig kommentar: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Misslyckades att skriva kommentar till utfil: %s\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr "Kunde inte konvertera till UTF8, kan inte lägga till\n"
-
-#: vorbiscomment/vcomment.c:287
-#, fuzzy
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1721,7 +1921,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1745,44 +1945,49 @@
 "   (när du använder den här flaggan är läsning från kommentarfil eller\n"
 "   stdin avslaget)\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Internt fel vid tolkning av kommandoflaggor\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Misslyckades att öppna infil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Misslyckades att öppna utfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Misslyckades att öppna kommentarfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Misslyckades att öppna kommentarfil \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, fuzzy, c-format
 msgid "Error removing old file %s\n"
 msgstr "Misslyckades att öppna kommentarfil \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, fuzzy, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Misslyckades att öppna infil \"%s\".\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr "Kunde inte konvertera till UTF8, kan inte lägga till\n"
+
 #~ msgid "Internal error: long option given when none expected.\n"
 #~ msgstr "Internt fel: lång flagga använd när det inte förväntades.\n"
 

Modified: trunk/vorbis-tools/po/uk.po
===================================================================
--- trunk/vorbis-tools/po/uk.po	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/uk.po	2005-06-18 16:36:46 UTC (rev 9477)
@@ -5,7 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: 2004-04-16 16:32+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd at mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk at lists.sourceforge.net>\n"
@@ -14,74 +15,76 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Помилка: недостатньо пам'яті при виконанні malloc_action().\n"
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr ""
 "Помилка: не вдається розподілити пам'ять при виконанні malloc_buffer_stats"
 "()\n"
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Помилка: пристрій відсутній.\n"
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr "Помилка: %s потребує вказування назви файлу виводу у ключі -f.\n"
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Помилка: непідтримуване значення параметра для пристрою %s.\n"
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Помилка: не вдається відкрити пристрій %s.\n"
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Помилка: збій пристрою %s.\n"
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Помилка: вихідний файл не може бути переданий пристрою %s.\n"
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Помилка: не вдається відкрити файл %s для записування.\n"
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Помилка: файл %s вже існує.\n"
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Помилка: ця помилка не повинна ніколи траплятись (%d). Паніка!\n"
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Помилка: недостатньо пам'яті при виконанні new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr ""
 "Помилка: недостатньо пам'яті при виконанні new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Помилка: недостатньо пам'яті при виконанні new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr ""
 "Помилка: недостатньо пам'яті при виконанні decoder_buffered_metadata_callback"
@@ -96,56 +99,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Помилка аналізу: %s у рядку %d з %s (%s)\n"
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Назва"
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Опис"
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Тип"
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Типово"
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr "none"
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr "bool"
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr "char"
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr "string"
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr "int"
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr "float"
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr "double"
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr "інший"
 
@@ -153,9 +159,9 @@
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(немає)"
 
@@ -183,16 +189,16 @@
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "Внутрішня помилка при аналізі параметрів командного рядка.\n"
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Розмір вхідного буфера менше мінімального - %dкБ."
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -202,44 +208,44 @@
 "рядка.\n"
 "=== Помилку спричинив параметр: %s\n"
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr "Доступні параметри:\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Пристрій %s не існує.\n"
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Драйвер %s не є драйвером файлу виводу.\n"
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "=== Не можна вказувати файл виводу без вказування драйвера.\n"
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Некоректний формат параметра: %s.\n"
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Неправильне значення пре-буфера. Допустимий діапазон 0-100.\n"
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr "ogg123 з %s %s\n"
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Відтворити кожен 0-й фрагмент неможливо!\n"
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -248,17 +254,21 @@
 "--- Для виконання перевірочного декодування, використовуйте драйвер виводу "
 "null.\n"
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Не вдається відкрити файл списку відтворення %s. Пропущений.\n"
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Вказаний у конфігурації драйвер %s - неправильний.\n"
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
@@ -266,7 +276,7 @@
 "=== Не вдається завантажити типовий драйвер, а у конфігураційному файлі "
 "драйвер не визначений. Завершення роботи.\n"
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -291,26 +301,28 @@
 "      Можливі пристрої: ('*'=справжній, '@'=файл):\n"
 "        "
 
-#: ogg123/cmdline_options.c:279
-#, c-format
+#: ogg123/cmdline_options.c:306
+#, fuzzy, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 "  -f, --file=назва_файлу  Встановити назву файлу виводу з вказаного раніше\n"
 "      файлу пристрою (з параметром -d).\n"
@@ -331,26 +343,27 @@
 "два сигнали SIGINT протягом s мілісекунд завершують роботу ogg123.\n"
 "  -l, --delay=s  встановлює значення s [у мілісекундах] (типово - 500).\n"
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Помилка: недостатньо пам'яті.\n"
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr ""
 "Помилка: не вдається розподілити пам'ять при виконанні malloc_decoder_stats"
 "()\n"
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Помилка: не вдається встановити маску сигналу."
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Помилка: не вдається створити вхідний буфер.\n"
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "типовий пристрій виводу"
@@ -359,7 +372,7 @@
 msgid "shuffle playlist"
 msgstr "перемішати список програвання"
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -368,96 +381,96 @@
 "\n"
 "Звуковий пристрій:   %s"
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Автор:   %s"
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "Коментарі: %s"
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Попередження: не вдається прочитати каталог %s.\n"
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Помилка: не вдається створити буфер для звуку.\n"
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Не знайдені модулі для читання файлу з %s.\n"
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Не вдається відкрити %s.\n"
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Формат файлу %s не підтримується.\n"
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 "Помилка відкривання %s використовуючи модуль %s. Можливо, файл пошкоджений.\n"
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Відтворення: %s"
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Не вдається пропустити %f секунд звуку."
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Помилка: помилка декодування.\n"
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Завершено."
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Пропуск у потокові; можливо нічого страшного\n"
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Бібліотека Vorbіs сповістила про помилку потоку.\n"
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, fuzzy, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Бітовий потік - %d канал, %ldГц"
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr ""
 "Значення щільності потоку бітів: верхнє=%ld номінальне=%ld нижнє=%ld вікно=%"
 "ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Кодування: %s"
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
+#, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Помилка: недостатньо пам'яті при виконанні create_playlist_member().\n"
 
@@ -468,6 +481,7 @@
 "Попередження зі списку відтворення %s: не вдається прочитати каталог %s.\n"
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
+#, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Помилка: недостатньо пам'яті при виконанні playlist_to_array().\n"
 
@@ -488,6 +502,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Помилка розподілу пам'яті при виконанні stats_init()\n"
 
@@ -521,80 +536,102 @@
 msgid " Output Buffer %5.1f%%"
 msgstr " Вихідний буфер %5.1f%%"
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr ""
 "Помилка: не вдається розподілити пам'ять при виконанні "
 "malloc_data_source_stats()\n"
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "Читання файлів WAV"
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "Читання файлів AIFF/AIFC"
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+#, fuzzy
+msgid "FLAC file reader"
+msgstr "Читання файлів WAV"
+
+#: oggenc/audio.c:52
+#, fuzzy
+msgid "Ogg FLAC file reader"
+msgstr "Читання файлів WAV"
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Попередження: неочікуваний кінець файлу при читанні заголовку WAV\n"
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Пропускається фрагмент типу \"%s\", довжина %d\n"
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Попередження: неочікуваний кінець файла у фрагменті AIFF\n"
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Попередження: у файлі AIFF не знайдено загальний фрагмент\n"
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Попередження: обрізаний загальний фрагмент у заголовку AIFF\n"
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Попередження: неочікуваний кінець файлу при читанні заголовку AIFF\n"
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Попередження: заголовок AIFF-C обрізаний.\n"
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, fuzzy, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Попередження: неможливо обробити стиснений AIFF-C\n"
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Попередження: у файлі AIFF не знайдено SSND-фрагмент\n"
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Попередження: у заголовку AIFF пошкоджений SSND-фрагмент\n"
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Попередження: неочікуваний кінець файлу при читанні заголовку AIFF\n"
 
-#: oggenc/audio.c:323
-#, fuzzy
+#: oggenc/audio.c:336
+#, fuzzy, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 "Попередження: OggEnc не підтримує цей тип AIFF/AIFC файлу\n"
 " Повинен бути 8-бітний чи 16-бітний PCM.\n"
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Попередження: формат фрагменту у заголовку WAV не розпізнаний\n"
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -602,7 +639,8 @@
 "Попередження: НЕПРАВИЛЬНИЙ формат фрагменту у заголовку wav.\n"
 " Але робиться спроба прочитати (може не спрацювати)...\n"
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
@@ -610,8 +648,8 @@
 "ПОМИЛКА: непідтримуваний тип wav файлу (повинен бути стандартним\n"
 "PCM або PCM типу 3 з плаваючою крапкою)\n"
 
-#: oggenc/audio.c:466
-#, fuzzy
+#: oggenc/audio.c:480
+#, fuzzy, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
@@ -619,16 +657,18 @@
 "ПОМИЛКА: непідтримуваний підформат wav файлу (повинен бути 16-бітним\n"
 "PCM або PCM з плаваючою крапкою)\n"
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
@@ -636,26 +676,28 @@
 "ПОМИЛКА: Від ресемплера отримане нульове число семплів. Повідомте про "
 "помилку автору.\n"
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Не вдається ініціалізувати ресемплер\n"
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Встановлення додаткового параметра кодувальника \"%s\" у значення %s\n"
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Змінено нижню межу частоти з %f кГц на %f кГц\n"
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Нерозпізнаний додатковий параметр \"%s\"\n"
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
@@ -663,41 +705,54 @@
 "255 каналів повинно вистачити для усіх. (Вибачте, але vorbis не підтримує "
 "більшу кількість)\n"
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr ""
 "Для запиту мінімальної чи максимальної щільності потоку бітів вимагається --"
 "managed\n"
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Помилка режиму ініціалізації: неправильні параметри для якості\n"
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 "Помилка режиму ініціалізації: неправильні параметри для щільності потоку "
 "бітів\n"
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Помилка при записуванні заголовку у потік виводу\n"
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Помилка при записуванні даних у потік виводу\n"
 
-#: oggenc/encode.c:349
-#, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+#: oggenc/encode.c:381
+#, fuzzy, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [залишилось %2dm%.2ds] %c"
 
-#: oggenc/encode.c:359
-#, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+#: oggenc/encode.c:391
+#, fuzzy, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tКодування [готово %2dm%.2ds] %c"
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -708,7 +763,8 @@
 "\n"
 "Кодування файлу завершено \"%s\"\n"
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -718,7 +774,7 @@
 "\n"
 "Кодування завершено.\n"
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -727,17 +783,17 @@
 "\n"
 "\tДовжина файлу:     %dхв %04.1fс\n"
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tЗалишилось часу:   %dхв %04.1fс\n"
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tСтиснення:         %.4f\n"
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -746,7 +802,7 @@
 "\tСередня щільність: %.1f кбіт/с\n"
 "\n"
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -757,17 +813,17 @@
 "         %s%s%s \n"
 "з середньою щільністю %d кбіт/с "
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr "стандартний ввід"
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr "стандартний вивід"
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -778,7 +834,7 @@
 "         %s%s%s \n"
 "з приблизною щільністю %d кбіт/с (увімкнено кодування з VBR)\n"
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -789,7 +845,7 @@
 "         %s%s%s \n"
 "з рівнем якості %2.2f з використанням обмеженого VBR "
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -800,7 +856,7 @@
 "         %s%s%s \n"
 "з якістю %2.2f\n"
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -811,7 +867,7 @@
 "         %s%s%s \n"
 "з використанням керування щільністю бітів "
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -820,12 +876,14 @@
 "%s%s\n"
 "ПОМИЛКА: Не вказані вхідні файли. Для отримання довідки використовуйте -h.\n"
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr ""
 "ПОМИЛКА: Вказано декілька файлів, але використовується стандартний ввід\n"
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
@@ -833,57 +891,65 @@
 "ПОМИЛКА: Декілька вхідних файлів при вказаній назві вхідного файлу: "
 "рекомендується використовувати -n\n"
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ПОМИЛКА: Не вдається відкрити вхідний файл \"%s\": %s\n"
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Відкривається %s модулем: %s\n"
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "ПОМИЛКА: Вхідний файл \"%s\" має непідтримуваний формат\n"
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: Не вказана назва файлу, використовується \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
 msgstr ""
 "ПОМИЛКА: Не вдається створити необхідні каталоги для файлу виводу \"%s\"\n"
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
+#, fuzzy, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr "Назва вхідного файлу не може співпадати з назвою файлу виводу\n"
+
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ПОМИЛКА: Не вдається відкрити файл виводу \"%s\": %s\n"
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Зміна частоти вхідних файлів з %d Гц до %d Гц\n"
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Змішування стерео у моно\n"
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, fuzzy, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "ПОМИЛКА: Змішування сигналів можливе лише зі стерео у моно\n"
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
@@ -893,6 +959,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -900,25 +967,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -966,8 +1050,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -1072,123 +1157,134 @@
 " вказана назва файлу виводу у параметрі -o\n"
 "\n"
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: проігнорований некоректний керуючий символ '%c' у форматі "
 "назви\n"
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "Увімкнення механізму керування щільністю бітів\n"
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: вказано порядок сирих байт для не сирих даних. Вважається, що "
 "дані сирі.\n"
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: не вдається прочитати аргумент порядку слідування байт \"%s\"\n"
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "ПОПЕРЕДЖЕННЯ: не вдається прочитати зміну частоти \"%s\"\n"
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 "Попередження: вказана зміна частоти дискретизації на %d Гц. Ви мали на увазі "
 "%d Гц?\n"
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, fuzzy, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Попередження: не вдається прочитати каталог %s.\n"
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Не знайдено значення додаткового параметра кодувальника\n"
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Внутрішня помилка аналізу командного рядка\n"
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr ""
 "Попередження: використано неправильний коментар (\"%s\"), ігнорується.\n"
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Попередження: номінальну щільність бітів \"%s\" не розпізнано\n"
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Попередження: мінімальну щільність бітів \"%s\" не розпізнано\n"
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Попередження: максимальну щільність бітів \"%s\" не розпізнано\n"
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Параметр якості \"%s\" не розпізнано, ігнорується\n"
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: встановлено занадто високу якість, обмежено до максимальної\n"
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: Вказано декілька форматів назв, використовується останній\n"
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: Вказано декілька фільтрів форматів назв, використовується "
 "останній\n"
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: Вказано декілька замін фільтрів форматів назв, "
 "використовується останній\n"
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: Вказано декілька файлів виводу, рекомендується використовувати "
 "-n\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: вказано значення сирих біт/семпл для не сирих даних. "
 "Вважається, що дані на вводі сирі.\n"
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "ПОПЕРЕДЖЕННЯ: вказано некоректне значення біт/семпл, вважається 16.\n"
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
@@ -1196,33 +1292,37 @@
 "ПОПЕРЕДЖЕННЯ: вказана кількість сирих каналів для не сирих даних. "
 "Вважається, що дані на вводі сирі.\n"
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "ПОПЕРЕДЖЕННЯ: вказана неправильна кількість каналів, вважається 2.\n"
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: вказана сира частота вибірки даних для не сирих даних. "
 "Вважається, що дані на вводі сирі.\n"
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: вказана неправильна частота дискретизації, вважається 44100.\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "ПОПЕРЕДЖЕННЯ: вказано невідомий параметр, ігнорується->\n"
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Не вдається перетворити коментар у UTF-8, неможливо додати\n"
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 "ПОПЕРЕДЖЕННЯ: вказана недостатня кількість заголовків, встановлені останні "
@@ -1243,15 +1343,172 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Помилка: сегмент шляху \"%s\" не є каталогом\n"
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
+#, fuzzy, c-format
+msgid ""
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
+msgstr ""
+"Попередження: коментар %d потоку %d має некоректний формат, він не містить "
+"'=': \"%s\"\n"
+
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+"Попередження: некоректна назва коментарю у коментарі %d (потік %d): \"%s\"\n"
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
+msgstr ""
+"Попередження: некоректна UTF-8 послідовність у коментарі %d (потік %d): "
+"неправильний маркер довжини\n"
+
+#: ogginfo/ogginfo2.c:225
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr ""
+"Попередження: неправильна UTF-8 послідовність у коментарі %d (потік %d): "
+"надто мало байтів\n"
+
+#: ogginfo/ogginfo2.c:284
+#, c-format
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr ""
+"Попередження: неправильна UTF-8 послідовність у коментарі %d (потік %d): "
+"неправильна послідовність\n"
+
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr "Попередження: помилка у utf8 декодері. Взагалі, це неможливо\n"
+
+#: ogginfo/ogginfo2.c:318
+#, fuzzy, c-format
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr ""
+"Попередження: не вдається розкодувати пакет заголовків vorbis - неправильний "
+"потік vorbis (%d)\n"
+
+#: ogginfo/ogginfo2.c:325
+#, fuzzy, c-format
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
+msgstr ""
+"Попередження: заголовки vorbis потоку %d некоректно розділені. Остання "
+"сторінка заголовка містить додаткові пакети або має не-нульовий granulepos\n"
+
+#: ogginfo/ogginfo2.c:329
+#, fuzzy, c-format
+msgid "Theora headers parsed for stream %d, information follows...\n"
+msgstr "Оброблені заголовки vorbis для потоку %d, далі йде інформація...\n"
+
+#: ogginfo/ogginfo2.c:332
+#, fuzzy, c-format
+msgid "Version: %d.%d.%d\n"
+msgstr "Версія: %d\n"
+
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
+#, c-format
+msgid "Vendor: %s\n"
+msgstr "Постачальник: %s\n"
+
+#: ogginfo/ogginfo2.c:335
+#, c-format
+msgid "Width: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:336
+#, fuzzy, c-format
+msgid "Height: %d\n"
+msgstr "Версія: %d\n"
+
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:347
+#, c-format
+msgid "Framerate %d/%d (%f fps)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
+msgid "User comments section follows...\n"
+msgstr "Далі слідує секція коментарів користувача...\n"
+
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+#, fuzzy
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "Попередження: значення granulepos потоку %d зменшилось "
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, fuzzy, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr "Попередження: значення granulepos потоку %d зменшилось "
+
+#: ogginfo/ogginfo2.c:432
+#, fuzzy
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Потік vorbis %d:\n"
+"\tДовжина даних: %ld байт\n"
+"\tЧас відтворення: %ldхв:%02ldс\n"
+"\tСередня щільність бітів: %f кбіт/с\n"
+
+#: ogginfo/ogginfo2.c:438
+#, fuzzy, c-format
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+"Потік vorbis %d:\n"
+"\tДовжина даних: %ld байт\n"
+"\tЧас відтворення: %ldхв:%02ldс\n"
+"\tСередня щільність бітів: %f кбіт/с\n"
+
+#: ogginfo/ogginfo2.c:466
+#, c-format
+msgid ""
 "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 "Попередження: не вдається розкодувати пакет заголовків vorbis - неправильний "
 "потік vorbis (%d)\n"
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
 "Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
@@ -1260,32 +1517,27 @@
 "Попередження: заголовки vorbis потоку %d некоректно розділені. Остання "
 "сторінка заголовка містить додаткові пакети або має не-нульовий granulepos\n"
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:477
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Оброблені заголовки vorbis для потоку %d, далі йде інформація...\n"
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Версія: %d\n"
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Постачальник: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:183
+#: ogginfo/ogginfo2.c:492
 #, c-format
-msgid "Vendor: %s\n"
-msgstr "Постачальник: %s\n"
-
-#: ogginfo/ogginfo2.c:184
-#, c-format
 msgid "Channels: %d\n"
 msgstr "Канали: %d\n"
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1294,152 +1546,108 @@
 "Дискретизація: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:188
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Номінальна щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:191
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Номінальна щільність бітів не встановлена\n"
 
-#: ogginfo/ogginfo2.c:194
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Максимальна щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:197
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Максимальна щільність бітів не встановлена\n"
 
-#: ogginfo/ogginfo2.c:200
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Мінімальна щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:203
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Мінімальна щільність бітів не встановлена\n"
 
-#: ogginfo/ogginfo2.c:206
-msgid "User comments section follows...\n"
-msgstr "Далі слідує секція коментарів користувача...\n"
-
-#: ogginfo/ogginfo2.c:218
-#, c-format
+#: ogginfo/ogginfo2.c:539
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Negative granulepos on vorbis stream outside of headers. This file was "
+"created by a buggy encoder\n"
 msgstr ""
-"Попередження: коментар %d потоку %d має некоректний формат, він не містить "
-"'=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:227
-#, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Попередження: некоректна назва коментарю у коментарі %d (потік %d): \"%s\"\n"
-
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
-#, c-format
+#: ogginfo/ogginfo2.c:561
+#, fuzzy
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Попередження: некоректна UTF-8 послідовність у коментарі %d (потік %d): "
-"неправильний маркер довжини\n"
+"Потік vorbis %d:\n"
+"\tДовжина даних: %ld байт\n"
+"\tЧас відтворення: %ldхв:%02ldс\n"
+"\tСередня щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:275
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Попередження: неправильна UTF-8 послідовність у коментарі %d (потік %d): "
-"надто мало байтів\n"
-
-#: ogginfo/ogginfo2.c:336
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
-msgstr ""
-"Попередження: неправильна UTF-8 послідовність у коментарі %d (потік %d): "
-"неправильна послідовність\n"
-
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr "Попередження: помилка у utf8 декодері. Взагалі, це неможливо\n"
-
-#: ogginfo/ogginfo2.c:366
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-msgstr "Попередження: значення granulepos потоку %d зменшилось "
-
-#: ogginfo/ogginfo2.c:369
+#: ogginfo/ogginfo2.c:567
 #, fuzzy, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
-msgstr "Попередження: значення granulepos потоку %d зменшилось "
-
-#: ogginfo/ogginfo2.c:375
 msgid ""
-"Negative granulepos on vorbis stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:395
-#, c-format
-msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 "Потік vorbis %d:\n"
 "\tДовжина даних: %ld байт\n"
 "\tЧас відтворення: %ldхв:%02ldс\n"
 "\tСередня щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Попередження: для потоку %d не встановлено маркер його кінця\n"
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Попередження: неправильна сторінка заголовку, не знайдено пакет\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 "Попередження: неправильна сторінка заголовку у потоці %d, містить багато "
 "пакетів\n"
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 #, fuzzy
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr "Попередження: дірка у даних зі зсувом приблизно "
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, fuzzy, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr "Попередження: дірка у даних зі зсувом приблизно "
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Помилка при відкриванні вхідного файлу \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1448,25 +1656,25 @@
 "Обробка файлу \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Не вдається знайти обробник потоку. Завдання повернуто\n"
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, fuzzy, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -1475,22 +1683,22 @@
 "Попередження: неправильно розташовані сторінки для потоку %d\n"
 "Це означає, що ogg-файл пошкоджений.\n"
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Новий логічний потік (#%d, серійний номер: %08x): тип %s\n"
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Попередження: для потоку %d не встановлена ознака його початку\n"
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "Попередження: у середині потоку %d знайдено ознаку початку потоку\n"
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
@@ -1499,12 +1707,12 @@
 "Попередження: пропущений порядковий номер у потоку %d. Отримана сторінка %"
 "ld, але очікувалась %ld. Це свідчить про пропуск у даних.\n"
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Логічний потік %d завершився\n"
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1513,11 +1721,11 @@
 "Помилка: Дані ogg не знайдені у файлі \"%s\".\n"
 "Ймовірно, вхідні дані не у форматі ogg.\n"
 
-#: ogginfo/ogginfo2.c:713
-#, fuzzy
+#: ogginfo/ogginfo2.c:905
+#, fuzzy, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1540,7 +1748,8 @@
 "\t   перевірки для деяких типів потоків.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1554,7 +1763,8 @@
 "та діагностики проблем з цими файлами.\n"
 "Докладна довідка виводиться командою \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:763
+#: ogginfo/ogginfo2.c:955
+#, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""
 "Не вказані вхідні файли. Для отримання довідки використовуйте \"ogginfo -h"
@@ -1580,19 +1790,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: параметр `%s' вимагає вказування аргументу\n"
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: нерозпізнаний параметр `--%s'\n"
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: нерозпізнаний параметр `%c%s'\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1603,7 +1810,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: неправильний параметр -- %c\n"
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1620,34 +1826,37 @@
 msgstr "%s: параметр `-W %s' не допускає вказування аргументів\n"
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Помилка сторінки. Пошкоджені вхідні дані.\n"
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Помилка потоку бітів, продовження роботи\n"
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "Виявлено кінець потоку перед точкою відрізання.\n"
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Встановлення ознаки кінця потоку: спроба оновлення повернула код 0\n"
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Точка відрізання не в середині потоку. Другий файл буде порожнім.\n"
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Необроблений спеціальний випадок: перший файл занадто короткий?\n"
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -1656,49 +1865,59 @@
 "       сторінку ogg. Файл не може бути коректно декодований.\n"
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Виправна помилка потоку бітів\n"
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr "Помилка потоку бітів\n"
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr "Спроба оновлення повернула 0, встановлення ознаки кінця потоку\n"
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr "Вхідні дані не у форматі ogg.\n"
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr "Помилка на першій сторінці\n"
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr "помилка у першому пакеті\n"
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Помилка у основному заголовку: не vorbis?\n"
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Вторинний заголовок пошкоджений\n"
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr "у заголовках виявлено кінець файлу\n"
 
 #: vcut/vcut.c:468
-#, fuzzy
+#, fuzzy, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr ""
 "Використання: vcut вх_файл.ogg вих_файл1.ogg вич_файл2.ogg точка_відрізання\n"
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1734,18 +1953,22 @@
 msgstr "Обробка: Вирізання в позиції %lld\n"
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr "Обробка не вдалась\n"
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr "Помилка читання заголовків\n"
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr "Помилка запису першого файлу виводу\n"
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr "Помилка запису другого файлу виводу\n"
 
@@ -1781,43 +2004,40 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr "Пошкоджені або відсутні дані, продовження роботи..."
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 "Помилка при записувані потоку виводу. Потік виводу може бути пошкоджений чи "
 "обрізаний."
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Помилка при відкриванні файлу як файлу vorbis: %s\n"
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Неправильний коментар: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "неправильний коментар: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Помилка при записуванні коментарів у файл виводу: %s\n"
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr "не вказана дія\n"
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr "Не вдається перетворити коментар у UTF-8, не можна додати\n"
-
-#: vorbiscomment/vcomment.c:287
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1837,7 +2057,7 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
@@ -1866,44 +2086,49 @@
 "   використання vorbiscomment у сценаріях. Проте цього недостатньо\n"
 "   для основної обробки коментарів в усіх випадках.\n"
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Внутрішня помилка при аналізі параметрів командного рядка\n"
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Помилка при відкриванні вхідного файлу '%s'.\n"
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Назва вхідного файлу не може співпадати з назвою файлу виводу\n"
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Помилка при відкриванні файлу виводу '%s'.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Помилка при відкриванні файлу коментарів '%s'.\n"
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Помилка при відкриванні файлу коментарів '%s'\n"
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Помилка видалення старого файлу %s\n"
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Помилка перейменування %s у %s\n"
 
+#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
+#~ msgstr "Не вдається перетворити коментар у UTF-8, не можна додати\n"
+
 #~ msgid "malloc"
 #~ msgstr "malloc"
 

Modified: trunk/vorbis-tools/po/vorbis-tools.pot
===================================================================
--- trunk/vorbis-tools/po/vorbis-tools.pot	2005-06-18 16:34:20 UTC (rev 9476)
+++ trunk/vorbis-tools/po/vorbis-tools.pot	2005-06-18 16:36:46 UTC (rev 9477)
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
 #
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-06-24 13:27+0100\n"
+"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
+"POT-Creation-Date: 2005-06-18 18:39+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,71 +17,73 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ogg123/buffer.c:114
+#, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr ""
 
 #: ogg123/buffer.c:347
+#, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr ""
 
-#: ogg123/callbacks.c:70
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:73
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:76
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:80
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:84
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:87
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:90
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:94
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr ""
 
-#: ogg123/callbacks.c:97
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr ""
 
-#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr ""
 
-#: ogg123/callbacks.c:169
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr ""
 
-#: ogg123/callbacks.c:228
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr ""
 
-#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
-#: ogg123/callbacks.c:349
+#: ogg123/callbacks.c:275 ogg123/callbacks.c:294 ogg123/callbacks.c:331
+#: ogg123/callbacks.c:350
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr ""
 
@@ -93,56 +96,59 @@
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr ""
 
-#. Column headers
-#. Name
 #: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr ""
 
-#. Description
 #: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr ""
 
-#. Type
 #: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr ""
 
-#. Default
 #: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:165
+#, c-format
 msgid "none"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:168
+#, c-format
 msgid "bool"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:171
+#, c-format
 msgid "char"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:174
+#, c-format
 msgid "string"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:177
+#, c-format
 msgid "int"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:180
+#, c-format
 msgid "float"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:183
+#, c-format
 msgid "double"
 msgstr ""
 
 #: ogg123/cfgfile_options.c:186
+#, c-format
 msgid "other"
 msgstr ""
 
@@ -150,9 +156,9 @@
 msgid "(NULL)"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:516 oggenc/oggenc.c:521
-#: oggenc/oggenc.c:526 oggenc/oggenc.c:531 oggenc/oggenc.c:536
-#: oggenc/oggenc.c:541
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr ""
 
@@ -180,82 +186,86 @@
 msgid "Unknown error"
 msgstr ""
 
-#: ogg123/cmdline_options.c:74
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:81
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr ""
 
-#: ogg123/cmdline_options.c:93
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
 "=== Option was: %s\n"
 msgstr ""
 
-#. not using the status interface here
-#: ogg123/cmdline_options.c:100
+#: ogg123/cmdline_options.c:115
+#, c-format
 msgid "Available options:\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:129
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:134
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:149
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:164
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:179
+#: ogg123/cmdline_options.c:198
 #, c-format
 msgid "ogg123 from %s %s\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:186
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:194
+#: ogg123/cmdline_options.c:213
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:206
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:227
+#: ogg123/cmdline_options.c:241
+msgid "=== Option conflict: End time is before start time.\n"
+msgstr ""
+
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:237
+#: ogg123/cmdline_options.c:264
 msgid ""
 "=== Could not load default driver and no driver specified in config file. "
 "Exiting.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:258
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
@@ -270,46 +280,49 @@
 "        "
 msgstr ""
 
-#: ogg123/cmdline_options.c:279
+#: ogg123/cmdline_options.c:306
 #, c-format
 msgid ""
 "  -f, --file=filename  Set the output filename for a previously\n"
 "      specified file device (with -d).\n"
-"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -k n, --skip n  Skip the first 'n' seconds (or hh:mm:ss format)\n"
+"  -K n, --end n   End at 'n' seconds (or hh:mm:ss format)\n"
 "  -o, --device-option=k:v passes special option k with value\n"
 "      v to previously specified device (with -d).  See\n"
 "      man page for more info.\n"
-"  -b n, --buffer n  use an input buffer of 'n' kilobytes\n"
-"  -p n, --prebuffer n  load n%% of the input buffer before playing\n"
-"  -v, --verbose  display progress and other status information\n"
-"  -q, --quiet    don't display anything (no title)\n"
-"  -x n, --nth    play every 'n'th block\n"
-"  -y n, --ntimes repeat every played block 'n' times\n"
-"  -z, --shuffle  shuffle play\n"
+"  -@, --list=filename   Read playlist of files and URLs from \"filename\"\n"
+"  -b n, --buffer n  Use an input buffer of 'n' kilobytes\n"
+"  -p n, --prebuffer n  Load n%% of the input buffer before playing\n"
+"  -v, --verbose  Display progress and other status information\n"
+"  -q, --quiet    Don't display anything (no title)\n"
+"  -x n, --nth    Play every 'n'th block\n"
+"  -y n, --ntimes Repeat every played block 'n' times\n"
+"  -z, --shuffle  Shuffle play\n"
 "\n"
 "ogg123 will skip to the next song on SIGINT (Ctrl-C); two SIGINTs within\n"
 "s milliseconds make ogg123 terminate.\n"
-"  -l, --delay=s  set s [milliseconds] (default 500).\n"
+"  -l, --delay=s  Set s [milliseconds] (default 500).\n"
 msgstr ""
 
-#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
-#: ogg123/oggvorbis_format.c:90
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
+#, c-format
 msgid "Error: Out of memory.\n"
 msgstr ""
 
-#: ogg123/format.c:78
+#: ogg123/format.c:81
+#, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr ""
 
-#: ogg123/http_transport.c:137
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr ""
 
-#: ogg123/http_transport.c:191
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr ""
 
-#. found, name, description, type, ptr, default
 #: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr ""
@@ -318,100 +331,100 @@
 msgid "shuffle playlist"
 msgstr ""
 
-#: ogg123/ogg123.c:261
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
 "Audio Device:   %s"
 msgstr ""
 
-#: ogg123/ogg123.c:262
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr ""
 
-#: ogg123/ogg123.c:263
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr ""
 
-#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:341
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:429
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:434
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:440
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:450
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:469
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr ""
 
-#: ogg123/ogg123.c:474
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr ""
 
-#: ogg123/ogg123.c:512
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr ""
 
-#. In case we were killed mid-output
-#: ogg123/ogg123.c:585
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:152
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:158
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:302
+#: ogg123/oggvorbis_format.c:303
 #, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:307
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:311
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr ""
 
 #: ogg123/playlist.c:41 ogg123/playlist.c:52
+#, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr ""
 
@@ -421,6 +434,7 @@
 msgstr ""
 
 #: ogg123/playlist.c:259 ogg123/playlist.c:271
+#, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr ""
 
@@ -441,6 +455,7 @@
 
 #: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
 #: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+#, c-format
 msgid "Memory allocation error in stats_init()\n"
 msgstr ""
 
@@ -474,163 +489,203 @@
 msgid " Output Buffer %5.1f%%"
 msgstr ""
 
-#: ogg123/transport.c:67
+#: ogg123/transport.c:70
+#, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr ""
 
-#: oggenc/audio.c:39
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr ""
 
-#: oggenc/audio.c:40
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr ""
 
-#: oggenc/audio.c:116 oggenc/audio.c:383
+#: oggenc/audio.c:51
+msgid "FLAC file reader"
+msgstr ""
+
+#: oggenc/audio.c:52
+msgid "Ogg FLAC file reader"
+msgstr ""
+
+#: oggenc/audio.c:129 oggenc/audio.c:396
+#, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr ""
 
-#: oggenc/audio.c:127
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr ""
 
-#: oggenc/audio.c:145
+#: oggenc/audio.c:158
+#, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr ""
 
-#: oggenc/audio.c:230
+#: oggenc/audio.c:243
+#, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr ""
 
-#: oggenc/audio.c:236
+#: oggenc/audio.c:249
+#, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:244
+#: oggenc/audio.c:257
+#, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:259
+#: oggenc/audio.c:272
+#, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr ""
 
-#: oggenc/audio.c:273
+#: oggenc/audio.c:286
 #, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr ""
 
-#: oggenc/audio.c:280
+#: oggenc/audio.c:293
+#, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr ""
 
-#: oggenc/audio.c:286
+#: oggenc/audio.c:299
+#, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:292
+#: oggenc/audio.c:305
+#, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:323
+#: oggenc/audio.c:336
+#, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
-" Must be 8, 16, or 24 bit PCM.\n"
+" Must be 8 or 16 bit PCM.\n"
 msgstr ""
 
-#: oggenc/audio.c:366
+#: oggenc/audio.c:379
+#, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr ""
 
-#: oggenc/audio.c:378
+#: oggenc/audio.c:391
+#, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
 msgstr ""
 
-#: oggenc/audio.c:415
+#: oggenc/audio.c:428
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:466
+#: oggenc/audio.c:480
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
 "or floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:541
+#: oggenc/audio.c:555
+#, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr ""
 
-#: oggenc/audio.c:547
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr ""
 
-#: oggenc/audio.c:644
+#: oggenc/audio.c:658
+#, c-format
 msgid ""
 "BUG: Got zero samples from resampler: your file will be truncated. Please "
 "report this.\n"
 msgstr ""
 
-#: oggenc/audio.c:662
+#: oggenc/audio.c:676
+#, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr ""
 
-#: oggenc/encode.c:59
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr ""
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr ""
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr ""
 
-#: oggenc/encode.c:133
+#: oggenc/encode.c:129
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
 "more)\n"
 msgstr ""
 
-#: oggenc/encode.c:141
+#: oggenc/encode.c:137
+#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr ""
 
-#: oggenc/encode.c:159
+#: oggenc/encode.c:155
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 
-#: oggenc/encode.c:183
+#: oggenc/encode.c:198
+#, c-format
+msgid "Set optional hard quality restrictions\n"
+msgstr ""
+
+#: oggenc/encode.c:200
+#, c-format
+msgid "Failed to set bitrate min/max in quality mode\n"
+msgstr ""
+
+#: oggenc/encode.c:212
+#, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 
-#: oggenc/encode.c:237
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:303
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:349
+#: oggenc/encode.c:381
 #, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr ""
 
-#: oggenc/encode.c:359
+#: oggenc/encode.c:391
 #, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c"
+msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr ""
 
-#: oggenc/encode.c:377
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -638,38 +693,39 @@
 "Done encoding file \"%s\"\n"
 msgstr ""
 
-#: oggenc/encode.c:379
+#: oggenc/encode.c:411
+#, c-format
 msgid ""
 "\n"
 "\n"
 "Done encoding.\n"
 msgstr ""
 
-#: oggenc/encode.c:383
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
 "\tFile length:  %dm %04.1fs\n"
 msgstr ""
 
-#: oggenc/encode.c:387
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr ""
 
-#: oggenc/encode.c:390
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr ""
 
-#: oggenc/encode.c:391
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
 "\n"
 msgstr ""
 
-#: oggenc/encode.c:428
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -677,17 +733,17 @@
 "at average bitrate %d kbps "
 msgstr ""
 
-#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
-#: oggenc/encode.c:452 oggenc/encode.c:458
+#: oggenc/encode.c:462 oggenc/encode.c:469 oggenc/encode.c:477
+#: oggenc/encode.c:484 oggenc/encode.c:490
 msgid "standard input"
 msgstr ""
 
-#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
-#: oggenc/encode.c:453 oggenc/encode.c:459
+#: oggenc/encode.c:463 oggenc/encode.c:470 oggenc/encode.c:478
+#: oggenc/encode.c:485 oggenc/encode.c:491
 msgid "standard output"
 msgstr ""
 
-#: oggenc/encode.c:436
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -695,7 +751,7 @@
 "at approximate bitrate %d kbps (VBR encoding enabled)\n"
 msgstr ""
 
-#: oggenc/encode.c:444
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -703,7 +759,7 @@
 "at quality level %2.2f using constrained VBR "
 msgstr ""
 
-#: oggenc/encode.c:451
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -711,7 +767,7 @@
 "at quality %2.2f\n"
 msgstr ""
 
-#: oggenc/encode.c:457
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -719,72 +775,82 @@
 "using bitrate management "
 msgstr ""
 
-#: oggenc/oggenc.c:97
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
 "ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:112
+#: oggenc/oggenc.c:113
+#, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr ""
 
-#: oggenc/oggenc.c:119
+#: oggenc/oggenc.c:120
+#, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:173
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:201
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:210
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr ""
 
-#: oggenc/oggenc.c:260
+#: oggenc/oggenc.c:263
+#, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:268
+#: oggenc/oggenc.c:271
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:279
+#: oggenc/oggenc.c:278
 #, c-format
+msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
+msgstr ""
+
+#: oggenc/oggenc.c:289
+#, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:309
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr ""
 
-#: oggenc/oggenc.c:316
+#: oggenc/oggenc.c:326
+#, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:319
-msgid "ERROR: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:329
+#, c-format
+msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:330
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:374
+#: oggenc/oggenc.c:381
 #, c-format
 msgid ""
 "%s%s\n"
@@ -794,6 +860,7 @@
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
+" -v, --version        Print the version number\n"
 " -r, --raw            Raw mode. Input files are read directly as PCM data\n"
 " -B, --raw-bits=n     Set bits/sample for raw input. Default is 16\n"
 " -C, --raw-chan=n     Set number of channels for raw input. Default is 2\n"
@@ -801,25 +868,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. This uses the bitrate management\n"
-"                      engine, and is not recommended for most users.\n"
-"                      See -q, --quality for a better alternative.\n"
+"                      argument in kbps. By default, this produces a VBR\n"
+"                      encoding, equivalent to using -q or --quality.\n"
+"                      See the --managed option to use a managed bitrate\n"
+"                      targetting the selected bitrate.\n"
+" --managed            Enable the bitrate management engine. This will allow\n"
+"                      much greater control over the precise bitrate(s) "
+"used,\n"
+"                      but encoding will be much slower. Don't use it unless\n"
+"                      you have a strong need for detailed control over\n"
+"                      bitrate, such as for streaming.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel.\n"
+"                      encoding for a fixed-size channel. Using this will\n"
+"                      automatically enable managed bitrate mode (see\n"
+"                      --managed).\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications.\n"
-" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
-"                      instead of specifying a particular bitrate.\n"
+"                      streaming applications. Using this will automatically\n"
+"                      enable managed bitrate mode (see --managed).\n"
+" --advanced-encode-option option=value\n"
+"                      Sets an advanced encoder option to the given value.\n"
+"                      The valid options (and their values) are documented\n"
+"                      in the man page supplied with this program. They are\n"
+"                      for advanced users only, and should be used with\n"
+"                      caution.\n"
+" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
+"                      high), instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      Quality -1 is also possible, but may not be of\n"
-"                      acceptable quality.\n"
+"                      The default quality level is 3.\n"
 " --resample n         Resample input data to sampling rate n (Hz)\n"
 " --downmix            Downmix stereo to mono. Only allowed on stereo\n"
 "                      input.\n"
 " -s, --serial         Specify a serial number for the stream. If encoding\n"
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
+" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
+"                      being copied to the output Ogg Vorbis file.\n"
 "\n"
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
@@ -867,8 +951,9 @@
 "INPUT FILES:\n"
 " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
 "AIFF/C\n"
-" files, or 32 bit IEEE floating point WAV. Files may be mono or stereo\n"
-" (or more channels) and any sample rate.\n"
+" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+"Files\n"
+"  may be mono or stereo (or more channels) and any sample rate.\n"
 " Alternatively, the --raw option may be used to use a raw PCM data file, "
 "which\n"
 " must be 16 bit stereo little-endian PCM ('headerless wav'), unless "
@@ -881,134 +966,149 @@
 "\n"
 msgstr ""
 
-#: oggenc/oggenc.c:546
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 
-#: oggenc/oggenc.c:572 oggenc/oggenc.c:688 oggenc/oggenc.c:701
+#: oggenc/oggenc.c:596 oggenc/oggenc.c:716 oggenc/oggenc.c:729
+#, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr ""
 
-#: oggenc/oggenc.c:581
+#: oggenc/oggenc.c:605
+#, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:591
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:597
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 
-#: oggenc/oggenc.c:607
+#: oggenc/oggenc.c:631
 #, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:617
+#: oggenc/oggenc.c:641
+#, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr ""
 
-#: oggenc/oggenc.c:628
+#: oggenc/oggenc.c:656
+#, c-format
 msgid "Internal error parsing command line options\n"
 msgstr ""
 
-#: oggenc/oggenc.c:639
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:674
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:682
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:695
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:707
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr ""
 
-#: oggenc/oggenc.c:715
+#: oggenc/oggenc.c:743
+#, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:749
+#, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:730
+#: oggenc/oggenc.c:758
+#, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:739
+#: oggenc/oggenc.c:767
+#, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:747
+#: oggenc/oggenc.c:775
+#, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:794
+#, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#. Failed, so just set to 16
-#: oggenc/oggenc.c:771 oggenc/oggenc.c:775
+#: oggenc/oggenc.c:799 oggenc/oggenc.c:803
+#, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:782
+#: oggenc/oggenc.c:810
+#, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
 msgstr ""
 
-#. Failed, so just set to 2
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:815
+#, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:798
+#: oggenc/oggenc.c:826
+#, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#. Failed, so just set to 44100
-#: oggenc/oggenc.c:803
+#: oggenc/oggenc.c:831
+#, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:835
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr ""
 
-#: oggenc/oggenc.c:829
+#: oggenc/oggenc.c:857 vorbiscomment/vcomment.c:274
+#, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:848
+#: oggenc/oggenc.c:876
+#, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 
@@ -1027,249 +1127,340 @@
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:158
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid ""
-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
+"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"\"%s\"\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:165
+#: ogginfo/ogginfo2.c:179
 #, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:210 ogginfo/ogginfo2.c:218
+#, c-format
 msgid ""
-"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"wrong\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:169
+#: ogginfo/ogginfo2.c:225
 #, c-format
-msgid "Vorbis headers parsed for stream %d, information follows...\n"
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:172
+#: ogginfo/ogginfo2.c:284
 #, c-format
-msgid "Version: %d\n"
+msgid ""
+"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:176
+#: ogginfo/ogginfo2.c:295
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:318
 #, c-format
-msgid "Vendor: %s (%s)\n"
+msgid ""
+"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:183
+#: ogginfo/ogginfo2.c:325
 #, c-format
-msgid "Vendor: %s\n"
+msgid ""
+"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:184
+#: ogginfo/ogginfo2.c:329
 #, c-format
-msgid "Channels: %d\n"
+msgid "Theora headers parsed for stream %d, information follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:185
+#: ogginfo/ogginfo2.c:332
 #, c-format
-msgid ""
-"Rate: %ld\n"
-"\n"
+msgid "Version: %d.%d.%d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:188
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
 #, c-format
-msgid "Nominal bitrate: %f kb/s\n"
+msgid "Vendor: %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:191
-msgid "Nominal bitrate not set\n"
+#: ogginfo/ogginfo2.c:335
+#, c-format
+msgid "Width: %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:194
+#: ogginfo/ogginfo2.c:336
 #, c-format
-msgid "Upper bitrate: %f kb/s\n"
+msgid "Height: %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:197
-msgid "Upper bitrate not set\n"
+#: ogginfo/ogginfo2.c:337
+#, c-format
+msgid "Total image: %d by %d, offset x %d, offset y %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:200
+#: ogginfo/ogginfo2.c:340
+msgid "Frame offset/size invalid: width incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:342
+msgid "Frame offset/size invalid: height incorrect\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:345
+msgid "Invalid zero framerate\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:347
 #, c-format
-msgid "Lower bitrate: %f kb/s\n"
+msgid "Framerate %d/%d (%f fps)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:203
-msgid "Lower bitrate not set\n"
+#: ogginfo/ogginfo2.c:351
+msgid "Aspect ratio undefined\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:206
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
 msgid "User comments section follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:218
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
 #, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:432
 msgid ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
+"Theora stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:227
+#: ogginfo/ogginfo2.c:438
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgid ""
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:258 ogginfo/ogginfo2.c:267
+#: ogginfo/ogginfo2.c:466
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:275
+#: ogginfo/ogginfo2.c:473
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
+"header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:336
+#: ogginfo/ogginfo2.c:477
 #, c-format
+msgid "Vorbis headers parsed for stream %d, information follows...\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:480
+#, c-format
+msgid "Version: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:484
+#, c-format
+msgid "Vendor: %s (%s)\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:492
+#, c-format
+msgid "Channels: %d\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:493
+#, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+"Rate: %ld\n"
+"\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:348
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+#: ogginfo/ogginfo2.c:496
+#, c-format
+msgid "Nominal bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:366
-msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+#: ogginfo/ogginfo2.c:499
+msgid "Nominal bitrate not set\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:369
+#: ogginfo/ogginfo2.c:502
 #, c-format
-msgid "Warning: granulepos in stream %d decreases from %Ld to %Ld"
+msgid "Upper bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:375
+#: ogginfo/ogginfo2.c:505
+msgid "Upper bitrate not set\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:508
+#, c-format
+msgid "Lower bitrate: %f kb/s\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:511
+msgid "Lower bitrate not set\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:539
 msgid ""
 "Negative granulepos on vorbis stream outside of headers. This file was "
 "created by a buggy encoder\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:395
+#: ogginfo/ogginfo2.c:561
+msgid ""
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
+msgstr ""
+
+#: ogginfo/ogginfo2.c:567
 #, c-format
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %ld bytes\n"
-"\tPlayback length: %ldm:%02lds\n"
-"\tAverage bitrate: %f kbps\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:553
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:579
+#: ogginfo/ogginfo2.c:770
 #, c-format
 msgid ""
 "Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools."
+"with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:596
+#: ogginfo/ogginfo2.c:788
 msgid ""
 "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
 "ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:598
+#: ogginfo/ogginfo2.c:790
 #, c-format
 msgid ""
-"Warning: Hole in data found at approximate offset %Ld bytes. Corrupted ogg.\n"
+"Warning: Hole in data found at approximate offset %lld bytes. Corrupted "
+"ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:623
+#: ogginfo/ogginfo2.c:815
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:628
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
 "\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:637
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:645
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:648
+#: ogginfo/ogginfo2.c:840
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:652
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:655
+#: ogginfo/ogginfo2.c:847
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
 "This indicates a corrupt ogg file: %s.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:667
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:670
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:674
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:679
+#: ogginfo/ogginfo2.c:871
 #, c-format
 msgid ""
 "Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
 "ld. Indicates missing data.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:694
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:702
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
 "Input probably not ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:713
+#: ogginfo/ogginfo2.c:905
+#, c-format
 msgid ""
-"ogginfo 1.0\n"
-"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"ogginfo 1.1.0\n"
+"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
@@ -1281,7 +1472,8 @@
 "\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:926
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1290,7 +1482,8 @@
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:763
+#: ogginfo/ogginfo2.c:955
+#, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""
 
@@ -1314,19 +1507,16 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -1337,7 +1527,6 @@
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#. 1003.2 specifies the format of this message.
 #: share/getopt.c:813 share/getopt.c:943
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
@@ -1354,81 +1543,95 @@
 msgstr ""
 
 #: vcut/vcut.c:133
+#, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr ""
 
 #: vcut/vcut.c:150
+#, c-format
 msgid "Bitstream error, continuing\n"
 msgstr ""
 
 #: vcut/vcut.c:175
+#, c-format
 msgid "Found EOS before cut point.\n"
 msgstr ""
 
 #: vcut/vcut.c:184
+#, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr ""
 
 #: vcut/vcut.c:194
+#, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr ""
 
 #: vcut/vcut.c:227
+#, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr ""
 
-#. Might this happen for _really_ high bitrate modes, if we're
-#. * spectacularly unlucky? Doubt it, but let's check for it just
-#. * in case.
-#.
 #: vcut/vcut.c:286
+#, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
 msgstr ""
 
 #: vcut/vcut.c:299
+#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr ""
 
 #: vcut/vcut.c:309
+#, c-format
 msgid "Bitstream error\n"
 msgstr ""
 
 #: vcut/vcut.c:332
+#, c-format
 msgid "Update sync returned 0, setting eos\n"
 msgstr ""
 
 #: vcut/vcut.c:381
+#, c-format
 msgid "Input not ogg.\n"
 msgstr ""
 
 #: vcut/vcut.c:391
+#, c-format
 msgid "Error in first page\n"
 msgstr ""
 
 #: vcut/vcut.c:396
+#, c-format
 msgid "error in first packet\n"
 msgstr ""
 
 #: vcut/vcut.c:402
+#, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr ""
 
 #: vcut/vcut.c:422
+#, c-format
 msgid "Secondary header corrupt\n"
 msgstr ""
 
 #: vcut/vcut.c:435
+#, c-format
 msgid "EOF in headers\n"
 msgstr ""
 
 #: vcut/vcut.c:468
+#, c-format
 msgid ""
 "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr ""
 
 #: vcut/vcut.c:472
+#, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -1461,18 +1664,22 @@
 msgstr ""
 
 #: vcut/vcut.c:515
+#, c-format
 msgid "Processing failed\n"
 msgstr ""
 
 #: vcut/vcut.c:537
+#, c-format
 msgid "Error reading headers\n"
 msgstr ""
 
 #: vcut/vcut.c:560
+#, c-format
 msgid "Error writing first output file\n"
 msgstr ""
 
 #: vcut/vcut.c:568
+#, c-format
 msgid "Error writing second output file\n"
 msgstr ""
 
@@ -1508,41 +1715,38 @@
 msgid "Corrupt or missing data, continuing..."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:495
+#: vorbiscomment/vcedit.c:498
 msgid ""
 "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 
-#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
+#: vorbiscomment/vcomment.c:108 vorbiscomment/vcomment.c:134
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:148
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:160
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:170
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr ""
 
-#. should never reach this point
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:192
+#, c-format
 msgid "no action specified\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:269
-msgid "Couldn't convert comment to UTF8, cannot add\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:287
+#: vorbiscomment/vcomment.c:292
+#, c-format
 msgid ""
 "Usage: \n"
 "  vorbiscomment [-l] file.ogg (to list the comments)\n"
@@ -1562,47 +1766,49 @@
 "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 "   (note that when using this, reading comments from the comment\n"
 "   file or stdin is disabled)\n"
-"   Raw mode (--raw, -R) will read and write comments in utf8,\n"
+"   Raw mode (--raw, -R) will read and write comments in UTF-8,\n"
 "   rather than converting to the user's character set. This is\n"
 "   useful for using vorbiscomment in scripts. However, this is\n"
 "   not sufficient for general round-tripping of comments in all\n"
 "   cases.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:371
+#: vorbiscomment/vcomment.c:376
+#, c-format
 msgid "Internal error parsing command options\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:457
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:466
+#: vorbiscomment/vcomment.c:471
+#, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:477
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:509
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:537
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:539
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr ""