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

ivo at svn.xiph.org ivo at svn.xiph.org
Sat Oct 25 08:25:56 PDT 2008


Author: ivo
Date: 2008-10-25 08:25:54 -0700 (Sat, 25 Oct 2008)
New Revision: 15454

Modified:
   trunk/vorbis-tools/po/be.po
   trunk/vorbis-tools/po/cs.po
   trunk/vorbis-tools/po/da.po
   trunk/vorbis-tools/po/en_GB.po
   trunk/vorbis-tools/po/eo.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/pl.po
   trunk/vorbis-tools/po/ro.po
   trunk/vorbis-tools/po/ru.po
   trunk/vorbis-tools/po/sk.po
   trunk/vorbis-tools/po/sv.po
   trunk/vorbis-tools/po/uk.po
   trunk/vorbis-tools/po/vi.po
   trunk/vorbis-tools/po/vorbis-tools.pot
Log:
Updating translations.

Modified: trunk/vorbis-tools/po/be.po
===================================================================
--- trunk/vorbis-tools/po/be.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/be.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -6,8 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2002-07-19 22:30+1000\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,189 +15,187 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ogg123/buffer.c:117
-#, c-format
+#: ogg123/buffer.c:111
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Памылка: нестае памяці ў malloc_action().\n"
 
-#: ogg123/buffer.c:360
-#, c-format
+#: ogg123/buffer.c:344
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Памылка: немагчыма атрымаць памяць у malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:75
+#: ogg123/buffer.c:363
+msgid "malloc"
+msgstr "malloc"
+
+#: ogg123/callbacks.c:70
 msgid "Error: Device not available.\n"
 msgstr "Памылка: прылада недасяжная.\n"
 
-#: ogg123/callbacks.c:78
+#: ogg123/callbacks.c:73
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
-msgstr ""
-"Памылка: %s патрабуе каб назва файла вываду была задана з выбарам -f.\n"
+msgstr "Памылка: %s патрабуе каб назва файла вываду была задана з выбарам -f.\n"
 
-#: ogg123/callbacks.c:81
+#: ogg123/callbacks.c:76
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Памылка: дадатковае значэньне выбру не падтрымліваецца прыладай %s.\n"
 
-#: ogg123/callbacks.c:85
+#: ogg123/callbacks.c:80
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Памылка: немагчыма адчыніць прыладу %s.\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:84
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Памылка: памылка прылады %s.\n"
 
-#: ogg123/callbacks.c:92
+#: ogg123/callbacks.c:87
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Памылка: файл вываду не павінен ужывацца для прылады %s.\n"
 
-#: ogg123/callbacks.c:95
+#: ogg123/callbacks.c:90
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Памылка: немагчыма адчыніць файл %s на запіс.\n"
 
-#: ogg123/callbacks.c:99
+#: ogg123/callbacks.c:94
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Памылка: файл %s ужо йснуе.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:97
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr ""
 "Памылка: гэтая памылка ніколі не павінна здарацца (%d).\n"
 "Хавайся ў бульбу!\n"
 
-#: ogg123/callbacks.c:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Памылка: нестае памяці ў new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:174
+#: ogg123/callbacks.c:169
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Памылка: нестае памяці ў new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:233
+#: ogg123/callbacks.c:228
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Памылка: нестае памяці ў new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
+#: ogg123/callbacks.c:349
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Памылка: нестае памяці ў decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Сыстэмная памылка"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Памылка разбору: %s у радку %d з %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Назва"
 
-#: ogg123/cfgfile_options.c:137
+#. Description
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Апісаньне"
 
-#: ogg123/cfgfile_options.c:140
+#. Type
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Від"
 
-#: ogg123/cfgfile_options.c:143
+#. Default
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Дапомна"
 
-#: ogg123/cfgfile_options.c:169
-#, c-format
+#: ogg123/cfgfile_options.c:165
 msgid "none"
 msgstr "ніякі"
 
-#: ogg123/cfgfile_options.c:172
-#, c-format
+#: ogg123/cfgfile_options.c:168
 msgid "bool"
 msgstr "лягічаскі"
 
-#: ogg123/cfgfile_options.c:175
-#, c-format
+#: ogg123/cfgfile_options.c:171
 msgid "char"
 msgstr "знакавы"
 
-#: ogg123/cfgfile_options.c:178
-#, c-format
+#: ogg123/cfgfile_options.c:174
 msgid "string"
 msgstr "радковы"
 
-#: ogg123/cfgfile_options.c:181
-#, c-format
+#: ogg123/cfgfile_options.c:177
 msgid "int"
 msgstr "цэлалікавы"
 
-#: ogg123/cfgfile_options.c:184
-#, c-format
+#: ogg123/cfgfile_options.c:180
 msgid "float"
 msgstr "сапраўнды"
 
-#: ogg123/cfgfile_options.c:187
-#, c-format
+#: ogg123/cfgfile_options.c:183
 msgid "double"
 msgstr "double"
 
-#: ogg123/cfgfile_options.c:190
-#, c-format
+#: ogg123/cfgfile_options.c:186
 msgid "other"
 msgstr "іншы"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:506 oggenc/oggenc.c:511
+#: oggenc/oggenc.c:516 oggenc/oggenc.c:521 oggenc/oggenc.c:526
+#: oggenc/oggenc.c:531
 msgid "(none)"
 msgstr "(ніякі)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Пасьпяхова"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Ключ ня знойдзены"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Ключа няма"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Кепскае значэньне"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Кепскі від у сьпісе выбараў"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Невядомая памылка"
 
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:74
 msgid "Internal error parsing command line options.\n"
 msgstr "Унутраная памылка разбору выбараў загаднага радка.\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:81
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Памер буфэра ўводу меншы за найменшы памер, роўны %d Кб."
 
-#: ogg123/cmdline_options.c:102
+#: ogg123/cmdline_options.c:93
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -207,44 +204,44 @@
 "=== Памылка \"%s\" разбору выбараў, вызначаных у загадным радку.\n"
 "=== Выбар: %s\n"
 
-#: ogg123/cmdline_options.c:109
-#, c-format
+#. not using the status interface here
+#: ogg123/cmdline_options.c:100
 msgid "Available options:\n"
 msgstr "Магчымыя выбары:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:109
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Няма такой прылады: %s.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:129
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Драйвэр %s ня выводзіць у файл.\n"
 
-#: ogg123/cmdline_options.c:143
+#: ogg123/cmdline_options.c:134
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "=== Нельга вызначаць файл вываду, ня вызначыўшы драйвэр.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:149
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Недакладны фармат выбара: %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:164
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Недапушчальнае значэньне прэбуфэра. Прамежак: 0-100.\n"
 
-#: ogg123/cmdline_options.c:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:179
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 з %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:186
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Немагчыма граць кожны 0-вы кавалак!\n"
 
-#: ogg123/cmdline_options.c:216
+#: ogg123/cmdline_options.c:194
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -252,253 +249,116 @@
 "--- Немагчыма граць кожны кавалак 0 разоў.\n"
 "--- Каб праверыць дэкаваньне, выкарыстоўвайце драйвэр вываду null.\n"
 
-#: ogg123/cmdline_options.c:232
+#: ogg123/cmdline_options.c:206
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
-msgstr ""
-"--- Немагчыма прачытаць сьпіс файлаў %s для прайграваньня. Прапушчана.\n"
+msgstr "--- Немагчыма прачытаць сьпіс файлаў %s для прайграваньня. Прапушчана.\n"
 
-#: ogg123/cmdline_options.c:248
-msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:227
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Драйвэр %s, які вызначаны ў файле наладак, недапушчальны.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
+#: ogg123/cmdline_options.c:237
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
 msgstr ""
 "=== Немагчыма загрузіць дапомны драйвэр і няма вызначэньня драйвэра ў файле\n"
 "наладак. Выхад.\n"
 
-#: ogg123/cmdline_options.c:292
+#: ogg123/cmdline_options.c:258
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 з %s %s\n"
+" ад Фундацыі Xiph.org (http://www.xiph.org/)\n"
+"\n"
+"Выкарыстаньне: ogg123 [<выбары>] <файл уводу> ...\n"
+"\n"
+"  -h, --help                 Гэтая даведка.\n"
+"  -V, --version              Адлюстроўвае вэрсыю Ogg123.\n"
+"  -d, --device=d             Ужывае 'd' ў якасьці прылады вываду.\n"
+"    Магчамыя прылады ('*'=жывая, '@'=файл):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Магчымыя выбары:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:279
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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"
+"  -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"
 "\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"
 msgstr ""
+"  -f, --file=назва_файла       Усталёўвае назву файла вываду для папярэдне\n"
+"                             вызначанай прылады file (з дапамогай -d).\n"
+"  -k n, --skip n             Абмінуць першыя n сэкундаў.\n"
+"  -o, --device-option=k:v      Перадае адмысловы выбар k са значэньнем v да\n"
+"                             папярэдне вызначанай прылады (з дапамогай -d).\n"
+"                             Глядзіце man старонку, каб атрымаць больш\n"
+"                             падрабязныя зьвесткі.\n"
+"  -b n, --buffer n           Ужываць буфэр уводу памерам n Кб.\n"
+"  -p n, --prebuffer n          Загружаць буфэр уводу на n%% перад тым, як\n"
+"                             пачынаць прайграваньне.\n"
+"  -v, --verbose              Адлюстроўваць зьвесткі аб поспеху й стане.\n"
+"  -q, --quiet                Нічога не адлюстроўваць (бяз назвы).\n"
+"  -x n, --nth                Граць кожны n-ны блёк.\n"
+"  -y n, --ntimes             Паўтараць кожны блёк n разоў.\n"
+"  -z, --shuffle              Прайграваць у выпадковым парадку.\n"
+"\n"
+"    Ogg123 пераходзіць да іншага сьпева, атрымаўшы SIGINT (Ctrl-C); два SIGINT\n"
+"на працягу s мілісэкундаў прымушаюць ogg123 выйсьці.\n"
+"  -l, --delay=s              Усталяваць s [мілісэкунды] (дапомна 500).\n"
 
-#: ogg123/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Файл: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Магчымыя выбары:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "Увод - ня ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Апісаньне"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Магчымыя выбары:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
+#: ogg123/oggvorbis_format.c:106 ogg123/oggvorbis_format.c:321
+#: ogg123/oggvorbis_format.c:336 ogg123/oggvorbis_format.c:354
 msgid "Error: Out of memory.\n"
 msgstr "Памылка: нестае памяці.\n"
 
-#: ogg123/format.c:82
-#, c-format
+#: ogg123/format.c:59
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Памылка: немагчыма атрымаць памяць у malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:145
+#: ogg123/http_transport.c:137
 msgid "Error: Could not set signal mask."
 msgstr "Памылка: немагчыма вызначыць маску сыгнала."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:191
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Памылка: немагчыма стварыць буфэр уводу.\n"
 
-#: ogg123/ogg123.c:82
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "дапомная прылада вываду"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "выпадковае прайграваньне"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Немагчыма абмінуць %f сэкундаў."
-
-#: ogg123/ogg123.c:378
+#: ogg123/ogg123.c:261
 #, c-format
 msgid ""
 "\n"
@@ -508,371 +368,241 @@
 "\n"
 "Прылада аўдыё:   %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:262
 #, c-format
 msgid "Author:   %s"
 msgstr "Стваральнік:   %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:263
 #, c-format
 msgid "Comments: %s"
 msgstr "Камэнтары: %s"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
+#: ogg123/ogg123.c:307 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Увага: немагчыма прачытаць тэчку %s.\n"
 
-#: ogg123/ogg123.c:460
+#: ogg123/ogg123.c:341
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Памылка: немагчыма стварыць аўдыёбуфэр.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:429
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Немагчыма адшукаць модуль, каб чытаць з %s.\n"
 
-#: ogg123/ogg123.c:561
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Немагчыма адчыніць %s.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:440
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Фармат файла %s не падтрымліваецца.\n"
 
-#: ogg123/ogg123.c:577
+#: ogg123/ogg123.c:450
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
-msgstr ""
-"Памылка адчыненьня %s з дапамогай модуля %s.  Магчыма файл пашкоджаны.\n"
+msgstr "Памылка адчыненьня %s з дапамогай модуля %s.  Магчыма файл пашкоджаны.\n"
 
-#: ogg123/ogg123.c:596
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
 msgstr "Прайграваньне: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:474
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Немагчыма абмінуць %f сэкундаў."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
 msgstr "Памылка: памылка дэкадаваньня.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Памылка: памылка прылады %s.\n"
-
-#: ogg123/ogg123.c:743
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:585
 msgid "Done."
 msgstr "Зроблена."
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:51
+msgid "Track number:"
+msgstr "Нумар запіса:"
+
+#: ogg123/oggvorbis_format.c:52
+msgid "ReplayGain (Track):"
+msgstr "ReplayGain (Запіс):"
+
+#: ogg123/oggvorbis_format.c:53
+msgid "ReplayGain (Album):"
+msgstr "ReplayGain (Альбом):"
+
+#: ogg123/oggvorbis_format.c:54
+msgid "ReplayGain (Track) Peak:"
+msgstr "ReplayGain (Запіс) Peak:"
+
+#: ogg123/oggvorbis_format.c:55
+msgid "ReplayGain (Album) Peak:"
+msgstr "ReplayGain (Альбом) Peak:"
+
+#: ogg123/oggvorbis_format.c:56
+msgid "Copyright"
+msgstr "Аўтарскія правы"
+
+#: ogg123/oggvorbis_format.c:57 ogg123/oggvorbis_format.c:58
+msgid "Comment:"
+msgstr "Камэнтар:"
+
+#: ogg123/oggvorbis_format.c:167
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Дзірка ў плыні; магчыма, гэта бясшкодна\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:173
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Бібліятэка Vorbis паведаміла пра памылку плыні.\n"
 
-#: ogg123/oggvorbis_format.c:310
-#, fuzzy, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr "Бітавая плыня: %d канал(ы), %ldГц"
-
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:402
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr ""
+msgid "Version is %d"
+msgstr "Вэрсыя -- %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:406
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr "Падказкі бітрэйту: верхні=%ld пачатковы=%ld ніжні=%ld вакно=%ld"
 
-#: ogg123/oggvorbis_format.c:327
+#: ogg123/oggvorbis_format.c:414
 #, c-format
+msgid "Bitstream is %d channel, %ldHz"
+msgstr "Бітавая плыня: %d канал(ы), %ldГц"
+
+#: ogg123/oggvorbis_format.c:419
+#, c-format
 msgid "Encoded by: %s"
 msgstr "Закадавана ўжываючы: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, c-format
+#: ogg123/playlist.c:41 ogg123/playlist.c:52
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Памылка: нестае памяці ў create_playlist_member().\n"
 
-#: ogg123/playlist.c:222
+#: ogg123/playlist.c:214
 #, c-format
 msgid "Warning from playlist %s: Could not read directory %s.\n"
 msgstr "Папярэджаньне ад сьпісу %s: немагчыма прачытаць тэчку %s.\n"
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
-#, c-format
+#: ogg123/playlist.c:259 ogg123/playlist.c:271
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Памылка: нестае памяці ў playlist_to_array().\n"
 
-#: ogg123/status.c:60
+#: ogg123/status.c:47
 #, c-format
 msgid "%sPrebuf to %.1f%%"
 msgstr "%sПрэбуф да %.1f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sПрыпынена"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr "%sEOS"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
-#, c-format
+#: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
+#: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Памылка атрыманьня памяці ў stats_init()\n"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Час: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "з %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Сярэдні бітрэйт: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr " буфэр уводу %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr " Буфэр вываду %5.1f%%"
 
-#: ogg123/transport.c:71
-#, c-format
+#: ogg123/transport.c:67
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Памылка: немагчыма атрымаць памяць у malloc_data_source_stats()\n"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 з %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, fuzzy, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr ""
-"Выкарыстаньне: vcut фай_уводу.ogg ф_вываду1.ogg ф_вываду2.ogg "
-"пункт_разрэзкі\n"
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "ПАМЫЛКА: немагчыма адкрыць файл уводу \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "ПАМЫЛКА: немагчыма адкрыць файл вываду \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Няўдалае адчыненьне файла як vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Памылка выдаленьня старога файла %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"ПАМЫЛКА: ня вызначаныя файлы ўводу. Паспрабуце -h для даведкі.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"ПАМЫЛКА: некалькі файлаў уводу з вызначанай назвай файла вываду;\n"
-"лепей выкарыстоўвайце -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:39
 msgid "WAV file reader"
 msgstr "Чытач файлаў WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
 msgstr "Чытач файлаў AIFF/AIFC"
 
-#: oggenc/audio.c:53
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "Чытач файлаў WAV"
-
-#: oggenc/audio.c:54
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "Чытач файлаў WAV"
-
-#: oggenc/audio.c:131 oggenc/audio.c:425
-#, c-format
+#: oggenc/audio.c:117 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўка WAV.\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:128
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Пропуск кавалка віду \"%s\", даўжынёй %d.\n"
 
-#: oggenc/audio.c:168
-#, c-format
+#: oggenc/audio.c:146
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўку AIFF.\n"
 
-#: oggenc/audio.c:254
-#, c-format
+#: oggenc/audio.c:231
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Увага: ня знойдзена ніводнага агульнага кавалка ў AIFF файле.\n"
 
-#: oggenc/audio.c:260
-#, c-format
+#: oggenc/audio.c:237
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Увага: няпоўны агульны кавалак у загалоўку AIFF.\n"
 
-#: oggenc/audio.c:268
-#, c-format
+#: oggenc/audio.c:245
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўку AIFF.\n"
 
-#: oggenc/audio.c:283
-#, c-format
+#: oggenc/audio.c:258
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Увага: няпоўны загаловак AIFF-C.\n"
 
-#: oggenc/audio.c:297
-#, fuzzy, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
+#: oggenc/audio.c:263
+msgid "Warning: Can't handle compressed AIFF-C\n"
 msgstr "Увага: сьціснутыя AIFF-C не падтрымліваюцца.\n"
 
-#: oggenc/audio.c:304
-#, c-format
+#: oggenc/audio.c:270
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Увага: кавалак SSND ня знойдзены ў AIFF файле.\n"
 
-#: oggenc/audio.c:310
-#, c-format
+#: oggenc/audio.c:276
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Увага: сапсаваны кавалак SSND у загалоўку AIFF.\n"
 
-#: oggenc/audio.c:316
-#, c-format
+#: oggenc/audio.c:282
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўку AIFF.\n"
 
-#: oggenc/audio.c:353
-#, c-format
+#: oggenc/audio.c:314
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
 " Must be 8 or 16 bit PCM.\n"
@@ -880,13 +610,11 @@
 "Увага: oggenc не падтрымлівае гэткі від файлаў AIFF/AIFC.\n"
 " Мае быць 8-мі ці 16-ці бітавым ІКМ.\n"
 
-#: oggenc/audio.c:407
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Увага: нераспазнаны фармат кавалка ў загалоўку WAV.\n"
 
-#: oggenc/audio.c:420
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -894,139 +622,82 @@
 "Увага: недапушчальны фармат кавалка ў загалоўку WAV.\n"
 " Усё адно спраба прачытаць (магчыма не спрацуе)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: oggenc/audio.c:406
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
-" or type 3 floating point PCM)\n"
+" or type 3 floating point PCM\n"
 msgstr ""
 "ПАМЫЛКА: від WAV файла не падтрымліваецца (мае быць стандартны ІКМ\n"
 "ці ІКМ 3-га віду з незамацаванай коскай.\n"
 
-#: oggenc/audio.c:467
-#, c-format
+#: oggenc/audio.c:455
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
-
-#: oggenc/audio.c:528
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
 "ПАМЫЛКА: падфармат файла WAV не падтрымліваецца (мае быць 16 бітавы\n"
 "ІКМ ці ІКМ з незамацаванай коскай.\n"
 
-#: oggenc/audio.c:604
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
+#: oggenc/audio.c:607
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
 msgstr ""
-
-#: oggenc/audio.c:624
-#, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:630
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:732
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"НЕДАРОБКА: атрыманыя сэмплы нулявога памеру ад рэсэмплера, Ваш файл будзе "
-"абрэзаны.\n"
+"НЕДАРОБКА: атрыманыя сэмплы нулявога памеру ад рэсэмплера, Ваш файл будзе абрэзаны.\n"
 "Калі ласка, паведаміце пра гэта распрацоўнікам праграмы.\n"
 
-#: oggenc/audio.c:750
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr "Немагчыма распачаць рэсэмплер.\n"
 
-#: oggenc/encode.c:64
+#: oggenc/encode.c:59
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Пашыраны выбар \"%s\" кадавальніка ўсталяваны ў %s.\n"
 
-#: oggenc/encode.c:101
+#: oggenc/encode.c:100
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Часьціня зьмененая з %f кГц у %f кГц.\n"
 
-#: oggenc/encode.c:104
+#: oggenc/encode.c:103
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Невядомы дадатковы выбар \"%s\".\n"
 
-#: oggenc/encode.c:111
-#, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
+#: oggenc/encode.c:133
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+msgstr "255 каналаў павінна хапіць кожнаму. (Нажаль vorbis не падтрымлівае болей)\n"
 
-#: oggenc/encode.c:115 oggenc/encode.c:252
-#, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, fuzzy, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 каналаў павінна хапіць кожнаму. (Нажаль vorbis не падтрымлівае болей)\n"
-
-#: oggenc/encode.c:182
-#, c-format
+#: oggenc/encode.c:141
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Запыт найменшага ці найбольшага бітрэйту патрабуе \"--managed\".\n"
 
-#: oggenc/encode.c:200
-#, c-format
+#: oggenc/encode.c:159
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Няўдалае распачынаньне рэжыму: недапушчальнае значэньне якасьці.\n"
 
-#: oggenc/encode.c:245
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:247
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:263
-#, c-format
+#: oggenc/encode.c:183
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "Няўдалае распачынаньне рэжыму: недапушчальнае значэньне бітрэйту.\n"
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:237
 msgid "Failed writing header to output stream\n"
 msgstr "Няўдалы запіс загалоўку ў плыню вываду.\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:303
 msgid "Failed writing data to output stream\n"
 msgstr "Няўдалы запіс даньняў у плыню вываду.\n"
 
-#: oggenc/encode.c:472
-#, fuzzy, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
+#: oggenc/encode.c:349
+#, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 msgstr "\t[%5.1f%%] [засталось %2d хв %.2d с] %c"
 
-#: oggenc/encode.c:482
-#, fuzzy, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+#: oggenc/encode.c:359
+#, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr "\tКадаваньне [%2d хв %.2d с пакуль] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:377
 #, c-format
 msgid ""
 "\n"
@@ -1037,8 +708,7 @@
 "\n"
 "Файл \"%s\" закадаваны.\n"
 
-#: oggenc/encode.c:502
-#, c-format
+#: oggenc/encode.c:379
 msgid ""
 "\n"
 "\n"
@@ -1048,7 +718,7 @@
 "\n"
 "Кадаваньне скончана.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:383
 #, c-format
 msgid ""
 "\n"
@@ -1057,17 +727,17 @@
 "\n"
 "\tДаўжыня файла:  %d хв %04.1f с.\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:387
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tПрайшло часу: %d хв %04.1f с.\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:390
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tХуткасьць:         %.4f.\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:391
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1076,7 +746,7 @@
 "\tСярэдні бітрэйт: %.1f Кбіт/с.\n"
 "\n"
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:428
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1087,17 +757,17 @@
 "         %s%s%s \n"
 "зь сярэднім бітрэйтам %d кбіт/с"
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
+#: oggenc/encode.c:452 oggenc/encode.c:458
 msgid "standard input"
 msgstr "стандартны ўвод"
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
+#: oggenc/encode.c:453 oggenc/encode.c:459
 msgid "standard output"
 msgstr "стандартны вывад"
 
-#: oggenc/encode.c:559
+#: oggenc/encode.c:436
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1108,7 +778,7 @@
 "         %s%s%s \n"
 "з прыблізным бітрэйтам %d Кбіт/с (з выкарыстаньнем VBR)\n"
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:444
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1119,7 +789,7 @@
 "         %s%s%s \n"
 "з узроўнем якасьці %2.2f ужываючы вымушаны VBR "
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:451
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1130,7 +800,7 @@
 "         %s%s%s \n"
 "зь якасьцю %2.2f\n"
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:457
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1141,705 +811,397 @@
 "         %s%s%s \n"
 "выкарыстоўваючы кіраваньне бітрэйтам "
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
+#: oggenc/oggenc.c:96
+#, c-format
+msgid ""
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 "%s%s\n"
 "ПАМЫЛКА: ня вызначаныя файлы ўводу. Паспрабуце -h для даведкі.\n"
 
-#: oggenc/oggenc.c:118
-#, c-format
+#: oggenc/oggenc.c:111
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "Памылка: некалькі файлаў вызначана пры ўжываньні стандартнага ўводу.\n"
 
-#: oggenc/oggenc.c:125
-#, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
+#: oggenc/oggenc.c:118
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
 msgstr ""
 "ПАМЫЛКА: некалькі файлаў уводу з вызначанай назвай файла вываду;\n"
 "лепей выкарыстоўвайце -n\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:172
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ПАМЫЛКА: немагчыма адкрыць файл уводу \"%s\": %s\n"
 
-#: oggenc/oggenc.c:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "Чытач файлаў WAV"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:200
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Адкрыцьцё модулем %s: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:209
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "ПАМЫЛКА: фармат файла ўводу \"%s\" не падтрымліваецца.\n"
 
-#: oggenc/oggenc.c:280
-#, c-format
+#: oggenc/oggenc.c:259
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "УВАГА: няма назвы файла, дапомная назва \"default.ogg\".\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:267
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"ПАМЫЛКА: немагчыма стварыць падтэчкі, патрэбныя для назвы файла вываду \"%s"
-"\".\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "ПАМЫЛКА: немагчыма стварыць падтэчкі, патрэбныя для назвы файла вываду \"%s\".\n"
 
-#: oggenc/oggenc.c:295
-#, fuzzy, c-format
-msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
-msgstr "Назвы файлаў уводу й вываду не павінны супадаць\n"
-
-#: oggenc/oggenc.c:306
+#: oggenc/oggenc.c:278
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ПАМЫЛКА: немагчыма адкрыць файл вываду \"%s\": %s\n"
 
-#: oggenc/oggenc.c:350
+#: oggenc/oggenc.c:308
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Рэсэмплінг уводу з %d Гц да %d Гц.\n"
 
-#: oggenc/oggenc.c:357
-#, c-format
+#: oggenc/oggenc.c:315
 msgid "Downmixing stereo to mono\n"
 msgstr "Пераўтварэньне якасьці са стэрэа ў мона.\n"
 
-#: oggenc/oggenc.c:360
-#, fuzzy, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:318
+msgid "ERROR: Can't downmix except from stereo to mono\n"
 msgstr "ПАМЫЛКА: зьмяненьне немагчымае, апроч са стэрэа ў мона.\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:365
 #, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 з %s %s\n"
-
-#: oggenc/oggenc.c:416
-#, c-format
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:417
-#, c-format
-msgid ""
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
+"                      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"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel. Using this will\n"
-"                      automatically enable managed bitrate mode (see\n"
-"                      --managed).\n"
+"                      encoding for a fixed-size channel.\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications. Using this will automatically\n"
-"                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
-" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
-"                      high), instead of specifying a particular bitrate.\n"
+"                      streaming applications.\n"
+" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
+"                      instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
+"                      Quality -1 is also possible, but may not be of\n"
+"                      acceptable quality.\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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
-" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
-"                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
-"                      used multiple times. The argument should be in the\n"
-"                      format \"tag=value\".\n"
+"                      used multiple times.\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\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 "
-"additional\n"
+" OggEnc input files must currently be 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"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
-" In this mode, output is to stdout unless an output filename is specified\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Выкарыстаньне: oggenc [выбары] input.wav [...]\n"
+"\n"
+"Агульныя выбары:\n"
+" -Q, --quiet                 Бяз вываду ў stderr.\n"
+" -h, --help                  Надрукаваць тэкст гэтае даведкі\n"
+" -r, --raw                     Просты рэжым. Уваходныя файлы чытаюцца наўпрост\n"
+"                             як ІКМ даныя\n"
+" -B, --raw-bits=n              Усталяваць колькасьць бітаў на сэмпл для простага\n"
+"                             ўводу. Дапомнае значэньне 16.\n"
+" -C, --raw-chan=n     Устанавіць колькасьць каналаў для простага ўваходу.\n"
+"                      Даўнята 2\n"
+" -R, --raw-rate=n     Устанавіць колькасьць сэмплаў на сэкунду для простага\n"
+"                      рэжыму. Даўнята 44100.\n"
+" --raw-endianness     1 для bigendian, 0 для little (даўнята 0)\n"
+" -b, --bitrate        Выбар намінальнага бітрэйту для кадаваньня. Спроба\n"
+"                      кадаваньня зь бітрэйтам, які спасярэджвае даны.\n"
+"                      Атрымоўвае парамэтар ў kb/s. Гэная апэрацыя задзейнічае\n"
+"                      мэханізм кіраваньня бітрэйтам і ня раіцца для бальшыні\n"
+"                      карыстальнікаў. Лепей ужывай -q, --quality.\n"
+" -m, --min-bitrate    Мінімальны бітрэйт (у kb/s). Пасуе пры кадаваньні з\n"
+"                      фіксаваным памерам канала.\n"
+" -M, --max-bitrate    Максымальны бітрэйт. Пасуе для патокавых дастасаваньняў.\n"
+" -q, --quality        Вызначае якасьць ад 0 (нізкая) да 10 (высокая), замест\n"
+"                      вызначэньня пэўнага бітрэйту. Гэта звычайны рэжым\n"
+"                      функцыянаваньня. Дробныя значэньні якасьці (2,75 і г.д.)\n"
+"                      таксама дазволеныя. Якасьць -1 магчымая, але наўрад\n"
+"                      будзе мець прымальную якасьць.\n"
+" --resample n         Рэсэмплаваць уваходныя даныя да часьціні n (Hz)\n"
+" --downmix            Пераўтварыць стэрэа ў мона. Дазволена толькі са стэрэа\n"
+"                      ўваходам.\n"
+" -s, --serial         Вызначае сэрыйны нумар для патоку. Калі кадуеш колькі\n"
+"                      файлаў нумар павялічваецца для кожнага файла, пачынаючы\n"
+"                      з другога.\n"
+"\n"
+"Выбары, зьвязаныя з назвамі:\n"
+" -o, --output=fn      Запіс файла ў fn (толькі ў аднафайлавым рэжыме)\n"
+" -n, --names=радок    Ствараць імёны файлаў паводле гэтага радка. %%a, %%t, %%l,\n"
+"                      %%n, %%d замяняюцца на выканаўцу, назву, альбом, нумар\n"
+"                      запісу і дату, адпаведна (гл. ніжэй)\n"
+"                      %%%% дае знак %%.\n"
+" -X, --name-remove=s  Выдаляць вызначаныя знакі з парамэтраў фарматнага радка,\n"
+"                      вызначанага -n. Карыснае для атрыманьня карэктных імёнаў\n"
+"                      файлаў.\n"
+" -P, --name-replace=s Замяняць знакі, выдаленыя --name-remove, на вызначаныя\n"
+"                      знакі. Калі гэты радок карацейшы за сьпіс --name-remove ці\n"
+"                      ня вызначаны, то лішнія знакі папросту выдаляюцца.\n"
+"                      Даўнятыя ўсталёўкі для вышэйшых двух парамэтраў залежаць\n"
+"                      ад пляцформы.\n"
+" -c, --comment=c      Дадаць радок як камэнтар. Гэтая опцыя можа ўжывацца колькі\n"
+"                      разоў.\n"
+" -d, --date           Дата запісу (звычайна дата выкананьня)\n"
+" -N, --tracknum       Нумар запісу\n"
+" -t, --title          Назва запісу\n"
+" -l, --album          Назва альбома\n"
+" -a, --artist         Імя выканаўцы\n"
+" -G, --genre          Стыль запісу\n"
+"                      Калі вызначана колькі файлаў, тады асобнікі папярэдніх пяці\n"
+"                      парамэтраў будуць ужывацца ў тым парадку, у якім яны\n"
+"                      вызначаныя. Калі назваў запісаў вызначана менш, чым файлаў,\n"
+"                      OggEnc надрукуе папярэджаньне і будзе ўжываць апошнюю для \n"
+"                      астатніх файлаў. Калі вызначана меней нумароў, то рэшта\n"
+"                      файлаў застанецца непранумараваная. Іншыя парамэтры будуць\n"
+"                      скарыстаныя ізноў без папярэджаньня (прыкладам ты можаш\n"
+"                      вызначыць адзін раз дату, і яна будзе ўжытая для ўсіх)\n"
+"\n"
+"Файлы ўводу:\n"
+"OggEnc падтрымлівае наступныя тыпы ўваходных тыпаў: 16 ці 8 бітавы ІКМ WAV, AIFF\n"
+"ці AIFF/C, ці 32 бітавы WAV з рацыянальнымі лікамі IEEE. Файлы могуць быць мона,\n"
+"стэрэа ці з большай колькасьцю каналаў і зь любой верхняй часьцінёй.\n"
+"Зь іншага боку, опцыя --raw дазваляе ўжываць простыя ІКМ файлы, якія маюць быць\n"
+"16 бітавымі стэрэа ІКМ файламі зь little-endian парадкам байтаў (\"неразборлівыя\n"
+"WAV\"), калі ня вызначаныя дадатковыя парамэтры простага рэжыму.\n"
+"Можна атрымоўваць файл са стандартнага ўваходу, ужыўшы - замест імя файла. У \n"
+"гэтым рэжыме выхад накіраваны ў stdout, калі ня вызначана імя выходнага файла з\n"
+"дапамогай -o.\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:536
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr "УВАГА: праігнараваны няправільны запабежны знак '%c' у фармаце імя\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
-#, c-format
+#: oggenc/oggenc.c:562 oggenc/oggenc.c:670 oggenc/oggenc.c:683
 msgid "Enabling bitrate management engine\n"
 msgstr "Задзейнічаньне мэханізму кіраваньня бітрэйтам\n"
 
-#: oggenc/oggenc.c:661
-#, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"УВАГА: вызначаны парадак байтаў для няпростых даных. Лічым уваход простым.\n"
+#: oggenc/oggenc.c:571
+msgid "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
+msgstr "УВАГА: вызначаны парадак байтаў для няпростых даных. Лічым уваход простым.\n"
 
-#: oggenc/oggenc.c:664
+#: oggenc/oggenc.c:574
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "УВАГА: немагчыма прачытаць парамэтар парадку байтаў \"%s\"\n"
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:581
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "УВАГА: немагчыма прачытаць часьціню рэсэмплінгу \"%s\"\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:587
 #, 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:687
-#, fuzzy, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Увага: немагчыма прачытаць тэчку %s.\n"
-
-#: oggenc/oggenc.c:700
-#, c-format
+#: oggenc/oggenc.c:599
 msgid "No value for advanced encoder option found\n"
 msgstr "Ня знойдзена значэньне для зададзенай пашыранай опцыі кадаваньніка\n"
 
-#: oggenc/oggenc.c:718
-#, c-format
+#: oggenc/oggenc.c:610
 msgid "Internal error parsing command line options\n"
 msgstr "Нутраная памылка разбору опцый каманднага радка\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Увага: няправільны камэнтар (\"%s\"), праігнараваны.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:656
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Увага: намінальны бітрэйт \"%s\" не распазнаны\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:664
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Увага: мінімальны бітрэйт \"%s\" не распазнаны\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:677
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Увага: максымальны бітрэйт \"%s\" не распазнаны\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:689
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Не распазнаная опцыя якасьці \"%s\", праігнараваная\n"
 
-#: oggenc/oggenc.c:807
-#, c-format
+#: oggenc/oggenc.c:697
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr "УВАГА: запытана завысокая якасьць, устаноўлена ў максымальную.\n"
 
-#: oggenc/oggenc.c:813
-#, c-format
+#: oggenc/oggenc.c:703
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "УВАГА: вызначана колькі фарматаў імя, ужыты апошні\n"
 
-#: oggenc/oggenc.c:822
-#, c-format
+#: oggenc/oggenc.c:712
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr "УВАГА: вызначана колькі фільтраў фармату імя, ужыты апошні\n"
 
-#: oggenc/oggenc.c:831
-#, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
+#: oggenc/oggenc.c:721
+msgid "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr "УВАГА: вызначана колькі фільтраў замены фармату імя, ужыты апошні\n"
 
-#: oggenc/oggenc.c:839
-#, c-format
+#: oggenc/oggenc.c:729
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr "УВАГА: вызначана колькі выходных файлаў, лепей ужывай -n\n"
 
-#: oggenc/oggenc.c:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 з %s %s\n"
+#: oggenc/oggenc.c:748
+msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+msgstr "УВАГА: вызначаныя біты на сэмпл для няпростых даных. Лічым уваход простым.\n"
 
-#: oggenc/oggenc.c:858
-#, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"УВАГА: вызначаныя біты на сэмпл для няпростых даных. Лічым уваход простым.\n"
-
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
-#, c-format
+#. Failed, so just set to 16
+#: oggenc/oggenc.c:753 oggenc/oggenc.c:757
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "УВАГА: вызначаныя біты на сэмпл няправільныя, прынята 16.\n"
 
-#: oggenc/oggenc.c:874
-#, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"УВАГА: вызначаная колькасьць каналаў для няпростых даных. Лічым уваход "
-"простым.\n"
+#: oggenc/oggenc.c:764
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "УВАГА: вызначаная колькасьць каналаў для няпростых даных. Лічым уваход простым.\n"
 
-#: oggenc/oggenc.c:879
-#, c-format
+#. Failed, so just set to 2
+#: oggenc/oggenc.c:769
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "УВАГА: вызначаная няправільная колькасьць каналаў, прынята 2.\n"
 
-#: oggenc/oggenc.c:890
-#, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"УВАГА: вызначаная часьціня для няпростых даных. Лічым уваход простым.\n"
+#: oggenc/oggenc.c:780
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+msgstr "УВАГА: вызначаная часьціня для няпростых даных. Лічым уваход простым.\n"
 
-#: oggenc/oggenc.c:895
-#, c-format
+#. Failed, so just set to 44100
+#: oggenc/oggenc.c:785
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr "УВАГА: вызначаная няправільная часьціня, прынята 44100.\n"
 
-#: oggenc/oggenc.c:902
-#, c-format
+#: oggenc/oggenc.c:789
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "УВАГА: вызначана невядомая опцыя, праігнараваная->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Немагчыма сканвэртаваць камэнтар у UTF-8, немагчыма дадаць\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
-#, c-format
+#: oggenc/oggenc.c:811
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Немагчыма сканвэртаваць камэнтар у UTF-8, немагчыма дадаць\n"
 
-#: oggenc/oggenc.c:954
-#, c-format
+#: oggenc/oggenc.c:830
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr "УВАГА: вызначана замала загалоўкаў, даўнімаецца апошні загаловак.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Немагчыма стварыць каталёг \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Памылка праверкі на існаваньне каталёгу %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:167
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Памылка: сэгмэнт шляху \"%s\" не зьяўляецца каталёгам\n"
 
-#: ogginfo/ogginfo2.c:212
-#, 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:220
+#: ogginfo/ogginfo2.c:156
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Увага: імя поля камэнтара ў камэнтары %d (паток %d) няправільнае: \"%s\"\n"
+msgid "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
+msgstr "Увага: немагчыма раскадаваць пакет загалоўку vorbis - няправільны паток vorbis (%d)\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo2.c:164
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
-msgstr ""
-"Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): "
-"маркер даўжыні няправільны\n"
+msgid "Warning: Vorbis 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:266
+#: ogginfo/ogginfo2.c:168
 #, 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:342
-#, fuzzy, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): "
-"няправільная пасьлядоўнасьць\n"
-
-#: ogginfo/ogginfo2.c:356
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr "Увага: памылка ў дэкодэры utf8. Павінна быць немагчымым\n"
-
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Увага: канец-патоку ня вызначаны ў патоку %d\n"
-
-#: ogginfo/ogginfo2.c:389
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Увага: немагчыма раскадаваць пакет загалоўку vorbis - няправільны паток "
-"vorbis (%d)\n"
-
-#: ogginfo/ogginfo2.c:396
-#, 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:400
-#, fuzzy, c-format
-msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr "Загалоўкі Vorbis разабраныя ў патоку %d, зьвесткі ніжэй...\n"
-
-#: ogginfo/ogginfo2.c:403
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Вэрсія: %d\n"
-
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
-#, c-format
-msgid "Vendor: %s\n"
-msgstr "Распаўсюднік: %s\n"
-
-#: ogginfo/ogginfo2.c:406
-#, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Вэрсія: %d\n"
-
-#: ogginfo/ogginfo2.c:408
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:416
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:429
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:431
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:433
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:437
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:439
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:441
-#, fuzzy
-msgid "Colourspace unspecified\n"
-msgstr "дзеяньне ня вызначана\n"
-
-#: ogginfo/ogginfo2.c:444
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:446
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:448
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:450
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:452
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr "Найбольшы бітрэйт: %f кбіт/с\n"
-
-#: ogginfo/ogginfo2.c:453
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
-msgid "User comments section follows...\n"
-msgstr "Камэнтары карыстальніка йдуць ніжэй...\n"
-
-#: ogginfo/ogginfo2.c:477
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Увага: канец-патоку ня вызначаны ў патоку %d\n"
-
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Увага: granulepos у патоку %d зьмяншаецца ад "
-
-#: ogginfo/ogginfo2.c:520
-msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-"Увага: немагчыма раскадаваць пакет загалоўку vorbis - няправільны паток "
-"vorbis (%d)\n"
-
-#: ogginfo/ogginfo2.c:565
-#, 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"
-msgstr ""
-"Увага: паток Vorbis %d утрымлівае няправільна акантаваныя загалоўкі. Апошняя "
-"старонка загалоўкаў утрымлівае дадатковыя пакеты ці granulepos ня роўнае "
-"нулю\n"
-
-#: ogginfo/ogginfo2.c:569
-#, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Загалоўкі Vorbis разабраныя ў патоку %d, зьвесткі ніжэй...\n"
 
-#: ogginfo/ogginfo2.c:572
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid "Version: %d\n"
 msgstr "Вэрсія: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:175
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Распаўсюднік: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:182
 #, c-format
+msgid "Vendor: %s\n"
+msgstr "Распаўсюднік: %s\n"
+
+#: ogginfo/ogginfo2.c:183
+#, c-format
 msgid "Channels: %d\n"
 msgstr "Каналаў: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:184
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1848,200 +1210,120 @@
 "Ступень: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:187
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Пачатковы бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:190
 msgid "Nominal bitrate not set\n"
 msgstr "Пачатковы бітрэйт ня вызначаны\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:193
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Найбольшы бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:196
 msgid "Upper bitrate not set\n"
 msgstr "Найбольшы бітрэйт ня вызначаны\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:199
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Найменшы бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:202
 msgid "Lower bitrate not set\n"
 msgstr "Найменшы бітрэйт ня вызначаны\n"
 
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo2.c:205
+msgid "User comments section follows...\n"
+msgstr "Камэнтары карыстальніка йдуць ніжэй...\n"
+
+#: ogginfo/ogginfo2.c:217
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
+msgid "Warning: Comment %d in stream %d is invalidly formatted, does not contain '=': \"%s\"\n"
+msgstr "Увага: камэнтар %d ў патоку %d няправільна адфарматаваны, ня ўтрымлівае '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:651
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
+#: ogginfo/ogginfo2.c:226
+#, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr "Увага: імя поля камэнтара ў камэнтары %d (паток %d) няправільнае: \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:692
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Увага: немагчыма раскадаваць пакет загалоўку vorbis - няправільны паток "
-"vorbis (%d)\n"
-
-#: ogginfo/ogginfo2.c:703
-#, fuzzy, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Увага: немагчыма раскадаваць пакет загалоўку vorbis - няправільны паток "
-"vorbis (%d)\n"
-
-#: ogginfo/ogginfo2.c:734
-#, fuzzy, c-format
-msgid ""
-"Warning: Kate 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:738
-#, fuzzy, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr "Загалоўкі Vorbis разабраныя ў патоку %d, зьвесткі ніжэй...\n"
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Вэрсія: %d\n"
-
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:257 ogginfo/ogginfo2.c:266
 #, c-format
-msgid "Language: %s\n"
-msgstr ""
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
+msgstr "Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): маркер даўжыні няправільны\n"
 
-#: ogginfo/ogginfo2.c:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Распаўсюднік: %s\n"
-
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
-msgid "No category set\n"
-msgstr "Пачатковы бітрэйт ня вызначаны\n"
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:274
 #, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr "Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): замала байтаў\n"
 
-#: ogginfo/ogginfo2.c:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr "Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): няправільная пасьлядоўнасьць\n"
 
-#: ogginfo/ogginfo2.c:783
-msgid "Unknown text directionality\n"
-msgstr ""
+#: ogginfo/ogginfo2.c:347
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr "Увага: памылка ў дэкодэры utf8. Павінна быць немагчымым\n"
 
-#: ogginfo/ogginfo2.c:795
-msgid "Invalid zero granulepos rate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:797
+#: ogginfo/ogginfo2.c:364
 #, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr ""
+msgid "Warning: granulepos in stream %d decreases from "
+msgstr "Увага: granulepos у патоку %d зьмяншаецца ад "
 
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:365
+msgid " to "
+msgstr " у "
+
+#: ogginfo/ogginfo2.c:365
 msgid "\n"
 msgstr "\n"
 
-#: ogginfo/ogginfo2.c:828
+#: ogginfo/ogginfo2.c:384
 #, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %ld bytes\n"
+"\tPlayback length: %ldm:%02lds\n"
+"\tAverage bitrate: %f kbps\n"
 msgstr ""
+"Плыня Vorbis %d:\n"
+"\tАгульная даўжыня даньняў: %ld байтаў\n"
+"\tДаўжыня прайграваньня: %ldm:%02ld s.\n"
+"\tСярэдні бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:418
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Увага: канец-патоку ня вызначаны ў патоку %d\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:537
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Увага: Няправільная старонка загалоўкаў, ня знойдзена пакетаў\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:549
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-"Увага: няправільная старонка загалоўкаў у патоку %d, утрымлівае колькі "
-"пакетаў\n"
+msgstr "Увага: няправільная старонка загалоўкаў у патоку %d, утрымлівае колькі пакетаў\n"
 
-#: ogginfo/ogginfo2.c:1088
-#, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1105
-#, fuzzy
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
+#: ogginfo/ogginfo2.c:574
+msgid "Warning: Hole in data found at approximate offset "
 msgstr "Увага: Дзірка ў даных знойдзена на прыблізнай адлегласьці "
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:575
+msgid " bytes. Corrupted ogg.\n"
+msgstr " байт(аў). Пашкоджаны ogg.\n"
+
+#: ogginfo/ogginfo2.c:599
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Памылка адкрыцьця файла ўводу \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:604
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2050,88 +1332,66 @@
 "Апрацоўка файла \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:613
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Немагчыма знайсьці апрацоўшчыка для патока, bailing\n"
 
-#: ogginfo/ogginfo2.c:1151
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1154
+#: ogginfo/ogginfo2.c:618
+#, c-format
 msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1158
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1161
-#, fuzzy, c-format
-msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
-"This indicates a corrupt ogg file: %s.\n"
+"This indicates a corrupt ogg file.\n"
 msgstr ""
 "Увага: недапушчальна разьмешчаныя старонкі ў лягічным патоку %d\n"
 "Гэта сьведчыць аб пашкоджанасьці файла ogg.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:625
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Новы лягічны паток (#%d, нумар: %08x): тып %s\n"
 
-#: ogginfo/ogginfo2.c:1176
+#: ogginfo/ogginfo2.c:628
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Увага: сьцяг пачатку патока не ўстаноўлены ў патоку %d\n"
 
-#: ogginfo/ogginfo2.c:1180
+#: ogginfo/ogginfo2.c:632
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "Увага: сьцяг пачатку патока знойдзены ў сярэдзіне патока %d\n"
 
-#: ogginfo/ogginfo2.c:1185
+#: ogginfo/ogginfo2.c:637
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
-msgstr ""
-"Увага: прабел у нумарах пасьлядоўнасьцяў у патоку %d. Атрыманая старонка %"
-"ld, але чакалася старонка %ld. Сьведчыць пра адсутнасьць даных.\n"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "Увага: прабел у нумарах пасьлядоўнасьцяў у патоку %d. Атрыманая старонка %ld, але чакалася старонка %ld. Сьведчыць пра адсутнасьць даных.\n"
 
-#: ogginfo/ogginfo2.c:1200
+#: ogginfo/ogginfo2.c:652
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Лягічная плыня %d скончылася\n"
 
-#: ogginfo/ogginfo2.c:1208
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:659
+#, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
+"Input probably not ogg.\n"
 msgstr ""
 "Памылка: ня знойдзена даных ogg у файле \"%s\".\n"
 "Уваход, магчыма, ня ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 з %s %s\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:670
 msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
+"ogginfo 1.0\n"
+"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] files1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
 "\t-h Show this help message\n"
 "\t-q Make less verbose. Once will remove detailed informative\n"
 "\t   messages, two will remove warnings\n"
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
+"\n"
 msgstr ""
 "ogginfo 1.0\n"
 "(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
@@ -2139,25 +1399,17 @@
 "Ужывай: ogginfo [опцыі] файл1.ogg [файл2.ogg ... файлN.ogg]\n"
 "Опцыі, які падтрымліваюцца:\n"
 "  -h     Паказвае гэтую даведка.\n"
-"  -q     Памяншае шматслоўнасьць. Адзін раз - прыбірае падрабязныя "
-"зьвесткі,\n"
+"  -q     Памяншае шматслоўнасьць. Адзін раз - прыбірае падрабязныя зьвесткі,\n"
 "         два разы - прыбірае папярэджваньні.\n"
-"  -v     Павялічвае шматслоўнасьць. Можа ўключыць больш падрабязную "
-"праверку\n"
+"  -v     Павялічвае шматслоўнасьць. Можа ўключыць больш падрабязную праверку\n"
 "         для некаторых тыпаў патокаў.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1234
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:691
 msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
-"ogginfo is a tool for printing information about Ogg files\n"
+"Ogginfo is a tool for printing information about ogg files\n"
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
@@ -2167,8 +1419,7 @@
 "і дыягназаваньня іхных праблем.\n"
 "Поўная даведка адлюстроўваецца па \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
-#, c-format
+#: ogginfo/ogginfo2.c:720
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Ня вызначана ўваходных файлаў. \"ogginfo -h\" для даведкі\n"
 
@@ -2192,16 +1443,19 @@
 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"
@@ -2212,6 +1466,7 @@
 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"
@@ -2227,43 +1482,35 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: опцыя `-W %s' не павінная мець парамэтра\n"
 
-#: vcut/vcut.c:149
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr "Памылка старонкі. Пашкоджаны ўваход.\n"
 
-#: vcut/vcut.c:166
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr "Памылка бітавагай плыні, працяг...\n"
 
-#: vcut/vcut.c:206
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr "Знодзены канец-плыні раней за пункт разрэзкі.\n"
 
-#: vcut/vcut.c:215
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Устаноўка канца плыні: абнаўленьне сынхра вернула 0\n"
 
-#: vcut/vcut.c:225
-#, c-format
+#: vcut/vcut.c:192
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Пункт разрэзкі па-за плыняй. Другі файл будзе пустым\n"
 
-#: vcut/vcut.c:277
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Некіраваны асобны выпадак: першы файл занадта кароткі?\n"
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr "Пункт разрэзкі па-за плыняй. Другі файл будзе пустым\n"
-
-#: vcut/vcut.c:353
-#, c-format
+#. 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:284
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -2271,61 +1518,47 @@
 "Памылка: першыя два скрутка аўдыё не зьмяшчаюцца ў адну\n"
 "         старонку ogg. Файл можа няправільна дэкадавацца.\n"
 
-#: vcut/vcut.c:373
-#, c-format
-msgid "Update sync returned 0, setting eos\n"
-msgstr "Абнаўленьне сынхра вернула 0, усталяваньне канца плыні\n"
-
-#: vcut/vcut.c:378
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr "Памылка бітавай плыні якую можна выправіць\n"
 
-#: vcut/vcut.c:387
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr "Памылка бітавай плыні\n"
 
-#: vcut/vcut.c:449
-#, c-format
+#: vcut/vcut.c:330
+msgid "Update sync returned 0, setting eos\n"
+msgstr "Абнаўленьне сынхра вернула 0, усталяваньне канца плыні\n"
+
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "Увод - ня ogg.\n"
 
-#: vcut/vcut.c:459
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Памылка на першай старонцы\n"
 
-#: vcut/vcut.c:464
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "Памылка ў першым скрутку\n"
 
-#: vcut/vcut.c:470
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Памылка ў першасным загалоўку: ня vorbis?\n"
 
-#: vcut/vcut.c:490
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Пашкоджаны другасны загаловак\n"
 
-#: vcut/vcut.c:503
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "EOF (канец файла) ў загалоўках\n"
 
-#: vcut/vcut.c:535
-#, 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:456
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
+msgstr "Выкарыстаньне: vcut фай_уводу.ogg ф_вываду1.ogg ф_вываду2.ogg пункт_разрэзкі\n"
 
-#: vcut/vcut.c:539
-#, c-format
+#: vcut/vcut.c:460
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -2335,669 +1568,190 @@
 "Праверце выходныя файлы на правільнасьць перад выдаленьнем крыніц.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Немагчыма адкрыць %s для чытаньня\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Немагчыма адкрыць %s для запісу\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Немагчыма разабраць пункт разрэзкі \"%s\"\n"
 
-#: vcut/vcut.c:570
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+#: vcut/vcut.c:484
+#, c-format
+msgid "Processing: Cutting at %lld\n"
 msgstr "Апрацоўка: разрэз ля %lld\n"
 
-#: vcut/vcut.c:572
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr "Апрацоўка: разрэз ля %lld\n"
-
-#: vcut/vcut.c:582
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr "Памылка апрацоўкі\n"
 
-#: vcut/vcut.c:604
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr "Памылка чатаньня загалоўкаў\n"
 
-#: vcut/vcut.c:627
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr "Памылка запісу першага файла вываду\n"
 
-#: vcut/vcut.c:635
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr "Памылка запісу другога файла вываду\n"
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:220
+msgid "Input truncated or empty."
+msgstr "Увод абрэзаны ці пусты."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:222
+msgid "Input is not an Ogg bitstream."
+msgstr "Увод не зьяўляецца бітавый плыняй ogg."
+
+#: vorbiscomment/vcedit.c:239
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Памылка чытаньня першай старонкі бітавае плыні ogg."
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:245
 msgid "Error reading initial header packet."
 msgstr "Памылка чытаньня пачатковага скрутка загалоўка."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Увод абрэзаны ці пусты."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "Увод не зьяўляецца бітавый плыняй ogg."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:251
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Бітавая плынь ogg ня ўтрымлівае даньняў vorbis."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "Канец файла (EOF) раней за канец загалоўка vorbis."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Бітавая плынь ogg ня ўтрымлівае даньняў vorbis."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:274
 msgid "Corrupt secondary header."
 msgstr "Пашкоджаны другасны загаловак."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:295
 msgid "EOF before end of vorbis headers."
 msgstr "Канец файла (EOF) раней за канец загалоўка vorbis."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:448
 msgid "Corrupt or missing data, continuing..."
 msgstr "Пашкоджаныя ці прапушчаныя даньні, працяг..."
 
-#: vorbiscomment/vcedit.c:875
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
-"Памылка запісу плыні ў вывад. Выходная плынь можа быць пашкоджана ці "
-"абрэзана."
+#: vorbiscomment/vcedit.c:487
+msgid "Error writing stream to output. Output stream may be corrupted or truncated."
+msgstr "Памылка запісу плыні ў вывад. Выходная плынь можа быць пашкоджана ці абрэзана."
 
-#: vorbiscomment/vcomment.c:190 vorbiscomment/vcomment.c:216
+#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Няўдалае адчыненьне файла як vorbis: %s\n"
 
-#: vorbiscomment/vcomment.c:235
+#: vorbiscomment/vcomment.c:148
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Кепскі камэнтар: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "кепскі камэнтар: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:170
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Памылка запісу камэнтароў у файл вываду: %s\n"
 
-#: vorbiscomment/vcomment.c:274
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:187
 msgid "no action specified\n"
 msgstr "дзеяньне ня вызначана\n"
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
-msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
+#: vorbiscomment/vcomment.c:269
+msgid "Couldn't convert comment to UTF8, cannot add\n"
+msgstr "Немагчыма пераўтварыць камэнтар у UTF8, немагчыма дадаць\n"
 
-#: vorbiscomment/vcomment.c:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
+#: vorbiscomment/vcomment.c:287
 msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
+"   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 ""
+"Выкарыстаньне: \n"
+"  vorbiscomment [-l] файл.ogg (каб паказаць камэнтары)\n"
+"  vorbiscomment -a ув.ogg вых.ogg (каб дадаць камэнтары)\n"
+"  vorbiscomment -w ув.ogg вых.ogg (каб зьмяніць камэнтары)\n"
+"\tу выпадку запісу на стандартным уваходзе чакаецца\n"
+"         шэраг камэнтароў ў форме 'КЛЮЧ=значэньне'. Гэты\n"
+"         шэраг цалкам замяняе існуючы.\n"
+"   І -a, і -w могуць мець толькі адно імя файла, у гэтым \n"
+"   выпадку будзе ўжыты тымчасовы файл.\n"
+"   -c можа ўжывацца, каб атрымоўваць камэнтары з пэўнага \n"
+"   файла, замест стандартнага ўваходу.\n"
+"   Прыклад: vorbiscomment -a in.ogg -c comments.txt\n"
+"   дадасьць камэнтары з comments.txt да in.ogg\n"
+"   У рэшце рэшт, можна вызначыць любую колькасьць ключоў у \n"
+"   камандным радку, ужываючы опцыю -t. Г.зн.\n"
+"   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
+"   (заўважым, што ў такім выпадку чытаньне камэнтароў з файла ці\n"
+"   стандартнага ўводу адключанае)\n"
+"   Просты рэжым (--raw, -R) чытае й піша камэнтары ў utf8, замест\n"
+"   пераўтварэньня ў мноства карыстальніка. Гэта карыснае пры\n"
+"   ужываньні vorbiscomment у сцэнарах. Аднак, гэтага не дастаткова\n"
+"   для поўнага абарачэньня камэнтароў ва ўсіх выпадках.\n"
 
-#: vorbiscomment/vcomment.c:391
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Кепскі від у сьпісе выбараў"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
+#: vorbiscomment/vcomment.c:371
 msgid "Internal error parsing command options\n"
 msgstr "Унутраная памылка апрацоўкі выбараў загаду\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:456
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Памылка адкрыцьця файла ўводу \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:587
-#, c-format
+#: vorbiscomment/vcomment.c:465
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Назвы файлаў уводу й вываду не павінны супадаць\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:476
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Памылка адкрыцьця файла вываду \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:491
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Памылка адкрыцьця файла камэнтараў \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:508
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Памылка адкрыцьця файла камэнтараў \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:536
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Памылка выдаленьня старога файла %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:538
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Памылка перайменаваньня \"%s\" у \"%s\"\n"
-
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Памылка выдаленьня старога файла %s\n"
-
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 з %s %s\n"
-#~ " ад Фундацыі Xiph.org (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Выкарыстаньне: ogg123 [<выбары>] <файл уводу> ...\n"
-#~ "\n"
-#~ "  -h, --help                 Гэтая даведка.\n"
-#~ "  -V, --version              Адлюстроўвае вэрсыю Ogg123.\n"
-#~ "  -d, --device=d             Ужывае 'd' ў якасьці прылады вываду.\n"
-#~ "    Магчамыя прылады ('*'=жывая, '@'=файл):\n"
-#~ "        "
-
-#~ 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"
-#~ "  -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"
-#~ "\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"
-#~ msgstr ""
-#~ "  -f, --file=назва_файла       Усталёўвае назву файла вываду для "
-#~ "папярэдне\n"
-#~ "                             вызначанай прылады file (з дапамогай -d).\n"
-#~ "  -k n, --skip n             Абмінуць першыя n сэкундаў.\n"
-#~ "  -o, --device-option=k:v      Перадае адмысловы выбар k са значэньнем v "
-#~ "да\n"
-#~ "                             папярэдне вызначанай прылады (з дапамогай -"
-#~ "d).\n"
-#~ "                             Глядзіце man старонку, каб атрымаць больш\n"
-#~ "                             падрабязныя зьвесткі.\n"
-#~ "  -b n, --buffer n           Ужываць буфэр уводу памерам n Кб.\n"
-#~ "  -p n, --prebuffer n          Загружаць буфэр уводу на n%% перад тым, "
-#~ "як\n"
-#~ "                             пачынаць прайграваньне.\n"
-#~ "  -v, --verbose              Адлюстроўваць зьвесткі аб поспеху й стане.\n"
-#~ "  -q, --quiet                Нічога не адлюстроўваць (бяз назвы).\n"
-#~ "  -x n, --nth                Граць кожны n-ны блёк.\n"
-#~ "  -y n, --ntimes             Паўтараць кожны блёк n разоў.\n"
-#~ "  -z, --shuffle              Прайграваць у выпадковым парадку.\n"
-#~ "\n"
-#~ "    Ogg123 пераходзіць да іншага сьпева, атрымаўшы SIGINT (Ctrl-C); два "
-#~ "SIGINT\n"
-#~ "на працягу s мілісэкундаў прымушаюць ogg123 выйсьці.\n"
-#~ "  -l, --delay=s              Усталяваць s [мілісэкунды] (дапомна 500).\n"
-
-#~ msgid "Track number:"
-#~ msgstr "Нумар запіса:"
-
-#~ msgid "ReplayGain (Track):"
-#~ msgstr "ReplayGain (Запіс):"
-
-#~ msgid "ReplayGain (Album):"
-#~ msgstr "ReplayGain (Альбом):"
-
-#~ msgid "ReplayGain (Track) Peak:"
-#~ msgstr "ReplayGain (Запіс) Peak:"
-
-#~ msgid "ReplayGain (Album) Peak:"
-#~ msgstr "ReplayGain (Альбом) Peak:"
-
-#~ msgid "Copyright"
-#~ msgstr "Аўтарскія правы"
-
-#~ msgid "Comment:"
-#~ msgstr "Камэнтар:"
-
-#~ msgid "Version is %d"
-#~ msgstr "Вэрсыя -- %d"
-
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " General:\n"
-#~ " -Q, --quiet          Produce no output to stderr\n"
-#~ " -h, --help           Print this help text\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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --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"
-#~ " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-#~ "                      encoding for a fixed-size channel.\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"
-#~ "                      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"
-#~ " --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"
-#~ "\n"
-#~ " Naming:\n"
-#~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times.\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 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"
-#~ " Alternatively, the --raw option may be used to use a raw PCM data file, "
-#~ "which\n"
-#~ " must be 16bit stereo little-endian PCM ('headerless wav'), unless "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an outfile filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Выкарыстаньне: oggenc [выбары] input.wav [...]\n"
-#~ "\n"
-#~ "Агульныя выбары:\n"
-#~ " -Q, --quiet                 Бяз вываду ў stderr.\n"
-#~ " -h, --help                  Надрукаваць тэкст гэтае даведкі\n"
-#~ " -r, --raw                     Просты рэжым. Уваходныя файлы чытаюцца "
-#~ "наўпрост\n"
-#~ "                             як ІКМ даныя\n"
-#~ " -B, --raw-bits=n              Усталяваць колькасьць бітаў на сэмпл для "
-#~ "простага\n"
-#~ "                             ўводу. Дапомнае значэньне 16.\n"
-#~ " -C, --raw-chan=n     Устанавіць колькасьць каналаў для простага "
-#~ "ўваходу.\n"
-#~ "                      Даўнята 2\n"
-#~ " -R, --raw-rate=n     Устанавіць колькасьць сэмплаў на сэкунду для "
-#~ "простага\n"
-#~ "                      рэжыму. Даўнята 44100.\n"
-#~ " --raw-endianness     1 для bigendian, 0 для little (даўнята 0)\n"
-#~ " -b, --bitrate        Выбар намінальнага бітрэйту для кадаваньня. Спроба\n"
-#~ "                      кадаваньня зь бітрэйтам, які спасярэджвае даны.\n"
-#~ "                      Атрымоўвае парамэтар ў kb/s. Гэная апэрацыя "
-#~ "задзейнічае\n"
-#~ "                      мэханізм кіраваньня бітрэйтам і ня раіцца для "
-#~ "бальшыні\n"
-#~ "                      карыстальнікаў. Лепей ужывай -q, --quality.\n"
-#~ " -m, --min-bitrate    Мінімальны бітрэйт (у kb/s). Пасуе пры кадаваньні "
-#~ "з\n"
-#~ "                      фіксаваным памерам канала.\n"
-#~ " -M, --max-bitrate    Максымальны бітрэйт. Пасуе для патокавых "
-#~ "дастасаваньняў.\n"
-#~ " -q, --quality        Вызначае якасьць ад 0 (нізкая) да 10 (высокая), "
-#~ "замест\n"
-#~ "                      вызначэньня пэўнага бітрэйту. Гэта звычайны рэжым\n"
-#~ "                      функцыянаваньня. Дробныя значэньні якасьці (2,75 і "
-#~ "г.д.)\n"
-#~ "                      таксама дазволеныя. Якасьць -1 магчымая, але "
-#~ "наўрад\n"
-#~ "                      будзе мець прымальную якасьць.\n"
-#~ " --resample n         Рэсэмплаваць уваходныя даныя да часьціні n (Hz)\n"
-#~ " --downmix            Пераўтварыць стэрэа ў мона. Дазволена толькі са "
-#~ "стэрэа\n"
-#~ "                      ўваходам.\n"
-#~ " -s, --serial         Вызначае сэрыйны нумар для патоку. Калі кадуеш "
-#~ "колькі\n"
-#~ "                      файлаў нумар павялічваецца для кожнага файла, "
-#~ "пачынаючы\n"
-#~ "                      з другога.\n"
-#~ "\n"
-#~ "Выбары, зьвязаныя з назвамі:\n"
-#~ " -o, --output=fn      Запіс файла ў fn (толькі ў аднафайлавым рэжыме)\n"
-#~ " -n, --names=радок    Ствараць імёны файлаў паводле гэтага радка. %%a, %%"
-#~ "t, %%l,\n"
-#~ "                      %%n, %%d замяняюцца на выканаўцу, назву, альбом, "
-#~ "нумар\n"
-#~ "                      запісу і дату, адпаведна (гл. ніжэй)\n"
-#~ "                      %%%% дае знак %%.\n"
-#~ " -X, --name-remove=s  Выдаляць вызначаныя знакі з парамэтраў фарматнага "
-#~ "радка,\n"
-#~ "                      вызначанага -n. Карыснае для атрыманьня карэктных "
-#~ "імёнаў\n"
-#~ "                      файлаў.\n"
-#~ " -P, --name-replace=s Замяняць знакі, выдаленыя --name-remove, на "
-#~ "вызначаныя\n"
-#~ "                      знакі. Калі гэты радок карацейшы за сьпіс --name-"
-#~ "remove ці\n"
-#~ "                      ня вызначаны, то лішнія знакі папросту выдаляюцца.\n"
-#~ "                      Даўнятыя ўсталёўкі для вышэйшых двух парамэтраў "
-#~ "залежаць\n"
-#~ "                      ад пляцформы.\n"
-#~ " -c, --comment=c      Дадаць радок як камэнтар. Гэтая опцыя можа ўжывацца "
-#~ "колькі\n"
-#~ "                      разоў.\n"
-#~ " -d, --date           Дата запісу (звычайна дата выкананьня)\n"
-#~ " -N, --tracknum       Нумар запісу\n"
-#~ " -t, --title          Назва запісу\n"
-#~ " -l, --album          Назва альбома\n"
-#~ " -a, --artist         Імя выканаўцы\n"
-#~ " -G, --genre          Стыль запісу\n"
-#~ "                      Калі вызначана колькі файлаў, тады асобнікі "
-#~ "папярэдніх пяці\n"
-#~ "                      парамэтраў будуць ужывацца ў тым парадку, у якім "
-#~ "яны\n"
-#~ "                      вызначаныя. Калі назваў запісаў вызначана менш, чым "
-#~ "файлаў,\n"
-#~ "                      OggEnc надрукуе папярэджаньне і будзе ўжываць "
-#~ "апошнюю для \n"
-#~ "                      астатніх файлаў. Калі вызначана меней нумароў, то "
-#~ "рэшта\n"
-#~ "                      файлаў застанецца непранумараваная. Іншыя парамэтры "
-#~ "будуць\n"
-#~ "                      скарыстаныя ізноў без папярэджаньня (прыкладам ты "
-#~ "можаш\n"
-#~ "                      вызначыць адзін раз дату, і яна будзе ўжытая для "
-#~ "ўсіх)\n"
-#~ "\n"
-#~ "Файлы ўводу:\n"
-#~ "OggEnc падтрымлівае наступныя тыпы ўваходных тыпаў: 16 ці 8 бітавы ІКМ "
-#~ "WAV, AIFF\n"
-#~ "ці AIFF/C, ці 32 бітавы WAV з рацыянальнымі лікамі IEEE. Файлы могуць "
-#~ "быць мона,\n"
-#~ "стэрэа ці з большай колькасьцю каналаў і зь любой верхняй часьцінёй.\n"
-#~ "Зь іншага боку, опцыя --raw дазваляе ўжываць простыя ІКМ файлы, якія "
-#~ "маюць быць\n"
-#~ "16 бітавымі стэрэа ІКМ файламі зь little-endian парадкам байтаў "
-#~ "(\"неразборлівыя\n"
-#~ "WAV\"), калі ня вызначаныя дадатковыя парамэтры простага рэжыму.\n"
-#~ "Можна атрымоўваць файл са стандартнага ўваходу, ужыўшы - замест імя "
-#~ "файла. У \n"
-#~ "гэтым рэжыме выхад накіраваны ў stdout, калі ня вызначана імя выходнага "
-#~ "файла з\n"
-#~ "дапамогай -o.\n"
-#~ "\n"
-
-#~ msgid " to "
-#~ msgstr " у "
-
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %ld bytes\n"
-#~ "\tPlayback length: %ldm:%02lds\n"
-#~ "\tAverage bitrate: %f kbps\n"
-#~ msgstr ""
-#~ "Плыня Vorbis %d:\n"
-#~ "\tАгульная даўжыня даньняў: %ld байтаў\n"
-#~ "\tДаўжыня прайграваньня: %ldm:%02ld s.\n"
-#~ "\tСярэдні бітрэйт: %f кбіт/с\n"
-
-#~ msgid " bytes. Corrupted ogg.\n"
-#~ msgstr " байт(аў). Пашкоджаны ogg.\n"
-
-#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
-#~ msgstr "Немагчыма пераўтварыць камэнтар у UTF8, немагчыма дадаць\n"
-
-#~ msgid ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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"
-#~ "   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 ""
-#~ "Выкарыстаньне: \n"
-#~ "  vorbiscomment [-l] файл.ogg (каб паказаць камэнтары)\n"
-#~ "  vorbiscomment -a ув.ogg вых.ogg (каб дадаць камэнтары)\n"
-#~ "  vorbiscomment -w ув.ogg вых.ogg (каб зьмяніць камэнтары)\n"
-#~ "\tу выпадку запісу на стандартным уваходзе чакаецца\n"
-#~ "         шэраг камэнтароў ў форме 'КЛЮЧ=значэньне'. Гэты\n"
-#~ "         шэраг цалкам замяняе існуючы.\n"
-#~ "   І -a, і -w могуць мець толькі адно імя файла, у гэтым \n"
-#~ "   выпадку будзе ўжыты тымчасовы файл.\n"
-#~ "   -c можа ўжывацца, каб атрымоўваць камэнтары з пэўнага \n"
-#~ "   файла, замест стандартнага ўваходу.\n"
-#~ "   Прыклад: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   дадасьць камэнтары з comments.txt да in.ogg\n"
-#~ "   У рэшце рэшт, можна вызначыць любую колькасьць ключоў у \n"
-#~ "   камандным радку, ужываючы опцыю -t. Г.зн.\n"
-#~ "   vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-#~ "   (заўважым, што ў такім выпадку чытаньне камэнтароў з файла ці\n"
-#~ "   стандартнага ўводу адключанае)\n"
-#~ "   Просты рэжым (--raw, -R) чытае й піша камэнтары ў utf8, замест\n"
-#~ "   пераўтварэньня ў мноства карыстальніка. Гэта карыснае пры\n"
-#~ "   ужываньні vorbiscomment у сцэнарах. Аднак, гэтага не дастаткова\n"
-#~ "   для поўнага абарачэньня камэнтароў ва ўсіх выпадках.\n"

Modified: trunk/vorbis-tools/po/cs.po
===================================================================
--- trunk/vorbis-tools/po/cs.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/cs.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -1,15 +1,15 @@
 # Czech translation of vorbis-tools
-# Copyright (C) 2003, 2007 Miloslav Trmac
-# This file may be distributed under the same license as the vorbis-tools package.
-# Miloslav Trmac <mitr at volny.cz>, 2003, 2007.
+# Copyright (C) 2003, 2007, 2008 Miloslav Trmač
+# This file is distributed under the same license as the vorbis-tools package.
+# Miloslav Trmač <mitr at volny.cz>, 2003, 2007, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vorbis-tools 1.1.1\n"
+"Project-Id-Version: vorbis-tools 1.2.1\n"
 "Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
-"PO-Revision-Date: 2007-09-06 22:34+0200\n"
-"Last-Translator: Miloslav Trmac <mitr at volny.cz>\n"
+"POT-Creation-Date: 2008-09-12 02:53+0100\n"
+"PO-Revision-Date: 2008-10-12 14:31+0200\n"
+"Last-Translator: Miloslav Trmač <mitr at volny.cz>\n"
 "Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -155,9 +155,9 @@
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:571 oggenc/oggenc.c:576
+#: oggenc/oggenc.c:581 oggenc/oggenc.c:586 oggenc/oggenc.c:591
+#: oggenc/oggenc.c:596
 msgid "(none)"
 msgstr "(žádný)"
 
@@ -200,8 +200,7 @@
 "=== Error \"%s\" while parsing config option from command line.\n"
 "=== Option was: %s\n"
 msgstr ""
-"=== Chyba \"%s\" při zpracovávání přepínače konfigurace z příkazového "
-"řádku.\n"
+"=== Chyba \"%s\" při zpracovávání přepínače konfigurace z příkazového řádku.\n"
 "=== Přepínač byl: %s\n"
 
 #: ogg123/cmdline_options.c:109
@@ -233,9 +232,9 @@
 msgstr "--- Hodnota prebuffer neplatná. Rozsah je 0-100.\n"
 
 #: ogg123/cmdline_options.c:201
-#, fuzzy, c-format
+#, c-format
 msgid "ogg123 from %s %s"
-msgstr "ogg123 z %s %s\n"
+msgstr "ogg123 z %s %s"
 
 #: ogg123/cmdline_options.c:208
 msgid "--- Cannot play every 0th chunk!\n"
@@ -264,12 +263,8 @@
 msgstr "--- Ovladač %s zadaný v konfiguračním souboru je neplatný.\n"
 
 #: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Nemohu načíst implicitní ovladač a v konfiguračním souboru není určen "
-"žádný ovladač. Končím.\n"
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Nemohu načíst implicitní ovladač a v konfiguračním souboru není určen žádný ovladač. Končím.\n"
 
 #: ogg123/cmdline_options.c:292
 #, c-format
@@ -278,6 +273,9 @@
 " by the Xiph.Org Foundation (http://www.xiph.org/)\n"
 "\n"
 msgstr ""
+"ogg123 z %s %s\n"
+" od nadace Xiph.Org (http://www.xiph.org/)\n"
+"\n"
 
 #: ogg123/cmdline_options.c:295
 #, c-format
@@ -286,21 +284,24 @@
 "Play Ogg audio files and network streams.\n"
 "\n"
 msgstr ""
+"Použití: ogg123 [přepínače] soubor ...\n"
+"Přehrávat zvukové soubory a síťové proudy Ogg.\n"
+"\n"
 
 #: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
+#, c-format
 msgid "Available codecs: "
-msgstr "Dostupné přepínače:\n"
+msgstr "Dostupné kodeky: "
 
 #: ogg123/cmdline_options.c:301
 #, c-format
 msgid "FLAC, "
-msgstr ""
+msgstr "FLAC, "
 
 #: ogg123/cmdline_options.c:305
 #, c-format
 msgid "Speex, "
-msgstr ""
+msgstr "Speex, "
 
 #: ogg123/cmdline_options.c:308
 #, c-format
@@ -308,27 +309,28 @@
 "Ogg Vorbis.\n"
 "\n"
 msgstr ""
+"Ogg Vorbis.\n"
+"\n"
 
 #: ogg123/cmdline_options.c:310
 #, c-format
 msgid "Output options\n"
-msgstr ""
+msgstr "Možnosti výstupu\n"
 
 #: ogg123/cmdline_options.c:311
 #, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
+msgid "  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
+msgstr "  -d zař, --device zař    Použít výstupní zařízení \"zař\". Dostupná zařízení:\n"
 
 #: ogg123/cmdline_options.c:313
 #, c-format
 msgid "Live:"
-msgstr ""
+msgstr "Živě:"
 
 #: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
+#, c-format
 msgid "File:"
-msgstr "Soubor: %s"
+msgstr "Soubor:"
 
 #: ogg123/cmdline_options.c:331
 #, c-format
@@ -336,11 +338,15 @@
 "  -f file, --file file    Set the output filename for a file device\n"
 "                          previously specified with --device.\n"
 msgstr ""
+"  -f soub, --file soub    Nastavit název souboru výstupu pro souborové zařízení\n"
+"                          dříve vybrané pomocí --device.\n"
 
 #: ogg123/cmdline_options.c:334
 #, c-format
 msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
 msgstr ""
+"  --audio-buffer n        Používat výstupní výrovnávací paměť zvuku velikosti\n"
+"                          'n' kilobajtů\n"
 
 #: ogg123/cmdline_options.c:335
 #, c-format
@@ -350,83 +356,87 @@
 "                          device previously specified with --device. See\n"
 "                          the ogg123 man page for available device options.\n"
 msgstr ""
+"  -o k:h, --device-option k:h\n"
+"                          Předat zvláštní přepínač 'k' s hodnotou 'h' zařízení\n"
+"                          dříve určenému pomocí --device. Pro dostupné\n"
+"                          přepínače zařízení si přečtěte man stránku ogg123.\n"
 
 #: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "Playlist options\n"
-msgstr "Dostupné přepínače:\n"
+msgstr "Přepínače seznamu skladeb:\n"
 
 #: ogg123/cmdline_options.c:342
 #, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
+msgid "  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
+msgstr "  -@ soub, --list soub    Načíst seznam souborů a URL ze \"soub\"\n"
 
 #: ogg123/cmdline_options.c:343
 #, c-format
 msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
+msgstr "  -r, --repeat            Opakovat seznam skladeb donekonečna\n"
 
 #: ogg123/cmdline_options.c:344
 #, c-format
 msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
+msgstr "  -R, --remote            Použít rozhraní pro vzdálené ovládání\n"
 
 #: ogg123/cmdline_options.c:345
 #, c-format
 msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
+msgstr "  -z, --shuffle           Zamíchat seznam souborů před přehráváním\n"
 
 #: ogg123/cmdline_options.c:346
 #, c-format
 msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
+msgstr "  -Z, --random            Přehrávat soubory náhodně do přerušení\n"
 
 #: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
+#, c-format
 msgid "Input options\n"
-msgstr "Vstup není ogg.\n"
+msgstr "Přepínače vstupu\n"
 
 #: ogg123/cmdline_options.c:350
 #, c-format
 msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
 msgstr ""
+"  -b n, --buffer n        Používat vstupní vyrovnávací paměť velikosti 'n'\n"
+"                          kilobajtů\n"
 
 #: ogg123/cmdline_options.c:351
 #, c-format
 msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
+msgstr "  -p n, --prebuffer n     Načíst n%% vstupu před přehráváním\n"
 
 #: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
+#, c-format
 msgid "Decode options\n"
-msgstr "Popis"
+msgstr "Přepínače dekódování\n"
 
 #: ogg123/cmdline_options.c:355
 #, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
+msgid "  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
+msgstr "  -k n, --skip n          Překočit prních 'n' sekund (nebo formát hh:mm:ss)\n"
 
 #: ogg123/cmdline_options.c:356
 #, c-format
 msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
+msgstr "  -K n, --end n           Skončit na 'n' sekundách (nebo formát hh:mm:ss)\n"
 
 #: ogg123/cmdline_options.c:357
 #, c-format
 msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
+msgstr "  -x n, --nth n           Přehrávat každý 'n'-tý blok\n"
 
 #: ogg123/cmdline_options.c:358
 #, c-format
 msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
+msgstr "  -y n, --ntimes n        Opakovat každý přehrávaný blok 'n'-krát\n"
 
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
+#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:399
+#, c-format
 msgid "Miscellaneous options\n"
-msgstr "Dostupné přepínače:\n"
+msgstr "Ostatní přepínače\n"
 
 #: ogg123/cmdline_options.c:362
 #, c-format
@@ -436,27 +446,30 @@
 "                          and will terminate if two SIGINTs are received\n"
 "                          within the specified timeout 's'. (default 500)\n"
 msgstr ""
+"  -l s, --delay s         Nastavit čas ukončení v milisekundách. ogg123\n"
+"                          přeskočí na další skladbu při SIGINT (Ctrl-C),\n"
+"                          a skončí, když dostane dva SIGINTy v zadaném čase\n"
+"                          's'. (implicitnÄ› 500)\n"
 
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
+#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:406
 #, c-format
 msgid "  -h, --help              Display this help\n"
-msgstr ""
+msgstr "  -h, --help              Zobrazit tuto nápovědu\n"
 
 #: ogg123/cmdline_options.c:368
 #, c-format
 msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
+msgstr "  -q, --quiet             Nic nezobrazovat (žádný nadpis)\n"
 
 #: ogg123/cmdline_options.c:369
 #, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
+msgid "  -v, --verbose           Display progress and other status information\n"
+msgstr "  -v, --verbose           Zobrazovat průběh a jiné informace o stavu\n"
 
 #: ogg123/cmdline_options.c:370
 #, c-format
 msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
+msgstr "  -V, --version           Zobrazit verzi ogg123\n"
 
 #: ogg123/file_transport.c:64 ogg123/http_transport.c:215
 #: ogg123/oggvorbis_format.c:95
@@ -487,12 +500,12 @@
 
 #: ogg123/ogg123.c:86
 msgid "repeat playlist forever"
-msgstr ""
+msgstr "opakovat seznam skladeb navždy"
 
 #: ogg123/ogg123.c:232
-#, fuzzy, c-format
+#, c-format
 msgid "Could not skip to %f in audio stream."
-msgstr "Nemohu přeskočit %f vteřin zvuku."
+msgstr "Nemohu v proudu zvuku přeskočit na %f."
 
 #: ogg123/ogg123.c:378
 #, c-format
@@ -557,9 +570,8 @@
 msgstr "Chyba: Selhání dekódování.\n"
 
 #: ogg123/ogg123.c:705
-#, fuzzy
 msgid "Error: buffer write failed.\n"
-msgstr "Chyba: Selhání zařízení %s.\n"
+msgstr "Chyba: zápis do vyrovnávací paměti selhal.\n"
 
 #: ogg123/ogg123.c:743
 msgid "Done."
@@ -665,16 +677,18 @@
 msgstr "Chyba: Nemohu alokovat paměť v malloc_data_source_stats()\n"
 
 #: oggdec/oggdec.c:50
-#, fuzzy, c-format
+#, c-format
 msgid "oggdec from %s %s\n"
-msgstr "ogg123 z %s %s\n"
+msgstr "oggdec z %s %s\n"
 
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
+#: oggdec/oggdec.c:56 oggenc/oggenc.c:396 ogginfo/ogginfo2.c:1223
 #, c-format
 msgid ""
 " by the Xiph.Org Foundation (http://www.xiph.org/)\n"
 "\n"
 msgstr ""
+" od nadace Xiph.Org (http://www.xiph.org/)\n"
+"\n"
 
 #: oggdec/oggdec.c:57
 #, c-format
@@ -682,31 +696,33 @@
 "Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
 msgstr ""
+"Použití: oggdec [přepínače] soubor1.ogg [soubor2.ogg ... souborN.ogg]\n"
+"\n"
 
 #: oggdec/oggdec.c:58
 #, c-format
 msgid "Supported options:\n"
-msgstr ""
+msgstr "Podporované přepínače:\n"
 
 #: oggdec/oggdec.c:59
 #, c-format
 msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
+msgstr " --quiet, -Q      Tichý režim. Žádný výstup na konzolu.\n"
 
 #: oggdec/oggdec.c:60
 #, c-format
 msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
+msgstr " --help,  -h      Vypsat tuto zprávu s nápovědou.\n"
 
 #: oggdec/oggdec.c:61
 #, c-format
 msgid " --version, -V    Print out version number.\n"
-msgstr ""
+msgstr " --version, -V    Vytisknout číslo verze.\n"
 
 #: oggdec/oggdec.c:62
 #, c-format
 msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
+msgstr " --bits, -b       Bitová hloubka výstupu (podporováno 8 a 16)\n"
 
 #: oggdec/oggdec.c:63
 #, c-format
@@ -714,6 +730,8 @@
 " --endianness, -e Output endianness for 16-bit output; 0 for\n"
 "                  little endian (default), 1 for big endian.\n"
 msgstr ""
+" --endianness, -e Pořadí bajtů pro 16-bitový výstup; 0 pro\n"
+"                  malý endian (implicitní), 1 pro velký endian.\n"
 
 #: oggdec/oggdec.c:65
 #, c-format
@@ -721,11 +739,13 @@
 " --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
 "                  signed (default 1).\n"
 msgstr ""
+" --sign, -s       Znaménko pro výstup PCM; 0 pro bez znaménka, 1 pro\n"
+"                  se znaménkem (implicitně 1).\n"
 
 #: oggdec/oggdec.c:67
 #, c-format
 msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
+msgstr " --raw, -R        Surový výstup (bez hlavičky).\n"
 
 #: oggdec/oggdec.c:68
 #, c-format
@@ -734,134 +754,86 @@
 "                  if there is only one input file, except in\n"
 "                  raw mode.\n"
 msgstr ""
+" --output, -o     Výstup do souboru daného názvu. Může být použito,\n"
+"                  jen když je jen jeden vstupní soubor, až na surový\n"
+"                  režim.\n"
 
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "CHYBA: Nemohu otevřít vstupní soubor \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "CHYBA: Nemohu otevřít výstupní soubor \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Nemohu otevřít soubor jako vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Chyba při odstraňování starého souboru %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"CHYBA: Neurčeny vstupní soubory. Použijte -h pro nápovědu.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"CHYBA: Více vstupních souborů s určeným názvem souboru výstupu: doporučuji "
-"použít -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:51
 msgid "WAV file reader"
 msgstr "Čteč souborů WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:52
 msgid "AIFF/AIFC file reader"
 msgstr "Čteč souborů AIFF/AIFC"
 
-#: oggenc/audio.c:53
+#: oggenc/audio.c:54
 msgid "FLAC file reader"
 msgstr "Čteč souborů FLAC"
 
-#: oggenc/audio.c:54
+#: oggenc/audio.c:55
 msgid "Ogg FLAC file reader"
 msgstr "Čteč souborů Ogg FLAC"
 
-#: oggenc/audio.c:131 oggenc/audio.c:425
+#: oggenc/audio.c:57
+msgid "AU file reader"
+msgstr "Čteč souborů AU"
+
+#: oggenc/audio.c:133
 #, 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:142
+#: oggenc/audio.c:144
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Přeskakuji úsek typu \"%s\", délka %d\n"
 
-#: oggenc/audio.c:168
+#: oggenc/audio.c:170
 #, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Varování: Neočekávaný EOF v úseku AIFF\n"
 
-#: oggenc/audio.c:254
+#: oggenc/audio.c:256
 #, 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:260
+#: oggenc/audio.c:262
 #, 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:268
+#: oggenc/audio.c:270
 #, 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:283
+#: oggenc/audio.c:285
 #, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Varování: Hlavička AIFF-C useknuta.\n"
 
-#: oggenc/audio.c:297
+#: oggenc/audio.c:299
 #, 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 (%c%c%c%c)\n"
 
-#: oggenc/audio.c:304
+#: oggenc/audio.c:306
 #, 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:310
+#: oggenc/audio.c:312
 #, 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:316
+#: oggenc/audio.c:318
 #, 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:353
+#: oggenc/audio.c:355
 #, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
@@ -870,82 +842,96 @@
 "Varování: OggEnc nepodporuje tento typ souboru AIFF/AIFC\n"
 " Musí to být osmi nebo šestnáctibitový PCM.\n"
 
-#: oggenc/audio.c:407
+#: oggenc/audio.c:409
 #, c-format
-msgid "Warning: Unrecognised format chunk in WAV header\n"
-msgstr "Varování: Úsek nerozpoznaného formátu v hlavičce WAV\n"
+msgid "Warning: Unrecognised format chunk in Wave header\n"
+msgstr "Varování: Úsek nerozpoznaného formátu v hlavičce Wave\n"
 
-#: oggenc/audio.c:420
+#: oggenc/audio.c:422
 #, c-format
 msgid ""
-"Warning: INVALID format chunk in wav header.\n"
+"Warning: INVALID format chunk in Wave header.\n"
 " Trying to read anyway (may not work)...\n"
 msgstr ""
-"Varování: Úsek NEPLATNÉHO formátu v hlavičce wav.\n"
+"Varování: Úsek NEPLATNÉHO formátu v hlavičce Wave.\n"
 " Zkouším přesto číst (možná nebude fungovat)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: oggenc/audio.c:427
+#, c-format
+msgid "Warning: Unexpected EOF in reading Wave header\n"
+msgstr "Varování: Neočekávaný EOF při čtení hlavičky Wave\n"
+
+#: oggenc/audio.c:460
+#, c-format
 msgid ""
-"ERROR: Wav file is unsupported type (must be standard PCM\n"
+"ERROR: Wave file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM)\n"
 msgstr ""
-"CHYBA: Soubor wav je nepodporovaného typu (musí být standardní PCM\n"
-" nebo PCM s plovoucí desetinnou čárku typu 3\n"
+"CHYBA: Soubor Wave je nepodporovaného typu (musí být standardní PCM\n"
+" nebo PCM s plovoucí desetinnou čárku typu 3)\n"
 
-#: oggenc/audio.c:467
+#: oggenc/audio.c:469
 #, c-format
 msgid ""
 "Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
 "The software that created this file is incorrect.\n"
 msgstr ""
+"Varování: 'Zarovnání bloku' WAV není správné, ignoruji je.\n"
+"Software, který vytvořil tento soubor, je chybný.\n"
 
-#: oggenc/audio.c:528
-#, fuzzy, c-format
+#: oggenc/audio.c:530
+#, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
 "or floating point PCM)\n"
 msgstr ""
-"CHYBA: Soubor wav má nepodporovaný subformát (musí být osmi, šestnácti nebo\n"
-"dvacetičtyřbitový PCM nebo PCM s plovoucí desetinnou čárkou\n"
+"CHYBA: Soubor Wave má nepodporovaný subformát (musí být 8-, 16-, 24- nebo\n"
+"32-bitový PCM nebo PCM s plovoucí desetinnou čárkou)\n"
 
-#: oggenc/audio.c:604
+#: oggenc/audio.c:606
 #, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"Dvacetičtyřbitová data PCM v big endian nejsou momentálně podporována, "
-"končím.\n"
+msgstr "Dvacetičtyřbitová data PCM v big endian nejsou momentálně podporována, končím.\n"
 
-#: oggenc/audio.c:624
-#, fuzzy, c-format
+#: oggenc/audio.c:626
+#, c-format
 msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"Dvacetičtyřbitová data PCM v big endian nejsou momentálně podporována, "
-"končím.\n"
+msgstr "Třicetivdoubitová data PCM v big endian nejsou momentálně podporována, končím.\n"
 
-#: oggenc/audio.c:630
+#: oggenc/audio.c:632
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr "Interní chyba: pokus čít nepodporovanou bitovou hloubku %d\n"
 
-#: oggenc/audio.c:732
+#: oggenc/audio.c:734
 #, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"CHYBA: Dostal jsem nula vzorků z převzorkovávače: váš soubor bude useknut. "
-"Nahlaste toto prosím.\n"
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "CHYBA: Dostal jsem nula vzorků z převzorkovávače: váš soubor bude useknut. Nahlaste toto prosím.\n"
 
-#: oggenc/audio.c:750
+#: oggenc/audio.c:752
 #, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Nemohu inicializovat převzorkovávač\n"
 
+#: oggenc/audio.c:882
+#, c-format
+msgid "Out of memory opening AU driver\n"
+msgstr "Nedostatek paměti při otevírání ovladače AU\n"
+
+#: oggenc/audio.c:889
+#, c-format
+msgid "At this moment, only linear 16 bit .au files are supported\n"
+msgstr "Momentálně jsou podporovány jen lineární 16-bitové soubory .au\n"
+
+#: oggenc/audio.c:941
+#, c-format
+msgid "Internal error! Please report this bug.\n"
+msgstr "Interní chyba! Ohlaste prosím tuto chybu.\n"
+
 #: oggenc/encode.c:64
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
-msgstr "Nastavuji pokročilý přepínač \"%s\" enkodéru na %s\n"
+msgstr "Nastavuji pokročilý přepínač \"%s\" kodéru na %s\n"
 
 #: oggenc/encode.c:101
 #, c-format
@@ -960,21 +946,17 @@
 #: oggenc/encode.c:111
 #, c-format
 msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
+msgstr "Nemohu nastavit pokročilé parametry správy bitrate\n"
 
 #: oggenc/encode.c:115 oggenc/encode.c:252
 #, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
+msgid "This version of libvorbisenc cannot set advanced rate management parameters\n"
+msgstr "Tato verze libvorbisenc neumí nastavit pokročilé parametry správy bitrate\n"
 
 #: oggenc/encode.c:174
-#, fuzzy, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but 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"
+#, c-format
+msgid "255 channels should be enough for anyone. (Sorry, but 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:182
 #, c-format
@@ -1134,105 +1116,95 @@
 "       %s%s%s \n"
 "s použitím správy bitrate "
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
+#: oggenc/oggenc.c:100
+#, c-format
 msgid "ERROR: No input files specified. Use -h for help.\n"
-msgstr ""
-"%s%s\n"
-"CHYBA: Neurčeny vstupní soubory. Použijte -h pro nápovědu.\n"
+msgstr "CHYBA: Nezadány vstupní soubory. Použijte -h pro nápovědu.\n"
 
-#: oggenc/oggenc.c:118
+#: oggenc/oggenc.c:115
 #, 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:125
+#: oggenc/oggenc.c:122
 #, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"CHYBA: Více vstupních souborů s určeným názvem souboru výstupu: doporučuji "
-"použít -n\n"
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "CHYBA: Více vstupních souborů s určeným názvem souboru výstupu: doporučuji použít -n\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:183
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "CHYBA: Nemohu otevřít vstupní soubor \"%s\": %s\n"
 
-#: oggenc/oggenc.c:202
-#, fuzzy
+#: oggenc/oggenc.c:199
 msgid "RAW file reader"
-msgstr "Čteč souborů WAV"
+msgstr "Čteč souborů RAW"
 
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:216
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Otevírám pomocí modulu %s: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:225
 #, 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:280
+#: oggenc/oggenc.c:277
 #, 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:288
+#: oggenc/oggenc.c:285
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"CHYBA: Nemohu vytvořit požadované podadresáře pro jméno souboru výstupu \"%s"
-"\"\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "CHYBA: Nemohu vytvořit požadované podadresáře pro jméno souboru výstupu \"%s\"\n"
 
-#: oggenc/oggenc.c:295
+#: oggenc/oggenc.c:292
 #, c-format
 msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
-msgstr ""
-"CHYBA: Název vstupního souboru je stený jako název výstupního souboru \"%s"
-"\"\n"
+msgstr "CHYBA: Název vstupního souboru je stený jako název výstupního souboru \"%s\"\n"
 
-#: oggenc/oggenc.c:306
+#: oggenc/oggenc.c:303
 #, 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:350
+#: oggenc/oggenc.c:335
 #, 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:357
+#: oggenc/oggenc.c:342
 #, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Mixuji stereo na mono\n"
 
-#: oggenc/oggenc.c:360
+#: oggenc/oggenc.c:345
 #, c-format
 msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "VAROVÁNÍ: Neumím mixovat kromě stereo do mono\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:353
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr "Měním velikost vstupu na %f\n"
 
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
+#: oggenc/oggenc.c:395
+#, c-format
 msgid "oggenc from %s %s"
-msgstr "ogg123 z %s %s\n"
+msgstr "oggenc z %s %s"
 
-#: oggenc/oggenc.c:416
+#: oggenc/oggenc.c:397
 #, c-format
 msgid ""
 "Usage: oggenc [options] inputfile [...]\n"
 "\n"
 msgstr ""
+"Použití: oggenc [přepínače] vstupnísoubor [...]\n"
+"\n"
 
-#: oggenc/oggenc.c:417
+#: oggenc/oggenc.c:398
 #, c-format
 msgid ""
 "OPTIONS:\n"
@@ -1241,8 +1213,13 @@
 " -h, --help           Print this help text\n"
 " -V, --version        Print the version number\n"
 msgstr ""
+"PŘEPÍNAČE:\n"
+" Obecné:\n"
+" -Q, --quiet          Nevypisovat nic na stderr\n"
+" -h, --help           Vytisknout tento text nápovědy\n"
+" -V, --version        Vytisknout číslo verze\n"
 
-#: oggenc/oggenc.c:423
+#: oggenc/oggenc.c:404
 #, c-format
 msgid ""
 " -k, --skeleton       Adds an Ogg Skeleton bitstream\n"
@@ -1252,8 +1229,15 @@
 " -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 msgstr ""
+" -k, --skeleton       Přidá bitový proud Ogg Skeleton\n"
+" -r, --raw            Surový režim. Vstupní soubory jsou čteny přímo jako data\n"
+"                      PCM\n"
+" -B, --raw-bits=n     Nastavit bity/vzorek pro surový vstup; implicitně 16\n"
+" -C, --raw-chan=n     Nastavit počet kanálů pro surový vstup; implicitně 2\n"
+" -R, --raw-rate=n     Nastavit vzorky/s pro surový vstup; implicitně 44100\n"
+" --raw-endianness     1 pro velký endian, 0 pro malý (implicitně 0)\n"
 
-#: oggenc/oggenc.c:430
+#: oggenc/oggenc.c:411
 #, c-format
 msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
@@ -1263,19 +1247,29 @@
 "                      See the --managed option to use a managed bitrate\n"
 "                      targetting the selected bitrate.\n"
 msgstr ""
+" -b, --bitrate        Zvolí nominální bitrate pro kódování. Pokusí se\n"
+"                      kódovat s touto průměrnou bitrate. Parametr je\n"
+"                      v kb/s. Toto implicitně vytvoří kódování VBR,\n"
+"                      stejně jako použití -q nebo --quality. Pro použití\n"
+"                      spravované bitrate s cílem zvolené bitrate viz\n"
+"                      přepínač --managed.\n"
 
-#: oggenc/oggenc.c:437
+#: oggenc/oggenc.c:418
 #, c-format
 msgid ""
 " --managed            Enable the bitrate management engine. This will allow\n"
-"                      much greater control over the precise bitrate(s) "
-"used,\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"
 msgstr ""
+" --managed            Povolit systém správy bitrate. To umožní mnohem větší\n"
+"                      kontrolu nad konkrétní použitou bitrate, ale kódování\n"
+"                      bude mnohem pomalejší. Nepoužívejte to, pokud\n"
+"                      nutně nepotřebujete podrobnou kontrolu nad bitrate,\n"
+"                      například pro streaming.\n"
 
-#: oggenc/oggenc.c:443
+#: oggenc/oggenc.c:424
 #, c-format
 msgid ""
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
@@ -1286,8 +1280,15 @@
 "                      streaming applications. Using this will automatically\n"
 "                      enable managed bitrate mode (see --managed).\n"
 msgstr ""
+" -m, --min-bitrate    Zadá minimální bitrate (v kb/s). Užitečné pro\n"
+"                      kódování pro kanál s fixní bitrate. Použití tohoto\n"
+"                      přepínače automaticky povolí režim správy bitrate\n"
+"                      (viz --managed).\n"
+" -M, --max-bitrate    Zadá maximální bitrate (v kb/s). Užitečné pro\n"
+"                      streaming. Použití tohoto přepínače automaticky povolí\n"
+"                      režim správy bitrate (viz --managed).\n"
 
-#: oggenc/oggenc.c:451
+#: oggenc/oggenc.c:432
 #, c-format
 msgid ""
 " --advanced-encode-option option=value\n"
@@ -1297,8 +1298,13 @@
 "                      for advanced users only, and should be used with\n"
 "                      caution.\n"
 msgstr ""
+" --advanced-encode-option přepínač=hodnota\n"
+"                      Nastaví pokročilý přepínač kodéru na danou hodnotu.\n"
+"                      Platné přepínače (a jejich hodnoty) jsou zdokumentovány\n"
+"                      v man stránce dodávané s tímto programe. Jsou jen pro\n"
+"                      pokročilé uživatele, a měly by být používány opatrně.\n"
 
-#: oggenc/oggenc.c:458
+#: oggenc/oggenc.c:439
 #, c-format
 msgid ""
 " -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
@@ -1307,8 +1313,13 @@
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
 "                      The default quality level is 3.\n"
 msgstr ""
+" -q, --quality        Určí kvalitu, mezi -1 (velmi nízká) a 10 (velmi\n"
+"                      vysoká) místo určení konkrétní bitrate. Toto je\n"
+"                      normální režim práce.\n"
+"                      Zlomkové kvality (např. 2.75) jsou povoleny\n"
+"                      Implicitní úroveň kvality je 3.\n"
 
-#: oggenc/oggenc.c:464
+#: oggenc/oggenc.c:445
 #, c-format
 msgid ""
 " --resample n         Resample input data to sampling rate n (Hz)\n"
@@ -1318,8 +1329,12 @@
 "                      multiple files, this will be incremented for each\n"
 "                      stream after the first.\n"
 msgstr ""
+" --resample n         Převzorkovat vstupní data na vzorkovací frekvenci n (Hz)\n"
+" --downmix            Mixovat stereo na mono. Povoleno jen pro stereo vstup.\n"
+" -s, --serial         Určí sériové číslo proudu. To bude při kódování více\n"
+"                      souborů inkrementováno pro každý další soubor.\n"
 
-#: oggenc/oggenc.c:471
+#: oggenc/oggenc.c:452
 #, c-format
 msgid ""
 " --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
@@ -1328,51 +1343,63 @@
 "                      support for files > 4GB and STDIN data streams. \n"
 "\n"
 msgstr ""
+" --discard-comments   Zabrání kopírování poznámek v souborech FLAC a Ogg FLAC\n"
+"                      do výstupního souboru Ogg Vorbis.\n"
+" --ignorelength       Ignorovat délku dat v hlavičkách. To umožní podporu\n"
+"                      souborů > 4GB a proudů dat STDIN.\n"
+"\n"
 
-#: oggenc/oggenc.c:477
+#: oggenc/oggenc.c:458
 #, c-format
 msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
 msgstr ""
+" Pojmenovávání:\n"
+" -o, --output=ns      Zapsat soubor do ns (platné jen v režimu jednoho souboru)\n"
+" -n, --names=řetězec  Vytvářet názvy souborů jako tento řetězec, a %%a, %%t, %%l,\n"
+"                      %%n, %%d nahradit po řadě umělcem, názvem, albem, číslem\n"
+"                      stopy a datem (pro jejich určení viz níže).\n"
+"                      %%%% vytvoří doslovné %%.\n"
 
-#: oggenc/oggenc.c:484
+#: oggenc/oggenc.c:465
 #, c-format
 msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
 msgstr ""
+" -X, --name-remove=s  Odstranit zadané znaky z parametrů pro řetězec formátu\n"
+"                      -n. Užitečné pro zajištění platnosti názvů souborů.\n"
+" -P, --name-replace=s Nahradit znaky odstraněné --name-remove zadanými znaky.\n"
+"                      Je-li tento řetězec kratší než seznam --name-remove nebo\n"
+"                      není-li zadán, ty další znaky jsou prostě odstraněny.\n"
+"                      Implicitní nastavení těchto dvou parametrů závisí na\n"
+"                      platformÄ›.\n"
 
-#: oggenc/oggenc.c:493
+#: oggenc/oggenc.c:474
 #, c-format
 msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
 "                      used multiple times. The argument should be in the\n"
 "                      format \"tag=value\".\n"
 " -d, --date           Date for track (usually date of performance)\n"
 msgstr ""
+" -c, --comment=p      Přidat zadaný řetězec jako další poznámku. Toto lze\n"
+"                      použít opakovaně. Parametr by měl být ve formátu\n"
+"                      \"tag=hodnota\".\n"
+" -d, --date           Datum stopy (obvykle datum koncertu)\n"
 
-#: oggenc/oggenc.c:501
+#: oggenc/oggenc.c:479
 #, c-format
 msgid ""
 " -N, --tracknum       Track number for this track\n"
@@ -1381,463 +1408,427 @@
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
 msgstr ""
+" -N, --tracknum       Číslo této stopy\n"
+" -t, --title          Název této stopy\n"
+" -l, --album          Název alba\n"
+" -a, --artist         Jméno umělce\n"
+" -G, --genre          Žánr stopy\n"
 
-#: oggenc/oggenc.c:507
+#: oggenc/oggenc.c:485
 #, c-format
 msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
 msgstr ""
+"                      Je-li zadáno více vstupních souborů, bude použito\n"
+"                      více instancí předchozích pěti parametrů, v tom\n"
+"                      pořadí, v jakém jsou zadány. Je-li zadáno méně názvů\n"
+"                      než souborů, OggEnc vytiskne varování a použije poslední\n"
+"                      pro zbývající soubory. Je-li zadáno méně čísel stop,\n"
+"                      následující soubory nebudou očíslovány. Pro ostatní\n"
+"                      přepínače bude poslední hodnota použita pro ostatní\n"
+"                      soubory bez varování (takže můžete například zadat datum\n"
+"                      jen jednou a bude použito pro všechny soubory)\n"
+"\n"
 
-#: oggenc/oggenc.c:518
+#: oggenc/oggenc.c:496
 #, c-format
 msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\n"
-" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
-"Files\n"
+" OggEnc input files must currently be 24, 16, or 8 bit PCM Wave, 16 bit u-Law (.au), AIFF, or AIFF/C\n"
+" files, 32 bit IEEE floating point Wave, 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 "
-"additional\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 wave'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
 " In this mode, output is to stdout unless an output filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"VSTUPNÍ SOUBORY:\n"
+" Soubory vstupu OggEnc momentálně musí být soubory 24-, 16-, nebo 8-bitové PCM\n"
+" Wave, 16-bitové u-Law (.au), AIFF nebo AIFF/C, Wave s 32-bitovou IEEE plovoucí\n"
+" desetinnou čárkkou, a možná FLAC nebo Ogg FLAC. Soubory mohou být mono nebo\n"
+" stereo (nebo s více kanály) a s libovolnou vzorkovací frekvencí.\n"
+" Místo toho může být použit přepínač --raw pro použití souboru se surovými daty\n"
+" PCM, který musí být 16-bitový stereo PCM s malým endianem ('wav bez\n"
+" hlavičky'), ledaže jsou zadadány další parametry pro surový režim.\n"
+" Můžete zadat čtení souboru ze stdin použitím - jako názvu souboru vstupu.\n"
+" V tomto režimu je výstup na stdout, ledaže je název souboru výstupu zadán\n"
+" pomocí -o\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:601
 #, 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:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
+#: oggenc/oggenc.c:630 oggenc/oggenc.c:755 oggenc/oggenc.c:768
 #, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "Povoluji systém správy bitrate\n"
 
-#: oggenc/oggenc.c:661
+#: oggenc/oggenc.c:639
 #, 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"
+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:664
+#: oggenc/oggenc.c:642
 #, 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:671
+#: oggenc/oggenc.c:649
 #, 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:677
+#: oggenc/oggenc.c:655
 #, 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"
+msgstr "Varování: Frekvence převzorkování zadána jako %d Hz. Mysleli jste %d Hz?\n"
 
-#: oggenc/oggenc.c:687
+#: oggenc/oggenc.c:665
 #, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Varování: Nemohu zpracovat faktor škálování \"%s\"\n"
 
-#: oggenc/oggenc.c:700
+#: oggenc/oggenc.c:675
 #, c-format
 msgid "No value for advanced encoder option found\n"
-msgstr "Nenalezena žádná hodnota pro pokročilý přepínač enkodéru\n"
+msgstr "Nenalezena žádná hodnota pro pokročilý přepínač kodéru\n"
 
-#: oggenc/oggenc.c:718
+#: oggenc/oggenc.c:693
 #, 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:729
+#: oggenc/oggenc.c:704
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Varování: Použita neplatná poznámka (\"%s\"), ignoruji.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:741
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Varování: nominální bitrate \"%s\" nerozpoznána\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:749
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Varování: minimální bitrate \"%s\" nerozpoznána\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:762
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Varování: maximální bitrate \"%s\" nerozpoznána\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:774
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Přepínač kvality \"%s\" nerozpoznán, ignoruji jej\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:782
 #, 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"
+msgstr "VAROVÁNÍ: nastavení kvality příliš vysoké, nastavuji na maximální kvalitu.\n"
 
-#: oggenc/oggenc.c:813
+#: oggenc/oggenc.c:788
 #, 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:822
+#: oggenc/oggenc.c:797
 #, 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:831
+#: oggenc/oggenc.c:806
 #, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
+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:839
+#: oggenc/oggenc.c:814
 #, 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:851
-#, fuzzy, c-format
+#: oggenc/oggenc.c:826
+#, c-format
 msgid "oggenc from %s %s\n"
-msgstr "ogg123 z %s %s\n"
+msgstr "oggenc z %s %s\n"
 
-#: oggenc/oggenc.c:858
+#: oggenc/oggenc.c:833
 #, 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"
+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"
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
+#: oggenc/oggenc.c:838 oggenc/oggenc.c:842
 #, 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:874
+#: oggenc/oggenc.c:849
 #, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"VAROVÁNÍ: Přímý počet kanálů zadán po nepřímá data. Předpokládám, že vstup "
-"je přím.\n"
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "VAROVÁNÍ: Přímý počet kanálů zadán po nepřímá data. Předpokládám, že vstup je přím.\n"
 
-#: oggenc/oggenc.c:879
+#: oggenc/oggenc.c:854
 #, 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:890
+#: oggenc/oggenc.c:865
 #, 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"
+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"
 
-#: oggenc/oggenc.c:895
+#: oggenc/oggenc.c:870
 #, 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:902
+#: oggenc/oggenc.c:877
 #, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "VAROVÁNÍ: Zadán neplatný přepínač, ignoruji->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Nemohu převést poznámku do UTF-8, nemohu ji přidat\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
+#: oggenc/oggenc.c:899 vorbiscomment/vcomment.c:354
 #, 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:954
+#: oggenc/oggenc.c:918
 #, 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"
+msgstr "VAROVÁNÍ: Zadáno nedostatečně názvů, implicitně používám poslední název.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:150
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Nemohu vytvořit adresář \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:157
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Chyba při kontrole existence adresáře %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:170
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Chyba: segment cesty \"%s\" není adresář\n"
 
-#: ogginfo/ogginfo2.c:212
+#: ogginfo/ogginfo2.c:211
 #, 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 má neplatný formát, neobsahuje '=': \"%s"
-"\"\n"
+msgid "Warning: Comment %d in stream %d has invalid format, does not contain '=': \"%s\"\n"
+msgstr "Varování: Poznámka %d v proudu %d má neplatný formát, neobsahuje '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo2.c:219
 #, 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"
+msgstr "Varování: Neplatný název pole poznámky v poznámce %d (proud %d): \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo2.c:250 ogginfo/ogginfo2.c:258
 #, 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"
+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:266
+#: ogginfo/ogginfo2.c:265
 #, 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"
+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:342
-#, fuzzy, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Varování: Neplatná sekvence UTF-8 v poznámce %d (proud %d): neplatná "
-"sekvence\n"
+#: ogginfo/ogginfo2.c:341
+#, c-format
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence \"%s\": %s\n"
+msgstr "Varování: Neplatná sekvence UTF-8 v poznámce %d (proud %d): neplatná sekvence \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:356
+#: ogginfo/ogginfo2.c:355
 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:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:380 ogginfo/ogginfo2.c:547 ogginfo/ogginfo2.c:680
+#, c-format
 msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Varování: EOS nenastaveno v proudu %d\n"
+msgstr "Varování: nesouvislost v proudu (%d)\n"
 
-#: ogginfo/ogginfo2.c:389
+#: ogginfo/ogginfo2.c:388
 #, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Varování: Nemohu dekódovat paket hlavičky theora - neplatný proud theora (%"
-"d)\n"
+msgid "Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr "Varování: Nemohu dekódovat paket hlavičky theora - neplatný proud theora (%d)\n"
 
-#: ogginfo/ogginfo2.c:396
+#: ogginfo/ogginfo2.c:395
 #, 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 theora %d nemá hlavičky správně umístěné v rámech. Poslední "
-"strana hlavičky obsahuje další pakety nebo má nenulovou granulepos\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 "Varování: Proud theora %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:400
+#: ogginfo/ogginfo2.c:399
 #, c-format
 msgid "Theora headers parsed for stream %d, information follows...\n"
 msgstr "Hlavičky theora zpracovány pro proud %d, následují informace...\n"
 
-#: ogginfo/ogginfo2.c:403
+#: ogginfo/ogginfo2.c:402
 #, c-format
 msgid "Version: %d.%d.%d\n"
 msgstr "Verze: %d.%d.%d\n"
 
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:582 ogginfo/ogginfo2.c:742
 #, c-format
 msgid "Vendor: %s\n"
 msgstr "Dodavatel: %s\n"
 
-#: ogginfo/ogginfo2.c:406
+#: ogginfo/ogginfo2.c:405
 #, c-format
 msgid "Width: %d\n"
 msgstr "Šířka: %d\n"
 
-#: ogginfo/ogginfo2.c:407
+#: ogginfo/ogginfo2.c:406
 #, c-format
 msgid "Height: %d\n"
 msgstr "Výška: %d\n"
 
-#: ogginfo/ogginfo2.c:408
+#: ogginfo/ogginfo2.c:407
 #, c-format
 msgid "Total image: %d by %d, crop offset (%d, %d)\n"
 msgstr "Celkový obrázek: %d krát %d, posun ořezu (%d, %d)\n"
 
-#: ogginfo/ogginfo2.c:411
+#: ogginfo/ogginfo2.c:410
 msgid "Frame offset/size invalid: width incorrect\n"
 msgstr "Posun/velikost políčka neplatná: nesprávná šířka\n"
 
-#: ogginfo/ogginfo2.c:413
+#: ogginfo/ogginfo2.c:412
 msgid "Frame offset/size invalid: height incorrect\n"
 msgstr "Posun políčka/velikost neplatná: nesprávná výška\n"
 
-#: ogginfo/ogginfo2.c:416
+#: ogginfo/ogginfo2.c:415
 msgid "Invalid zero framerate\n"
 msgstr "Neplatná nulová rychlost políček\n"
 
-#: ogginfo/ogginfo2.c:418
+#: ogginfo/ogginfo2.c:417
 #, c-format
 msgid "Framerate %d/%d (%.02f fps)\n"
 msgstr "Rychlost políček %d/%d (%.02f/s)\n"
 
-#: ogginfo/ogginfo2.c:422
+#: ogginfo/ogginfo2.c:421
 msgid "Aspect ratio undefined\n"
 msgstr "Poměr stran nedefinován\n"
 
-#: ogginfo/ogginfo2.c:427
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:426
+#, c-format
 msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr "Poměr stran pixelu %d:%d (1:%f)\n"
+msgstr "Poměr stran pixelu %d:%d (%f:1)\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:428
 msgid "Frame aspect 4:3\n"
 msgstr "Poměr stran políčka 4:3\n"
 
-#: ogginfo/ogginfo2.c:431
+#: ogginfo/ogginfo2.c:430
 msgid "Frame aspect 16:9\n"
 msgstr "Poměr stran políčka 16:9\n"
 
-#: ogginfo/ogginfo2.c:433
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:432
+#, c-format
 msgid "Frame aspect %f:1\n"
-msgstr "Poměr stran políčka 4:3\n"
+msgstr "Poměr stran políčka %f:1\n"
 
-#: ogginfo/ogginfo2.c:437
+#: ogginfo/ogginfo2.c:436
 msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
 msgstr "Prostor barev: Dop. ITU-R BT.470-6 Systém M (NTSC)\n"
 
-#: ogginfo/ogginfo2.c:439
+#: ogginfo/ogginfo2.c:438
 msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
 msgstr "Prostor barev: Dop. ITU-R BT.470-6 Systémy B a G (PAL)\n"
 
-#: ogginfo/ogginfo2.c:441
+#: ogginfo/ogginfo2.c:440
 msgid "Colourspace unspecified\n"
 msgstr "Prostor barev nedefinován\n"
 
-#: ogginfo/ogginfo2.c:444
+#: ogginfo/ogginfo2.c:443
 msgid "Pixel format 4:2:0\n"
 msgstr "Formát pixelů 4:2:0\n"
 
-#: ogginfo/ogginfo2.c:446
+#: ogginfo/ogginfo2.c:445
 msgid "Pixel format 4:2:2\n"
 msgstr "Formát pixelů 4:2:2\n"
 
-#: ogginfo/ogginfo2.c:448
+#: ogginfo/ogginfo2.c:447
 msgid "Pixel format 4:4:4\n"
 msgstr "Formát pixelů 4:4:4\n"
 
-#: ogginfo/ogginfo2.c:450
+#: ogginfo/ogginfo2.c:449
 msgid "Pixel format invalid\n"
 msgstr "Neplatný formát pixelů\n"
 
-#: ogginfo/ogginfo2.c:452
+#: ogginfo/ogginfo2.c:451
 #, c-format
 msgid "Target bitrate: %d kbps\n"
 msgstr "Cílová bitrate: %d kb/s\n"
 
-#: ogginfo/ogginfo2.c:453
+#: ogginfo/ogginfo2.c:452
 #, c-format
 msgid "Nominal quality setting (0-63): %d\n"
 msgstr "Nominální nastavení kvality (0-63): %d\n"
 
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
+#: ogginfo/ogginfo2.c:455 ogginfo/ogginfo2.c:605 ogginfo/ogginfo2.c:801
 msgid "User comments section follows...\n"
 msgstr "Následuje oblast poznámek uživatele...\n"
 
-#: ogginfo/ogginfo2.c:477
-#, fuzzy
+#: ogginfo/ogginfo2.c:476
 msgid "Warning: Expected frame %"
-msgstr "Varování: EOS nenastaveno v proudu %d\n"
+msgstr "Varování: Očekáván rám %"
 
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-#, fuzzy
+#: ogginfo/ogginfo2.c:492 ogginfo/ogginfo2.c:620 ogginfo/ogginfo2.c:818
 msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Varování: granulepos v proudu %d se snižuje z %lld na %lld"
+msgstr "Varování: granulepos v proudu %d se snižuje z %"
 
-#: ogginfo/ogginfo2.c:520
+#: ogginfo/ogginfo2.c:519
 msgid ""
 "Theora stream %d:\n"
 "\tTotal data length: %"
 msgstr ""
+"Proud Theora %d:\n"
+"\tCelková délka dat: %"
 
-#: ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-"Varování: Nemohu dekódovat paket hlavičky vorbis - neplatný proud vorbis (%"
-"d)\n"
+#: ogginfo/ogginfo2.c:556
+#, c-format
+msgid "Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%d)\n"
+msgstr "Varování: Nemohu dekódovat paket hlavičky vorbis %d - neplatný proud vorbis (%d)\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:564
 #, 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"
-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"
+msgid "Warning: Vorbis 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:569
+#: ogginfo/ogginfo2.c:568
 #, 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:572
+#: ogginfo/ogginfo2.c:571
 #, c-format
 msgid "Version: %d\n"
 msgstr "Verze: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:575
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Dodavatel: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:583
 #, c-format
 msgid "Channels: %d\n"
 msgstr "Kanálů: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:584
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1846,206 +1837,182 @@
 "Frekvence: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:587
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Nominální bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:590
 msgid "Nominal bitrate not set\n"
 msgstr "Nominální bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:593
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Vyšší bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:596
 msgid "Upper bitrate not set\n"
 msgstr "Vyšší bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:599
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Nižší bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:602
 msgid "Lower bitrate not set\n"
 msgstr "Nižší bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:630
-#, fuzzy, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
-"Záporná granulepos v proudu vorbis mimo hlavičky. Tento soubor byl vytvořen "
-"chybným enkodérem\n"
+#: ogginfo/ogginfo2.c:629
+#, c-format
+msgid "Negative or zero granulepos (%lld) on vorbis stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "Záporná nebo nulová granulepos (%lld) v proudu vorbis mimo hlaviček. Tento soubor byl vytvořen chybným kodérem\n"
 
-#: ogginfo/ogginfo2.c:651
+#: ogginfo/ogginfo2.c:650
 msgid ""
 "Vorbis stream %d:\n"
 "\tTotal data length: %"
 msgstr ""
+"Proud Vorbis %d:\n"
+"\tCelková délka dat: %"
 
-#: ogginfo/ogginfo2.c:692
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Varování: Nemohu dekódovat paket hlavičky theora - neplatný proud theora (%"
-"d)\n"
+#: ogginfo/ogginfo2.c:691
+#, c-format
+msgid "Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
+msgstr "Varování: Nemohu dekódovat paket hlavičky kate %d - neplatný proud kate (%d)\n"
 
-#: ogginfo/ogginfo2.c:703
-#, fuzzy, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Varování: Nemohu dekódovat paket hlavičky theora - neplatný proud theora (%"
-"d)\n"
+#: ogginfo/ogginfo2.c:702
+#, c-format
+msgid "Warning: packet %d does not seem to be a kate header - invalid kate stream (%d)\n"
+msgstr "Varování: paket %d zřejmě není hlavička kate - neplatný proud kate (%d)\n"
 
-#: ogginfo/ogginfo2.c:734
-#, fuzzy, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
-"Varování: Proud theora %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:733
+#, c-format
+msgid "Warning: Kate stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n"
+msgstr "Varování: Proud kate %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:738
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:737
+#, c-format
 msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr "Hlavičky theora zpracovány pro proud %d, následují informace...\n"
+msgstr "Hlavičky kate zpracovány pro proud %d, následují informace...\n"
 
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:740
+#, c-format
 msgid "Version: %d.%d\n"
-msgstr "Verze: %d.%d.%d\n"
+msgstr "Verze: %d.%d\n"
 
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:746
 #, c-format
 msgid "Language: %s\n"
-msgstr ""
+msgstr "Jazyk: %s\n"
 
-#: ogginfo/ogginfo2.c:750
+#: ogginfo/ogginfo2.c:749
 msgid "No language set\n"
-msgstr ""
+msgstr "Jazyk nenastaven\n"
 
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:752
+#, c-format
 msgid "Category: %s\n"
-msgstr "Dodavatel: %s\n"
+msgstr "Kategorie: %s\n"
 
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
+#: ogginfo/ogginfo2.c:755
 msgid "No category set\n"
-msgstr "Nominální bitrate nenastavena\n"
+msgstr "Kategorie nenastavena\n"
 
-#: ogginfo/ogginfo2.c:761
+#: ogginfo/ogginfo2.c:760
 msgid "utf-8"
-msgstr ""
+msgstr "utf-8"
 
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:764
 #, c-format
 msgid "Character encoding: %s\n"
-msgstr ""
+msgstr "Kódování znaků: %s\n"
 
-#: ogginfo/ogginfo2.c:768
+#: ogginfo/ogginfo2.c:767
 msgid "Unknown character encoding\n"
-msgstr ""
+msgstr "Neznámé kódování znaků\n"
 
-#: ogginfo/ogginfo2.c:773
+#: ogginfo/ogginfo2.c:772
 msgid "left to right, top to bottom"
-msgstr ""
+msgstr "zleva doprava, shora dolů"
 
-#: ogginfo/ogginfo2.c:774
+#: ogginfo/ogginfo2.c:773
 msgid "right to left, top to bottom"
-msgstr ""
+msgstr "zprava doleva, shora dolů"
 
-#: ogginfo/ogginfo2.c:775
+#: ogginfo/ogginfo2.c:774
 msgid "top to bottom, right to left"
-msgstr ""
+msgstr "zdola nahoru, zprava doleva"
 
-#: ogginfo/ogginfo2.c:776
+#: ogginfo/ogginfo2.c:775
 msgid "top to bottom, left to right"
-msgstr ""
+msgstr "zdola nahoru, zleva doprava"
 
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo2.c:779
 #, c-format
 msgid "Text directionality: %s\n"
-msgstr ""
+msgstr "Směr textu: %s\n"
 
-#: ogginfo/ogginfo2.c:783
+#: ogginfo/ogginfo2.c:782
 msgid "Unknown text directionality\n"
-msgstr ""
+msgstr "Neznámý směr textu\n"
 
-#: ogginfo/ogginfo2.c:795
-#, fuzzy
+#: ogginfo/ogginfo2.c:794
 msgid "Invalid zero granulepos rate\n"
-msgstr "Neplatná nulová rychlost políček\n"
+msgstr "Neplatná nulová rychlost granulepos\n"
 
-#: ogginfo/ogginfo2.c:797
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:796
+#, c-format
 msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr "Rychlost políček %d/%d (%.02f/s)\n"
+msgstr "Rychlost granulepos %d/%d (%.02f g/s)\n"
 
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:809
 msgid "\n"
-msgstr ""
+msgstr "\n"
 
-#: ogginfo/ogginfo2.c:828
-#, fuzzy, c-format
-msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-"Záporná granulepos v proudu vorbis mimo hlavičky. Tento soubor byl vytvořen "
-"chybným enkodérem\n"
+#: ogginfo/ogginfo2.c:827
+#, c-format
+msgid "Negative granulepos (%lld) on kate stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "Záporná granulepos (%lld) v proudu kate mimo hlaviček. Tento soubor byl vytvořen chybným kodérem\n"
 
-#: ogginfo/ogginfo2.c:853
+#: ogginfo/ogginfo2.c:852
 msgid ""
 "Kate stream %d:\n"
 "\tTotal data length: %"
 msgstr ""
+"Proud Kate %d:\n"
+"\tCelková délka dat: %"
 
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:892
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Varování: EOS nenastaveno v proudu %d\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:1047
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Varování: Neplatná strana hlavičky, nenalezen paket\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:1073
 #, 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:1088
+#: ogginfo/ogginfo2.c:1087
 #, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-"Poznámka: Proud %d má sériové číslo %d, což je platné, ale může to způsobit "
-"problémy s některými nástroji.\n"
+msgid "Note: Stream %d has serial number %d, which is legal but may cause problems with some tools.\n"
+msgstr "Poznámka: Proud %d má sériové číslo %d, což je platné, ale může to způsobit problémy s některými nástroji.\n"
 
-#: ogginfo/ogginfo2.c:1105
-#, fuzzy
+#: ogginfo/ogginfo2.c:1104
 msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-"Varování: V datech nalezena díra na přibližném posunutí %lld bajtů. Ogg "
-"poškozen.\n"
+msgstr "Varování: V datech nalezena díra (%d bajtů) na přibližném posunutí %"
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:1128
 #, 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:1134
+#: ogginfo/ogginfo2.c:1133
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2054,26 +2021,23 @@
 "Zpracovávám soubor \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:1142
 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:1151
+#: ogginfo/ogginfo2.c:1150
 msgid "Page found for stream after EOS flag"
 msgstr "Strana proudu nalezena po značce EOS"
 
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-"Omezení na muxing Oggu porušeno, nový proud před EOS všech předchozích proudů"
+#: ogginfo/ogginfo2.c:1153
+msgid "Ogg muxing constraints violated, new stream before EOS of all previous streams"
+msgstr "Omezení na muxing Oggu porušeno, nový proud před EOS všech předchozích proudů"
 
-#: ogginfo/ogginfo2.c:1158
+#: ogginfo/ogginfo2.c:1157
 msgid "Error unknown."
 msgstr "Neznámá chyba."
 
-#: ogginfo/ogginfo2.c:1161
+#: ogginfo/ogginfo2.c:1160
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -2082,51 +2046,47 @@
 "Varování: neplatně umístěná stránka (stránky) pro logický proud %d\n"
 "To indikuje poškozený soubor ogg: %s.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:1172
 #, 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:1176
+#: ogginfo/ogginfo2.c:1175
 #, 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:1180
+#: ogginfo/ogginfo2.c:1179
 #, 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:1185
+#: ogginfo/ogginfo2.c:1184
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
-msgstr ""
-"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"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "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:1200
+#: ogginfo/ogginfo2.c:1199
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Logický proud %d skončil\n"
 
-#: ogginfo/ogginfo2.c:1208
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:1207
+#, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
 "Input probably not Ogg.\n"
 msgstr ""
 "Chyba: V souboru \"%s\" nenalezena data ogg\n"
-"Vstup pravděpodobně není ogg.\n"
+"Vstup pravděpodobně není Ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:1218
+#, c-format
 msgid "ogginfo from %s %s\n"
-msgstr "ogg123 z %s %s\n"
+msgstr "ogginfo z %s %s\n"
 
-#: ogginfo/ogginfo2.c:1225
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:1224
+#, c-format
 msgid ""
 "(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
@@ -2138,25 +2098,23 @@
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
 msgstr ""
-"ogginfo 1.1.0\n"
 "© 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
-"Použití: ogginfo [přepínače] soubor1.ogg [soubor2.ogg ... souborN.ogg]\n"
+"Použití: ogginfo [přepínače] soubor1.ogg [soubor2.ogx ... souborN.ogv]\n"
 "Podporované přepínače:\n"
 "\t-h Zobrazit tuto zprávu nápovědy\n"
-"\t-q Být méně podrobný. Jeden odstraní detailní informativní\n"
+"\t-q Být méně podrobný. Jeden odstraní podrobné informativní\n"
 "\t   zprávy, dva odstraní varování\n"
-"\t-v Být více podrobný. Může povolit přesnější kontroly\n"
-"\t   pro některé typy proudů.\n"
-"\n"
+"\t-v Být podrobnější. U některých typů proudů může\n"
+"\t   povolit přesnější kontroly.\n"
 
-#: ogginfo/ogginfo2.c:1234
+#: ogginfo/ogginfo2.c:1233
 #, c-format
 msgid "\t-V Output version information and exit\n"
-msgstr ""
+msgstr "\t-V Vypsat informace o verzi a skončit\n"
 
-#: ogginfo/ogginfo2.c:1246
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:1245
+#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
 "\n"
@@ -2164,13 +2122,13 @@
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
-"Použití: ogginfo [přepínače] soubor1.ogg [soubor2.ogg ... souborN.ogg]\n"
+"Použití: ogginfo [přepínače] soubor1.ogg [soubor2.ogx ... souborN.ogv]\n"
 "\n"
-"Ogginfo je nástroj pro vytištění informací o souborech ogg\n"
+"ogginfo je nástroj pro vytištění informací o souborech Ogg\n"
 "a pro diagnostiku problémů s nimi.\n"
 "Úplná nápověda je zobrazena pomocí \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
+#: ogginfo/ogginfo2.c:1279
 #, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Nezadány vstupní soubory. \"ogginfo -h\" pro nápovědu\n"
@@ -2261,9 +2219,9 @@
 msgstr "Neobsloužený speciální případ: první soubor příliš krátký?\n"
 
 #: vcut/vcut.c:327
-#, fuzzy, c-format
+#, c-format
 msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr "Místo řezu není uvnitř proudu. Druhý soubor bude prázdný\n"
+msgstr "Místo řezu příliš blízko konci souboru. Druhý soubor bude prázdný.\n"
 
 #: vcut/vcut.c:353
 #, c-format
@@ -2321,10 +2279,8 @@
 
 #: vcut/vcut.c:535
 #, 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 | +bodřezu]\n"
+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 | +bodřezu]\n"
 
 #: vcut/vcut.c:539
 #, c-format
@@ -2384,7 +2340,7 @@
 
 #: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
 msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+msgstr "Nemohu získat dost paměti pro vyrovnávací paměť vstupu."
 
 #: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
 msgid "Error reading first page of Ogg bitstream."
@@ -2396,7 +2352,7 @@
 
 #: vorbiscomment/vcedit.c:238
 msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
+msgstr "Nemohu získat dost paměti pro registraci nového sériového čísla proudu."
 
 #: vorbiscomment/vcedit.c:506
 msgid "Input truncated or empty."
@@ -2411,14 +2367,12 @@
 msgstr "Bitový proud ogg neobsahuje data vorbis."
 
 #: vorbiscomment/vcedit.c:579
-#, fuzzy
 msgid "EOF before recognised stream."
-msgstr "EOF před koncem hlaviček vorbis."
+msgstr "EOF před rozpoznaným proudem."
 
 #: vorbiscomment/vcedit.c:595
-#, fuzzy
 msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Bitový proud ogg neobsahuje data vorbis."
+msgstr "Bitový proud ogg neobsahuje podporovaný typ dat."
 
 #: vorbiscomment/vcedit.c:639
 msgid "Corrupt secondary header."
@@ -2433,11 +2387,8 @@
 msgstr "Poškozená nebo chybějící data, pokračuji..."
 
 #: vorbiscomment/vcedit.c:875
-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ý."
+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:190 vorbiscomment/vcomment.c:216
 #, c-format
@@ -2464,20 +2415,23 @@
 msgid "no action specified\n"
 msgstr "neurčena žádná akce\n"
 
-#: vorbiscomment/vcomment.c:379
+#: vorbiscomment/vcomment.c:376
 #, c-format
 msgid ""
 "vorbiscomment from %s %s\n"
 " by the Xiph.Org Foundation (http://www.xiph.org/)\n"
 "\n"
 msgstr ""
+"vorbiscomment z %s %s\n"
+" od nadace Xiph.Org (http://www.xiph.org/)\n"
+"\n"
 
-#: vorbiscomment/vcomment.c:382
+#: vorbiscomment/vcomment.c:379
 #, c-format
 msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
+msgstr "Vypsat nebo upravit poznámky v souborech Ogg Vorbis.\n"
 
-#: vorbiscomment/vcomment.c:385
+#: vorbiscomment/vcomment.c:382
 #, c-format
 msgid ""
 "Usage: \n"
@@ -2485,147 +2439,160 @@
 "  vorbiscomment [-lR] file\n"
 "  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
 msgstr ""
+"Použití: \n"
+"  vorbiscomment [-Vh]\n"
+"  vorbiscomment [-lR] soubor\n"
+"  vorbiscomment [-R] [-c soubor] [-t tag] <-a|-w> souborvstupu [souborvýstupu]\n"
 
-#: vorbiscomment/vcomment.c:391
+#: vorbiscomment/vcomment.c:388
 #, c-format
 msgid "Listing options\n"
-msgstr ""
+msgstr "Přepínače pro výpis\n"
 
-#: vorbiscomment/vcomment.c:392
+#: vorbiscomment/vcomment.c:389
 #, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
+msgid "  -l, --list              List the comments (default if no options are given)\n"
 msgstr ""
+"  -l, --list              Vypsat poznámky (implicitní, když není zadán žádný\n"
+"                          přepínač)\n"
 
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
+#: vorbiscomment/vcomment.c:392
+#, c-format
 msgid "Editing options\n"
-msgstr "Špatný typ v seznamu přepínačů"
+msgstr "Přepínače úpravy\n"
 
-#: vorbiscomment/vcomment.c:396
+#: vorbiscomment/vcomment.c:393
 #, c-format
 msgid "  -a, --append            Append comments\n"
-msgstr ""
+msgstr "  -a, --append            Přidat poznámky\n"
 
-#: vorbiscomment/vcomment.c:397
+#: vorbiscomment/vcomment.c:394
 #, c-format
 msgid ""
 "  -t \"name=value\", --tag \"name=value\"\n"
 "                          Specify a comment tag on the commandline\n"
 msgstr ""
+"  -t \"název=hodnota\", --tag \"název=hodnota\"\n"
+"                          Určí tag poznámky na příkazovém řádku\n"
 
-#: vorbiscomment/vcomment.c:399
+#: vorbiscomment/vcomment.c:396
 #, c-format
 msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
+msgstr "  -w, --write             Zapsat poznámky a přepsat existující\n"
 
-#: vorbiscomment/vcomment.c:403
+#: vorbiscomment/vcomment.c:400
 #, c-format
 msgid ""
 "  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
+"                          When listing, write comments to the specified file.\n"
+"                          When editing, read comments from the specified file.\n"
 msgstr ""
+"  -c soubor, --commentfile soubor\n"
+"                          Při výpisu zapsat poznámky do zadaného souboru.\n"
+"                          Při úpravě číst poznámky ze zadaného souboru.\n"
 
-#: vorbiscomment/vcomment.c:406
+#: vorbiscomment/vcomment.c:403
 #, c-format
 msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
+msgstr "  -R, --raw               Číst a zapisovat poznámky v UTF-8\n"
 
-#: vorbiscomment/vcomment.c:410
+#: vorbiscomment/vcomment.c:407
 #, c-format
 msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
+msgstr "  -V, --version           Vypsat informace o verzi a skončit\n"
 
-#: vorbiscomment/vcomment.c:413
+#: vorbiscomment/vcomment.c:410
 #, c-format
 msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
+"If no output file is specified, vorbiscomment will modify the input file. This\n"
+"is handled via temporary file, such that the input file is not modified if any\n"
 "errors are encountered during processing.\n"
 msgstr ""
+"Není-li zadán soubor výstupu, vorbiscomment upraví soubor vstupu. Při tom\n"
+"se používá dočasný soubor, takže soubor vstupu není změněn, když při\n"
+"práci dojde k nějaké chybě.\n"
 
-#: vorbiscomment/vcomment.c:418
+#: vorbiscomment/vcomment.c:415
 #, c-format
 msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
+"vorbiscomment handles comments in the format \"name=value\", one per line. By\n"
+"default, comments are written to stdout when listing, and read from stdin when\n"
 "editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
+"can be given on the commandline with -t \"name=value\". Use of either -c or -t\n"
 "disables reading from stdin.\n"
 msgstr ""
+"vorbiscomment pracuje s poznámkami formátu \"name=value\", na každém řádku jedna.\n"
+"Implicitně jsou při výpisu poznámky zapsány na stdout a při úpravách čteny ze\n"
+"stdin. Místo toho může být zadán soubor přepínačem -c nebo mohou být tagy\n"
+"zadány na příkazovém řádku pomocí -t \"název=hodnota\". Použití -c nebo -t zakáže\n"
+"čtení ze stdin.\n"
 
-#: vorbiscomment/vcomment.c:425
+#: vorbiscomment/vcomment.c:422
 #, c-format
 msgid ""
 "Examples:\n"
 "  vorbiscomment -a in.ogg -c comments.txt\n"
 "  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
 msgstr ""
+"Příklady:\n"
+"  vorbiscomment -a vstup.ogg -c poznámky.txt\n"
+"  vorbiscomment -a vstup.ogg -t \"ARTIST=Někdo\" -t \"TITLE=Název\"\n"
 
-#: vorbiscomment/vcomment.c:430
+#: vorbiscomment/vcomment.c:427
 #, c-format
 msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
+"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather than\n"
+"converting to the user's character set, which is useful in scripts. However,\n"
 "this is not sufficient for general round-tripping of comments in all cases.\n"
 msgstr ""
+"POZNÁMKA: Surový režim (--raw, -R) čte a zapisuje poznámky v UTF-8 místo\n"
+"převodu do znakové sady uživatele, což je užitečné ve skriptech, ale obecně\n"
+"není vždy dostatečné pro zachování dat.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:489
 #, 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:578
+#: vorbiscomment/vcomment.c:575
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Chyba při otevírání vstupního souboru '%s'.\n"
 
-#: vorbiscomment/vcomment.c:587
+#: vorbiscomment/vcomment.c:584
 #, 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"
+msgstr "Název vstupního souboru nemůže být stejný jako název výstupního souboru\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:595
 #, 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:613
+#: vorbiscomment/vcomment.c:610
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Chyba při otevírání souboru poznámek '%s'.\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:627
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Chyba při otevírání souboru poznámek '%s'\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:661
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Chyba při odstraňování starého souboru %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:663
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Chyba při přejmenovávání %s na %s\n"
 
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
+#: vorbiscomment/vcomment.c:673
+#, c-format
 msgid "Error removing erroneous temporary file %s\n"
-msgstr "Chyba při odstraňování starého souboru %s\n"
+msgstr "Chyba při odstraňování chybného dočasného souboru %s\n"
 
 #~ msgid ""
 #~ "ogg123 from %s %s\n"
@@ -2658,8 +2625,7 @@
 #~ "  -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"
-#~ "  -@, --list=filename   Read playlist of files and URLs from \"filename"
-#~ "\"\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"
@@ -2672,8 +2638,7 @@
 #~ "s milliseconds make ogg123 terminate.\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"
+#~ "  -f, --file=názevsouboru  Nastavit název souboru výstupu pro dříve určené\n"
 #~ "      zařízení souboru (pomocí -d).\n"
 #~ "  -k n, --skip n  Přeskočit prvních 'n' vteřin (nebo formát hh:mm:ss)\n"
 #~ "  -K n, --end n   Skončit na 'n' sekundách (nebo formát hh:mm:ss)\n"
@@ -2701,8 +2666,7 @@
 #~ " -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"
+#~ " -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"
 #~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
@@ -2713,12 +2677,9 @@
 #~ "                      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"
+#~ " --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"
@@ -2726,20 +2687,15 @@
 #~ "                      automatically enable managed bitrate mode (see\n"
 #~ "                      --managed).\n"
 #~ " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-#~ "                      streaming applications. Using this will "
-#~ "automatically\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"
+#~ "                      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"
+#~ " -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"
@@ -2747,8 +2703,7 @@
 #~ " --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"
+#~ " -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"
@@ -2756,28 +2711,19 @@
 #~ "\n"
 #~ " Naming:\n"
 #~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
+#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
+#~ "                      %%n, %%d replaced by artist, title, album, track number,\n"
+#~ "                      and date, respectively (see below for specifying these).\n"
 #~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
+#~ " -X, --name-remove=s  Remove the specified characters from parameters to the\n"
+#~ "                      -n format string. Useful to ensure legal filenames.\n"
+#~ " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
+#~ "                      characters specified. If this string is shorter than the\n"
 #~ "                      --name-remove list or is not specified, the extra\n"
 #~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
+#~ "                      Default settings for the above two arguments are platform\n"
 #~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
+#~ " -c, --comment=c      Add the given string as an extra comment. This may be\n"
 #~ "                      used multiple times. The argument should be in the\n"
 #~ "                      format \"tag=value\".\n"
 #~ " -d, --date           Date for track (usually date of performance)\n"
@@ -2787,37 +2733,24 @@
 #~ " -a, --artist         Name of artist\n"
 #~ " -G, --genre          Genre of track\n"
 #~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
+#~ "                      instances of the previous five arguments will be used,\n"
 #~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
+#~ "                      specified than files, OggEnc will print a warning, and\n"
+#~ "                      reuse the final one for the remaining files. If fewer\n"
+#~ "                      track numbers are given, the remaining files will be\n"
+#~ "                      unnumbered. For the others, the final tag will be reused\n"
+#~ "                      for all others without warning (so you can specify a date\n"
+#~ "                      once, for example, and have it used for all the files)\n"
 #~ "\n"
 #~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-#~ "AIFF/C\n"
-#~ " files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
-#~ "Files\n"
+#~ " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or AIFF/C\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 "
-#~ "additional\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 additional\n"
 #~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an output filename is "
-#~ "specified\n"
+#~ " You can specify taking the file from stdin by using - as the input filename.\n"
+#~ " In this mode, output is to stdout unless an output filename is specified\n"
 #~ " with -o\n"
 #~ "\n"
 #~ msgstr ""
@@ -2829,43 +2762,29 @@
 #~ " -Q, --quiet          Neposílat na stderr žádný výstup\n"
 #~ " -h, --help           Vypsat tento text nápovědy\n"
 #~ " -v, --version        Vypsat číslo verze\n"
-#~ " -r, --raw            Přímý režim. Soubory vstupu jsou čteny přímo jako "
-#~ "data PCM\n"
-#~ " -B, --raw-bits=n     Natavit bity/vzorek pro přímý vstup. Implicitní je "
-#~ "16\n"
-#~ " -C, --raw-chan=n     Nastavit počet kanálů pro přímý vstup. Implicitní "
-#~ "je 2\n"
-#~ " -R, --raw-rate=n     Nastavit vzorky/s pro přímý vstup. Implicitní je "
-#~ "44100\n"
+#~ " -r, --raw            Přímý režim. Soubory vstupu jsou čteny přímo jako data PCM\n"
+#~ " -B, --raw-bits=n     Natavit bity/vzorek pro přímý vstup. Implicitní je 16\n"
+#~ " -C, --raw-chan=n     Nastavit počet kanálů pro přímý vstup. Implicitní je 2\n"
+#~ " -R, --raw-rate=n     Nastavit vzorky/s pro přímý vstup. Implicitní je 44100\n"
 #~ " --raw-endianness     1 pro big endian, 0 pro little (implicitní je 0)\n"
-#~ " -b, --bitrate        Určení nominální bitrate, do které kódovat. "
-#~ "Pokusit\n"
-#~ "                      se kódovat s bitrate s tímto průměrem. Bere "
-#~ "argument\n"
-#~ "                      v kb/s. Implicitně tvoří kódování VBR, podobně "
-#~ "jako\n"
+#~ " -b, --bitrate        Určení nominální bitrate, do které kódovat. Pokusit\n"
+#~ "                      se kódovat s bitrate s tímto průměrem. Bere argument\n"
+#~ "                      v kb/s. Implicitně tvoří kódování VBR, podobně jako\n"
 #~ "                      použití -q nebo --quality.  Pro použití spravované\n"
-#~ "                      bitrate cílící zvolenou bitrate viz přepínač --"
-#~ "managed.\n"
+#~ "                      bitrate cílící zvolenou bitrate viz přepínač --managed.\n"
 #~ " -m, --min-bitrate    Určení minimální bitrate (v kb/s). Užitečné pro\n"
-#~ "                      kódování pro kanál fixní propustnosti. Použití "
-#~ "tohoto\n"
+#~ "                      kódování pro kanál fixní propustnosti. Použití tohoto\n"
 #~ "                      automaticky povolí režim spravované bitrate (viz\n"
 #~ "                      --managed).\n"
 #~ " -M, --max-bitrate    Určení maximální bitrate (v kb/s). Užitečné pro\n"
-#~ "                      aplikace streaming.  Použití tohoto automaticky "
-#~ "povolí\n"
+#~ "                      aplikace streaming.  Použití tohoto automaticky povolí\n"
 #~ "                      režim spravované bitrate (viz --managed).\n"
 #~ " --advanced-encode-option přepínač=hodnota\n"
-#~ "                      Nastaví pokročilý přepínač enkodéru na danou "
-#~ "hodnotu.\n"
-#~ "                      Platné přepínače (a jejich hodnoty) jsou "
-#~ "zdokumentovány\n"
-#~ "                      ve stránce man dodávané s tímto programem. Jsou jen "
-#~ "pro\n"
+#~ "                      Nastaví pokročilý přepínač enkodéru na danou hodnotu.\n"
+#~ "                      Platné přepínače (a jejich hodnoty) jsou zdokumentovány\n"
+#~ "                      ve stránce man dodávané s tímto programem. Jsou jen pro\n"
 #~ "                      pokročilé uživatele a měly by se používat opatrně.\n"
-#~ " -q, --quality        Určení kvality mezi -1 (velmi nízká) a 10 (velmi "
-#~ "vysoká),\n"
+#~ " -q, --quality        Určení kvality mezi -1 (velmi nízká) a 10 (velmi vysoká),\n"
 #~ "                      místo určení konkrétní bitrate.\n"
 #~ "                      Toto je normální režim práce.\n"
 #~ "                      Desetinné kvality (např. 2.75) jsou povoleny\n"
@@ -2873,35 +2792,27 @@
 #~ " --resample n         Převzorkovat vstup na vzorkovací frekvenci n (Hz)\n"
 #~ " --downmix            Mixovat stereo na mono. Povoleno jen na stereo\n"
 #~ "                      vstupu.\n"
-#~ " -s, --serial         Určení sériového čísla proudu. Pokud se kóduje "
-#~ "více\n"
+#~ " -s, --serial         Určení sériového čísla proudu. Pokud se kóduje více\n"
 #~ "                      souborů, bude inkrementováno pro každý proud po\n"
 #~ "                      tom prvním.\n"
-#~ " --discard-coimments  Brání kopírování poznámek v souborech FLAC a Ogg "
-#~ "FLAC do\n"
+#~ " --discard-coimments  Brání kopírování poznámek v souborech FLAC a Ogg FLAC do\n"
 #~ "                      výstupního souboru Ogg Vorbis.\n"
 #~ "\n"
 #~ " Pojmenování:\n"
-#~ " -o, --output=js      Zapsat soubor do js (platné jen v režimu jednoho "
-#~ "souboru)\n"
-#~ " -n, --names=řetězec  Tvořit názvy souborů jako tento řetězec, s %%a, %%"
-#~ "t, %%l,\n"
-#~ "                      %%n, %%d nahrazené umělcem, resp. názvem, albem, "
-#~ "číslem\n"
+#~ " -o, --output=js      Zapsat soubor do js (platné jen v režimu jednoho souboru)\n"
+#~ " -n, --names=řetězec  Tvořit názvy souborů jako tento řetězec, s %%a, %%t, %%l,\n"
+#~ "                      %%n, %%d nahrazené umělcem, resp. názvem, albem, číslem\n"
 #~ "                      stopy a datem (viz níže pro jejich určení).\n"
 #~ "                      %%%% dává doslovné %%.\n"
 #~ " -X, --name-remove=s  Odstranit určené znaky z parametrů řetězce formátu\n"
 #~ "                      -n. Užitečné pro zajištění platných názvů souborů.\n"
-#~ " -P, --name-replace=s Nahradit znaky odstraněné --name-remove s určenými "
-#~ "znaky.\n"
+#~ " -P, --name-replace=s Nahradit znaky odstraněné --name-remove s určenými znaky.\n"
 #~ "                      Pokud je tento řetězec kratší než seznam\n"
-#~ "                      --name-remove nebo není určen, přebytečné znaky "
-#~ "jsou\n"
+#~ "                      --name-remove nebo není určen, přebytečné znaky jsou\n"
 #~ "                      prostě odstraněny.\n"
 #~ "                      Implicitní nastavení dvou argumentů výše závisí na\n"
 #~ "                      platformÄ›.\n"
-#~ " -c, --comment=c      Přidat daný řetězec jako přídavnou poznámku. Toto "
-#~ "může\n"
+#~ " -c, --comment=c      Přidat daný řetězec jako přídavnou poznámku. Toto může\n"
 #~ "                      být použito vícekrát.\n"
 #~ " -d, --date           Datum pro tuto stopu (obvykle datum provedení)\n"
 #~ " -N, --tracknum       Číslo stopy pro tuto stopu\n"
@@ -2909,39 +2820,25 @@
 #~ " -l, --album          Název alba\n"
 #~ " -a, --artist         Jméno umělce\n"
 #~ " -G, --genre          Žánr stopy\n"
-#~ "                      Je-li zadáno více vstupních soubor, bude použito "
-#~ "více\n"
-#~ "                      instancí předchozích pěti argumentů, v pořadí, v "
-#~ "jakém\n"
-#~ "                      jsou zadány. Je-li zadáno méně názvů než souborů, "
-#~ "OggEnc\n"
-#~ "                      vypíše varování a použije poslední název pro "
-#~ "zbývající\n"
-#~ "                      soubory. Je-li zadáno méně čísel stop, zbývající "
-#~ "soubory\n"
-#~ "                      budou bez čísla. Pro ostatní atributy bude "
-#~ "poslední\n"
-#~ "                      hodnota použita bez varování (takže můžete např. "
-#~ "zadat\n"
-#~ "                      datum jednou a nechat je používat pro všechny "
-#~ "soubory)\n"
+#~ "                      Je-li zadáno více vstupních soubor, bude použito více\n"
+#~ "                      instancí předchozích pěti argumentů, v pořadí, v jakém\n"
+#~ "                      jsou zadány. Je-li zadáno méně názvů než souborů, OggEnc\n"
+#~ "                      vypíše varování a použije poslední název pro zbývající\n"
+#~ "                      soubory. Je-li zadáno méně čísel stop, zbývající soubory\n"
+#~ "                      budou bez čísla. Pro ostatní atributy bude poslední\n"
+#~ "                      hodnota použita bez varování (takže můžete např. zadat\n"
+#~ "                      datum jednou a nechat je používat pro všechny soubory)\n"
 #~ "\n"
 #~ "VSTUPNÍ SOUBORY:\n"
-#~ " Vstupní soubory OggEnc musí momentálně být soubory dvacetičtyř, "
-#~ "šestnácti nebo\n"
-#~ " osmibitového PCM WAV, AIFF, AIFF/C nebo třicetidvoubitové WAV s "
-#~ "pohyblivou\n"
+#~ " Vstupní soubory OggEnc musí momentálně být soubory dvacetičtyř, šestnácti nebo\n"
+#~ " osmibitového PCM WAV, AIFF, AIFF/C nebo třicetidvoubitové WAV s pohyblivou\n"
 #~ " řádovou čárkou IEEE. Soubory mohou mono nebo stereo (nebo vícekanálové)\n"
 #~ " s libovolnou vzorkovací frekvencí.\n"
-#~ " Nebo může být použit přepínač --raw pro použití jednoho přímého "
-#~ "datového\n"
+#~ " Nebo může být použit přepínač --raw pro použití jednoho přímého datového\n"
 #~ " souboru PCM, který musí být šestnáctibitový stereo little edian PCM\n"
-#~ " ('wav bez hlavičky'), pokud nejsou zadány další parametry pro přímý "
-#~ "režim.\n"
-#~ " Můžete zadat čtení souboru ze stdin použitím - jako názvu souboru "
-#~ "vstupu.\n"
-#~ " V tomto režimu je výstup na stdout, pokud není určen název souboru "
-#~ "výstupu\n"
+#~ " ('wav bez hlavičky'), pokud nejsou zadány další parametry pro přímý režim.\n"
+#~ " Můžete zadat čtení souboru ze stdin použitím - jako názvu souboru vstupu.\n"
+#~ " V tomto režimu je výstup na stdout, pokud není určen název souboru výstupu\n"
 #~ " pomocí -o\n"
 #~ "\n"
 
@@ -2995,12 +2892,8 @@
 #~ "\tDélka přehrávání: %ldm:%02ld.%03lds\n"
 #~ "\tPrůměrná bitrate: %f kb/s\n"
 
-#~ 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í %I64d bajtů. Ogg "
-#~ "poškozen.\n"
+#~ 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í %I64d bajtů. Ogg poškozen.\n"
 
 #~ msgid ""
 #~ "Usage: \n"
@@ -3042,8 +2935,7 @@
 #~ "   připojí poznámky v poznámky.txt do vstup.ogg\n"
 #~ "   Konečně, můžete zadat jakýkoli počet značek, které přidat,\n"
 #~ "   na příkazové řádce pomocí přepínače -t. Např.\n"
-#~ "   vorbiscomment -a vstup.ogg -t \"ARTIST=Nějaký Chlapík\" -t "
-#~ "\"TITLE=Název\"\n"
+#~ "   vorbiscomment -a vstup.ogg -t \"ARTIST=Nějaký Chlapík\" -t \"TITLE=Název\"\n"
 #~ "   (všimněte si, že při použití tohoto je čtení poznámek ze souboru\n"
 #~ "   poznámek nebo stdin zakázáno)\n"
 #~ "   Přímý režim (--raw, -R) bude číst a zapisovat poznámky v UTF-8\n"

Modified: trunk/vorbis-tools/po/da.po
===================================================================
--- trunk/vorbis-tools/po/da.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/da.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -5,8 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 0.99.1.3.1\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2002-02-05 10:31+0100\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,16 +13,18 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ogg123/buffer.c:117
-#, c-format
+#: ogg123/buffer.c:107
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Fejl: Slut på hukommelse i malloc_action().\n"
 
-#: ogg123/buffer.c:360
-#, c-format
+#: ogg123/buffer.c:338
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Fejl: Kunne ikke reservere hukommelse i malloc_buffer_stats()\n"
 
+#: ogg123/buffer.c:357
+msgid "malloc"
+msgstr ""
+
 #: ogg123/callbacks.c:75
 msgid "Error: Device not available.\n"
 msgstr "Fejl: Enhed ikke tilgængelig.\n"
@@ -68,133 +69,129 @@
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Fejl: Denne fejl bør aldrig ske (%d). Panik!\n"
 
-#: ogg123/callbacks.c:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:127 ogg123/callbacks.c:132
 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:174
+#: ogg123/callbacks.c:175
 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:233
+#: ogg123/callbacks.c:234
 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:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: ogg123/callbacks.c:280 ogg123/callbacks.c:299 ogg123/callbacks.c:336
+#: ogg123/callbacks.c:355
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Fejl: Slut på hukommelse i decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Systemfejl"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Tolkningsfejl: %s på linje %d i %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Navn"
 
-#: ogg123/cfgfile_options.c:137
+#. Description
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ogg123/cfgfile_options.c:140
+#. Type
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Type"
 
-#: ogg123/cfgfile_options.c:143
+#. Default
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Standardværdi"
 
-#: ogg123/cfgfile_options.c:169
-#, c-format
+#: ogg123/cfgfile_options.c:165
 msgid "none"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:172
-#, c-format
+#: ogg123/cfgfile_options.c:168
 msgid "bool"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:175
-#, c-format
+#: ogg123/cfgfile_options.c:171
 msgid "char"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:178
-#, c-format
+#: ogg123/cfgfile_options.c:174
 msgid "string"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:181
-#, c-format
+#: ogg123/cfgfile_options.c:177
 msgid "int"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:184
-#, c-format
+#: ogg123/cfgfile_options.c:180
 msgid "float"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:187
-#, c-format
+#: ogg123/cfgfile_options.c:183
 msgid "double"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:190
-#, c-format
+#: ogg123/cfgfile_options.c:186
 msgid "other"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:465 oggenc/oggenc.c:470
+#: oggenc/oggenc.c:475 oggenc/oggenc.c:480 oggenc/oggenc.c:485
+#: oggenc/oggenc.c:490
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Lykkedes"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Nøgle fandtes ikke"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Ingen nøgle"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Fejlagtig værdi"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Fejlagtig type i argumentliste"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: ogg123/cmdline_options.c:83
-#, fuzzy
-msgid "Internal error parsing command line options.\n"
-msgstr "Intern fejl ved tolkning af kommandoflag\n"
+#: ogg123/cmdline_options.c:69
+msgid "Internal error: long option given when none expected.\n"
+msgstr "Intern fejl: langt flag brugt når det ikke forventedes.\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:75
 #, 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:102
+#: ogg123/cmdline_options.c:87
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -203,44 +200,44 @@
 "=== Fejl \"%s\" under tolkning af konfigurationsflag fra kommandolinjen.\n"
 "=== Flaget var: %s\n"
 
-#: ogg123/cmdline_options.c:109
-#, c-format
+#. not using the status interface here
+#: ogg123/cmdline_options.c:94
 msgid "Available options:\n"
 msgstr "Tilgængelige flag:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:103
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Ingen enhed %s.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:123
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Drivrutine %s er ikke for filer.\n"
 
-#: ogg123/cmdline_options.c:143
+#: ogg123/cmdline_options.c:128
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "== Kan ikke angive udfil uden at angiv drivrutine.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:143
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Fejlagtigt format på argument: %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:158
 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:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:173
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 fra %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:180
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Kan ikke spille hver 0'te blok!\n"
 
-#: ogg123/cmdline_options.c:216
+#: ogg123/cmdline_options.c:188
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -248,634 +245,389 @@
 "--- Kan ikke spille hver blok 0 gange.\n"
 "--- For at lave en testafkodning, brug null-driveren for uddata.\n"
 
-#: ogg123/cmdline_options.c:232
-#, fuzzy, c-format
-msgid "--- Cannot open playlist file %s.  Skipped.\n"
-msgstr "FEJL: Kan ikke åbne indfil \"%s\": %s\n"
-
-#: ogg123/cmdline_options.c:248
-msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:215
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Drivrutine %s angivet i konfigurationsfil ugyldig.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Kunne ikke indlæse standard-drivrutine, og ingen er specificeret i "
-"konfigurationsfilen. Afslutter.\n"
+#: ogg123/cmdline_options.c:225
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Kunne ikke indlæse standard-drivrutine, og ingen er specificeret i konfigurationsfilen. Afslutter.\n"
 
-#: ogg123/cmdline_options.c:292
+#: ogg123/cmdline_options.c:246
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiphophorus Team (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 fra %s %s\n"
+" af Xiphophorus-gruppen (http://www.xiph.org/)\n"
+"\n"
+"Brug: ogg123 [<flag>] <indfil> ...\n"
+"\n"
+"  -h, --help     denne hjælpeteksten\n"
+"  -V, --version  vis Ogg123's version\n"
+"  -d, --device=d brug 'd' som ud-enhed\n"
+"      Mulige enheder er ('*'=direkte, '@'=fil):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Tilgængelige flag:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:267
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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"
+"  -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"
 "\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"
 msgstr ""
+"  -f, --file=filnavn  Angiv udfilens navn for tidligere valgt \n"
+"        filenhed (med -d).\n"
+"  -k n, --skip n  Overspring de første n sekunder\n"
+"  -o, --device-option=k:v videresend særligt\n"
+"        flag k med værdi v til tidligere valgt enhed (med -d).\n"
+"        Se manualen for mere information.\n"
+"  -b n, --buffer n  brug en ind-buffer på n kilobyte\n"
+"  -p n, --prebuffer n  indlæs n%% af ind-bufferen inden afspilning\n"
+"  -v, --verbose  vis fremadskridende og anden statusinformation\n"
+"  -q, --quiet    vis ingenting (ingen titel)\n"
+"  -x n, --nth    spil hver n'te blok\n"
+"  -y n, --ntimes gentag hvert spillet blok n gange\n"
+"  -z, --shuffle  spil i tilfældig rækkefølge\n"
+"\n"
+"ogg123 hoppar til næste spor hvis den får en SIGINT (Ctrl-C); to SIGINT\n"
+"inden for s millisekunder gør at ogg123 afsluttes.\n"
+"  -l, --delay=s  sæt s [millisekunder] (standard 500).\n"
 
-#: ogg123/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Fil: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Tilgængelige flag:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "Inddata ikke ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Beskrivelse"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Tilgængelige flag:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:207
+#: ogg123/oggvorbis_format.c:109
 msgid "Error: Out of memory.\n"
 msgstr "Fejl: Slut på hukommelse.\n"
 
-#: ogg123/format.c:82
-#, c-format
+#: ogg123/format.c:59
 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:145
+#: ogg123/http_transport.c:119
+msgid "Error: Out of memory in new_curl_thread_arg().\n"
+msgstr "Fejl: Slut på hukommelse i new_curl_thread_arg().\n"
+
+#: ogg123/http_transport.c:144
 msgid "Error: Could not set signal mask."
 msgstr "Fejl: Kunne ikke sætte signalmaske."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:196
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Fejl: Kan ikke oprette ind-buffer\n"
 
-#: ogg123/ogg123.c:82
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:72
 msgid "default output device"
 msgstr "forvalgt udenhed"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:74
 msgid "shuffle playlist"
 msgstr "bland spillelisten"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Mislykkedes at overspringe %f sekunder lyd."
-
-#: ogg123/ogg123.c:378
-#, fuzzy, c-format
+#: ogg123/ogg123.c:255
+#, c-format
 msgid ""
 "\n"
-"Audio Device:   %s"
+"Device:   %s"
 msgstr ""
 "\n"
 "Enhed:    %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:256
 #, c-format
 msgid "Author:   %s"
 msgstr "Forfatter:   %s"
 
-#: ogg123/ogg123.c:380
-#, fuzzy, c-format
-msgid "Comments: %s"
+#: ogg123/ogg123.c:257
+#, c-format
+msgid "Comments: %s\n"
 msgstr "Kommentarer: %s\n"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
-#, fuzzy, c-format
-msgid "Warning: Could not read directory %s.\n"
-msgstr "Kunne ikke oprette katalog \"%s\": %s\n"
-
-#: ogg123/ogg123.c:460
+#: ogg123/ogg123.c:313
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Fejl: Kan ikke oprette lydbuffer.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:387
 #, 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:561
+#: ogg123/ogg123.c:392
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Kan ikke åbne %s.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:398
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Filformatet på %s understøttes ikke.\n"
 
-#: ogg123/ogg123.c:577
+#: ogg123/ogg123.c:405
 #, 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:596
+#: ogg123/ogg123.c:430
 #, c-format
 msgid "Playing: %s"
 msgstr "Spiller: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:435
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Mislykkedes at overspringe %f sekunder lyd."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:473
 msgid "Error: Decoding failure.\n"
 msgstr "Fejl: Afkodning mislykkedes.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Fejl: Fejl på enhed %s.\n"
-
-#: ogg123/ogg123.c:743
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:546
 msgid "Done."
 msgstr "Færdig."
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:50
+#, c-format
+msgid "Artist: %s"
+msgstr "Artist: %s"
+
+#: ogg123/oggvorbis_format.c:51
+#, c-format
+msgid "Album: %s"
+msgstr "Album: %s"
+
+#: ogg123/oggvorbis_format.c:52
+#, c-format
+msgid "Title: %s"
+msgstr "Titel: %s"
+
+#: ogg123/oggvorbis_format.c:53
+#, c-format
+msgid "Version: %s"
+msgstr "Version: %s"
+
+#: ogg123/oggvorbis_format.c:54
+#, c-format
+msgid "Track number: %s"
+msgstr "Spor: %s"
+
+#: ogg123/oggvorbis_format.c:55
+#, c-format
+msgid "Organization: %s"
+msgstr "Organisation: %s"
+
+#: ogg123/oggvorbis_format.c:56
+#, c-format
+msgid "Genre: %s"
+msgstr "Genre: %s"
+
+#: ogg123/oggvorbis_format.c:57
+#, c-format
+msgid "Description: %s"
+msgstr "Beskrivelse: %s"
+
+#: ogg123/oggvorbis_format.c:58
+#, c-format
+msgid "Date: %s"
+msgstr "Dato: %s"
+
+#: ogg123/oggvorbis_format.c:59
+#, c-format
+msgid "Location: %s"
+msgstr "Sted: %s"
+
+#: ogg123/oggvorbis_format.c:60
+#, c-format
+msgid "Copyright %s"
+msgstr "Ophavsret %s"
+
+#: ogg123/oggvorbis_format.c:61
+#, c-format
+msgid "Comment: %s"
+msgstr "Kommentar: %s"
+
+#: ogg123/oggvorbis_format.c:170
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Hul i strømmen; nok ufarligt\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:176
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Vorbis-biblioteket rapporterede en fejl i strømmen.\n"
 
-#: ogg123/oggvorbis_format.c:310
-#, fuzzy, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr "Bitstrømmen har %d kanaler, %ldHz"
-
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:370
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr ""
+msgid "Version is %d"
+msgstr "Version %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:374
 #, 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:327
+#: ogg123/oggvorbis_format.c:382
 #, c-format
+msgid "Bitstream is %d channel, %ldHz"
+msgstr "Bitstrømmen har %d kanaler, %ldHz"
+
+#: ogg123/oggvorbis_format.c:387
+#, c-format
 msgid "Encoded by: %s"
 msgstr "Kodet af: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, fuzzy, c-format
-msgid "Error: Out of memory in create_playlist_member().\n"
-msgstr "Fejl: Slut på hukommelse i new_status_message_arg().\n"
-
-#: ogg123/playlist.c:222
+#: ogg123/status.c:47
 #, c-format
-msgid "Warning from playlist %s: Could not read directory %s.\n"
-msgstr ""
-
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
-#, fuzzy, c-format
-msgid "Error: Out of memory in playlist_to_array().\n"
-msgstr "Fejl: Slut på hukommelse i malloc_action().\n"
-
-#: ogg123/status.c:60
-#, fuzzy, c-format
-msgid "%sPrebuf to %.1f%%"
+msgid "%sPrebuf to %1.f%%"
 msgstr "%sForbufr til %1.f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sPauseret"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr ""
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
-#, c-format
+#: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
+#: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Hukommelsestildelingsfejl i stats_init()\n"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Tid: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "af %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Gennemsnitlig bithastighed: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr " Indbuffer %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr " Udbuffer %5.1f%%"
 
-#: ogg123/transport.c:71
-#, c-format
+#: ogg123/transport.c:59
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Fejl: Kunne ikke reservere hukommelse i malloc_data_source_stats()\n"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 fra %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, fuzzy, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr "Brug: vcut indfil.ogg udfil1.ogg udfil2.ogg skærepunkt\n"
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "FEJL: Kan ikke åbne indfil \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "FEJL: Kan ikke åbne udfil \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Mislykkedes at åbne fil som vorbis-type: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Fejl ved åbning af indfil \"%s\".\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"FEJL: Ingen indfil angivet. Brug -h for hjælp.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr "FEJL: Flere indfiler med angivet udfilnavn: anbefaler at bruge -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:38
 msgid "WAV file reader"
 msgstr "WAV-fillæser"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:39
 msgid "AIFF/AIFC file reader"
 msgstr "AIFF/AIFC-fillæser"
 
-#: oggenc/audio.c:53
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "WAV-fillæser"
-
-#: oggenc/audio.c:54
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "WAV-fillæser"
-
-#: oggenc/audio.c:131 oggenc/audio.c:425
-#, c-format
+#: oggenc/audio.c:112 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Advarsel: Uventet EOF under læsning af WAV-hoved\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:123
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Overspringer bid af type \"%s\", længde %d\n"
 
-#: oggenc/audio.c:168
-#, c-format
+#: oggenc/audio.c:141
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Advarsel: Uventet EOF i AIFF-blok\n"
 
-#: oggenc/audio.c:254
-#, c-format
+#: oggenc/audio.c:226
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Advarsel: Ingen fælles blok i AIFF-fil\n"
 
-#: oggenc/audio.c:260
-#, c-format
+#: oggenc/audio.c:232
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Advarsel: Afkortet fælles blok i AIFF-hoved\n"
 
-#: oggenc/audio.c:268
-#, c-format
+#: oggenc/audio.c:240
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Advarsel: Uventet EOF under læsning af AIFF-hoved\n"
 
-#: oggenc/audio.c:283
-#, c-format
+#: oggenc/audio.c:253
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Advarsel: AIFF-C-hoved afkortet.\n"
 
-#: oggenc/audio.c:297
-#, fuzzy, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
+#: oggenc/audio.c:258
+msgid "Warning: Can't handle compressed AIFF-C\n"
 msgstr "Advarsel: Kan ikke håndtere komprimeret AIFF-C\n"
 
-#: oggenc/audio.c:304
-#, c-format
+#: oggenc/audio.c:265
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Advarsel: Finder ingen SSND-blok i AIFF-fil\n"
 
-#: oggenc/audio.c:310
-#, c-format
+#: oggenc/audio.c:271
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Advarsel: Fejlagtig SSND-blok i AIFF-hoved\n"
 
-#: oggenc/audio.c:316
-#, c-format
+#: oggenc/audio.c:277
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Advarsel: Uventet EOF under læsning af AIFF-hoved\n"
 
-#: oggenc/audio.c:353
+#: oggenc/audio.c:290 oggenc/audio.c:417
 #, c-format
 msgid ""
+"Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
+" At other than 44.1/48 kHz quality will be degraded.\n"
+msgstr ""
+"Advarsel: Vorbis er i øjeblikket ikke justeret for denne\n"
+"samplingsfrekvens på inddata (%.3f kHz).  Kvaliteten bliver forværret\n"
+"ved anden frekvens end 44.1/48 kHz.\n"
+
+#: oggenc/audio.c:314
+msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\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:407
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Advarsel: ukendt format på blok i Wav-hoved\n"
 
-#: oggenc/audio.c:420
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -883,131 +635,55 @@
 "Advarsel: UGYLDIGT format på blok i wav-hoved.\n"
 " Forsøger at læse alligevel (fungerer måske ikke)...\n"
 
-#: oggenc/audio.c:458
-#, c-format
+#: oggenc/audio.c:406
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
-" or type 3 floating point PCM)\n"
+" or type 3 floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:467
-#, c-format
+#: oggenc/audio.c:460
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:528
+#: oggenc/audio.c:558
 #, c-format
 msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
+"Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
+" At other than 44.1/48 kHz quality will be significantly degraded.\n"
 msgstr ""
+"Advarsel: Vorbis er i øjeblikket ikke justeret for denne\n"
+" samplingsfrekvens (%.3f kHz). Ved andet end 44.1 eller 48 kHz bliver\n"
+" kvaliteten væsentligt forværret.\n"
 
-#: oggenc/audio.c:604
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:624
-#, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:630
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:732
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-
-#: oggenc/audio.c:750
-#, c-format
-msgid "Couldn't initialise resampler\n"
-msgstr ""
-
-#: oggenc/encode.c:64
-#, c-format
-msgid "Setting advanced encoder option \"%s\" to %s\n"
-msgstr ""
-
-#: oggenc/encode.c:101
-#, c-format
-msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
-msgstr ""
-
-#: oggenc/encode.c:104
-#, fuzzy, c-format
-msgid "Unrecognised advanced option \"%s\"\n"
-msgstr "%s: ukendt flag \"--%s\"\n"
-
-#: oggenc/encode.c:111
-#, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:115 oggenc/encode.c:252
-#, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-
-#: oggenc/encode.c:182
-#, c-format
-msgid "Requesting a minimum or maximum bitrate requires --managed\n"
-msgstr ""
-
-#: oggenc/encode.c:200
-#, c-format
+#: oggenc/encode.c:59
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 
-#: oggenc/encode.c:245
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:247
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:263
-#, c-format
+#: oggenc/encode.c:71
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:110
 msgid "Failed writing header to output stream\n"
 msgstr "Mislykkedes at skrive hoved til udstrømmen\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:178
 msgid "Failed writing data to output stream\n"
 msgstr "Mislykkedes at skrive data til udstrømmen\n"
 
-#: oggenc/encode.c:472
-#, fuzzy, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
+#: oggenc/encode.c:224
+#, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 msgstr "\t[%5.1f%%] [%2dm%.2ds resterer] %c"
 
-#: oggenc/encode.c:482
-#, fuzzy, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+#: oggenc/encode.c:234
+#, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr "\tKoder [%2dm%.2ds til nu] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:252
 #, c-format
 msgid ""
 "\n"
@@ -1018,8 +694,7 @@
 "\n"
 "Kodning af \"%s\" færdig\n"
 
-#: oggenc/encode.c:502
-#, c-format
+#: oggenc/encode.c:254
 msgid ""
 "\n"
 "\n"
@@ -1029,7 +704,7 @@
 "\n"
 "Kodning klar.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:258
 #, c-format
 msgid ""
 "\n"
@@ -1038,17 +713,17 @@
 "\n"
 "\tFillængde:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:262
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tForløbet tid: %dm %04.1fs\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:265
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tHastighed:    %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:266
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1057,1043 +732,463 @@
 "\tGennemsnitlig bithastighed: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:551
-#, fuzzy, c-format
+#: oggenc/encode.c:290
+#, c-format
 msgid ""
 "Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at average bitrate %d kbps "
+"         %s%s%s at quality %2.2f\n"
 msgstr ""
 "Koder %s%s%s til \n"
 "         %s%s%s med kvalitet %2.2f\n"
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:291 oggenc/encode.c:298
 msgid "standard input"
 msgstr "standard ind"
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:292 oggenc/encode.c:299
 msgid "standard output"
 msgstr "standard ud"
 
-#: oggenc/encode.c:559
-#, fuzzy, c-format
+#: oggenc/encode.c:295
+#, c-format
 msgid ""
 "Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at approximate bitrate %d kbps (VBR encoding enabled)\n"
+"         %s%s%s at bitrate %d kbps,\n"
+"using full bitrate management engine\n"
 msgstr ""
 "Koder %s%s%s til\n"
 "         %s%s%s med bithastighed %d kbps,\n"
 "med komplet bithastighedhåndteringsmotor\n"
 
-#: oggenc/encode.c:567
-#, fuzzy, c-format
+#: oggenc/oggenc.c:90
+#, c-format
 msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at quality level %2.2f using constrained VBR "
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
-"Koder %s%s%s til \n"
-"         %s%s%s med kvalitet %2.2f\n"
-
-#: oggenc/encode.c:574
-#, fuzzy, c-format
-msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at quality %2.2f\n"
-msgstr ""
-"Koder %s%s%s til \n"
-"         %s%s%s med kvalitet %2.2f\n"
-
-#: oggenc/encode.c:580
-#, fuzzy, c-format
-msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"using bitrate management "
-msgstr ""
-"Koder %s%s%s til\n"
-"         %s%s%s med bithastighed %d kbps,\n"
-"med komplet bithastighedhåndteringsmotor\n"
-
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
-msgstr ""
 "%s%s\n"
 "FEJL: Ingen indfil angivet. Brug -h for hjælp.\n"
 
-#: oggenc/oggenc.c:118
-#, c-format
+#: oggenc/oggenc.c:105
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "FEJL: Flere filer angivne med stdin\n"
 
-#: oggenc/oggenc.c:125
-#, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
+#: oggenc/oggenc.c:112
+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:186
+#: oggenc/oggenc.c:166
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "FEJL: Kan ikke åbne indfil \"%s\": %s\n"
 
-#: oggenc/oggenc.c:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "WAV-fillæser"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:193
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Åbner med %s-modul: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:202
 #, 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:280
-#, c-format
+#: oggenc/oggenc.c:249
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "ADVARSEL: Intet filnavn, bruger forvalgt navn \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:257
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+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:295
-#, 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:306
+#: oggenc/oggenc.c:268
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "FEJL: Kan ikke åbne udfil \"%s\": %s\n"
 
-#: oggenc/oggenc.c:350
-#, c-format
-msgid "Resampling input from %d Hz to %d Hz\n"
-msgstr ""
-
-#: oggenc/oggenc.c:357
-#, c-format
-msgid "Downmixing stereo to mono\n"
-msgstr ""
-
-#: oggenc/oggenc.c:360
-#, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
-msgstr ""
-
-#: oggenc/oggenc.c:368
-#, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 fra %s %s\n"
-
-#: oggenc/oggenc.c:416
-#, c-format
+#: oggenc/oggenc.c:316
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"WARNING: Usage of the bitrate options (-b, -m, -M) has been deprecated\n"
+"To use these, you must specify that you wish to use managed mode, using\n"
+"the --managed option.\n"
+"This will cause oggenc to enable the full bitrate management engine.\n"
+"You should do this ONLY if bitrate management is critical to your usage\n"
+"(for example, certain audio streaming applications).\n"
+"Usage of the bitrate management engine will generally decrease quality,\n"
+"using the normal fully VBR modes (quality specified using -q) is\n"
+"very highly recommended for most users.\n"
+"Usage of the -managed option will become MANDATORY in the next release.\n"
 "\n"
 msgstr ""
 
-#: oggenc/oggenc.c:417
-#, c-format
+#: oggenc/oggenc.c:331
+#, fuzzy, c-format
 msgid ""
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
+"\n"
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\n"
-" --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
+" -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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\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. 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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
+"                      argument in kbps.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel. Using this will\n"
-"                      automatically enable managed bitrate mode (see\n"
-"                      --managed).\n"
+"                      encoding for a fixed-size channel.\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications. Using this will automatically\n"
-"                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
-" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
-"                      high), instead of specifying a particular bitrate.\n"
+"                      streaming applications.\n"
+" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
+"                      instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
-" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
-"                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
-"                      used multiple times. The argument should be in the\n"
-"                      format \"tag=value\".\n"
+"                      used multiple times.\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\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 "
-"additional\n"
+" OggEnc input files must currently be 16 or 8 bit PCM WAV, AIFF, or AIFF/C\n"
+" files. Files may be mono or stereo (or more channels) and any sample rate.\n"
+" However, the encoder is only tuned for rates of 44.1 and 48 kHz and while\n"
+" other rates will be accepted quality will be significantly degraded.\n"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
-" In this mode, output is to stdout unless an output filename is specified\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Brug: oggenc [flag] indfil.wav [...]\n"
+"\n"
+"FLAG:\n"
+" Generelle:\n"
+" -Q, --quiet          Skriv ikke på stderr\n"
+" -h, --help           Vis denne hjælpetekst\n"
+" -r, --raw            Rå-tilstand. Indfiler læses direkte som PCM-data\n"
+" -B, --raw-bits=n     Vælg bit/sample for rå-inddata. Standardværdi er 16\n"
+" -C, --raw-chan=n     Vælg antal kanaler for rå-inddata. Standardværdi er 2\n"
+" -R, --raw-rate=n     Vælg samplinger/sekund for rå-inddata. Standardværdi er 44100\n"
+" -b, --bitrate        Vælg en nominel bithastighed at kode\n"
+"                      i. Forsøger at kode med en bithastighed som i\n"
+"                      gennemsnit bliver denne. Tager et argument i kbps.\n"
+" -m, --min-bitrate    Angiv minimal bithastighed (i kbps). Brugbart\n"
+"                      til at kode for en kanal med bestemt størrelse.\n"
+" -M, --max-bitrate    Angiv maksimal bithastighed (i kbps). Nyttigt\n"
+"                      for strømmende applikationer.\n"
+" -q, --quality        Angiv kvalitet mellem 0 (lav) og 10 (høj),\n"
+"                      i stedet til at angiv særlige bithastigheder.\n"
+"                      Dette er den normale arbejdsmåde. Kvalitet i\n"
+"                      brøkdele (fx 2.75) er tilladt.\n"
+" -s, --serial         Angiv et serienummer for strømmen. Hvis flere\n"
+"                      filer kodes vil dette blive øget for hver\n"
+"                      strøm efter den første.\n"
+"\n"
+" Navngivning:\n"
+" -o, --output=fn      Skriv til fil fn (kun gyldig for enkeltstående fil)\n"
+" -n, --names=streng   Opret filer med navn ifølge streng, hvor %%a, %%t, %%l,\n"
+"                      %%n, %%d erstattes med artist, titel, album, spor\n"
+"                      respektive dato (se nedenfor for at angive\n"
+"                      disse). %%%% giver et bogstaveligt %%.\n"
+" -X, --name-remove=s  Fjern angivne tegn fra parametrene til\n"
+"                      formatstrengen for -n. God til at forsikre sig\n"
+"                      om gyldige filnavne.\n"
+" -P, --name-replace=s Erstat tegn fjernet af --name-remove med\n"
+"                      angivet tegn. Hvis denne streng er kortere end\n"
+"                      listen til --name-remove, eller udeladt, fjernes\n"
+"                      ekstra tegn.\n"
+"                      Forvalgte værdier for de to ovenstående\n"
+"                      argumenter afhænger af platformen.\n"
+" -c, --comment=c      Tilføj argumentstrengen som en ekstra\n"
+"                      kommentar.  Kan bruges flere gange.\n"
+" -d, --date           Dato for sporet (almindeligvis dato for optræden)\n"
+" -N, --tracknum       Spornummer for dette spor\n"
+" -t, --title          Titel for dette spor\n"
+" -l, --album          Navn på albummet\n"
+" -a, --artist         Navn på artisten\n"
+" -G, --genre          Sporets genre\n"
+"                      Hvis flere indfiler angives vil flere tilfælde af de\n"
+"                      fem foregående flag bruges i given\n"
+"                      rækkefølge. Hvis antal titler er færre end antal\n"
+"                      indfiler viser OggEnc en advarsel og genbruger\n"
+"                      det sidste argument. Hvis antal spornumre er\n"
+"                      færre bliver de resterende filer unummererede. For\n"
+"                      øvrige flag genbruges det sidste mærke uden\n"
+"                      advarsel (så du fx kan angive en dato en gang\n"
+"                      og bruge den for alle filer).\n"
+"\n"
+"INDFILER:\n"
+" Indfiler til OggEnc skal i øjeblikket være 16 eller 8 bit RCM\n"
+" WAV, AIFF eller AIFF/C.  De kan være mono eller stereo (eller flere\n"
+" kanaler) med vilkårlig samplingshastighed.  Dog er koderen kun\n"
+" justeret for 44.1 og 48 kHz samplingshastighed, og også selvom andre\n"
+" hastigheder accepteres bliver kvaliteten væsentligt\n"
+" forværret. Alternativt kan flaget --raw bruges til at bruge en\n"
+" fil med rå PCM-data, hvilken skal være 16 bit stereo little-endian\n"
+" PCM ('headerless wav') hvis ikke yderligere flag for rå-tilstand\n"
+" bruges.\n"
+" Du kan læse fra stdin gennem at angive - som navn for indfilen. I denne\n"
+" tilstand går uddata til stdout hvis intet filnavn angives med -o\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:495
 #, 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:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
-#, c-format
+#: oggenc/oggenc.c:518
 msgid "Enabling bitrate management engine\n"
 msgstr ""
 
-#: oggenc/oggenc.c:661
-#, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:664
-#, c-format
-msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:671
-#, c-format
-msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:677
-#, c-format
-msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
-msgstr ""
-
-#: oggenc/oggenc.c:687
-#, fuzzy, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Kunne ikke tolke skærepunkt \"%s\"\n"
-
-#: oggenc/oggenc.c:700
-#, c-format
-msgid "No value for advanced encoder option found\n"
-msgstr ""
-
-#: oggenc/oggenc.c:718
-#, c-format
+#: oggenc/oggenc.c:522
 msgid "Internal error parsing command line options\n"
 msgstr ""
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:569
 #, c-format
-msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:766
-#, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:582
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:594
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:600
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr ""
 
-#: oggenc/oggenc.c:807
-#, c-format
+#: oggenc/oggenc.c:607
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:813
-#, c-format
+#: oggenc/oggenc.c:612
+msgid "WARNING: negative quality specified, setting to minimum.\n"
+msgstr ""
+
+#: oggenc/oggenc.c:618
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:822
-#, c-format
+#: oggenc/oggenc.c:627
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:831
-#, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
+#: oggenc/oggenc.c:636
+msgid "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:839
-#, c-format
+#: oggenc/oggenc.c:644
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 fra %s %s\n"
-
-#: oggenc/oggenc.c:858
-#, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:663
+msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
-#, c-format
+#. Failed, so just set to 16
+#: oggenc/oggenc.c:668 oggenc/oggenc.c:672
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:874
-#, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
+#: oggenc/oggenc.c:679
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:879
-#, c-format
+#. Failed, so just set to 2
+#: oggenc/oggenc.c:684
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:890
-#, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:695
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:895
-#, c-format
+#. Failed, so just set to 44100
+#: oggenc/oggenc.c:700
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:902
-#, c-format
+#: oggenc/oggenc.c:704
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr ""
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr ""
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
-#, c-format
+#: oggenc/oggenc.c:726
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:954
-#, c-format
+#: oggenc/oggenc.c:745
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:139
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Kunne ikke oprette katalog \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:146
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr ""
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:157
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:212
+#: ogginfo/ogginfo.c:33
 #, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
-msgstr ""
+msgid "Usage: %s [filename1.ogg] ... [filenameN.ogg]\n"
+msgstr "Brug: %s [filnavn1.ogg] ... [filnavnN.ogg]\n"
 
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo.c:38
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
+msgid "filename=%s\n"
+msgstr "filnavn=%s\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo.c:68
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:266
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:342
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:356
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:389
-#, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:396
-#, 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:400
-#, c-format
-msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:403
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Version: %s"
-
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
-#, fuzzy, c-format
-msgid "Vendor: %s\n"
+msgid "vendor=%s\n"
 msgstr "leverandør=%s\n"
 
-#: ogginfo/ogginfo2.c:406
+#: ogginfo/ogginfo.c:70
 #, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, c-format
-msgid "Height: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:408
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:416
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:429
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:431
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:433
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:437
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:439
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:441
-msgid "Colourspace unspecified\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:444
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:446
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:448
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:450
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:452
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
-
-#: ogginfo/ogginfo2.c:453
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
-msgid "User comments section follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:477
-msgid "Warning: Expected frame %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:520
 msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
+"version=%d\n"
+"channels=%d\n"
+"rate=%ld\n"
 msgstr ""
+"version=%d\n"
+"kanaler=%d\n"
+"hastighed=%ld\n"
 
-#: ogginfo/ogginfo2.c:557
-#, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
+#: ogginfo/ogginfo.c:75
+msgid "bitrate_upper="
 msgstr ""
 
-#: ogginfo/ogginfo2.c:565
-#, 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"
+#: ogginfo/ogginfo.c:77 ogginfo/ogginfo.c:83 ogginfo/ogginfo.c:89
+msgid "none\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:569
-#, c-format
-msgid "Vorbis headers parsed for stream %d, information follows...\n"
-msgstr ""
+#: ogginfo/ogginfo.c:81
+msgid "bitrate_nominal="
+msgstr "nominel bithastighed="
 
-#: ogginfo/ogginfo2.c:572
-#, fuzzy, c-format
-msgid "Version: %d\n"
-msgstr "Version: %s"
+#: ogginfo/ogginfo.c:87
+msgid "bitrate_lower="
+msgstr "nedre bithastighed="
 
-#: ogginfo/ogginfo2.c:576
-#, fuzzy, c-format
-msgid "Vendor: %s (%s)\n"
-msgstr "leverandør=%s\n"
-
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo.c:91
 #, c-format
-msgid "Channels: %d\n"
+msgid "%ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:585
-#, fuzzy, c-format
-msgid ""
-"Rate: %ld\n"
-"\n"
-msgstr "Dato: %s"
-
-#: ogginfo/ogginfo2.c:588
-#, fuzzy, c-format
-msgid "Nominal bitrate: %f kb/s\n"
-msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
-
-#: ogginfo/ogginfo2.c:591
-msgid "Nominal bitrate not set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:594
-#, fuzzy, c-format
-msgid "Upper bitrate: %f kb/s\n"
-msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
-
-#: ogginfo/ogginfo2.c:597
-msgid "Upper bitrate not set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:600
-#, fuzzy, c-format
-msgid "Lower bitrate: %f kb/s\n"
-msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
-
-#: ogginfo/ogginfo2.c:603
-msgid "Lower bitrate not set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo.c:100
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
+msgid "bitrate_average=%ld\n"
+msgstr "gennemsnitlig bithastighed=%ld\n"
 
-#: ogginfo/ogginfo2.c:651
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:692
+#: ogginfo/ogginfo.c:101
 #, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
+msgid "length=%f\n"
+msgstr "længde=%f\n"
 
-#: ogginfo/ogginfo2.c:703
+#: ogginfo/ogginfo.c:102
 #, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
+msgid "playtime=%ld:%02ld\n"
+msgstr "spilletid=%ld:%02ld\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo.c:300
 #, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
+msgid "Unable to open \"%s\": %s\n"
+msgstr "Kan ikke åbne \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:738
+#: ogginfo/ogginfo.c:319
 #, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Version: %s"
-
-#: ogginfo/ogginfo2.c:747
-#, c-format
-msgid "Language: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Dato: %s"
-
-#: ogginfo/ogginfo2.c:756
-msgid "No category set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
-#, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
-#, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:783
-msgid "Unknown text directionality\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:795
-msgid "Invalid zero granulepos rate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:797
-#, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:810
-msgid "\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:828
-#, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
-#, c-format
-msgid "Warning: EOS not set on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1048
-msgid "Warning: Invalid header page, no packet found\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1074
-#, c-format
-msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1088
-#, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1105
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1129
-#, fuzzy, c-format
-msgid "Error opening input file \"%s\": %s\n"
-msgstr "Fejl ved åbning af indfil \"%s\".\n"
-
-#: ogginfo/ogginfo2.c:1134
-#, fuzzy, c-format
-msgid ""
-"Processing file \"%s\"...\n"
 "\n"
+"serial=%ld\n"
 msgstr ""
-"\n"
-"\n"
-"Kodning af \"%s\" færdig\n"
 
-#: ogginfo/ogginfo2.c:1143
-#, fuzzy
-msgid "Could not find a processor for stream, bailing\n"
-msgstr "Kunne ikke åbne %s for læsning\n"
-
-#: ogginfo/ogginfo2.c:1151
-msgid "Page found for stream after EOS flag"
+#: ogginfo/ogginfo.c:320
+msgid "header_integrity=pass\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
+#: ogginfo/ogginfo.c:323
+msgid "header_integrity=fail\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1158
-msgid "Error unknown."
+#: ogginfo/ogginfo.c:328
+msgid "stream_integrity=pass\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1161
-#, c-format
-msgid ""
-"Warning: illegally placed page(s) for logical stream %d\n"
-"This indicates a corrupt ogg file: %s.\n"
+#: ogginfo/ogginfo.c:331
+msgid "stream_integrity=fail\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1173
-#, c-format
-msgid "New logical stream (#%d, serial: %08x): type %s\n"
+#: ogginfo/ogginfo.c:334
+msgid "stream_truncated=false\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1176
-#, c-format
-msgid "Warning: stream start flag not set on stream %d\n"
+#: ogginfo/ogginfo.c:336
+msgid "stream_truncated=true\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1180
+#: ogginfo/ogginfo.c:344
 #, c-format
-msgid "Warning: stream start flag found in mid-stream on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1185
-#, 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:1200
-#, c-format
-msgid "Logical stream %d ended\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1208
-#, c-format
-msgid ""
-"Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 fra %s %s\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, c-format
-msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
-"Flags supported:\n"
-"\t-h Show this help message\n"
-"\t-q Make less verbose. Once will remove detailed informative\n"
-"\t   messages, two will remove warnings\n"
-"\t-v Make more verbose. This may enable more detailed checks\n"
-"\t   for some stream types.\n"
+"total_length=%f\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1234
+#: ogginfo/ogginfo.c:345
 #, c-format
-msgid "\t-V Output version information and exit\n"
+msgid "total_playtime=%ld:%02ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1246
-#, c-format
-msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
-"\n"
-"ogginfo is a tool for printing information about Ogg files\n"
-"and for diagnosing problems with them.\n"
-"Full help shown with \"ogginfo -h\".\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1280
-#, fuzzy, c-format
-msgid "No input files specified. \"ogginfo -h\" for help\n"
-msgstr ""
-"%s%s\n"
-"FEJL: Ingen indfil angivet. Brug -h for hjælp.\n"
-
 #: share/getopt.c:673
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -2114,16 +1209,19 @@
 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"
@@ -2134,6 +1232,7 @@
 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"
@@ -2149,101 +1248,82 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flaget `-W %s' tager intet argument\n"
 
-#: vcut/vcut.c:149
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr ""
 
-#: vcut/vcut.c:166
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr ""
 
-#: vcut/vcut.c:206
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr ""
 
-#: vcut/vcut.c:215
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr ""
 
-#: vcut/vcut.c:225
-#, c-format
+#: vcut/vcut.c:192
 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:277
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr ""
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr "Skærepunkt uden for strømmen. Anden fil vil være tom\n"
-
-#: vcut/vcut.c:353
-#, c-format
+#. 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:284
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
 msgstr ""
 
-#: vcut/vcut.c:373
-#, c-format
-msgid "Update sync returned 0, setting eos\n"
-msgstr ""
-
-#: vcut/vcut.c:378
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr ""
 
-#: vcut/vcut.c:387
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr ""
 
-#: vcut/vcut.c:449
-#, c-format
+#: vcut/vcut.c:330
+msgid "Update sync returned 0, setting eos\n"
+msgstr ""
+
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "Inddata ikke ogg.\n"
 
-#: vcut/vcut.c:459
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Fejl på første side\n"
 
-#: vcut/vcut.c:464
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "fejl i første pakke\n"
 
-#: vcut/vcut.c:470
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Fejl i primært hoved: ikke vorbis?\n"
 
-#: vcut/vcut.c:490
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Sekundært hoved fejlagtigt\n"
 
-#: vcut/vcut.c:503
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "EOF i hoved\n"
 
-#: vcut/vcut.c:535
-#, fuzzy, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+#: vcut/vcut.c:456
+#, fuzzy
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
 msgstr "Brug: vcut indfil.ogg udfil1.ogg udfil2.ogg skærepunkt\n"
 
-#: vcut/vcut.c:539
-#, c-format
+#: vcut/vcut.c:460
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -2253,656 +1333,166 @@
 "Undersøg resultatet inden kilderne slettes.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Kunne ikke åbne %s for læsning\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Kunne ikke åbne %s for skrivning\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Kunne ikke tolke skærepunkt \"%s\"\n"
 
-#: vcut/vcut.c:570
+#: vcut/vcut.c:484
 #, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+msgid "Processing: Cutting at %lld\n"
 msgstr ""
 
-#: vcut/vcut.c:572
-#, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr ""
-
-#: vcut/vcut.c:582
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr ""
 
-#: vcut/vcut.c:604
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr ""
 
-#: vcut/vcut.c:627
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr ""
 
-#: vcut/vcut.c:635
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr ""
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:214
+msgid "Input truncated or empty."
+msgstr "Inddata trunkeret eller tomt."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:216
+msgid "Input is not an Ogg bitstream."
+msgstr "Inddata er ikke en Ogg-bitstrøm."
+
+#: vorbiscomment/vcedit.c:232
 msgid "Error reading first page of Ogg bitstream."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:238
 msgid "Error reading initial header packet."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Inddata trunkeret eller tomt."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "Inddata er ikke en Ogg-bitstrøm."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:244
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Ogg-bitstrøm indeholder ikke vorbisdata."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "EOF før slutningen på vorbis-hovedet."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg-bitstrøm indeholder ikke vorbisdata."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:267
 msgid "Corrupt secondary header."
 msgstr "Fejlagtigt sekundær-hoved."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:288
 msgid "EOF before end of vorbis headers."
 msgstr "EOF før slutningen på vorbis-hovedet."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:444
 msgid "Corrupt or missing data, continuing..."
 msgstr "Data ødelagt eller mangler, fortsætter..."
 
-#: vorbiscomment/vcedit.c:875
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+#: vorbiscomment/vcedit.c:479
+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:190 vorbiscomment/vcomment.c:216
+#: vorbiscomment/vcomment.c:100 vorbiscomment/vcomment.c:122
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Mislykkedes at åbne fil som vorbis-type: %s\n"
 
-#: vorbiscomment/vcomment.c:235
+#: vorbiscomment/vcomment.c:138
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Fejlagtig kommentar: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:150
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "fejlagtig kommentar: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Mislykkedes at skrive kommentar til udfil: %s\n"
 
-#: vorbiscomment/vcomment.c:274
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:173
 msgid "no action specified\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
-msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
+#: vorbiscomment/vcomment.c:250
+msgid "Couldn't convert comment to UTF8, cannot add\n"
+msgstr "Kunne ikke konvertere til UTF8, kan ikke tilføje\n"
 
-#: vorbiscomment/vcomment.c:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
+#: vorbiscomment/vcomment.c:268
 msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
 msgstr ""
+"Brug:\n"
+"  vorbiscomment [-l] fil.ogg (lister kommentarer)\n"
+"  vorbiscomment -a ind.ogg ud.ogg (tilføjer kommentarer)\n"
+"  vorbiscomment -w ind.ogg ud.ogg (ændrer kommentarer)\n"
+"\tfor skrivning forventes nye kommentarer på formen 'TAG=værdi'\n"
+"\tpå stdin.  Disse erstatter helt de gamle.\n"
+"   Både -a og -w accepterer et filnavn, i så fald bruges en temporær\n"
+"   fil.\n"
+"   -c kan bruges til at læse kommentarer fra en fil i stedet for\n"
+"   stdin.\n"
+"   Eksempel: vorbiscomment -a ind.ogg -c kommentarer.txt\n"
+"   tilføjer kommentarerne i kommentarer.txt til ind.ogg\n"
+"   Til slut kan du angive mærker der skal tilføjes på kommandolinjen med\n"
+"   flaget -t.  Fx\n"
+"   vorbiscomment -a in.ogg -t \"ARTIST=Nogen Artist\" -t \"TITLE=En titel\"\n"
+"   (når du bruger dette flag er læsning fra kommentarfil eller\n"
+"   stdin deaktiveret)\n"
 
-#: vorbiscomment/vcomment.c:391
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Fejlagtig type i argumentliste"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
+#: vorbiscomment/vcomment.c:339
 msgid "Internal error parsing command options\n"
 msgstr "Intern fejl ved tolkning af kommandoflag\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:422
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Fejl ved åbning af indfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:587
+#: vorbiscomment/vcomment.c:438
 #, c-format
-msgid "Input filename may not be the same as output filename\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:598
-#, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Fejl ved åbning af udfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:453
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Fejl ved åbning af kommentarfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:470
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Fejl ved åbning af kommentarfil \"%s\"\n"
-
-#: vorbiscomment/vcomment.c:664
-#, fuzzy, c-format
-msgid "Error removing old file %s\n"
-msgstr "Fejl ved åbning af udfil \"%s\".\n"
-
-#: vorbiscomment/vcomment.c:666
-#, fuzzy, c-format
-msgid "Error renaming %s to %s\n"
-msgstr "Fejl ved åbning af indfil \"%s\".\n"
-
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Fejl ved åbning af udfil \"%s\".\n"
-
-#~ msgid "Internal error: long option given when none expected.\n"
-#~ msgstr "Intern fejl: langt flag brugt når det ikke forventedes.\n"
-
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiphophorus Team (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 fra %s %s\n"
-#~ " af Xiphophorus-gruppen (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Brug: ogg123 [<flag>] <indfil> ...\n"
-#~ "\n"
-#~ "  -h, --help     denne hjælpeteksten\n"
-#~ "  -V, --version  vis Ogg123's version\n"
-#~ "  -d, --device=d brug 'd' som ud-enhed\n"
-#~ "      Mulige enheder er ('*'=direkte, '@'=fil):\n"
-#~ "        "
-
-#~ 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"
-#~ "  -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"
-#~ "\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"
-#~ msgstr ""
-#~ "  -f, --file=filnavn  Angiv udfilens navn for tidligere valgt \n"
-#~ "        filenhed (med -d).\n"
-#~ "  -k n, --skip n  Overspring de første n sekunder\n"
-#~ "  -o, --device-option=k:v videresend særligt\n"
-#~ "        flag k med værdi v til tidligere valgt enhed (med -d).\n"
-#~ "        Se manualen for mere information.\n"
-#~ "  -b n, --buffer n  brug en ind-buffer på n kilobyte\n"
-#~ "  -p n, --prebuffer n  indlæs n%% af ind-bufferen inden afspilning\n"
-#~ "  -v, --verbose  vis fremadskridende og anden statusinformation\n"
-#~ "  -q, --quiet    vis ingenting (ingen titel)\n"
-#~ "  -x n, --nth    spil hver n'te blok\n"
-#~ "  -y n, --ntimes gentag hvert spillet blok n gange\n"
-#~ "  -z, --shuffle  spil i tilfældig rækkefølge\n"
-#~ "\n"
-#~ "ogg123 hoppar til næste spor hvis den får en SIGINT (Ctrl-C); to SIGINT\n"
-#~ "inden for s millisekunder gør at ogg123 afsluttes.\n"
-#~ "  -l, --delay=s  sæt s [millisekunder] (standard 500).\n"
-
-#~ msgid "Error: Out of memory in new_curl_thread_arg().\n"
-#~ msgstr "Fejl: Slut på hukommelse i new_curl_thread_arg().\n"
-
-#~ msgid "Artist: %s"
-#~ msgstr "Artist: %s"
-
-#~ msgid "Album: %s"
-#~ msgstr "Album: %s"
-
-#~ msgid "Title: %s"
-#~ msgstr "Titel: %s"
-
-#~ msgid "Track number: %s"
-#~ msgstr "Spor: %s"
-
-#~ msgid "Organization: %s"
-#~ msgstr "Organisation: %s"
-
-#~ msgid "Genre: %s"
-#~ msgstr "Genre: %s"
-
-#~ msgid "Description: %s"
-#~ msgstr "Beskrivelse: %s"
-
-#~ msgid "Location: %s"
-#~ msgstr "Sted: %s"
-
-#~ msgid "Copyright %s"
-#~ msgstr "Ophavsret %s"
-
-#~ msgid "Comment: %s"
-#~ msgstr "Kommentar: %s"
-
-#~ msgid "Version is %d"
-#~ msgstr "Version %d"
-
-#~ msgid ""
-#~ "Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
-#~ " At other than 44.1/48 kHz quality will be degraded.\n"
-#~ msgstr ""
-#~ "Advarsel: Vorbis er i øjeblikket ikke justeret for denne\n"
-#~ "samplingsfrekvens på inddata (%.3f kHz).  Kvaliteten bliver forværret\n"
-#~ "ved anden frekvens end 44.1/48 kHz.\n"
-
-#~ msgid ""
-#~ "Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
-#~ " At other than 44.1/48 kHz quality will be significantly degraded.\n"
-#~ msgstr ""
-#~ "Advarsel: Vorbis er i øjeblikket ikke justeret for denne\n"
-#~ " samplingsfrekvens (%.3f kHz). Ved andet end 44.1 eller 48 kHz bliver\n"
-#~ " kvaliteten væsentligt forværret.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " General:\n"
-#~ " -Q, --quiet          Produce no output to stderr\n"
-#~ " -h, --help           Print this help text\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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\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.\n"
-#~ " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-#~ "                      encoding for a fixed-size channel.\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"
-#~ "                      This is the normal mode of operation.\n"
-#~ "                      Fractional qualities (e.g. 2.75) are permitted\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"
-#~ "\n"
-#~ " Naming:\n"
-#~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times.\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 16 or 8 bit PCM WAV, AIFF, or AIFF/"
-#~ "C\n"
-#~ " files. Files may be mono or stereo (or more channels) and any sample "
-#~ "rate.\n"
-#~ " However, the encoder is only tuned for rates of 44.1 and 48 kHz and "
-#~ "while\n"
-#~ " other rates will be accepted quality will be significantly degraded.\n"
-#~ " Alternatively, the --raw option may be used to use a raw PCM data file, "
-#~ "which\n"
-#~ " must be 16bit stereo little-endian PCM ('headerless wav'), unless "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an outfile filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Brug: oggenc [flag] indfil.wav [...]\n"
-#~ "\n"
-#~ "FLAG:\n"
-#~ " Generelle:\n"
-#~ " -Q, --quiet          Skriv ikke på stderr\n"
-#~ " -h, --help           Vis denne hjælpetekst\n"
-#~ " -r, --raw            Rå-tilstand. Indfiler læses direkte som PCM-data\n"
-#~ " -B, --raw-bits=n     Vælg bit/sample for rå-inddata. Standardværdi er "
-#~ "16\n"
-#~ " -C, --raw-chan=n     Vælg antal kanaler for rå-inddata. Standardværdi er "
-#~ "2\n"
-#~ " -R, --raw-rate=n     Vælg samplinger/sekund for rå-inddata. "
-#~ "Standardværdi er 44100\n"
-#~ " -b, --bitrate        Vælg en nominel bithastighed at kode\n"
-#~ "                      i. Forsøger at kode med en bithastighed som i\n"
-#~ "                      gennemsnit bliver denne. Tager et argument i kbps.\n"
-#~ " -m, --min-bitrate    Angiv minimal bithastighed (i kbps). Brugbart\n"
-#~ "                      til at kode for en kanal med bestemt størrelse.\n"
-#~ " -M, --max-bitrate    Angiv maksimal bithastighed (i kbps). Nyttigt\n"
-#~ "                      for strømmende applikationer.\n"
-#~ " -q, --quality        Angiv kvalitet mellem 0 (lav) og 10 (høj),\n"
-#~ "                      i stedet til at angiv særlige bithastigheder.\n"
-#~ "                      Dette er den normale arbejdsmåde. Kvalitet i\n"
-#~ "                      brøkdele (fx 2.75) er tilladt.\n"
-#~ " -s, --serial         Angiv et serienummer for strømmen. Hvis flere\n"
-#~ "                      filer kodes vil dette blive øget for hver\n"
-#~ "                      strøm efter den første.\n"
-#~ "\n"
-#~ " Navngivning:\n"
-#~ " -o, --output=fn      Skriv til fil fn (kun gyldig for enkeltstående "
-#~ "fil)\n"
-#~ " -n, --names=streng   Opret filer med navn ifølge streng, hvor %%a, %%t, %"
-#~ "%l,\n"
-#~ "                      %%n, %%d erstattes med artist, titel, album, spor\n"
-#~ "                      respektive dato (se nedenfor for at angive\n"
-#~ "                      disse). %%%% giver et bogstaveligt %%.\n"
-#~ " -X, --name-remove=s  Fjern angivne tegn fra parametrene til\n"
-#~ "                      formatstrengen for -n. God til at forsikre sig\n"
-#~ "                      om gyldige filnavne.\n"
-#~ " -P, --name-replace=s Erstat tegn fjernet af --name-remove med\n"
-#~ "                      angivet tegn. Hvis denne streng er kortere end\n"
-#~ "                      listen til --name-remove, eller udeladt, fjernes\n"
-#~ "                      ekstra tegn.\n"
-#~ "                      Forvalgte værdier for de to ovenstående\n"
-#~ "                      argumenter afhænger af platformen.\n"
-#~ " -c, --comment=c      Tilføj argumentstrengen som en ekstra\n"
-#~ "                      kommentar.  Kan bruges flere gange.\n"
-#~ " -d, --date           Dato for sporet (almindeligvis dato for optræden)\n"
-#~ " -N, --tracknum       Spornummer for dette spor\n"
-#~ " -t, --title          Titel for dette spor\n"
-#~ " -l, --album          Navn på albummet\n"
-#~ " -a, --artist         Navn på artisten\n"
-#~ " -G, --genre          Sporets genre\n"
-#~ "                      Hvis flere indfiler angives vil flere tilfælde af "
-#~ "de\n"
-#~ "                      fem foregående flag bruges i given\n"
-#~ "                      rækkefølge. Hvis antal titler er færre end antal\n"
-#~ "                      indfiler viser OggEnc en advarsel og genbruger\n"
-#~ "                      det sidste argument. Hvis antal spornumre er\n"
-#~ "                      færre bliver de resterende filer unummererede. For\n"
-#~ "                      øvrige flag genbruges det sidste mærke uden\n"
-#~ "                      advarsel (så du fx kan angive en dato en gang\n"
-#~ "                      og bruge den for alle filer).\n"
-#~ "\n"
-#~ "INDFILER:\n"
-#~ " Indfiler til OggEnc skal i øjeblikket være 16 eller 8 bit RCM\n"
-#~ " WAV, AIFF eller AIFF/C.  De kan være mono eller stereo (eller flere\n"
-#~ " kanaler) med vilkårlig samplingshastighed.  Dog er koderen kun\n"
-#~ " justeret for 44.1 og 48 kHz samplingshastighed, og også selvom andre\n"
-#~ " hastigheder accepteres bliver kvaliteten væsentligt\n"
-#~ " forværret. Alternativt kan flaget --raw bruges til at bruge en\n"
-#~ " fil med rå PCM-data, hvilken skal være 16 bit stereo little-endian\n"
-#~ " PCM ('headerless wav') hvis ikke yderligere flag for rå-tilstand\n"
-#~ " bruges.\n"
-#~ " Du kan læse fra stdin gennem at angive - som navn for indfilen. I denne\n"
-#~ " tilstand går uddata til stdout hvis intet filnavn angives med -o\n"
-#~ "\n"
-
-#~ msgid "Usage: %s [filename1.ogg] ... [filenameN.ogg]\n"
-#~ msgstr "Brug: %s [filnavn1.ogg] ... [filnavnN.ogg]\n"
-
-#~ msgid "filename=%s\n"
-#~ msgstr "filnavn=%s\n"
-
-#~ msgid ""
-#~ "version=%d\n"
-#~ "channels=%d\n"
-#~ "rate=%ld\n"
-#~ msgstr ""
-#~ "version=%d\n"
-#~ "kanaler=%d\n"
-#~ "hastighed=%ld\n"
-
-#~ msgid "bitrate_nominal="
-#~ msgstr "nominel bithastighed="
-
-#~ msgid "bitrate_lower="
-#~ msgstr "nedre bithastighed="
-
-#~ msgid "bitrate_average=%ld\n"
-#~ msgstr "gennemsnitlig bithastighed=%ld\n"
-
-#~ msgid "length=%f\n"
-#~ msgstr "længde=%f\n"
-
-#~ msgid "playtime=%ld:%02ld\n"
-#~ msgstr "spilletid=%ld:%02ld\n"
-
-#~ msgid "Unable to open \"%s\": %s\n"
-#~ msgstr "Kan ikke åbne \"%s\": %s\n"
-
-#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
-#~ msgstr "Kunne ikke konvertere til UTF8, kan ikke tilføje\n"
-
-#~ msgid ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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"
-#~ msgstr ""
-#~ "Brug:\n"
-#~ "  vorbiscomment [-l] fil.ogg (lister kommentarer)\n"
-#~ "  vorbiscomment -a ind.ogg ud.ogg (tilføjer kommentarer)\n"
-#~ "  vorbiscomment -w ind.ogg ud.ogg (ændrer kommentarer)\n"
-#~ "\tfor skrivning forventes nye kommentarer på formen 'TAG=værdi'\n"
-#~ "\tpå stdin.  Disse erstatter helt de gamle.\n"
-#~ "   Både -a og -w accepterer et filnavn, i så fald bruges en temporær\n"
-#~ "   fil.\n"
-#~ "   -c kan bruges til at læse kommentarer fra en fil i stedet for\n"
-#~ "   stdin.\n"
-#~ "   Eksempel: vorbiscomment -a ind.ogg -c kommentarer.txt\n"
-#~ "   tilføjer kommentarerne i kommentarer.txt til ind.ogg\n"
-#~ "   Til slut kan du angive mærker der skal tilføjes på kommandolinjen med\n"
-#~ "   flaget -t.  Fx\n"
-#~ "   vorbiscomment -a in.ogg -t \"ARTIST=Nogen Artist\" -t \"TITLE=En titel"
-#~ "\"\n"
-#~ "   (når du bruger dette flag er læsning fra kommentarfil eller\n"
-#~ "   stdin deaktiveret)\n"

Modified: trunk/vorbis-tools/po/en_GB.po
===================================================================
--- trunk/vorbis-tools/po/en_GB.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/en_GB.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -5,8 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2002-07-19 22:30+1000\n"
 "PO-Revision-Date: 2004-04-26 10:36-0400\n"
 "Last-Translator: Gareth Owen <gowen72 at yahoo.com>\n"
 "Language-Team: English (British) <en_gb at li.org>\n"
@@ -14,186 +13,185 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ogg123/buffer.c:117
-#, c-format
+#: ogg123/buffer.c:111
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Error: Out of memory in malloc_action().\n"
 
-#: ogg123/buffer.c:360
-#, c-format
+#: ogg123/buffer.c:344
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Error: Could not allocate memory in malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:75
+#: ogg123/buffer.c:363
+msgid "malloc"
+msgstr "malloc"
+
+#: ogg123/callbacks.c:70
 msgid "Error: Device not available.\n"
 msgstr "Error: Device not available.\n"
 
-#: ogg123/callbacks.c:78
+#: ogg123/callbacks.c:73
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr "Error: %s requires an output filename to be specified with -f.\n"
 
-#: ogg123/callbacks.c:81
+#: ogg123/callbacks.c:76
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Error: Unsupported option value to %s device.\n"
 
-#: ogg123/callbacks.c:85
+#: ogg123/callbacks.c:80
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Error: Cannot open device %s.\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:84
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Error: Device %s failure.\n"
 
-#: ogg123/callbacks.c:92
+#: ogg123/callbacks.c:87
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Error: An output file cannot be given for %s device.\n"
 
-#: ogg123/callbacks.c:95
+#: ogg123/callbacks.c:90
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Error: Cannot open file %s for writing.\n"
 
-#: ogg123/callbacks.c:99
+#: ogg123/callbacks.c:94
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Error: File %s already exists.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:97
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Error: This error should never happen (%d).  Panic!\n"
 
-#: ogg123/callbacks.c:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Error: Out of memory in new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:174
+#: ogg123/callbacks.c:169
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Error: Out of memory in new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:233
+#: ogg123/callbacks.c:228
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Error: Out of memory in new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
+#: ogg123/callbacks.c:349
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "System error"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Parse error: %s on line %d of %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Name"
 
-#: ogg123/cfgfile_options.c:137
+#. Description
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Description"
 
-#: ogg123/cfgfile_options.c:140
+#. Type
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Type"
 
-#: ogg123/cfgfile_options.c:143
+#. Default
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Default"
 
-#: ogg123/cfgfile_options.c:169
-#, c-format
+#: ogg123/cfgfile_options.c:165
 msgid "none"
 msgstr "none"
 
-#: ogg123/cfgfile_options.c:172
-#, c-format
+#: ogg123/cfgfile_options.c:168
 msgid "bool"
 msgstr "bool"
 
-#: ogg123/cfgfile_options.c:175
-#, c-format
+#: ogg123/cfgfile_options.c:171
 msgid "char"
 msgstr "char"
 
-#: ogg123/cfgfile_options.c:178
-#, c-format
+#: ogg123/cfgfile_options.c:174
 msgid "string"
 msgstr "string"
 
-#: ogg123/cfgfile_options.c:181
-#, c-format
+#: ogg123/cfgfile_options.c:177
 msgid "int"
 msgstr "int"
 
-#: ogg123/cfgfile_options.c:184
-#, c-format
+#: ogg123/cfgfile_options.c:180
 msgid "float"
 msgstr "float"
 
-#: ogg123/cfgfile_options.c:187
-#, c-format
+#: ogg123/cfgfile_options.c:183
 msgid "double"
 msgstr "double"
 
-#: ogg123/cfgfile_options.c:190
-#, c-format
+#: ogg123/cfgfile_options.c:186
 msgid "other"
 msgstr "other"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:506 oggenc/oggenc.c:511
+#: oggenc/oggenc.c:516 oggenc/oggenc.c:521 oggenc/oggenc.c:526
+#: oggenc/oggenc.c:531
 msgid "(none)"
 msgstr "(none)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Success"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Key not found"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "No key"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Bad value"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Bad type in options list"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Unknown error"
 
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:74
 msgid "Internal error parsing command line options.\n"
 msgstr "Internal error parsing command line options.\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:81
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Input buffer size smaller than minimum size of %dkB."
 
-#: ogg123/cmdline_options.c:102
+#: ogg123/cmdline_options.c:93
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -202,44 +200,44 @@
 "=== Error \"%s\" while parsing config option from command line.\n"
 "=== Option was: %s\n"
 
-#: ogg123/cmdline_options.c:109
-#, c-format
+#. not using the status interface here
+#: ogg123/cmdline_options.c:100
 msgid "Available options:\n"
 msgstr "Available options:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:109
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== No such device %s.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:129
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Driver %s is not a file output driver.\n"
 
-#: ogg123/cmdline_options.c:143
+#: ogg123/cmdline_options.c:134
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "=== Cannot specify output file without specifying a driver.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:149
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Incorrect option format: %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:164
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Prebuffer value invalid. Range is 0-100.\n"
 
-#: ogg123/cmdline_options.c:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:179
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 from %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:186
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Cannot play every 0th chunk!\n"
 
-#: ogg123/cmdline_options.c:216
+#: ogg123/cmdline_options.c:194
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -247,252 +245,112 @@
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
 
-#: ogg123/cmdline_options.c:232
+#: ogg123/cmdline_options.c:206
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Cannot open playlist file %s.  Skipped.\n"
 
-#: ogg123/cmdline_options.c:248
-msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:227
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Driver %s specified in configuration file invalid.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
+#: ogg123/cmdline_options.c:237
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Could not load default driver and no driver specified in config file. Exiting.\n"
 
-#: ogg123/cmdline_options.c:292
+#: ogg123/cmdline_options.c:258
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 from %s %s\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
+"\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
+"\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Available options:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:279
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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"
+"  -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"
 "\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"
 msgstr ""
+"  -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"
+"  -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"
+"\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"
 
-#: ogg123/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "File: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Available options:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "Input not ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Description"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Available options:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
+#: ogg123/oggvorbis_format.c:106 ogg123/oggvorbis_format.c:321
+#: ogg123/oggvorbis_format.c:336 ogg123/oggvorbis_format.c:354
 msgid "Error: Out of memory.\n"
 msgstr "Error: Out of memory.\n"
 
-#: ogg123/format.c:82
-#, c-format
+#: ogg123/format.c:59
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Error: Could not allocate memory in malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:145
+#: ogg123/http_transport.c:137
 msgid "Error: Could not set signal mask."
 msgstr "Error: Could not set signal mask."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:191
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Error: Unable to create input buffer.\n"
 
-#: ogg123/ogg123.c:82
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "default output device"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "shuffle playlist"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Could not skip %f seconds of audio."
-
-#: ogg123/ogg123.c:378
+#: ogg123/ogg123.c:261
 #, c-format
 msgid ""
 "\n"
@@ -501,368 +359,241 @@
 "\n"
 "Audio Device:   %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:262
 #, c-format
 msgid "Author:   %s"
 msgstr "Author:   %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:263
 #, c-format
 msgid "Comments: %s"
 msgstr "Comments: %s"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
+#: ogg123/ogg123.c:307 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Warning: Could not read directory %s.\n"
 
-#: ogg123/ogg123.c:460
+#: ogg123/ogg123.c:341
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Error: Could not create audio buffer.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:429
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "No module could be found to read from %s.\n"
 
-#: ogg123/ogg123.c:561
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Cannot open %s.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:440
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "The file format of %s is not supported.\n"
 
-#: ogg123/ogg123.c:577
+#: ogg123/ogg123.c:450
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr "Error opening %s using the %s module.  The file may be corrupted.\n"
 
-#: ogg123/ogg123.c:596
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
 msgstr "Playing: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:474
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Could not skip %f seconds of audio."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
 msgstr "Error: Decoding failure.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Error: Device %s failure.\n"
-
-#: ogg123/ogg123.c:743
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:585
 msgid "Done."
 msgstr "Done."
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:51
+msgid "Track number:"
+msgstr "Track number:"
+
+#: ogg123/oggvorbis_format.c:52
+msgid "ReplayGain (Track):"
+msgstr "ReplayGain (Track):"
+
+#: ogg123/oggvorbis_format.c:53
+msgid "ReplayGain (Album):"
+msgstr "ReplayGain (Album):"
+
+#: ogg123/oggvorbis_format.c:54
+msgid "ReplayGain (Track) Peak:"
+msgstr "ReplayGain (Track) Peak:"
+
+#: ogg123/oggvorbis_format.c:55
+msgid "ReplayGain (Album) Peak:"
+msgstr "ReplayGain (Album) Peak:"
+
+#: ogg123/oggvorbis_format.c:56
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ogg123/oggvorbis_format.c:57 ogg123/oggvorbis_format.c:58
+msgid "Comment:"
+msgstr "Comment:"
+
+#: ogg123/oggvorbis_format.c:167
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Hole in the stream; probably harmless\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:173
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Vorbis library reported a stream error.\n"
 
-#: ogg123/oggvorbis_format.c:310
-#, fuzzy, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr "Bitstream is %d channel, %ldHz"
-
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:402
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr ""
+msgid "Version is %d"
+msgstr "Version is %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:406
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 
-#: ogg123/oggvorbis_format.c:327
+#: ogg123/oggvorbis_format.c:414
 #, c-format
+msgid "Bitstream is %d channel, %ldHz"
+msgstr "Bitstream is %d channel, %ldHz"
+
+#: ogg123/oggvorbis_format.c:419
+#, c-format
 msgid "Encoded by: %s"
 msgstr "Encoded by: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, c-format
+#: ogg123/playlist.c:41 ogg123/playlist.c:52
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Error: Out of memory in create_playlist_member().\n"
 
-#: ogg123/playlist.c:222
+#: ogg123/playlist.c:214
 #, c-format
 msgid "Warning from playlist %s: Could not read directory %s.\n"
 msgstr "Warning from playlist %s: Could not read directory %s.\n"
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
-#, c-format
+#: ogg123/playlist.c:259 ogg123/playlist.c:271
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Error: Out of memory in playlist_to_array().\n"
 
-#: ogg123/status.c:60
+#: ogg123/status.c:47
 #, c-format
 msgid "%sPrebuf to %.1f%%"
 msgstr "%sPrebuf to %.1f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sPaused"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr "%sEOS"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
-#, c-format
+#: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
+#: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Memory allocation error in stats_init()\n"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Time: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "of %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Avg bitrate: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr " Input Buffer %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr " Output Buffer %5.1f%%"
 
-#: ogg123/transport.c:71
-#, c-format
+#: ogg123/transport.c:67
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Error: Could not allocate memory in malloc_data_source_stats()\n"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 from %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, fuzzy, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "ERROR: Cannot open input file \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "ERROR: Cannot open output file \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Failed to open file as vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Error removing old file %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"ERROR: No input files specified. Use -h for help.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:39
 msgid "WAV file reader"
 msgstr "WAV file reader"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
 msgstr "AIFF/AIFC file reader"
 
-#: oggenc/audio.c:53
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "WAV file reader"
-
-#: oggenc/audio.c:54
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "WAV file reader"
-
-#: oggenc/audio.c:131 oggenc/audio.c:425
-#, c-format
+#: oggenc/audio.c:117 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Warning: Unexpected EOF in reading WAV header\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:128
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Skipping chunk of type \"%s\", length %d\n"
 
-#: oggenc/audio.c:168
-#, c-format
+#: oggenc/audio.c:146
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Warning: Unexpected EOF in AIFF chunk\n"
 
-#: oggenc/audio.c:254
-#, c-format
+#: oggenc/audio.c:231
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Warning: No common chunk found in AIFF file\n"
 
-#: oggenc/audio.c:260
-#, c-format
+#: oggenc/audio.c:237
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Warning: Truncated common chunk in AIFF header\n"
 
-#: oggenc/audio.c:268
-#, c-format
+#: oggenc/audio.c:245
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Warning: Unexpected EOF in reading AIFF header\n"
 
-#: oggenc/audio.c:283
-#, c-format
+#: oggenc/audio.c:258
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Warning: AIFF-C header truncated.\n"
 
-#: oggenc/audio.c:297
-#, fuzzy, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
+#: oggenc/audio.c:263
+msgid "Warning: Can't handle compressed AIFF-C\n"
 msgstr "Warning: Can't handle compressed AIFF-C\n"
 
-#: oggenc/audio.c:304
-#, c-format
+#: oggenc/audio.c:270
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Warning: No SSND chunk found in AIFF file\n"
 
-#: oggenc/audio.c:310
-#, c-format
+#: oggenc/audio.c:276
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Warning: Corrupted SSND chunk in AIFF header\n"
 
-#: oggenc/audio.c:316
-#, c-format
+#: oggenc/audio.c:282
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Warning: Unexpected EOF reading AIFF header\n"
 
-#: oggenc/audio.c:353
-#, c-format
+#: oggenc/audio.c:314
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
 " Must be 8 or 16 bit PCM.\n"
@@ -870,13 +601,11 @@
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
 " Must be 8 or 16 bit PCM.\n"
 
-#: oggenc/audio.c:407
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Warning: Unrecognised format chunk in WAV header\n"
 
-#: oggenc/audio.c:420
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -884,139 +613,80 @@
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: oggenc/audio.c:406
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
-" or type 3 floating point PCM)\n"
+" or type 3 floating point PCM\n"
 msgstr ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM\n"
 
-#: oggenc/audio.c:467
-#, c-format
+#: oggenc/audio.c:455
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
-
-#: oggenc/audio.c:528
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
 "ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
 "or floating point PCM\n"
 
-#: oggenc/audio.c:604
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
+#: oggenc/audio.c:607
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
 
-#: oggenc/audio.c:624
-#, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:630
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:732
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-
-#: oggenc/audio.c:750
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr "Couldn't initialise resampler\n"
 
-#: oggenc/encode.c:64
+#: oggenc/encode.c:59
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Setting advanced encoder option \"%s\" to %s\n"
 
-#: oggenc/encode.c:101
+#: oggenc/encode.c:100
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Changed lowpass frequency from %f kHz to %f kHz\n"
 
-#: oggenc/encode.c:104
+#: oggenc/encode.c:103
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Unrecognised advanced option \"%s\"\n"
 
-#: oggenc/encode.c:111
-#, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
+#: oggenc/encode.c:133
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+msgstr "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
 
-#: oggenc/encode.c:115 oggenc/encode.c:252
-#, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, fuzzy, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 channels should be enough for anyone. (Sorry, vorbis doesn't support "
-"more)\n"
-
-#: oggenc/encode.c:182
-#, c-format
+#: oggenc/encode.c:141
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Requesting a minimum or maximum bitrate requires --managed\n"
 
-#: oggenc/encode.c:200
-#, c-format
+#: oggenc/encode.c:159
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Mode initialisation failed: invalid parameters for quality\n"
 
-#: oggenc/encode.c:245
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:247
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:263
-#, c-format
+#: oggenc/encode.c:183
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "Mode initialisation failed: invalid parameters for bitrate\n"
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:237
 msgid "Failed writing header to output stream\n"
 msgstr "Failed writing header to output stream\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:303
 msgid "Failed writing data to output stream\n"
 msgstr "Failed writing data to output stream\n"
 
-#: oggenc/encode.c:472
-#, fuzzy, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
+#: oggenc/encode.c:349
+#, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 msgstr "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 
-#: oggenc/encode.c:482
-#, fuzzy, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+#: oggenc/encode.c:359
+#, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr "\tEncoding [%2dm%.2ds so far] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:377
 #, c-format
 msgid ""
 "\n"
@@ -1027,8 +697,7 @@
 "\n"
 "Done encoding file \"%s\"\n"
 
-#: oggenc/encode.c:502
-#, c-format
+#: oggenc/encode.c:379
 msgid ""
 "\n"
 "\n"
@@ -1038,7 +707,7 @@
 "\n"
 "Done encoding.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:383
 #, c-format
 msgid ""
 "\n"
@@ -1047,17 +716,17 @@
 "\n"
 "\tFile length:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:387
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tElapsed time: %dm %04.1fs\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:390
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tRate:         %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:391
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1066,7 +735,7 @@
 "\tAverage bitrate: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:428
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1077,17 +746,17 @@
 "         %s%s%s \n"
 "at average bitrate %d kbps "
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
+#: oggenc/encode.c:452 oggenc/encode.c:458
 msgid "standard input"
 msgstr "standard input"
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
+#: oggenc/encode.c:453 oggenc/encode.c:459
 msgid "standard output"
 msgstr "standard output"
 
-#: oggenc/encode.c:559
+#: oggenc/encode.c:436
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1098,7 +767,7 @@
 "         %s%s%s \n"
 "at approximate bitrate %d kbps (VBR encoding enabled)\n"
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:444
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1109,7 +778,7 @@
 "         %s%s%s \n"
 "at quality level %2.2f using constrained VBR "
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:451
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1120,7 +789,7 @@
 "         %s%s%s \n"
 "at quality %2.2f\n"
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:457
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1131,698 +800,395 @@
 "         %s%s%s \n"
 "using bitrate management "
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
+#: oggenc/oggenc.c:96
+#, c-format
+msgid ""
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 "%s%s\n"
 "ERROR: No input files specified. Use -h for help.\n"
 
-#: oggenc/oggenc.c:118
-#, c-format
+#: oggenc/oggenc.c:111
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "ERROR: Multiple files specified when using stdin\n"
 
-#: oggenc/oggenc.c:125
-#, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
+#: oggenc/oggenc.c:118
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "ERROR: Multiple input files with specified output filename: suggest using -n\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:172
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ERROR: Cannot open input file \"%s\": %s\n"
 
-#: oggenc/oggenc.c:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "WAV file reader"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:200
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Opening with %s module: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:209
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "ERROR: Input file \"%s\" is not a supported format\n"
 
-#: oggenc/oggenc.c:280
-#, c-format
+#: oggenc/oggenc.c:259
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "WARNING: No filename, defaulting to \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:267
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
 
-#: oggenc/oggenc.c:295
-#, fuzzy, c-format
-msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
-msgstr "Input filename may not be the same as output filename\n"
-
-#: oggenc/oggenc.c:306
+#: oggenc/oggenc.c:278
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ERROR: Cannot open output file \"%s\": %s\n"
 
-#: oggenc/oggenc.c:350
+#: oggenc/oggenc.c:308
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Resampling input from %d Hz to %d Hz\n"
 
-#: oggenc/oggenc.c:357
-#, c-format
+#: oggenc/oggenc.c:315
 msgid "Downmixing stereo to mono\n"
 msgstr "Downmixing stereo to mono\n"
 
-#: oggenc/oggenc.c:360
-#, fuzzy, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:318
+msgid "ERROR: Can't downmix except from stereo to mono\n"
 msgstr "ERROR: Can't downmix except from stereo to mono\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:365
 #, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 from %s %s\n"
-
-#: oggenc/oggenc.c:416
-#, c-format
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:417
-#, c-format
-msgid ""
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
+"                      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"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel. Using this will\n"
-"                      automatically enable managed bitrate mode (see\n"
-"                      --managed).\n"
+"                      encoding for a fixed-size channel.\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications. Using this will automatically\n"
-"                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
-" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
-"                      high), instead of specifying a particular bitrate.\n"
+"                      streaming applications.\n"
+" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
+"                      instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
+"                      Quality -1 is also possible, but may not be of\n"
+"                      acceptable quality.\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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
-" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
-"                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
-"                      used multiple times. The argument should be in the\n"
-"                      format \"tag=value\".\n"
+"                      used multiple times.\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\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 "
-"additional\n"
+" OggEnc input files must currently be 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"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
-" In this mode, output is to stdout unless an output filename is specified\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
+"\n"
+"OPTIONS:\n"
+" General:\n"
+" -Q, --quiet          Produce no output to stderr\n"
+" -h, --help           Print this help text\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
+" --raw-endianness     1 for big endian, 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"
+" -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
+"                      encoding for a fixed-size channel.\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"
+"                      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"
+" --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"
+"\n"
+" Naming:\n"
+" -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
+" -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
+"                      %%%% gives a literal %%.\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
+"                      -n format string. Useful to ensure legal filenames.\n"
+" -P, --name-replace=s Replace characters removed by --name-remove with the\n"
+"                      characters specified. If this string is shorter than the\n"
+"                      --name-remove list or is not specified, the extra\n"
+"                      characters are just removed.\n"
+"                      Default settings for the above two arguments are platform\n"
+"                      specific.\n"
+" -c, --comment=c      Add the given string as an extra comment. This may be\n"
+"                      used multiple times.\n"
+" -d, --date           Date for track (usually date of performance)\n"
+" -N, --tracknum       Track number for this track\n"
+" -t, --title          Title for this track\n"
+" -l, --album          Name of album\n"
+" -a, --artist         Name of artist\n"
+" -G, --genre          Genre of track\n"
+"                      If multiple input files are given, then multiple\n"
+"                      instances of the previous five arguments will be used,\n"
+"                      in the order they are given. If fewer titles are\n"
+"                      specified than files, OggEnc will print a warning, and\n"
+"                      reuse the final one for the remaining files. If fewer\n"
+"                      track numbers are given, the remaining files will be\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
+"\n"
+"INPUT FILES:\n"
+" OggEnc input files must currently be 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"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
+" parameters for raw mode are specified.\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
+" with -o\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:536
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr "WARNING: Ignoring illegal escape character '%c' in name format\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
-#, c-format
+#: oggenc/oggenc.c:562 oggenc/oggenc.c:670 oggenc/oggenc.c:683
 msgid "Enabling bitrate management engine\n"
 msgstr "Enabling bitrate management engine\n"
 
-#: oggenc/oggenc.c:661
-#, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:571
+msgid "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
+msgstr "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 
-#: oggenc/oggenc.c:664
+#: oggenc/oggenc.c:574
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "WARNING: Couldn't read endianness argument \"%s\"\n"
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:581
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "WARNING: Couldn't read resampling frequency \"%s\"\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:587
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 
-#: oggenc/oggenc.c:687
-#, fuzzy, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Warning: Could not read directory %s.\n"
-
-#: oggenc/oggenc.c:700
-#, c-format
+#: oggenc/oggenc.c:599
 msgid "No value for advanced encoder option found\n"
 msgstr "No value for advanced encoder option found\n"
 
-#: oggenc/oggenc.c:718
-#, c-format
+#: oggenc/oggenc.c:610
 msgid "Internal error parsing command line options\n"
 msgstr "Internal error parsing command line options\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:656
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Warning: nominal bitrate \"%s\" not recognised\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:664
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Warning: minimum bitrate \"%s\" not recognised\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:677
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Warning: maximum bitrate \"%s\" not recognised\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:689
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Quality option \"%s\" not recognised, ignoring\n"
 
-#: oggenc/oggenc.c:807
-#, c-format
+#: oggenc/oggenc.c:697
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr "WARNING: quality setting too high, setting to maximum quality.\n"
 
-#: oggenc/oggenc.c:813
-#, c-format
+#: oggenc/oggenc.c:703
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "WARNING: Multiple name formats specified, using final\n"
 
-#: oggenc/oggenc.c:822
-#, c-format
+#: oggenc/oggenc.c:712
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr "WARNING: Multiple name format filters specified, using final\n"
 
-#: oggenc/oggenc.c:831
-#, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
-msgstr ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
+#: oggenc/oggenc.c:721
+msgid "WARNING: Multiple name format filter replacements specified, using final\n"
+msgstr "WARNING: Multiple name format filter replacements specified, using final\n"
 
-#: oggenc/oggenc.c:839
-#, c-format
+#: oggenc/oggenc.c:729
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr "WARNING: Multiple output files specified, suggest using -n\n"
 
-#: oggenc/oggenc.c:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 from %s %s\n"
+#: oggenc/oggenc.c:748
+msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+msgstr "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 
-#: oggenc/oggenc.c:858
-#, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
-
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
-#, c-format
+#. Failed, so just set to 16
+#: oggenc/oggenc.c:753 oggenc/oggenc.c:757
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "WARNING: Invalid bits/sample specified, assuming 16.\n"
 
-#: oggenc/oggenc.c:874
-#, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
+#: oggenc/oggenc.c:764
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
 
-#: oggenc/oggenc.c:879
-#, c-format
+#. Failed, so just set to 2
+#: oggenc/oggenc.c:769
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "WARNING: Invalid channel count specified, assuming 2.\n"
 
-#: oggenc/oggenc.c:890
-#, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:780
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+msgstr "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 
-#: oggenc/oggenc.c:895
-#, c-format
+#. Failed, so just set to 44100
+#: oggenc/oggenc.c:785
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr "WARNING: Invalid sample rate specified, assuming 44100.\n"
 
-#: oggenc/oggenc.c:902
-#, c-format
+#: oggenc/oggenc.c:789
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "WARNING: Unknown option specified, ignoring->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Couldn't convert comment to UTF-8, cannot add\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
-#, c-format
+#: oggenc/oggenc.c:811
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Couldn't convert comment to UTF-8, cannot add\n"
 
-#: oggenc/oggenc.c:954
-#, c-format
+#: oggenc/oggenc.c:830
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr "WARNING: Insufficient titles specified, defaulting to final title.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Couldn't create directory \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Error checking for existence of directory %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:167
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Error: path segment \"%s\" is not a directory\n"
 
-#: ogginfo/ogginfo2.c:212
-#, fuzzy, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
-msgstr ""
-"Warning: Comment %d in stream %d is invalidly formatted, does not contain "
-"'=': \"%s\"\n"
-
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo2.c:156
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgid "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
+msgstr "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo2.c:164
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
-msgstr ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+msgid "Warning: Vorbis stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n"
+msgstr "Warning: Vorbis stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n"
 
-#: ogginfo/ogginfo2.c:266
+#: ogginfo/ogginfo2.c:168
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-
-#: ogginfo/ogginfo2.c:342
-#, fuzzy, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
-
-#: ogginfo/ogginfo2.c:356
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr "Warning: Failure in utf8 decoder. This should be impossible\n"
-
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Warning: EOS not set on stream %d\n"
-
-#: ogginfo/ogginfo2.c:389
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
-
-#: ogginfo/ogginfo2.c:396
-#, 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 ""
-"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-
-#: ogginfo/ogginfo2.c:400
-#, fuzzy, c-format
-msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr "Vorbis headers parsed for stream %d, information follows...\n"
-
-#: ogginfo/ogginfo2.c:403
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Version: %d\n"
-
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
-#, c-format
-msgid "Vendor: %s\n"
-msgstr "Vendor: %s\n"
-
-#: ogginfo/ogginfo2.c:406
-#, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Version: %d\n"
-
-#: ogginfo/ogginfo2.c:408
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:416
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:429
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:431
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:433
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:437
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:439
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:441
-#, fuzzy
-msgid "Colourspace unspecified\n"
-msgstr "no action specified\n"
-
-#: ogginfo/ogginfo2.c:444
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:446
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:448
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:450
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:452
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr "Upper bitrate: %f kb/s\n"
-
-#: ogginfo/ogginfo2.c:453
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
-msgid "User comments section follows...\n"
-msgstr "User comments section follows...\n"
-
-#: ogginfo/ogginfo2.c:477
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Warning: EOS not set on stream %d\n"
-
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Warning: granulepos in stream %d decreases from "
-
-#: ogginfo/ogginfo2.c:520
-msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
-
-#: ogginfo/ogginfo2.c:565
-#, 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"
-msgstr ""
-"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-
-#: ogginfo/ogginfo2.c:569
-#, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Vorbis headers parsed for stream %d, information follows...\n"
 
-#: ogginfo/ogginfo2.c:572
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid "Version: %d\n"
 msgstr "Version: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:175
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Vendor: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:182
 #, c-format
+msgid "Vendor: %s\n"
+msgstr "Vendor: %s\n"
+
+#: ogginfo/ogginfo2.c:183
+#, c-format
 msgid "Channels: %d\n"
 msgstr "Channels: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:184
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1831,195 +1197,120 @@
 "Rate: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:187
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Nominal bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:190
 msgid "Nominal bitrate not set\n"
 msgstr "Nominal bitrate not set\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:193
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Upper bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:196
 msgid "Upper bitrate not set\n"
 msgstr "Upper bitrate not set\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:199
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Lower bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:202
 msgid "Lower bitrate not set\n"
 msgstr "Lower bitrate not set\n"
 
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo2.c:205
+msgid "User comments section follows...\n"
+msgstr "User comments section follows...\n"
+
+#: ogginfo/ogginfo2.c:217
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
+msgid "Warning: Comment %d in stream %d is invalidly formatted, does not contain '=': \"%s\"\n"
+msgstr "Warning: Comment %d in stream %d is invalidly formatted, does not contain '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:651
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
+#: ogginfo/ogginfo2.c:226
+#, c-format
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgstr "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:692
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
-
-#: ogginfo/ogginfo2.c:703
-#, fuzzy, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
-
-#: ogginfo/ogginfo2.c:734
-#, fuzzy, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
-"Warning: Vorbis stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-
-#: ogginfo/ogginfo2.c:738
-#, fuzzy, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr "Vorbis headers parsed for stream %d, information follows...\n"
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Version: %d\n"
-
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:257 ogginfo/ogginfo2.c:266
 #, c-format
-msgid "Language: %s\n"
-msgstr ""
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
+msgstr "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
 
-#: ogginfo/ogginfo2.c:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Vendor: %s\n"
-
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
-msgid "No category set\n"
-msgstr "Nominal bitrate not set\n"
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:274
 #, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr "Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
 
-#: ogginfo/ogginfo2.c:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
 
-#: ogginfo/ogginfo2.c:783
-msgid "Unknown text directionality\n"
-msgstr ""
+#: ogginfo/ogginfo2.c:347
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr "Warning: Failure in utf8 decoder. This should be impossible\n"
 
-#: ogginfo/ogginfo2.c:795
-msgid "Invalid zero granulepos rate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:797
+#: ogginfo/ogginfo2.c:364
 #, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr ""
+msgid "Warning: granulepos in stream %d decreases from "
+msgstr "Warning: granulepos in stream %d decreases from "
 
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:365
+msgid " to "
+msgstr " to "
+
+#: ogginfo/ogginfo2.c:365
 msgid "\n"
 msgstr "\n"
 
-#: ogginfo/ogginfo2.c:828
+#: ogginfo/ogginfo2.c:384
 #, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %ld bytes\n"
+"\tPlayback length: %ldm:%02lds\n"
+"\tAverage bitrate: %f kbps\n"
 msgstr ""
+"Vorbis stream %d:\n"
+"\tTotal data length: %ld bytes\n"
+"\tPlayback length: %ldm:%02lds\n"
+"\tAverage bitrate: %f kbps\n"
 
-#: ogginfo/ogginfo2.c:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:418
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Warning: EOS not set on stream %d\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:537
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Warning: Invalid header page, no packet found\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:549
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr "Warning: Invalid header page in stream %d, contains multiple packets\n"
 
-#: ogginfo/ogginfo2.c:1088
-#, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1105
-#, fuzzy
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
+#: ogginfo/ogginfo2.c:574
+msgid "Warning: Hole in data found at approximate offset "
 msgstr "Warning: Hole in data found at approximate offset "
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:575
+msgid " bytes. Corrupted ogg.\n"
+msgstr " bytes. Corrupted ogg.\n"
+
+#: ogginfo/ogginfo2.c:599
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Error opening input file \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:604
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2028,88 +1319,66 @@
 "Processing file \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:613
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Could not find a processor for stream, bailing\n"
 
-#: ogginfo/ogginfo2.c:1151
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1154
+#: ogginfo/ogginfo2.c:618
+#, c-format
 msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1158
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1161
-#, fuzzy, c-format
-msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
-"This indicates a corrupt ogg file: %s.\n"
+"This indicates a corrupt ogg file.\n"
 msgstr ""
 "Warning: illegally placed page(s) for logical stream %d\n"
 "This indicates a corrupt ogg file.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:625
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "New logical stream (#%d, serial: %08x): type %s\n"
 
-#: ogginfo/ogginfo2.c:1176
+#: ogginfo/ogginfo2.c:628
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Warning: stream start flag not set on stream %d\n"
 
-#: ogginfo/ogginfo2.c:1180
+#: ogginfo/ogginfo2.c:632
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "Warning: stream start flag found in mid-stream on stream %d\n"
 
-#: ogginfo/ogginfo2.c:1185
+#: ogginfo/ogginfo2.c:637
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
-msgstr ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
 
-#: ogginfo/ogginfo2.c:1200
+#: ogginfo/ogginfo2.c:652
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Logical stream %d ended\n"
 
-#: ogginfo/ogginfo2.c:1208
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:659
+#, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
+"Input probably not ogg.\n"
 msgstr ""
 "Error: No ogg data found in file \"%s\".\n"
 "Input probably not ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 from %s %s\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:670
 msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
+"ogginfo 1.0\n"
+"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] files1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
 "\t-h Show this help message\n"
 "\t-q Make less verbose. Once will remove detailed informative\n"
 "\t   messages, two will remove warnings\n"
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
+"\n"
 msgstr ""
 "ogginfo 1.0\n"
 "(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
@@ -2123,17 +1392,11 @@
 "\t   for some stream types.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1234
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:691
 msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
-"ogginfo is a tool for printing information about Ogg files\n"
+"Ogginfo is a tool for printing information about ogg files\n"
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
@@ -2143,8 +1406,7 @@
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
-#, c-format
+#: ogginfo/ogginfo2.c:720
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "No input files specified. \"ogginfo -h\" for help\n"
 
@@ -2168,16 +1430,19 @@
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: option `%s' requires an argument\n"
 
+#. --option
 #: share/getopt.c:750
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unrecognised option `--%s'\n"
 
+#. +option or -option
 #: share/getopt.c:754
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unrecognised option `%c%s'\n"
 
+#. 1003.2 specifies the format of this message.
 #: share/getopt.c:780
 #, c-format
 msgid "%s: illegal option -- %c\n"
@@ -2188,6 +1453,7 @@
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: invalid option -- %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"
@@ -2203,43 +1469,35 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: option `-W %s' doesn't allow an argument\n"
 
-#: vcut/vcut.c:149
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr "Page error. Corrupt input.\n"
 
-#: vcut/vcut.c:166
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr "Bitstream error, continuing\n"
 
-#: vcut/vcut.c:206
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr "Found EOS before cut point.\n"
 
-#: vcut/vcut.c:215
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Setting eos: update sync returned 0\n"
 
-#: vcut/vcut.c:225
-#, c-format
+#: vcut/vcut.c:192
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Cutpoint not within stream. Second file will be empty\n"
 
-#: vcut/vcut.c:277
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Unhandled special case: first file too short?\n"
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr "Cutpoint not within stream. Second file will be empty\n"
-
-#: vcut/vcut.c:353
-#, c-format
+#. 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:284
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -2247,59 +1505,47 @@
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
 
-#: vcut/vcut.c:373
-#, c-format
-msgid "Update sync returned 0, setting eos\n"
-msgstr "Update sync returned 0, setting eos\n"
-
-#: vcut/vcut.c:378
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr "Recoverable bitstream error\n"
 
-#: vcut/vcut.c:387
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr "Bitstream error\n"
 
-#: vcut/vcut.c:449
-#, c-format
+#: vcut/vcut.c:330
+msgid "Update sync returned 0, setting eos\n"
+msgstr "Update sync returned 0, setting eos\n"
+
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "Input not ogg.\n"
 
-#: vcut/vcut.c:459
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Error in first page\n"
 
-#: vcut/vcut.c:464
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "error in first packet\n"
 
-#: vcut/vcut.c:470
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Error in primary header: not vorbis?\n"
 
-#: vcut/vcut.c:490
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Secondary header corrupt\n"
 
-#: vcut/vcut.c:503
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "EOF in headers\n"
 
-#: vcut/vcut.c:535
-#, fuzzy, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+#: vcut/vcut.c:456
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
 msgstr "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
 
-#: vcut/vcut.c:539
-#, c-format
+#: vcut/vcut.c:460
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -2309,649 +1555,191 @@
 "Check that the output files are correct before deleting sources.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Couldn't open %s for reading\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Couldn't open %s for writing\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Couldn't parse cutpoint \"%s\"\n"
 
-#: vcut/vcut.c:570
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+#: vcut/vcut.c:484
+#, c-format
+msgid "Processing: Cutting at %lld\n"
 msgstr "Processing: Cutting at %lld\n"
 
-#: vcut/vcut.c:572
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr "Processing: Cutting at %lld\n"
-
-#: vcut/vcut.c:582
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr "Processing failed\n"
 
-#: vcut/vcut.c:604
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr "Error reading headers\n"
 
-#: vcut/vcut.c:627
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr "Error writing first output file\n"
 
-#: vcut/vcut.c:635
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr "Error writing second output file\n"
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:220
+msgid "Input truncated or empty."
+msgstr "Input truncated or empty."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:222
+msgid "Input is not an Ogg bitstream."
+msgstr "Input is not an Ogg bitstream."
+
+#: vorbiscomment/vcedit.c:239
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Error reading first page of Ogg bitstream."
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:245
 msgid "Error reading initial header packet."
 msgstr "Error reading initial header packet."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Input truncated or empty."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "Input is not an Ogg bitstream."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:251
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Ogg bitstream does not contain vorbis data."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "EOF before end of vorbis headers."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg bitstream does not contain vorbis data."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:274
 msgid "Corrupt secondary header."
 msgstr "Corrupt secondary header."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:295
 msgid "EOF before end of vorbis headers."
 msgstr "EOF before end of vorbis headers."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:448
 msgid "Corrupt or missing data, continuing..."
 msgstr "Corrupt or missing data, continuing..."
 
-#: vorbiscomment/vcedit.c:875
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+#: vorbiscomment/vcedit.c:487
+msgid "Error writing stream to output. Output stream may be corrupted or truncated."
+msgstr "Error writing stream to output. Output stream may be corrupted or truncated."
 
-#: vorbiscomment/vcomment.c:190 vorbiscomment/vcomment.c:216
+#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Failed to open file as vorbis: %s\n"
 
-#: vorbiscomment/vcomment.c:235
+#: vorbiscomment/vcomment.c:148
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Bad comment: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "bad comment: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:170
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Failed to write comments to output file: %s\n"
 
-#: vorbiscomment/vcomment.c:274
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:187
 msgid "no action specified\n"
 msgstr "no action specified\n"
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
-msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
+#: vorbiscomment/vcomment.c:269
+msgid "Couldn't convert comment to UTF8, cannot add\n"
+msgstr "Couldn't convert comment to UTF8, cannot add\n"
 
-#: vorbiscomment/vcomment.c:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
+#: vorbiscomment/vcomment.c:287
 msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
+"   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 ""
+"Usage: \n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
+"   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"
 
-#: vorbiscomment/vcomment.c:391
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Bad type in options list"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
+#: vorbiscomment/vcomment.c:371
 msgid "Internal error parsing command options\n"
 msgstr "Internal error parsing command options\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:456
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Error opening input file '%s'.\n"
 
-#: vorbiscomment/vcomment.c:587
-#, c-format
+#: vorbiscomment/vcomment.c:465
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Input filename may not be the same as output filename\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:476
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Error opening output file '%s'.\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:491
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Error opening comment file '%s'.\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:508
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Error opening comment file '%s'\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:536
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Error removing old file %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:538
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Error renaming %s to %s\n"
-
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Error removing old file %s\n"
-
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-
-#~ 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"
-#~ "  -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"
-#~ "\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"
-#~ msgstr ""
-#~ "  -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"
-#~ "  -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"
-#~ "\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"
-
-#~ msgid "Track number:"
-#~ msgstr "Track number:"
-
-#~ msgid "ReplayGain (Track):"
-#~ msgstr "ReplayGain (Track):"
-
-#~ msgid "ReplayGain (Album):"
-#~ msgstr "ReplayGain (Album):"
-
-#~ msgid "ReplayGain (Track) Peak:"
-#~ msgstr "ReplayGain (Track) Peak:"
-
-#~ msgid "ReplayGain (Album) Peak:"
-#~ msgstr "ReplayGain (Album) Peak:"
-
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
-#~ msgid "Comment:"
-#~ msgstr "Comment:"
-
-#~ msgid "Version is %d"
-#~ msgstr "Version is %d"
-
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " General:\n"
-#~ " -Q, --quiet          Produce no output to stderr\n"
-#~ " -h, --help           Print this help text\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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --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"
-#~ " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-#~ "                      encoding for a fixed-size channel.\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"
-#~ "                      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"
-#~ " --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"
-#~ "\n"
-#~ " Naming:\n"
-#~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times.\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 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"
-#~ " Alternatively, the --raw option may be used to use a raw PCM data file, "
-#~ "which\n"
-#~ " must be 16bit stereo little-endian PCM ('headerless wav'), unless "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an outfile filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " General:\n"
-#~ " -Q, --quiet          Produce no output to stderr\n"
-#~ " -h, --help           Print this help text\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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --raw-endianness     1 for big endian, 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"
-#~ " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-#~ "                      encoding for a fixed-size channel.\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"
-#~ "                      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"
-#~ " --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"
-#~ "\n"
-#~ " Naming:\n"
-#~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times.\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 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"
-#~ " Alternatively, the --raw option may be used to use a raw PCM data file, "
-#~ "which\n"
-#~ " must be 16bit stereo little-endian PCM ('headerless wav'), unless "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an outfile filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-
-#~ msgid " to "
-#~ msgstr " to "
-
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %ld bytes\n"
-#~ "\tPlayback length: %ldm:%02lds\n"
-#~ "\tAverage bitrate: %f kbps\n"
-#~ msgstr ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %ld bytes\n"
-#~ "\tPlayback length: %ldm:%02lds\n"
-#~ "\tAverage bitrate: %f kbps\n"
-
-#~ msgid " bytes. Corrupted ogg.\n"
-#~ msgstr " bytes. Corrupted ogg.\n"
-
-#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
-#~ msgstr "Couldn't convert comment to UTF8, cannot add\n"
-
-#~ msgid ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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"
-#~ "   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 ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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"
-#~ "   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"

Modified: trunk/vorbis-tools/po/eo.po
===================================================================
--- trunk/vorbis-tools/po/eo.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/eo.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.2.1\n"
 "Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2008-09-12 02:53+0100\n"
 "PO-Revision-Date: 2008-09-21 16:26-0300\n"
 "Last-Translator: Felipe Castro <fefcas at gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@ -155,9 +155,9 @@
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:571 oggenc/oggenc.c:576
+#: oggenc/oggenc.c:581 oggenc/oggenc.c:586 oggenc/oggenc.c:591
+#: oggenc/oggenc.c:596
 msgid "(none)"
 msgstr "(neniu)"
 
@@ -263,12 +263,8 @@
 msgstr "--- La pelilo %s indikita en la agordo-dosiero malvalidas.\n"
 
 #: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Ne eblis ŝargi je antaŭsupozita pelilo kaj neniu alia estas indikita en "
-"la agordo-dosiero. Nepras eliro.\n"
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Ne eblis ŝargi je antaŭsupozita pelilo kaj neniu alia estas indikita en la agordo-dosiero. Nepras eliro.\n"
 
 #: ogg123/cmdline_options.c:292
 #, c-format
@@ -323,11 +319,8 @@
 
 #: ogg123/cmdline_options.c:311
 #, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-"  -d dev, --device dev    Uzu la eligan aparaton  \"dev\". Disponeblaj "
-"aparatoj:\n"
+msgid "  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
+msgstr "  -d dev, --device dev    Uzu la eligan aparaton  \"dev\". Disponeblaj aparatoj:\n"
 
 #: ogg123/cmdline_options.c:313
 #, c-format
@@ -375,12 +368,10 @@
 
 #: ogg123/cmdline_options.c:342
 #, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
+msgid "  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
 msgstr ""
 "  -@ dosiero, --list dosiero\n"
-"                          Legas muzikliston de dosieroj kaj URL-oj el "
-"\"dosiero\"\n"
+"                          Legas muzikliston de dosieroj kaj URL-oj el \"dosiero\"\n"
 
 #: ogg123/cmdline_options.c:343
 #, c-format
@@ -415,8 +406,7 @@
 #: ogg123/cmdline_options.c:351
 #, c-format
 msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-"  -p n, --prebuffer n     Åœargas je n%% el la eniga bufro antaÅ­ ol ludi\n"
+msgstr "  -p n, --prebuffer n     Åœargas je n%% el la eniga bufro antaÅ­ ol ludi\n"
 
 #: ogg123/cmdline_options.c:354
 #, c-format
@@ -425,11 +415,8 @@
 
 #: ogg123/cmdline_options.c:355
 #, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-"  -k n, --skip n          Pretersaltas la unuajn 'n' sekundoj (aÅ­ laÅ­ hh:mm:"
-"ss)\n"
+msgid "  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
+msgstr "  -k n, --skip n          Pretersaltas la unuajn 'n' sekundoj (aÅ­ laÅ­ hh:mm:ss)\n"
 
 #: ogg123/cmdline_options.c:356
 #, c-format
@@ -446,7 +433,7 @@
 msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
 msgstr "  -y n, --ntimes n        Ripetas ĉiun luditan blokon 'n' foje\n"
 
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
+#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:399
 #, c-format
 msgid "Miscellaneous options\n"
 msgstr "Mikstemaj opcioj\n"
@@ -459,16 +446,12 @@
 "                          and will terminate if two SIGINTs are received\n"
 "                          within the specified timeout 's'. (default 500)\n"
 msgstr ""
-"  -l s, --delay s         Difinas ĉesigan tempo-limon per milisekundoj. "
-"ogg123\n"
-"                          pretersaltos al la sekvonta muziko okaze de "
-"SIGINT\n"
-"                          (Ctrl-C), kaj ĉesiĝos se du SIGINT-oj estos "
-"ricevitaj\n"
-"                          ene de la specifita tempo-limo 's'. (implicite "
-"500)\n"
+"  -l s, --delay s         Difinas ĉesigan tempo-limon per milisekundoj. ogg123\n"
+"                          pretersaltos al la sekvonta muziko okaze de SIGINT\n"
+"                          (Ctrl-C), kaj ĉesiĝos se du SIGINT-oj estos ricevitaj\n"
+"                          ene de la specifita tempo-limo 's'. (implicite 500)\n"
 
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
+#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:406
 #, c-format
 msgid "  -h, --help              Display this help\n"
 msgstr "  -h, --help              Montrigas ĉi tiun helpon\n"
@@ -480,10 +463,8 @@
 
 #: ogg123/cmdline_options.c:369
 #, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-"  -v, --verbose           Montrigas evoluan kaj aliajn statusajn informojn\n"
+msgid "  -v, --verbose           Display progress and other status information\n"
+msgstr "  -v, --verbose           Montrigas evoluan kaj aliajn statusajn informojn\n"
 
 #: ogg123/cmdline_options.c:370
 #, c-format
@@ -572,9 +553,7 @@
 #: ogg123/ogg123.c:577
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
-msgstr ""
-"Eraro dum malfermo de %s uzante la modulon %s-on.  La dosiero povas esti "
-"disrompita.\n"
+msgstr "Eraro dum malfermo de %s uzante la modulon %s-on.  La dosiero povas esti disrompita.\n"
 
 #: ogg123/ogg123.c:596
 #, c-format
@@ -619,8 +598,7 @@
 #: ogg123/oggvorbis_format.c:319
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
-msgstr ""
-"Konsiletoj pri bitrapido: supra=%ld meznombra=%ld suba=%ld intervalo=%ld"
+msgstr "Konsiletoj pri bitrapido: supra=%ld meznombra=%ld suba=%ld intervalo=%ld"
 
 #: ogg123/oggvorbis_format.c:327
 #, c-format
@@ -703,7 +681,7 @@
 msgid "oggdec from %s %s\n"
 msgstr "oggdec el %s %s\n"
 
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
+#: oggdec/oggdec.c:56 oggenc/oggenc.c:396 ogginfo/ogginfo2.c:1223
 #, c-format
 msgid ""
 " by the Xiph.Org Foundation (http://www.xiph.org/)\n"
@@ -780,132 +758,82 @@
 "                  uzata se ekzistas nur unu eniga dosiero, krom en\n"
 "                  kruda reĝimo.\n"
 
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "ERARO: Ne eblas malfermi la enig-dosieron \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "ERARO: Ne eblas malfermi la elig-dosieron \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Malsukcesis malfermo de dosiero kiel vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Eraro dum forigo de la malnova dosiero '%s'\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"ERARO: Neniu enig-dosiero estis indikita. Uzu la opcion -h por helpo.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"ERARO: Pluraj enig-dosieroj kun elig-dosiernomo indikita: ni sugestas uzon "
-"de -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:51
 msgid "WAV file reader"
 msgstr "Legilo de dosiero WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:52
 msgid "AIFF/AIFC file reader"
 msgstr "Legilo de dosiero AIFF/AIFC"
 
-#: oggenc/audio.c:53
+#: oggenc/audio.c:54
 msgid "FLAC file reader"
 msgstr "Legilo de dosiero FLAC"
 
-#: oggenc/audio.c:54
+#: oggenc/audio.c:55
 msgid "Ogg FLAC file reader"
 msgstr "Legilo de dosiero Ogg FLAC"
 
-#: oggenc/audio.c:131 oggenc/audio.c:425
+#: oggenc/audio.c:57
+msgid "AU file reader"
+msgstr "Legilo de dosiero AU"
+
+#: oggenc/audio.c:133
 #, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Averto: Neatendita EOF (fino de dosiero) dum lego de WAV-kapo\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:144
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Oni preterpasas pecon el tipo \"%s\", grandeco %d\n"
 
-#: oggenc/audio.c:168
+#: oggenc/audio.c:170
 #, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Averto: Neatendita EOF (fino de dosiero) en AIFF-a peco\n"
 
-#: oggenc/audio.c:254
+#: oggenc/audio.c:256
 #, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Averto: Neniu komuna peco estis trovita en la AIFF-a dosiero\n"
 
-#: oggenc/audio.c:260
+#: oggenc/audio.c:262
 #, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Averto: Distranĉita komuna peco en AIFF-kapo\n"
 
-#: oggenc/audio.c:268
+#: oggenc/audio.c:270
 #, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Averto: Neatendita EOF (fino de dosiero) dum lego de AIFF-kapo\n"
 
-#: oggenc/audio.c:283
+#: oggenc/audio.c:285
 #, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Averto: AIFF-C-kapo estas distranĉita.\n"
 
-#: oggenc/audio.c:297
+#: oggenc/audio.c:299
 #, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Averto: Ne eblas trakti kompaktitan AIFF-C-on (%c%c%c%c)\n"
 
-#: oggenc/audio.c:304
+#: oggenc/audio.c:306
 #, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Averto: Neniu SSND-peco estis trovita en la AIFF-dosiero\n"
 
-#: oggenc/audio.c:310
+#: oggenc/audio.c:312
 #, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Averto: Disrompita SSND-peco en AIFF-kapo\n"
 
-#: oggenc/audio.c:316
+#: oggenc/audio.c:318
 #, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Averto: Neatendita EOF (fino de dosiero) dum lego de AIFF-kapo\n"
 
-#: oggenc/audio.c:353
+#: oggenc/audio.c:355
 #, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
@@ -915,31 +843,35 @@
 " Devas esti 8 aÅ­ 16-bita PCM.\n"
 "\n"
 
-#: oggenc/audio.c:407
-#, fuzzy, c-format
-msgid "Warning: Unrecognised format chunk in WAV header\n"
+#: oggenc/audio.c:409
+#, c-format
+msgid "Warning: Unrecognised format chunk in Wave header\n"
 msgstr "Averto: Nerekonita form-difiniga peco en la kapo de 'Wave'\n"
 
-#: oggenc/audio.c:420
-#, fuzzy, c-format
+#: oggenc/audio.c:422
+#, c-format
 msgid ""
-"Warning: INVALID format chunk in wav header.\n"
+"Warning: INVALID format chunk in Wave header.\n"
 " Trying to read anyway (may not work)...\n"
 msgstr ""
 "Averto: NEVALIDA form-difiniga peco en kapo de 'Wave'.\n"
 " Ni provos legi tiel mem (eble sensukcese)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: oggenc/audio.c:427
+#, c-format
+msgid "Warning: Unexpected EOF in reading Wave header\n"
+msgstr "Averto: Neatendita EOF (fino de dosiero) dum legado de kapo de 'Wave'\n"
+
+#: oggenc/audio.c:460
+#, c-format
 msgid ""
-"ERROR: Wav file is unsupported type (must be standard PCM\n"
+"ERROR: Wave file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM)\n"
 msgstr ""
-"ERARO: La 'Wave'-dosiero prezentas nesubtenatan tipon (devas esti laÅ­norma "
-"PCM\n"
+"ERARO: La 'Wave'-dosiero prezentas nesubtenatan tipon (devas esti laÅ­norma PCM\n"
 " aÅ­ glitkoma PCM tipo 3)\n"
 
-#: oggenc/audio.c:467
+#: oggenc/audio.c:469
 #, c-format
 msgid ""
 "Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
@@ -948,47 +880,55 @@
 "Averto: WAV-a valoro 'block alignment' estas malĝusta, ni ignoras.\n"
 "La programo kiu kreis tiun ĉi dosieron estas malkorekta.\n"
 
-#: oggenc/audio.c:528
+#: oggenc/audio.c:530
 #, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
 "or floating point PCM)\n"
 msgstr ""
-"ERARO: La Wav-dosiero prezentas nesubtenatan subformon (devas esti 8,16,24 "
-"aÅ­ 32-bita PCM\n"
+"ERARO: La Wav-dosiero prezentas nesubtenatan subformon (devas esti 8,16,24 aÅ­ 32-bita PCM\n"
 " aÅ­ glitkoma PCM)\n"
 
-#: oggenc/audio.c:604
+#: oggenc/audio.c:606
 #, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"Pezkomenca 24-bita PCM-a datumaro ne estas aktuale subtenata, ni ĉesigas.\n"
+msgstr "Pezkomenca 24-bita PCM-a datumaro ne estas aktuale subtenata, ni ĉesigas.\n"
 
-#: oggenc/audio.c:624
+#: oggenc/audio.c:626
 #, c-format
 msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"Pezkomenca 32-bita PCM-datumaro ne estas aktuale subtenata, ni ĉesigas.\n"
+msgstr "Pezkomenca 32-bita PCM-datumaro ne estas aktuale subtenata, ni ĉesigas.\n"
 
-#: oggenc/audio.c:630
+#: oggenc/audio.c:632
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr "Interna eraro: provo legi nesubtenatan bitprofundecon %d\n"
 
-#: oggenc/audio.c:732
+#: oggenc/audio.c:734
 #, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"MALÄœUSTAÄ´O: Ni trovis nulajn specimenojn el la specimen-reakirilo: via "
-"dosiero estos tranĉita. Bonvolu raporti ĉi tion.\n"
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "MALĜUSTAĴO: Ni trovis nulajn specimenojn el la specimen-reakirilo: via dosiero estos tranĉita. Bonvolu raporti ĉi tion.\n"
 
-#: oggenc/audio.c:750
+#: oggenc/audio.c:752
 #, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Ne eblis lanĉi la specimen-reakirilon\n"
 
+#: oggenc/audio.c:882
+#, c-format
+msgid "Out of memory opening AU driver\n"
+msgstr "Manko de memoro dun malfermo de AU-pelilo\n"
+
+#: oggenc/audio.c:889
+#, c-format
+msgid "At this moment, only linear 16 bit .au files are supported\n"
+msgstr "Je tiu ĉi momento, nur linearaj 16-bitaj '.au'-dosieroj estas subtenataj\n"
+
+#: oggenc/audio.c:941
+#, c-format
+msgid "Internal error! Please report this bug.\n"
+msgstr "Interna eraro! Bonvolu raporti tiun ĉi problemon.\n"
+
 #: oggenc/encode.c:64
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
@@ -1011,20 +951,13 @@
 
 #: oggenc/encode.c:115 oggenc/encode.c:252
 #, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-"Tiu ĉi versio de 'libvorbisenc' ne povas difini alnivelajn rapidec-"
-"administrajn parametrojn\n"
+msgid "This version of libvorbisenc cannot set advanced rate management parameters\n"
+msgstr "Tiu ĉi versio de 'libvorbisenc' ne povas difini alnivelajn rapidec-administrajn parametrojn\n"
 
 #: oggenc/encode.c:174
 #, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 kanaloj devus sufiĉi por ĉiuj. (Pardonon, Vorbis ne subtenas pli ol "
-"tiom)\n"
+msgid "255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support more)\n"
+msgstr "255 kanaloj devus sufiĉi por ĉiuj. (Pardonon, Vorbis ne subtenas pli ol tiom)\n"
 
 #: oggenc/encode.c:182
 #, c-format
@@ -1049,8 +982,7 @@
 #: oggenc/encode.c:263
 #, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
-msgstr ""
-"La ekdifino de reĝimo malsukcesis: nevalidaj parametroj por bitrapido\n"
+msgstr "La ekdifino de reĝimo malsukcesis: nevalidaj parametroj por bitrapido\n"
 
 #: oggenc/encode.c:330 oggenc/encode.c:352
 msgid "Failed writing header to output stream\n"
@@ -1185,94 +1117,86 @@
 "            %s%s%s \n"
 "uzante regadon de bitrapido "
 
-#: oggenc/oggenc.c:103
+#: oggenc/oggenc.c:100
 #, c-format
 msgid "ERROR: No input files specified. Use -h for help.\n"
-msgstr ""
-"ERARO: Neniu enig-dosiero estis indikita. Uzu la opcion -h por helpo.\n"
+msgstr "ERARO: Neniu enig-dosiero estis indikita. Uzu la opcion -h por helpo.\n"
 
-#: oggenc/oggenc.c:118
+#: oggenc/oggenc.c:115
 #, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "ERARO: Pluraj dosieroj estis indikitaj dum uzo de 'stdin'\n"
 
-#: oggenc/oggenc.c:125
+#: oggenc/oggenc.c:122
 #, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"ERARO: Pluraj enig-dosieroj kun elig-dosiernomo indikita: ni sugestas uzon "
-"de -n\n"
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "ERARO: Pluraj enig-dosieroj kun elig-dosiernomo indikita: ni sugestas uzon de -n\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:183
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ERARO: Ne eblas malfermi la enig-dosieron \"%s\": %s\n"
 
-#: oggenc/oggenc.c:202
+#: oggenc/oggenc.c:199
 msgid "RAW file reader"
 msgstr "Legilo de dosiero RAW"
 
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:216
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Malfermado kun %s-modulo: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:225
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "ERARO: La enig-dosiero \"%s\" ne estas subtenata formo\n"
 
-#: oggenc/oggenc.c:280
+#: oggenc/oggenc.c:277
 #, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "AVERTO: Neniu dosiernomo, apriore ni uzu \"default.ogg\"-on\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:285
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"ERARO: Ne eblis krei postulatajn subdosierujojn por la elig-dosiernomo \"%s"
-"\"\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "ERARO: Ne eblis krei postulatajn subdosierujojn por la elig-dosiernomo \"%s\"\n"
 
-#: oggenc/oggenc.c:295
+#: oggenc/oggenc.c:292
 #, c-format
 msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
 msgstr "ERARO: La enig-dosieromo estas la sama ol la elig-dosiernomo \"%s\"\n"
 
-#: oggenc/oggenc.c:306
+#: oggenc/oggenc.c:303
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ERARO: Ne eblas malfermi la elig-dosieron \"%s\": %s\n"
 
-#: oggenc/oggenc.c:350
+#: oggenc/oggenc.c:335
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Reakirado de enigo el %d Hz al %d Hz\n"
 
-#: oggenc/oggenc.c:357
+#: oggenc/oggenc.c:342
 #, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Enmiksado de dukanalo al unukanalo\n"
 
-#: oggenc/oggenc.c:360
+#: oggenc/oggenc.c:345
 #, c-format
 msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "AVERTO: Ne eblas enmiksi, krom de dukanalo al unukanalo\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:353
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr "Reskalado de la enigo al %f\n"
 
-#: oggenc/oggenc.c:414
+#: oggenc/oggenc.c:395
 #, c-format
 msgid "oggenc from %s %s"
 msgstr "oggenc el %s %s"
 
-#: oggenc/oggenc.c:416
+#: oggenc/oggenc.c:397
 #, c-format
 msgid ""
 "Usage: oggenc [options] inputfile [...]\n"
@@ -1281,7 +1205,7 @@
 "Uzado: oggenc [opcioj] enigdosiero [...]\n"
 "\n"
 
-#: oggenc/oggenc.c:417
+#: oggenc/oggenc.c:398
 #, c-format
 msgid ""
 "OPTIONS:\n"
@@ -1296,7 +1220,7 @@
 " -h, --help           Montrigas tiun ĉi helpo-tekston\n"
 " -V, --version        Montrigas la versi-numeron\n"
 
-#: oggenc/oggenc.c:423
+#: oggenc/oggenc.c:404
 #, c-format
 msgid ""
 " -k, --skeleton       Adds an Ogg Skeleton bitstream\n"
@@ -1307,17 +1231,13 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 msgstr ""
 " -k, --skeleton       Aldonas bitfluon 'Ogg Skeleton'\n"
-" -r, --raw            Kruda reĝimo. Enig-dosieroj estas legataj rekte kiel "
-"PCM-datumaro\n"
-" -B, --raw-bits=n     Difinas bitoj/specimeno por kruda enigo; implicite "
-"estas 16\n"
-" -C, --raw-chan=n     Difinas la nombron da kanaloj por kruda enigo; "
-"implicite estas 2\n"
-" -R, --raw-rate=n     Difinas specimenojn/sek por kruda enigo; implicite "
-"estas 44100\n"
+" -r, --raw            Kruda reĝimo. Enig-dosieroj estas legataj rekte kiel PCM-datumaro\n"
+" -B, --raw-bits=n     Difinas bitoj/specimeno por kruda enigo; implicite estas 16\n"
+" -C, --raw-chan=n     Difinas la nombron da kanaloj por kruda enigo; implicite estas 2\n"
+" -R, --raw-rate=n     Difinas specimenojn/sek por kruda enigo; implicite estas 44100\n"
 " --raw-endianness     1 por pezkomenca, 0 por pezfina (implicite estas 0)\n"
 
-#: oggenc/oggenc.c:430
+#: oggenc/oggenc.c:411
 #, c-format
 msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
@@ -1328,33 +1248,28 @@
 "                      targetting the selected bitrate.\n"
 msgstr ""
 " -b, --bitrate        Elektas meznombran bitrapidon por enkodigo. Äœi provas\n"
-"                      enkodi je bitrapido ĉirkaŭ tiu ĉi valoro. Ĝi prenas "
-"argumenton\n"
-"                      je kbps. AntaÅ­supoze, tio produktas VBR-enkodon, "
-"ekvivalenta\n"
+"                      enkodi je bitrapido ĉirkaŭ tiu ĉi valoro. Ĝi prenas argumenton\n"
+"                      je kbps. AntaÅ­supoze, tio produktas VBR-enkodon, ekvivalenta\n"
 "                      al tia, kiam oni uzas la opcion -q aÅ­ --quality.\n"
-"                      Vidu la opcion --managed por uzi mastrumitan "
-"bitrapidon,\n"
+"                      Vidu la opcion --managed por uzi mastrumitan bitrapidon,\n"
 "                      kiu celu la elektitan valoron.\n"
 
-#: oggenc/oggenc.c:437
+#: oggenc/oggenc.c:418
 #, c-format
 msgid ""
 " --managed            Enable the bitrate management engine. This will allow\n"
-"                      much greater control over the precise bitrate(s) "
-"used,\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"
 msgstr ""
 " --managed            Åœaltas la motoron por mastrumado de bitrapido. Tio\n"
-"                       permesos multe pli grandan precizecon por specifi la "
-"uzata(j)n\n"
+"                       permesos multe pli grandan precizecon por specifi la uzata(j)n\n"
 "                       bitrapido(j)n, tamen la enkodado estos multe pli\n"
 "                       malrapida. Ne uzu tion, krom se vi bezonegas bonan\n"
 "                       precizecon por bitrapido, ekzemple dum sonfluo.\n"
 
-#: oggenc/oggenc.c:443
+#: oggenc/oggenc.c:424
 #, c-format
 msgid ""
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
@@ -1370,11 +1285,10 @@
 "                      ebligos la reĝimon de mastrumado de bitrapido\n"
 "                      (vidu la opcion --managed).\n"
 " -M, --max-bitrate    Specifas maksimuman bitrapidon po kbps. Utilas por\n"
-"                      sonfluaj aplikaĵoj. Tio aŭtomate ebligos la reĝimon "
-"de\n"
+"                      sonfluaj aplikaĵoj. Tio aŭtomate ebligos la reĝimon de\n"
 "                      mastrumado de bitrapido (vidu la opcion --managed).\n"
 
-#: oggenc/oggenc.c:451
+#: oggenc/oggenc.c:432
 #, c-format
 msgid ""
 " --advanced-encode-option option=value\n"
@@ -1385,16 +1299,13 @@
 "                      caution.\n"
 msgstr ""
 " --advanced-encode-option opcio=valoro\n"
-"                      Difinas alnivelan enkodigan opcion por la indikita "
-"valoro.\n"
-"                      La validaj opcioj (kaj ties valoroj) estas "
-"priskribitaj\n"
+"                      Difinas alnivelan enkodigan opcion por la indikita valoro.\n"
+"                      La validaj opcioj (kaj ties valoroj) estas priskribitaj\n"
 "                      en la 'man'-paĝo disponigita kun tiu ĉi programo. Ili\n"
-"                      celas precipe alnivelajn uzantojn, kaj devus esti "
-"uzata\n"
+"                      celas precipe alnivelajn uzantojn, kaj devus esti uzata\n"
 "                      tre singarde.\n"
 
-#: oggenc/oggenc.c:458
+#: oggenc/oggenc.c:439
 #, c-format
 msgid ""
 " -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
@@ -1409,7 +1320,7 @@
 "                      Frakciaj kvalitoj (ekz. 2.75) estas permesitaj.\n"
 "                      La implicita kvalito-nivelo estas 3.\n"
 
-#: oggenc/oggenc.c:464
+#: oggenc/oggenc.c:445
 #, c-format
 msgid ""
 " --resample n         Resample input data to sampling rate n (Hz)\n"
@@ -1423,10 +1334,9 @@
 " --downmix            Enmiksas dukanalon al unukanalo. Nur ebligita por\n"
 "                      dukanala enigo.\n"
 " -s, --serial         Specifas serian numeron por la fluo. Se oni enkodas\n"
-"                      multoblajn dosierojn, tiu numero kreskas post ĉiu "
-"fluo.\n"
+"                      multoblajn dosierojn, tiu numero kreskas post ĉiu fluo.\n"
 
-#: oggenc/oggenc.c:471
+#: oggenc/oggenc.c:452
 #, c-format
 msgid ""
 " --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
@@ -1436,85 +1346,64 @@
 "\n"
 msgstr ""
 " --discard-comments   Evitas komentojn en FLAC aÅ­ Ogg-FLAC-dosieroj por ke\n"
-"                      ili ne estu kopiitaj al la elig-dosiero de Ogg "
-"Vorbis.\n"
+"                      ili ne estu kopiitaj al la elig-dosiero de Ogg Vorbis.\n"
 " --ignorelength       Ignoras la datumlongecon en la kapoj de 'wav'. Tio\n"
-"                     ebligos subtenon de dosierojn > 4GB kaj datumfluojn "
-"'STDIN'.\n"
+"                     ebligos subtenon de dosierojn > 4GB kaj datumfluojn 'STDIN'.\n"
 "\n"
 
-#: oggenc/oggenc.c:477
+#: oggenc/oggenc.c:458
 #, c-format
 msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
 msgstr ""
 " Nomigo:\n"
-" -o, --output=dn      Skribas dosieron kun la nomo 'dn' (nur validas por "
-"unuop-\n"
+" -o, --output=dn      Skribas dosieron kun la nomo 'dn' (nur validas por unuop-\n"
 "                      dosiera reĝimo)\n"
 " -n, --names=ĉeno    Produktas dosiernomojn laŭ tiu 'ĉeno', kun %%a, %%t,\n"
-"                      %%l, %%n, %%d anstataÅ­itaj per artisto, titolo, "
-"albumo,\n"
-"                      bendnumero kaj dato, respektive (vidu sube kiel "
-"specifi\n"
+"                      %%l, %%n, %%d anstataÅ­itaj per artisto, titolo, albumo,\n"
+"                      bendnumero kaj dato, respektive (vidu sube kiel specifi\n"
 "                      tion). %%%% rezultigas la signon %%.\n"
 
-#: oggenc/oggenc.c:484
+#: oggenc/oggenc.c:465
 #, c-format
 msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
 msgstr ""
-" -X, --name-remove=s  Forigas la indikitajn signojn en 's' el la parametroj "
-"de\n"
+" -X, --name-remove=s  Forigas la indikitajn signojn en 's' el la parametroj de\n"
 "                      la ĉeno post -n. Utilas por validigi dosiernomojn\n"
-" -P, --name-replace=s AnstataÅ­igas signojn forigitaj de --name-remove per "
-"la\n"
-"                      specifitaj signoj en la ĉeno 's'. Se tiu ĉeno estos "
-"pli\n"
+" -P, --name-replace=s AnstataÅ­igas signojn forigitaj de --name-remove per la\n"
+"                      specifitaj signoj en la ĉeno 's'. Se tiu ĉeno estos pli\n"
 "                      mallonga ol la listo en --name-remove aÅ­ tiu ne estas\n"
 "                      specifita, la signoj estos simple forigitaj.\n"
-"                      Implicitaj valoroj por la supraj du argumentoj "
-"dependas de\n"
+"                      Implicitaj valoroj por la supraj du argumentoj dependas de\n"
 "                      la platformo de via sistemo.\n"
 
-#: oggenc/oggenc.c:493
-#, fuzzy, c-format
+#: oggenc/oggenc.c:474
+#, c-format
 msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
 "                      used multiple times. The argument should be in the\n"
 "                      format \"tag=value\".\n"
 " -d, --date           Date for track (usually date of performance)\n"
 msgstr ""
-" -c, --comment=k      Aldonas la ĉenon 'k' kiel kroman komenton. Tio povas "
-"esti\n"
+" -c, --comment=k      Aldonas la ĉenon 'k' kiel kroman komenton. Tio povas esti\n"
 "                      uzata plurfoje. La argumento devas esti laÅ­ la formo\n"
 "                      \"etikedo=valoro\".\n"
-" -d, --date           Dato por la bendo (ordinare temas pri la dato de "
-"ludado)\n"
+" -d, --date           Dato por la bendo (ordinare temas pri la dato de ludado)\n"
 
-#: oggenc/oggenc.c:501
+#: oggenc/oggenc.c:479
 #, c-format
 msgid ""
 " -N, --tracknum       Track number for this track\n"
@@ -1529,72 +1418,53 @@
 " -a, --artist         Nomo de la artisto\n"
 " -G, --genre          Muzikstilo de la bendo\n"
 
-#: oggenc/oggenc.c:507
+#: oggenc/oggenc.c:485
 #, c-format
 msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
 msgstr ""
 "                      Se multopaj enig-dosieroj estas indikitaj, tiaokaze\n"
-"                      multopaj ekzemploj de la antaÅ­aj kvin argumentoj "
-"estos\n"
+"                      multopaj ekzemploj de la antaÅ­aj kvin argumentoj estos\n"
 "                      uzitaj, laÅ­ la donita ordo. Se oni indikis malpli da\n"
-"                      titoloj ol dosieroj, OggEnc montros averton, kaj "
-"reuzos\n"
-"                      la lastan por la restantaj dosieroj. Se malpli da "
-"bend-\n"
+"                      titoloj ol dosieroj, OggEnc montros averton, kaj reuzos\n"
+"                      la lastan por la restantaj dosieroj. Se malpli da bend-\n"
 "                      numeroj estas indikitaj, la restantaj dosieroj estos\n"
-"                      nenumeritaj. Por la aliaj, la lasta etikedo estos "
-"reuzata\n"
+"                      nenumeritaj. Por la aliaj, la lasta etikedo estos reuzata\n"
 "                      por ĉiuj restantaj sen ajna averto (tiel ekzemple vi\n"
 "                      povas specifigi daton kaj aplikigi ĝin por ĉiuj aliaj\n"
 "                      dosieroj.\n"
 "\n"
 
-#: oggenc/oggenc.c:518
-#, fuzzy, c-format
+#: oggenc/oggenc.c:496
+#, c-format
 msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\n"
-" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
-"Files\n"
+" OggEnc input files must currently be 24, 16, or 8 bit PCM Wave, 16 bit u-Law (.au), AIFF, or AIFF/C\n"
+" files, 32 bit IEEE floating point Wave, 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 "
-"additional\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 wave'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
 " In this mode, output is to stdout unless an output filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
 "ENIG-DOSIEROJ:\n"
-" Enigaj dosieroj de OggEnc aktuale devas esti laÅ­ la formoj 24, 16 aÅ­ 8-"
-"bitaj\n"
-" PCM WAV, AIFF aÅ­ AIFF/C, 32-bitaj IEEE-glitkomaj Wave kaj, laÅ­dezire, FLAC "
-"aÅ­\n"
-" Ogg FLAC. Dosieroj povas esti unukanalaj aÅ­ dukanalaj (aÅ­ plurkanalaj) kaj "
-"je\n"
-" iu ajn akiro-rapido. Alternative, la opcio --raw povas esti indikata por ke "
-"oni\n"
-" uzu krudan PCM-datuman dosieron, kiu devas esti 16-bita dukanala pezfina "
-"PCM\n"
+" Enigaj dosieroj de OggEnc aktuale devas esti laÅ­ la formoj 24, 16 aÅ­ 8-bitaj\n"
+" PCM WAV, AIFF aÅ­ AIFF/C, 32-bitaj IEEE-glitkomaj Wave kaj, laÅ­dezire, FLAC aÅ­\n"
+" Ogg FLAC. Dosieroj povas esti unukanalaj aÅ­ dukanalaj (aÅ­ plurkanalaj) kaj je\n"
+" iu ajn akiro-rapido. Alternative, la opcio --raw povas esti indikata por ke oni\n"
+" uzu krudan PCM-datuman dosieron, kiu devas esti 16-bita dukanala pezfina PCM\n"
 " ('senkapa wav'), krom se oni specifu kromajn parametrojn por kruda reĝimo.\n"
 " Vi povas indiki akiradon de dosiero el 'stdin' uzante la signon '-' kiel\n"
 " enig-dosiernomon.\n"
@@ -1602,387 +1472,330 @@
 " indikita per -o\n"
 "\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:601
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
-msgstr ""
-"AVERTO: ni preteratentas malpermesitan specialan signon '%c' en la nomformo\n"
+msgstr "AVERTO: ni preteratentas malpermesitan specialan signon '%c' en la nomformo\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
+#: oggenc/oggenc.c:630 oggenc/oggenc.c:755 oggenc/oggenc.c:768
 #, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "Ni ebligas la motoron kiu regas bitrapidon\n"
 
-#: oggenc/oggenc.c:661
+#: oggenc/oggenc.c:639
 #, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"AVERTO: Kruda pez-ordo estis specifita por nekruda datumaro. Ni konsideros "
-"ke la enigo estas kruda.\n"
+msgid "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
+msgstr "AVERTO: Kruda pez-ordo estis specifita por nekruda datumaro. Ni konsideros ke la enigo estas kruda.\n"
 
-#: oggenc/oggenc.c:664
+#: oggenc/oggenc.c:642
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "AVERTO: Ne eblis legi pez-ordan argumenton \"%s\"\n"
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:649
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "AVERTO: Ne eblis legi reakiradan frekvencon \"%s\"\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:655
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
-msgstr ""
-"Averto: La reakirada rapideco estis specifita kiel %d Hz. Eble vi volis "
-"indiki %d Hz, ĉu?\n"
+msgstr "Averto: La reakirada rapideco estis specifita kiel %d Hz. Eble vi volis indiki %d Hz, ĉu?\n"
 
-#: oggenc/oggenc.c:687
+#: oggenc/oggenc.c:665
 #, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Averto: Ne eblis malkomponi skalan faktoron \"%s\"\n"
 
-#: oggenc/oggenc.c:700
+#: oggenc/oggenc.c:675
 #, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Neniu valoro por la opcio de alnivela enkodilo estis trovita\n"
 
-#: oggenc/oggenc.c:718
+#: oggenc/oggenc.c:693
 #, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Interna eraro dum analizado de la komandlinaj opcioj\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:704
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Averto: Malpermesita komento estis uzata (\"%s\"), ni preteratentas.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:741
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Averto: la meznombra bitrapido \"%s\" ne estis rekonita\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:749
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Averto: la minimuma bitrapido \"%s\" ne estis rekonita\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:762
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Averto: la maksimuma bitrapido \"%s\" ne estis rekonita\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:774
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "La kvalita opcio \"%s\" ne estis rekonita, ni preteratentas\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:782
 #, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
-msgstr ""
-"AVERTO: la kvalito nivelo estas tro alta, ni uzos la maksimuman valoron.\n"
+msgstr "AVERTO: la kvalito nivelo estas tro alta, ni uzos la maksimuman valoron.\n"
 
-#: oggenc/oggenc.c:813
+#: oggenc/oggenc.c:788
 #, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
-msgstr ""
-"AVERTO: Tromultaj formo-indikoj por nomoj estis specifitaj, ni uzos la "
-"lastan\n"
+msgstr "AVERTO: Tromultaj formo-indikoj por nomoj estis specifitaj, ni uzos la lastan\n"
 
-#: oggenc/oggenc.c:822
+#: oggenc/oggenc.c:797
 #, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
-msgstr ""
-"AVERTO: Tromultaj filtriloj de nomformo-indikoj estis specifitaj, ni uzos la "
-"lastan\n"
+msgstr "AVERTO: Tromultaj filtriloj de nomformo-indikoj estis specifitaj, ni uzos la lastan\n"
 
-#: oggenc/oggenc.c:831
+#: oggenc/oggenc.c:806
 #, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
-msgstr ""
-"AVERTO: Tromultaj anstataÅ­igoj de filtriloj de nomformo-indikoj estis "
-"specifitaj, ni uzos la lastan\n"
+msgid "WARNING: Multiple name format filter replacements specified, using final\n"
+msgstr "AVERTO: Tromultaj anstataÅ­igoj de filtriloj de nomformo-indikoj estis specifitaj, ni uzos la lastan\n"
 
-#: oggenc/oggenc.c:839
+#: oggenc/oggenc.c:814
 #, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
-msgstr ""
-"AVERTO: Tromultaj eligaj dosieroj estis specifitaj, tio sugestas uzon de -n\n"
+msgstr "AVERTO: Tromultaj eligaj dosieroj estis specifitaj, tio sugestas uzon de -n\n"
 
-#: oggenc/oggenc.c:851
+#: oggenc/oggenc.c:826
 #, c-format
 msgid "oggenc from %s %s\n"
 msgstr "oggenc el %s %s\n"
 
-#: oggenc/oggenc.c:858
+#: oggenc/oggenc.c:833
 #, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"AVERTO: Kruda bitoj/specimeno estis specifita por nekruda datumaro. Ni "
-"konsideros ke la enigo estas kruda.\n"
+msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+msgstr "AVERTO: Kruda bitoj/specimeno estis specifita por nekruda datumaro. Ni konsideros ke la enigo estas kruda.\n"
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
+#: oggenc/oggenc.c:838 oggenc/oggenc.c:842
 #, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
-msgstr ""
-"AVERTO: Nevalida bitoj/specimeno estis specifita, ni konsideros kiel 16.\n"
+msgstr "AVERTO: Nevalida bitoj/specimeno estis specifita, ni konsideros kiel 16.\n"
 
-#: oggenc/oggenc.c:874
+#: oggenc/oggenc.c:849
 #, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"AVERTO: Kruda kanal-nombro estis specifita por nekruda datumaro. Ni "
-"konsideros ke la enigo estas kruda.\n"
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "AVERTO: Kruda kanal-nombro estis specifita por nekruda datumaro. Ni konsideros ke la enigo estas kruda.\n"
 
-#: oggenc/oggenc.c:879
+#: oggenc/oggenc.c:854
 #, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "AVERTO: Nevalida kanal-nombro estis specifita, ni konsideros kiel 2.\n"
 
-#: oggenc/oggenc.c:890
+#: oggenc/oggenc.c:865
 #, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"AVERTO: Kruda akiro-rapido estis specifita por nekruda datumaro. Ni "
-"konsideros ke la enigo estas kruda.\n"
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+msgstr "AVERTO: Kruda akiro-rapido estis specifita por nekruda datumaro. Ni konsideros ke la enigo estas kruda.\n"
 
-#: oggenc/oggenc.c:895
+#: oggenc/oggenc.c:870
 #, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
-msgstr ""
-"AVERTO: Nevalida akiro-rapido estis specifita, ni konsideros kiel 44100.\n"
+msgstr "AVERTO: Nevalida akiro-rapido estis specifita, ni konsideros kiel 44100.\n"
 
-#: oggenc/oggenc.c:902
+#: oggenc/oggenc.c:877
 #, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "AVERTO: Nekonata opcio estis specifita, ni preteratentas->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Ne eblis konverti la komenton al UTF-8, ne eblas aldoni\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
+#: oggenc/oggenc.c:899 vorbiscomment/vcomment.c:354
 #, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Ne eblis konverti la komenton al UTF-8, ne eblas aldoni\n"
 
-#: oggenc/oggenc.c:954
+#: oggenc/oggenc.c:918
 #, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
-msgstr ""
-"AVERTO: Nesufiĉe da titoloj estis specifitaj: promanke al la lasta titolo.\n"
+msgstr "AVERTO: Nesufiĉe da titoloj estis specifitaj: promanke al la lasta titolo.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:150
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Ne eblis krei la dosierujon \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:157
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Okazis eraro kiam ni kontrolis ekziston de la dosierujo %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:170
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Eraro: la pado-segmento \"%s\" ne estas dosierujo\n"
 
-#: ogginfo/ogginfo2.c:212
+#: ogginfo/ogginfo2.c:211
 #, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
-msgstr ""
-"Averto: La komendo %d en la fluo %d havas nevalidan formon, ĝi ne enhavas la "
-"simbolon '=': \"%s\"\n"
+msgid "Warning: Comment %d in stream %d has invalid format, does not contain '=': \"%s\"\n"
+msgstr "Averto: La komendo %d en la fluo %d havas nevalidan formon, ĝi ne enhavas la simbolon '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo2.c:219
 #, c-format
 msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Averto : Nevalida komenta nomo-kampo en la komento %d (fluo %d): \"%s\"\n"
+msgstr "Averto : Nevalida komenta nomo-kampo en la komento %d (fluo %d): \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo2.c:250 ogginfo/ogginfo2.c:258
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
-msgstr ""
-"Averto: Malpermesita UTF-8-a signo-sekvo en la komento %d (fluo %d): la "
-"grandeca marko malĝustas\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
+msgstr "Averto: Malpermesita UTF-8-a signo-sekvo en la komento %d (fluo %d): la grandeca marko malĝustas\n"
 
-#: ogginfo/ogginfo2.c:266
+#: ogginfo/ogginfo2.c:265
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Averto: Malpermesita UTF-8-a signo-sekvo en la komento %d (fluo %d): tro "
-"malmultaj bitokoj\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr "Averto: Malpermesita UTF-8-a signo-sekvo en la komento %d (fluo %d): tro malmultaj bitokoj\n"
 
-#: ogginfo/ogginfo2.c:342
+#: ogginfo/ogginfo2.c:341
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Averto: Malpermesita UTF-8-a signo-vico en la komento %d (fluo %d): nevalida "
-"signo-sekvo \"%s\": %s\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence \"%s\": %s\n"
+msgstr "Averto: Malpermesita UTF-8-a signo-vico en la komento %d (fluo %d): nevalida signo-sekvo \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:356
+#: ogginfo/ogginfo2.c:355
 msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
 msgstr "Averto: Malsukceso en utf8-a dekodilo. Tio ĉi devus esti malebla\n"
 
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
+#: ogginfo/ogginfo2.c:380 ogginfo/ogginfo2.c:547 ogginfo/ogginfo2.c:680
 #, c-format
 msgid "Warning: discontinuity in stream (%d)\n"
 msgstr "Averto: malkontinuaĵo en fluo (%d)\n"
 
-#: ogginfo/ogginfo2.c:389
+#: ogginfo/ogginfo2.c:388
 #, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Averto: Ne eblis dekodi 'theora' kapo-pako - nevalida 'theora' fluo (%d)\n"
+msgid "Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr "Averto: Ne eblis dekodi 'theora' kapo-pako - nevalida 'theora' fluo (%d)\n"
 
-#: ogginfo/ogginfo2.c:396
+#: ogginfo/ogginfo2.c:395
 #, 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 ""
-"Averto: La 'theora' fluo %d ne havas ĝuste enkadrigitan kapdatumaron. La kap-"
-"paĝo de la terminalo enhavas kromajn pakojn aŭ ĝi havas la atributon "
-"'granulepos' ne-nula\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 "Averto: La 'theora' fluo %d ne havas ĝuste enkadrigitan kapdatumaron. La kap-paĝo de la terminalo enhavas kromajn pakojn aŭ ĝi havas la atributon 'granulepos' ne-nula\n"
 
-#: ogginfo/ogginfo2.c:400
+#: ogginfo/ogginfo2.c:399
 #, c-format
 msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr ""
-"'Theora'-kapoj estis malkomponitaj por la fluo %d, jen pli da informo...\n"
+msgstr "'Theora'-kapoj estis malkomponitaj por la fluo %d, jen pli da informo...\n"
 
-#: ogginfo/ogginfo2.c:403
+#: ogginfo/ogginfo2.c:402
 #, c-format
 msgid "Version: %d.%d.%d\n"
 msgstr "Versio: %d.%d.%d\n"
 
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:582 ogginfo/ogginfo2.c:742
 #, c-format
 msgid "Vendor: %s\n"
 msgstr "Vendanto: %s\n"
 
-#: ogginfo/ogginfo2.c:406
+#: ogginfo/ogginfo2.c:405
 #, c-format
 msgid "Width: %d\n"
 msgstr "Larĝeco: %d\n"
 
-#: ogginfo/ogginfo2.c:407
+#: ogginfo/ogginfo2.c:406
 #, c-format
 msgid "Height: %d\n"
 msgstr "Alteco: %d\n"
 
-#: ogginfo/ogginfo2.c:408
+#: ogginfo/ogginfo2.c:407
 #, c-format
 msgid "Total image: %d by %d, crop offset (%d, %d)\n"
 msgstr "Tuta bildo: %d je %d, marĝena deŝovo (%d, %d)\n"
 
-#: ogginfo/ogginfo2.c:411
+#: ogginfo/ogginfo2.c:410
 msgid "Frame offset/size invalid: width incorrect\n"
 msgstr "Malvalida deŝovo/grandeco de kadro: malĝusta larĝeco\n"
 
-#: ogginfo/ogginfo2.c:413
+#: ogginfo/ogginfo2.c:412
 msgid "Frame offset/size invalid: height incorrect\n"
 msgstr "Malvalida deŝovo/grandeco de kadro: malĝusta alteco\n"
 
-#: ogginfo/ogginfo2.c:416
+#: ogginfo/ogginfo2.c:415
 msgid "Invalid zero framerate\n"
 msgstr "Malvalida nula kadro-rapido\n"
 
-#: ogginfo/ogginfo2.c:418
+#: ogginfo/ogginfo2.c:417
 #, c-format
 msgid "Framerate %d/%d (%.02f fps)\n"
 msgstr "Kadro-rapido %d/%d (%.02f pkps)\n"
 
-#: ogginfo/ogginfo2.c:422
+#: ogginfo/ogginfo2.c:421
 msgid "Aspect ratio undefined\n"
 msgstr "Nedifinita kadra proporcio\n"
 
-#: ogginfo/ogginfo2.c:427
+#: ogginfo/ogginfo2.c:426
 #, c-format
 msgid "Pixel aspect ratio %d:%d (%f:1)\n"
 msgstr "Bildera proporcio %d:%d (%f:1)\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:428
 msgid "Frame aspect 4:3\n"
 msgstr "Kadra proporcio 4:3\n"
 
-#: ogginfo/ogginfo2.c:431
+#: ogginfo/ogginfo2.c:430
 msgid "Frame aspect 16:9\n"
 msgstr "Kadra proporcio 16:9\n"
 
-#: ogginfo/ogginfo2.c:433
+#: ogginfo/ogginfo2.c:432
 #, c-format
 msgid "Frame aspect %f:1\n"
 msgstr "Kadra proporcio %f:1\n"
 
-#: ogginfo/ogginfo2.c:437
+#: ogginfo/ogginfo2.c:436
 msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
 msgstr "Kolorspaco: Rec. ITU-R BT.470-6 System M (NTSC)\n"
 
-#: ogginfo/ogginfo2.c:439
+#: ogginfo/ogginfo2.c:438
 msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
 msgstr "Kolorspaco: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
 
-#: ogginfo/ogginfo2.c:441
+#: ogginfo/ogginfo2.c:440
 msgid "Colourspace unspecified\n"
 msgstr "Nespecifita kolorspaco\n"
 
-#: ogginfo/ogginfo2.c:444
+#: ogginfo/ogginfo2.c:443
 msgid "Pixel format 4:2:0\n"
 msgstr "Bildero-formo 4:2:0\n"
 
-#: ogginfo/ogginfo2.c:446
+#: ogginfo/ogginfo2.c:445
 msgid "Pixel format 4:2:2\n"
 msgstr "Bildero-formo 4:2:2\n"
 
-#: ogginfo/ogginfo2.c:448
+#: ogginfo/ogginfo2.c:447
 msgid "Pixel format 4:4:4\n"
 msgstr "Bildero-formo 4:4:4\n"
 
-#: ogginfo/ogginfo2.c:450
+#: ogginfo/ogginfo2.c:449
 msgid "Pixel format invalid\n"
 msgstr "Malvalida bildero-formo\n"
 
-#: ogginfo/ogginfo2.c:452
+#: ogginfo/ogginfo2.c:451
 #, c-format
 msgid "Target bitrate: %d kbps\n"
 msgstr "Celata bitrapido: %d kbps\n"
 
-#: ogginfo/ogginfo2.c:453
+#: ogginfo/ogginfo2.c:452
 #, c-format
 msgid "Nominal quality setting (0-63): %d\n"
 msgstr "Meznombra kvalito alĝustigo (0-63: %d\n"
 
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
+#: ogginfo/ogginfo2.c:455 ogginfo/ogginfo2.c:605 ogginfo/ogginfo2.c:801
 msgid "User comments section follows...\n"
 msgstr "Jen sekcio de uzant-komentoj...\n"
 
-#: ogginfo/ogginfo2.c:477
+#: ogginfo/ogginfo2.c:476
 msgid "Warning: Expected frame %"
 msgstr "Averto: Atendita kadro %"
 
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
+#: ogginfo/ogginfo2.c:492 ogginfo/ogginfo2.c:620 ogginfo/ogginfo2.c:818
 msgid "Warning: granulepos in stream %d decreases from %"
 msgstr "Averto: 'granulepos' en la fluo %d malpliiĝas de %"
 
-#: ogginfo/ogginfo2.c:520
+#: ogginfo/ogginfo2.c:519
 msgid ""
 "Theora stream %d:\n"
 "\tTotal data length: %"
@@ -1990,47 +1803,37 @@
 "'Theora'-fluo %d:\n"
 "\tTotala datum-longeco: %"
 
-#: ogginfo/ogginfo2.c:557
+#: ogginfo/ogginfo2.c:556
 #, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-"Averto: Ne eblis dekodi 'vorbis'-an kapo-pakon %d - malvalida 'vorbis'-a "
-"fluo (%d)\n"
+msgid "Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%d)\n"
+msgstr "Averto: Ne eblis dekodi 'vorbis'-an kapo-pakon %d - malvalida 'vorbis'-a fluo (%d)\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:564
 #, 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"
-msgstr ""
-"Averto: La 'vorbis'-a fluo %d ne havas ĝuste enkadrigitan kapdatumaron. La "
-"kap-paĝo de la terminalo enhavas kromajn pakojn aŭ ĝi havas la atributon "
-"'granulepos' ne-nula\n"
+msgid "Warning: Vorbis stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n"
+msgstr "Averto: La 'vorbis'-a fluo %d ne havas ĝuste enkadrigitan kapdatumaron. La kap-paĝo de la terminalo enhavas kromajn pakojn aŭ ĝi havas la atributon 'granulepos' ne-nula\n"
 
-#: ogginfo/ogginfo2.c:569
+#: ogginfo/ogginfo2.c:568
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
-msgstr ""
-"'Vorbis'-kapoj estis malkomponitaj por la fluo %d, jen pli da informo...\n"
+msgstr "'Vorbis'-kapoj estis malkomponitaj por la fluo %d, jen pli da informo...\n"
 
-#: ogginfo/ogginfo2.c:572
+#: ogginfo/ogginfo2.c:571
 #, c-format
 msgid "Version: %d\n"
 msgstr "Versio: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:575
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Vendanto: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:583
 #, c-format
 msgid "Channels: %d\n"
 msgstr "Kanaloj: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:584
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -2039,43 +1842,39 @@
 "Rapido: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:587
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Meznombra bitrapido: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:590
 msgid "Nominal bitrate not set\n"
 msgstr "La meznombra bitrapido ne estas difinita\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:593
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Supera bitrapido:  %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:596
 msgid "Upper bitrate not set\n"
 msgstr "La supera bitrapido ne esta difinita\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:599
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Malsupera bitrapido: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:602
 msgid "Lower bitrate not set\n"
 msgstr "La malsupera bitrapido ne estas difinita\n"
 
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo2.c:629
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
-"Negativa aÅ­ nula 'granulepos' (%lld) aperis for de kapdatumaro en 'vorbis'-a "
-"fluo. Tiu ĉi dosiero estis kreita de fuŝa enkodilo\n"
+msgid "Negative or zero granulepos (%lld) on vorbis stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "Negativa aŭ nula 'granulepos' (%lld) aperis for de kapdatumaro en 'vorbis'-a fluo. Tiu ĉi dosiero estis kreita de fuŝa enkodilo\n"
 
-#: ogginfo/ogginfo2.c:651
+#: ogginfo/ogginfo2.c:650
 msgid ""
 "Vorbis stream %d:\n"
 "\tTotal data length: %"
@@ -2083,121 +1882,106 @@
 "Fluo Vorbis %d:\n"
 "\tEntuta datumlongeco: %"
 
-#: ogginfo/ogginfo2.c:692
+#: ogginfo/ogginfo2.c:691
 #, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Averto: Ne eblis dekodi 'kate'-an kapo-pakon %d - nevalida 'kate'-a fluo (%"
-"d)\n"
+msgid "Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
+msgstr "Averto: Ne eblis dekodi 'kate'-an kapo-pakon %d - nevalida 'kate'-a fluo (%d)\n"
 
-#: ogginfo/ogginfo2.c:703
+#: ogginfo/ogginfo2.c:702
 #, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Averto: la pako %d ne ŝajnas esti 'kate'-kapo - nevalida 'kate'-a fluo (%d)\n"
+msgid "Warning: packet %d does not seem to be a kate header - invalid kate stream (%d)\n"
+msgstr "Averto: la pako %d ne ŝajnas esti 'kate'-kapo - nevalida 'kate'-a fluo (%d)\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:733
 #, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
-"Averto: La 'kate'-fluo %d ne havas ĝuste enkadrigitan kapdatumaron. La fina "
-"kap-paĝo enhavas kromajn pakojn aŭ ĝi havas ne-nulan 'granulepos'-atributon\n"
+msgid "Warning: Kate stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n"
+msgstr "Averto: La 'kate'-fluo %d ne havas ĝuste enkadrigitan kapdatumaron. La fina kap-paĝo enhavas kromajn pakojn aŭ ĝi havas ne-nulan 'granulepos'-atributon\n"
 
-#: ogginfo/ogginfo2.c:738
+#: ogginfo/ogginfo2.c:737
 #, c-format
 msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr ""
-"'Kate'-kapoj estis disanalizitaj por la fluo %d, jen pli da informo...\n"
+msgstr "'Kate'-kapoj estis disanalizitaj por la fluo %d, jen pli da informo...\n"
 
-#: ogginfo/ogginfo2.c:741
+#: ogginfo/ogginfo2.c:740
 #, c-format
 msgid "Version: %d.%d\n"
 msgstr "Versio: %d.%d\n"
 
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:746
 #, c-format
 msgid "Language: %s\n"
 msgstr "Lingvo: %s\n"
 
-#: ogginfo/ogginfo2.c:750
+#: ogginfo/ogginfo2.c:749
 msgid "No language set\n"
 msgstr "Neniu lingvo estis difinita\n"
 
-#: ogginfo/ogginfo2.c:753
+#: ogginfo/ogginfo2.c:752
 #, c-format
 msgid "Category: %s\n"
 msgstr "Kategorio: %s\n"
 
-#: ogginfo/ogginfo2.c:756
+#: ogginfo/ogginfo2.c:755
 msgid "No category set\n"
 msgstr "Neniu kategorio estis difinita\n"
 
-#: ogginfo/ogginfo2.c:761
+#: ogginfo/ogginfo2.c:760
 msgid "utf-8"
 msgstr "utf-8"
 
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:764
 #, c-format
 msgid "Character encoding: %s\n"
 msgstr "Sign-enkodo: %s\n"
 
-#: ogginfo/ogginfo2.c:768
+#: ogginfo/ogginfo2.c:767
 msgid "Unknown character encoding\n"
 msgstr "Nekonata sign-enkodo\n"
 
-#: ogginfo/ogginfo2.c:773
+#: ogginfo/ogginfo2.c:772
 msgid "left to right, top to bottom"
 msgstr "maldekstre dekstren, supre malsupren"
 
-#: ogginfo/ogginfo2.c:774
+#: ogginfo/ogginfo2.c:773
 msgid "right to left, top to bottom"
 msgstr "dekstre maldekstren, supre malsupren"
 
-#: ogginfo/ogginfo2.c:775
+#: ogginfo/ogginfo2.c:774
 msgid "top to bottom, right to left"
 msgstr "supre malsupren, dekstre maldekstren"
 
-#: ogginfo/ogginfo2.c:776
+#: ogginfo/ogginfo2.c:775
 msgid "top to bottom, left to right"
 msgstr "supre malsupren, maldekstre dekstren"
 
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo2.c:779
 #, c-format
 msgid "Text directionality: %s\n"
 msgstr "Direkto de teksto: %s\n"
 
-#: ogginfo/ogginfo2.c:783
+#: ogginfo/ogginfo2.c:782
 msgid "Unknown text directionality\n"
 msgstr "Nekonata direkto de teksto\n"
 
-#: ogginfo/ogginfo2.c:795
+#: ogginfo/ogginfo2.c:794
 msgid "Invalid zero granulepos rate\n"
 msgstr "Malvalida nula 'granulepos'-rapido\n"
 
-#: ogginfo/ogginfo2.c:797
+#: ogginfo/ogginfo2.c:796
 #, c-format
 msgid "Granulepos rate %d/%d (%.02f gps)\n"
 msgstr "'Granulepos'-rapido %d/%d (%.02f gps)\n"
 
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:809
 msgid "\n"
 msgstr "\n"
 
-#: ogginfo/ogginfo2.c:828
+#: ogginfo/ogginfo2.c:827
 #, c-format
-msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-"Negativa 'granulepos' (%lld) aperis for de kapdatumaro en 'kate'-fluo. Tiu "
-"ĉi dosiero estis kreita de fuŝa enkodilo\n"
+msgid "Negative granulepos (%lld) on kate stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "Negativa 'granulepos' (%lld) aperis for de kapdatumaro en 'kate'-fluo. Tiu ĉi dosiero estis kreita de fuŝa enkodilo\n"
 
-#: ogginfo/ogginfo2.c:853
+#: ogginfo/ogginfo2.c:852
 msgid ""
 "Kate stream %d:\n"
 "\tTotal data length: %"
@@ -2205,42 +1989,35 @@
 "Fluo Kate %d:\n"
 "\tEntuta datumlongeco: %"
 
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:892
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Averto: Neniu EOS (flufino) estis difinita en la fluo %d\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:1047
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Averto: Nevalida kap-paĝo, neniu pako estis trovita\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:1073
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-"Averto: Nevalida kap-paĝo en la fluo %d, ĝi enhavas tromultajn pakojn\n"
+msgstr "Averto: Nevalida kap-paĝo en la fluo %d, ĝi enhavas tromultajn pakojn\n"
 
-#: ogginfo/ogginfo2.c:1088
+#: ogginfo/ogginfo2.c:1087
 #, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-"Rimarko: La fluo %d havas seri-numero %d, kiu estas permesita, sed ĝi povas "
-"kaÅ­zi problemojn kun kelkaj iloj.\n"
+msgid "Note: Stream %d has serial number %d, which is legal but may cause problems with some tools.\n"
+msgstr "Rimarko: La fluo %d havas seri-numero %d, kiu estas permesita, sed ĝi povas kaŭzi problemojn kun kelkaj iloj.\n"
 
-#: ogginfo/ogginfo2.c:1105
+#: ogginfo/ogginfo2.c:1104
 msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-"Averto: Truo estis trovita en la datumaro (%d bajtoj) proksimume ĉe la "
-"deŝovo %"
+msgstr "Averto: Truo estis trovita en la datumaro (%d bajtoj) proksimume ĉe la deŝovo %"
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:1128
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Eraro dum malfermado de la enig-dosiero \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:1133
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2249,27 +2026,23 @@
 "Procezado de la dosiero \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:1142
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Ne eblis trovi procezilon por la fluo, do ni forlasas ĝin\n"
 
-#: ogginfo/ogginfo2.c:1151
+#: ogginfo/ogginfo2.c:1150
 msgid "Page found for stream after EOS flag"
 msgstr "Estis trovita paĝo por la fluo post signo EOS (flufino)"
 
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-"Oni preterobservis la limojn por intermiksado: aperis nova fluo antaÅ­ la "
-"fino de ĉiuj antaŭaj fluoj"
+#: ogginfo/ogginfo2.c:1153
+msgid "Ogg muxing constraints violated, new stream before EOS of all previous streams"
+msgstr "Oni preterobservis la limojn por intermiksado: aperis nova fluo antaŭ la fino de ĉiuj antaŭaj fluoj"
 
-#: ogginfo/ogginfo2.c:1158
+#: ogginfo/ogginfo2.c:1157
 msgid "Error unknown."
 msgstr "Eraro nekonata."
 
-#: ogginfo/ogginfo2.c:1161
+#: ogginfo/ogginfo2.c:1160
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -2278,39 +2051,32 @@
 "Averto: malvalide lokita(j) paĝo(j) por la logika fluo %d\n"
 "Tio indikas ke la ogg-dosiero estas disrompita: %s.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:1172
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Nova logika datum-fluo (num.: %d, serio: %08x): tipo %s\n"
 
-#: ogginfo/ogginfo2.c:1176
+#: ogginfo/ogginfo2.c:1175
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
-msgstr ""
-"Averto: komenco-signalo por fluo ne estis difinita en la datum-fluo %d\n"
+msgstr "Averto: komenco-signalo por fluo ne estis difinita en la datum-fluo %d\n"
 
-#: ogginfo/ogginfo2.c:1180
+#: ogginfo/ogginfo2.c:1179
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
-msgstr ""
-"Averto: komenco-signalo por fluo ne estis trovita en la mezo de la datum-"
-"fluo %d\n"
+msgstr "Averto: komenco-signalo por fluo ne estis trovita en la mezo de la datum-fluo %d\n"
 
-#: ogginfo/ogginfo2.c:1185
+#: ogginfo/ogginfo2.c:1184
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
-msgstr ""
-"Averto: aperis intervalo en numer-sekvoj de la fluo %d. Oni ricevis la paĝon "
-"%ld atendinte la paĝon %ld. Tio indikas nekompletan datumaron.\n"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "Averto: aperis intervalo en numer-sekvoj de la fluo %d. Oni ricevis la paĝon %ld atendinte la paĝon %ld. Tio indikas nekompletan datumaron.\n"
 
-#: ogginfo/ogginfo2.c:1200
+#: ogginfo/ogginfo2.c:1199
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "La logika fluo %d finiĝis\n"
 
-#: ogginfo/ogginfo2.c:1208
+#: ogginfo/ogginfo2.c:1207
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -2319,12 +2085,12 @@
 "Eraro: Neniu ogg-datumaro estis trovita en la dosiero \"%s\".\n"
 "La enigo probable ne estas Ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
+#: ogginfo/ogginfo2.c:1218
 #, c-format
 msgid "ogginfo from %s %s\n"
 msgstr "ogginfo el %s %s\n"
 
-#: ogginfo/ogginfo2.c:1225
+#: ogginfo/ogginfo2.c:1224
 #, c-format
 msgid ""
 "(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
@@ -2347,12 +2113,12 @@
 "\t-v Fariĝas pli mesaĝema. Tio ebligos pli detalajn kontrolojn\n"
 "\t   por kelkaj tipoj de fluoj.\n"
 
-#: ogginfo/ogginfo2.c:1234
+#: ogginfo/ogginfo2.c:1233
 #, c-format
 msgid "\t-V Output version information and exit\n"
 msgstr "\t-V Eligas eligan informaron kaj ĉesiĝas\n"
 
-#: ogginfo/ogginfo2.c:1246
+#: ogginfo/ogginfo2.c:1245
 #, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
@@ -2367,7 +2133,7 @@
 "kaj helpas malkovri problemojn pri ili.\n"
 "Kompleta helpo estas montrata per \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
+#: ogginfo/ogginfo2.c:1279
 #, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Neniu enig-dosiero estis specifica. Uzu \"ogginfo -h\" por helpo\n"
@@ -2518,11 +2284,8 @@
 
 #: vcut/vcut.c:535
 #, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
-msgstr ""
-"Uzado: vcut enigdosiero.ogg eligdosiero1.ogg eligdosiero2.ogg [tondpunkto | "
-"+tondpunkto]\n"
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+msgstr "Uzado: vcut enigdosiero.ogg eligdosiero1.ogg eligdosiero2.ogg [tondpunkto | +tondpunkto]\n"
 
 #: vcut/vcut.c:539
 #, c-format
@@ -2532,8 +2295,7 @@
 "\n"
 msgstr ""
 "AVERTO: vcut ankoraÅ­ estas eksperimenta programeto.\n"
-"Certigu ke la eligitaj dosieroj estas korektaj antaÅ­ ol forigi la "
-"fontdosierojn.\n"
+"Certigu ke la eligitaj dosieroj estas korektaj antaÅ­ ol forigi la fontdosierojn.\n"
 "\n"
 
 #: vcut/vcut.c:544
@@ -2595,8 +2357,7 @@
 
 #: vorbiscomment/vcedit.c:238
 msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-"Ne eblis disponi sufiĉe da memoro por registri novan seri-numeron de fluo."
+msgstr "Ne eblis disponi sufiĉe da memoro por registri novan seri-numeron de fluo."
 
 #: vorbiscomment/vcedit.c:506
 msgid "Input truncated or empty."
@@ -2631,11 +2392,8 @@
 msgstr "Disrompita aÅ­ malkompleta datumaro, ni daÅ­rigas..."
 
 #: vorbiscomment/vcedit.c:875
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
-"Eraro dum skribado de fluo al la eligo. La elig-fluo povas esti disrompita "
-"aŭ tranĉita."
+msgid "Error writing stream to output. Output stream may be corrupted or truncated."
+msgstr "Eraro dum skribado de fluo al la eligo. La elig-fluo povas esti disrompita aŭ tranĉita."
 
 #: vorbiscomment/vcomment.c:190 vorbiscomment/vcomment.c:216
 #, c-format
@@ -2662,7 +2420,7 @@
 msgid "no action specified\n"
 msgstr "neniu ago estis indikita\n"
 
-#: vorbiscomment/vcomment.c:379
+#: vorbiscomment/vcomment.c:376
 #, c-format
 msgid ""
 "vorbiscomment from %s %s\n"
@@ -2673,12 +2431,12 @@
 " farite de Fondaĵo Xiph.Org (http://www.xiph.org/)\n"
 "\n"
 
-#: vorbiscomment/vcomment.c:382
+#: vorbiscomment/vcomment.c:379
 #, c-format
 msgid "List or edit comments in Ogg Vorbis files.\n"
 msgstr "Listigi aÅ­ redakti komentojn en dosieroj Ogg Vorbis.\n"
 
-#: vorbiscomment/vcomment.c:385
+#: vorbiscomment/vcomment.c:382
 #, c-format
 msgid ""
 "Usage: \n"
@@ -2689,34 +2447,29 @@
 "Uzado: \n"
 "  vorbiscomment [-Vh]\n"
 "  vorbiscomment [-lR] dosiero\n"
-"  vorbiscomment [-R] [-c dosiero] [-t etikedo] <-a|-w> enigdosiero "
-"[eligdosiero]\n"
+"  vorbiscomment [-R] [-c dosiero] [-t etikedo] <-a|-w> enigdosiero [eligdosiero]\n"
 
-#: vorbiscomment/vcomment.c:391
+#: vorbiscomment/vcomment.c:388
 #, c-format
 msgid "Listing options\n"
 msgstr "Listigaj opcioj\n"
 
-#: vorbiscomment/vcomment.c:392
+#: vorbiscomment/vcomment.c:389
 #, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-"  -l, --list              Listigas la komentojn (implicite, se neniu opcio "
-"estas indikita)\n"
+msgid "  -l, --list              List the comments (default if no options are given)\n"
+msgstr "  -l, --list              Listigas la komentojn (implicite, se neniu opcio estas indikita)\n"
 
-#: vorbiscomment/vcomment.c:395
+#: vorbiscomment/vcomment.c:392
 #, c-format
 msgid "Editing options\n"
 msgstr "Redaktadaj opcioj\n"
 
-#: vorbiscomment/vcomment.c:396
+#: vorbiscomment/vcomment.c:393
 #, c-format
 msgid "  -a, --append            Append comments\n"
 msgstr "  -a, --append            Postaldonas komentojn\n"
 
-#: vorbiscomment/vcomment.c:397
+#: vorbiscomment/vcomment.c:394
 #, c-format
 msgid ""
 "  -t \"name=value\", --tag \"name=value\"\n"
@@ -2725,76 +2478,59 @@
 "  -t \"nomo=valoro\", --tag \"nomo=valoro\"\n"
 "                          Specifas komentan etikedon ĉe la komand-linio\n"
 
-#: vorbiscomment/vcomment.c:399
+#: vorbiscomment/vcomment.c:396
 #, c-format
 msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-"  -w, --write             Skribas komentojn, anstataÅ­igante la jam "
-"ekzistantajn\n"
+msgstr "  -w, --write             Skribas komentojn, anstataÅ­igante la jam ekzistantajn\n"
 
-#: vorbiscomment/vcomment.c:403
+#: vorbiscomment/vcomment.c:400
 #, c-format
 msgid ""
 "  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
+"                          When listing, write comments to the specified file.\n"
+"                          When editing, read comments from the specified file.\n"
 msgstr ""
 "  -c dosiero, --commentfile dosiero\n"
-"                          Dum listigo, skribas komentojn al la indikita "
-"dosiero.\n"
-"                          Dum redaktado, legas komentojn el la indikita "
-"dosiero.\n"
+"                          Dum listigo, skribas komentojn al la indikita dosiero.\n"
+"                          Dum redaktado, legas komentojn el la indikita dosiero.\n"
 
-#: vorbiscomment/vcomment.c:406
+#: vorbiscomment/vcomment.c:403
 #, c-format
 msgid "  -R, --raw               Read and write comments in UTF-8\n"
 msgstr "  -R, --raw               Legas kaj skribas komentojn per UTF-8\n"
 
-#: vorbiscomment/vcomment.c:410
+#: vorbiscomment/vcomment.c:407
 #, c-format
 msgid "  -V, --version           Output version information and exit\n"
 msgstr "  -V, --version           Eligas versian informon kaj ĉesiĝas\n"
 
-#: vorbiscomment/vcomment.c:413
+#: vorbiscomment/vcomment.c:410
 #, c-format
 msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
+"If no output file is specified, vorbiscomment will modify the input file. This\n"
+"is handled via temporary file, such that the input file is not modified if any\n"
 "errors are encountered during processing.\n"
 msgstr ""
-"Se neniu elig-dosiero estas indikita, vorbiscomment modifos la enig-"
-"dosieron. Tio\n"
-"estas traktata per provizora dosiero, tiel ke la enig-dosiero ne estu "
-"modifita\n"
+"Se neniu elig-dosiero estas indikita, vorbiscomment modifos la enig-dosieron. Tio\n"
+"estas traktata per provizora dosiero, tiel ke la enig-dosiero ne estu modifita\n"
 "okaze de iu eraro dum la procezado.\n"
 
-#: vorbiscomment/vcomment.c:418
+#: vorbiscomment/vcomment.c:415
 #, c-format
 msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
+"vorbiscomment handles comments in the format \"name=value\", one per line. By\n"
+"default, comments are written to stdout when listing, and read from stdin when\n"
 "editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
+"can be given on the commandline with -t \"name=value\". Use of either -c or -t\n"
 "disables reading from stdin.\n"
 msgstr ""
-"vorbiscomment traktas komentojn kiuj estu laÅ­ la formo \"nomo=valoro\", po "
-"unu por\n"
-"linio. Implicite, komentoj estas skribitaj al 'stdout' dum listado, kaj "
-"estas legitaj\n"
-"el 'stdin' dum redaktado. Alternative, dosiero povas esti indikita per la "
-"opcio -c,\n"
-"aÅ­ etikedoj povas esti indikitaj en la komand-linio per -t \"nomo=valoro\". "
-"Uzo de\n"
+"vorbiscomment traktas komentojn kiuj estu laÅ­ la formo \"nomo=valoro\", po unu por\n"
+"linio. Implicite, komentoj estas skribitaj al 'stdout' dum listado, kaj estas legitaj\n"
+"el 'stdin' dum redaktado. Alternative, dosiero povas esti indikita per la opcio -c,\n"
+"aÅ­ etikedoj povas esti indikitaj en la komand-linio per -t \"nomo=valoro\". Uzo de\n"
 "-c aÅ­ -t malebligas legi el 'stdin'.\n"
 
-#: vorbiscomment/vcomment.c:425
+#: vorbiscomment/vcomment.c:422
 #, c-format
 msgid ""
 "Examples:\n"
@@ -2805,83 +2541,62 @@
 "  vorbiscomment -a enig.ogg -c komentoj.txt\n"
 "  vorbiscomment -a enig.ogg -t \"ARTIST=Iu Homo\" -t \"TITLE=Iu Titolo\"\n"
 
-#: vorbiscomment/vcomment.c:430
+#: vorbiscomment/vcomment.c:427
 #, c-format
 msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
+"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather than\n"
+"converting to the user's character set, which is useful in scripts. However,\n"
 "this is not sufficient for general round-tripping of comments in all cases.\n"
 msgstr ""
-"ATENTU: kruda reĝimo (--raw, -R) legos kaj skribos komentojn per UTF-8 "
-"anstataÅ­\n"
-"konverti al la signaro de la uzanto, kio utilas por skriptoj. Tamen, tio ne "
-"sufiĉas\n"
+"ATENTU: kruda reĝimo (--raw, -R) legos kaj skribos komentojn per UTF-8 anstataŭ\n"
+"konverti al la signaro de la uzanto, kio utilas por skriptoj. Tamen, tio ne sufiĉas\n"
 "por ĝenerala difinado de komentoj en ĉiuj situacioj.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:489
 #, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Interna eraro dum malkomponado de la komandliniaj opcioj\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:575
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Eraro dum malfermo de la enig-dosiero '%s'.\n"
 
-#: vorbiscomment/vcomment.c:587
+#: vorbiscomment/vcomment.c:584
 #, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr "La enig-dosiernomo eble ne estas la sama ol la elig-dosiernomo\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:595
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Eraro dum malfermo de la elig-dosiero '%s'.\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:610
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Eraro dum malfermo de la koment-dosiero '%s'.\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:627
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Eraro dum malfermo de la koment-dosiero '%s'\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:661
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Eraro dum forigo de la malnova dosiero '%s'\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:663
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Eraro dum renomigo de '%s' al '%s'\n"
 
-#: vorbiscomment/vcomment.c:676
+#: vorbiscomment/vcomment.c:673
 #, c-format
 msgid "Error removing erroneous temporary file %s\n"
 msgstr "Eraro dum forigo de malĝusta provizora dosiero %s\n"
 
-#~ msgid "AU file reader"
-#~ msgstr "Legilo de dosiero AU"
-
-#~ msgid "Warning: Unexpected EOF in reading Wave header\n"
-#~ msgstr ""
-#~ "Averto: Neatendita EOF (fino de dosiero) dum legado de kapo de 'Wave'\n"
-
-#~ msgid "Out of memory opening AU driver\n"
-#~ msgstr "Manko de memoro dun malfermo de AU-pelilo\n"
-
-#~ msgid "At this moment, only linear 16 bit .au files are supported\n"
-#~ msgstr ""
-#~ "Je tiu ĉi momento, nur linearaj 16-bitaj '.au'-dosieroj estas subtenataj\n"
-
-#~ msgid "Internal error! Please report this bug.\n"
-#~ msgstr "Interna eraro! Bonvolu raporti tiun ĉi problemon.\n"
-
 #~ msgid ""
 #~ "ogg123 from %s %s\n"
 #~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
@@ -2913,8 +2628,7 @@
 #~ "  -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"
-#~ "  -@, --list=filename   Read playlist of files and URLs from \"filename"
-#~ "\"\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"
@@ -2929,14 +2643,12 @@
 #~ msgstr ""
 #~ "  -f, --file=dosiernomo  Difinas la eligan dosiernomon por antaÅ­e\n"
 #~ "      indikita aparat-dosiero (kun -d).\n"
-#~ "  -k n, --skip n  Preterpasas la unuajn 'n' sekundojn (aÅ­ laÅ­ formo hh:mm:"
-#~ "ss)\n"
+#~ "  -k n, --skip n  Preterpasas la unuajn 'n' sekundojn (aÅ­ laÅ­ formo hh:mm:ss)\n"
 #~ "  -K n, --end n   Finas je la sekundo 'n' (aÅ­ laÅ­ formo hh:mm:ss)\n"
 #~ "  -o, --device-option=k:v pasas specialan opcion 'k' kun valoro\n"
 #~ "      'v' al antaÅ­e indikita aparato (kun -d).  Vidu\n"
 #~ "      \"man\"-an paĝon por pli da informo.\n"
-#~ "  -@, --list=dosiernomo   Legas dosierojn kaj URL-ojn el 'dosiernomo' kun "
-#~ "ludlisto\n"
+#~ "  -@, --list=dosiernomo   Legas dosierojn kaj URL-ojn el 'dosiernomo' kun ludlisto\n"
 #~ "  -b n, --buffer n  Uzas enigan bufron el 'n' kilobajtoj\n"
 #~ "  -p n, --prebuffer n  Ŝarĝas je 'n'%% el la eniga bufro antaŭ ol ekludi\n"
 #~ "  -v, --verbose  Montras progreson kaj ceteran informaron pri stato\n"
@@ -2945,8 +2657,7 @@
 #~ "  -y n, --ntimes Ripetas ĉiun luditan blokon 'n' foje\n"
 #~ "  -z, --shuffle  Hazarda ludado\n"
 #~ "\n"
-#~ "ogg123 pretersaltos al la sekvan muzikon pro SIGINT (Ctrl-C); du SIGINT-"
-#~ "oj ene de\n"
+#~ "ogg123 pretersaltos al la sekvan muzikon pro SIGINT (Ctrl-C); du SIGINT-oj ene de\n"
 #~ "'s' milisekundoj finigas ogg123-on.\n"
 #~ "  -l, --delay=s  Difinas 's'-on [milisekundoj] (antaÅ­supoze al 500).\n"
 
@@ -2959,8 +2670,7 @@
 #~ " -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"
+#~ " -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"
 #~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
@@ -2971,12 +2681,9 @@
 #~ "                      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"
+#~ " --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"
@@ -2984,20 +2691,15 @@
 #~ "                      automatically enable managed bitrate mode (see\n"
 #~ "                      --managed).\n"
 #~ " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-#~ "                      streaming applications. Using this will "
-#~ "automatically\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"
+#~ "                      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"
+#~ " -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"
@@ -3005,8 +2707,7 @@
 #~ " --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"
+#~ " -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"
@@ -3014,28 +2715,19 @@
 #~ "\n"
 #~ " Naming:\n"
 #~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
+#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
+#~ "                      %%n, %%d replaced by artist, title, album, track number,\n"
+#~ "                      and date, respectively (see below for specifying these).\n"
 #~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
+#~ " -X, --name-remove=s  Remove the specified characters from parameters to the\n"
+#~ "                      -n format string. Useful to ensure legal filenames.\n"
+#~ " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
+#~ "                      characters specified. If this string is shorter than the\n"
 #~ "                      --name-remove list or is not specified, the extra\n"
 #~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
+#~ "                      Default settings for the above two arguments are platform\n"
 #~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
+#~ " -c, --comment=c      Add the given string as an extra comment. This may be\n"
 #~ "                      used multiple times. The argument should be in the\n"
 #~ "                      format \"tag=value\".\n"
 #~ " -d, --date           Date for track (usually date of performance)\n"
@@ -3045,37 +2737,24 @@
 #~ " -a, --artist         Name of artist\n"
 #~ " -G, --genre          Genre of track\n"
 #~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
+#~ "                      instances of the previous five arguments will be used,\n"
 #~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
+#~ "                      specified than files, OggEnc will print a warning, and\n"
+#~ "                      reuse the final one for the remaining files. If fewer\n"
+#~ "                      track numbers are given, the remaining files will be\n"
+#~ "                      unnumbered. For the others, the final tag will be reused\n"
+#~ "                      for all others without warning (so you can specify a date\n"
+#~ "                      once, for example, and have it used for all the files)\n"
 #~ "\n"
 #~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-#~ "AIFF/C\n"
-#~ " files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
-#~ "Files\n"
+#~ " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or AIFF/C\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 "
-#~ "additional\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 additional\n"
 #~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an output filename is "
-#~ "specified\n"
+#~ " You can specify taking the file from stdin by using - as the input filename.\n"
+#~ " In this mode, output is to stdout unless an output filename is specified\n"
 #~ " with -o\n"
 #~ "\n"
 #~ msgstr ""
@@ -3087,58 +2766,39 @@
 #~ " -Q, --quiet          Skribas nenion al 'stderr'\n"
 #~ " -h, --help           Montras tiun ĉi helpan tekston\n"
 #~ " -v, --version        Montras la version de la programo\n"
-#~ " -r, --raw            Kruda reĝimo. Enig-dosieroj estas rekte legataj "
-#~ "kiel\n"
+#~ " -r, --raw            Kruda reĝimo. Enig-dosieroj estas rekte legataj kiel\n"
 #~ "                      PCM-datumaron\n"
-#~ " -B, --raw-bits=n     Difinas po bitoj/specimeno dum kruda enigo. "
-#~ "AntaÅ­supoze al 16\n"
-#~ " -C, --raw-chan=n     Difinas la nombron da kanaloj dum kruda enigo. "
-#~ "AntaÅ­supoze\n"
+#~ " -B, --raw-bits=n     Difinas po bitoj/specimeno dum kruda enigo. AntaÅ­supoze al 16\n"
+#~ " -C, --raw-chan=n     Difinas la nombron da kanaloj dum kruda enigo. AntaÅ­supoze\n"
 #~ "                      al 2\n"
-#~ " -R, --raw-rate=n     Difinas po specimenoj/sekundo dum kruda enigo. "
-#~ "AntaÅ­supoze al\n"
+#~ " -R, --raw-rate=n     Difinas po specimenoj/sekundo dum kruda enigo. AntaÅ­supoze al\n"
 #~ "                      44100\n"
-#~ " --raw-endianness     1 por pezkomenceco, 0 por pezfineco (antaÅ­supoze al "
-#~ "0)\n"
-#~ " -b, --bitrate        Elektas meznombran bitrapidon por enkodigo. Oni "
-#~ "provas\n"
-#~ "                      enkodi je bitrapido ĉirkaŭ tio. Ĝi prenas "
-#~ "argumenton\n"
-#~ "                      je kbps. AntaÅ­supoze, tio produktas VBR-enkodon "
-#~ "ekvivalentan\n"
+#~ " --raw-endianness     1 por pezkomenceco, 0 por pezfineco (antaÅ­supoze al 0)\n"
+#~ " -b, --bitrate        Elektas meznombran bitrapidon por enkodigo. Oni provas\n"
+#~ "                      enkodi je bitrapido ĉirkaŭ tio. Ĝi prenas argumenton\n"
+#~ "                      je kbps. AntaÅ­supoze, tio produktas VBR-enkodon ekvivalentan\n"
 #~ "                      al tia, kiam oni uzas la opcion -q aÅ­ --quality.\n"
-#~ "                      Vidu la opcion --managed por uzi regitan "
-#~ "bitrapidon\n"
+#~ "                      Vidu la opcion --managed por uzi regitan bitrapidon\n"
 #~ "                      kiu celu elektitan valoron.\n"
-#~ " --managed            Åœaltas la motoron por regado de bitrapido. Tio "
-#~ "permesos\n"
-#~ "                      multe pli grandan precizecon por specifi la uzata(j)"
-#~ "n\n"
+#~ " --managed            Åœaltas la motoron por regado de bitrapido. Tio permesos\n"
+#~ "                      multe pli grandan precizecon por specifi la uzata(j)n\n"
 #~ "                      bitrapido(j)n, tamen la enkodado estos multe pli\n"
 #~ "                      malrapida. Ne uzu tion, krom se vi bezonegas bonan\n"
 #~ "                      precizecon por bitrapido, ekzemple dum sonfluo.\n"
-#~ " -m, --min-bitrate    Specifas minimuman bitrapidon (po kbps). Utilas "
-#~ "por\n"
-#~ "                      enkodado de kanalo kun fiksita grandeco. Tio "
-#~ "aÅ­tomate\n"
+#~ " -m, --min-bitrate    Specifas minimuman bitrapidon (po kbps). Utilas por\n"
+#~ "                      enkodado de kanalo kun fiksita grandeco. Tio aÅ­tomate\n"
 #~ "                      ebligos la reĝimon de regado de bitrapido\n"
 #~ "                      (vidu la opcion --managed).\n"
 #~ " -M, --max-bitrate    Specifas maksimuman bitrapidon po kbps. Utilas por\n"
-#~ "                      sonfluaj aplikaĵoj. Tio aŭtomate ebligos la reĝimon "
-#~ "de\n"
+#~ "                      sonfluaj aplikaĵoj. Tio aŭtomate ebligos la reĝimon de\n"
 #~ "                      regado de bitrapido (vidu la opcion --managed).\n"
 #~ " --advanced-encode-option option=value\n"
-#~ "                      Difinas alnivelan enkodan opcion por la indikita "
-#~ "valoro.\n"
-#~ "                      La validaj opcioj (kaj ties valoroj) estas "
-#~ "priskribitaj\n"
-#~ "                      en la 'man'-paĝo disponigita kun tiu ĉi programo. "
-#~ "Ili\n"
-#~ "                      celas precipe alnivelajn uzantojn, kaj devus esti "
-#~ "uzata\n"
+#~ "                      Difinas alnivelan enkodan opcion por la indikita valoro.\n"
+#~ "                      La validaj opcioj (kaj ties valoroj) estas priskribitaj\n"
+#~ "                      en la 'man'-paĝo disponigita kun tiu ĉi programo. Ili\n"
+#~ "                      celas precipe alnivelajn uzantojn, kaj devus esti uzata\n"
 #~ "                      tre singarde.\n"
-#~ " -q, --quality        Specifas kvaliton, inter -1 (tre malalta) kaj 10 "
-#~ "(tre\n"
+#~ " -q, --quality        Specifas kvaliton, inter -1 (tre malalta) kaj 10 (tre\n"
 #~ "                      alta), anstataÅ­ indiki specifan bitrapidon.\n"
 #~ "                      Tio estas la normala reĝimo de funkciado.\n"
 #~ "                      Frakciaj kvalitoj (ekz. 2.75) estas permesitaj.\n"
@@ -3146,85 +2806,54 @@
 #~ " --resample n         Reakiras enigan datumaron per rapideco 'n' (Hz).\n"
 #~ " --downmix            Enmiksas dukanalon al unukanalo. Nur ebligita por\n"
 #~ "                      dukanala enigo.\n"
-#~ " -s, --serial         Specifas serian numeron por la fluo. Se oni "
-#~ "enkodas\n"
-#~ "                      multopajn dosierojn, tio estos pliigita por ĉiu "
-#~ "fluo\n"
+#~ " -s, --serial         Specifas serian numeron por la fluo. Se oni enkodas\n"
+#~ "                      multopajn dosierojn, tio estos pliigita por ĉiu fluo\n"
 #~ "                      post la unua.\n"
-#~ " --discard-comments   Evitas komentojn en FLAC aÅ­ Ogg-FLAC-dosieroj por "
-#~ "ke\n"
-#~ "                      ili ne estu kopiitaj al la elig-dosiero de Ogg "
-#~ "Vorbis.\n"
+#~ " --discard-comments   Evitas komentojn en FLAC aÅ­ Ogg-FLAC-dosieroj por ke\n"
+#~ "                      ili ne estu kopiitaj al la elig-dosiero de Ogg Vorbis.\n"
 #~ "\n"
 #~ " Nomado:\n"
-#~ " -o, --output=dn      Skribas dosieron kun la nomo 'dn' (nur validas por "
-#~ "unuop-\n"
+#~ " -o, --output=dn      Skribas dosieron kun la nomo 'dn' (nur validas por unuop-\n"
 #~ "                      dosiera reĝimo)\n"
-#~ " -n, --names=ĉeno    Produktas dosiernomojn laŭ tiu 'ĉeno', kun %%a, %%"
-#~ "t,\n"
-#~ "                      %%l, %%n, %%d anstataÅ­itaj per artisto, titolo, "
-#~ "albumo,\n"
-#~ "                      bendnumero kaj dato, respektive (vidu sube kiel "
-#~ "specifi\n"
+#~ " -n, --names=ĉeno    Produktas dosiernomojn laŭ tiu 'ĉeno', kun %%a, %%t,\n"
+#~ "                      %%l, %%n, %%d anstataÅ­itaj per artisto, titolo, albumo,\n"
+#~ "                      bendnumero kaj dato, respektive (vidu sube kiel specifi\n"
 #~ "                      tion). %%%% rezultigas la signon %%.\n"
-#~ " -X, --name-remove=s  Forigas la indikitajn signojn en 's' el la "
-#~ "parametroj de\n"
-#~ "                      la ĉeno post -n. Utilas por certigi validajn "
-#~ "dosiernomojn\n"
-#~ " -P, --name-replace=s AnstataÅ­igas signojn forigitaj de --name-remove per "
-#~ "la\n"
-#~ "                      specifitaj signoj en la ĉeno 's'. Se tiu ĉeno estos "
-#~ "pli\n"
-#~ "                      mallonga ol la listo en --name-remove aÅ­ tiu ne "
-#~ "estas\n"
+#~ " -X, --name-remove=s  Forigas la indikitajn signojn en 's' el la parametroj de\n"
+#~ "                      la ĉeno post -n. Utilas por certigi validajn dosiernomojn\n"
+#~ " -P, --name-replace=s AnstataÅ­igas signojn forigitaj de --name-remove per la\n"
+#~ "                      specifitaj signoj en la ĉeno 's'. Se tiu ĉeno estos pli\n"
+#~ "                      mallonga ol la listo en --name-remove aÅ­ tiu ne estas\n"
 #~ "                      specifita, la signoj estos simple forigitaj.\n"
-#~ "                      AntaÅ­supozitaj valoroj por la supraj du argumentoj "
-#~ "dependas de\n"
+#~ "                      AntaÅ­supozitaj valoroj por la supraj du argumentoj dependas de\n"
 #~ "                      la platformo de via sistemo.\n"
-#~ " -c, --comment=k      Aldonas la ĉenon 'k' kiel kroman komenton. Tio "
-#~ "povas esti\n"
+#~ " -c, --comment=k      Aldonas la ĉenon 'k' kiel kroman komenton. Tio povas esti\n"
 #~ "                      uzata plurfoje. La argumento devas laÅ­i la formon\n"
 #~ "                      \"etikedo=valoro\".\n"
-#~ " -d, --date           Dato por la bendo (ordinare temas pri la dato de "
-#~ "ludado)\n"
+#~ " -d, --date           Dato por la bendo (ordinare temas pri la dato de ludado)\n"
 #~ " -N, --tracknum       Bendnumero por tiu ĉi bendo\n"
 #~ " -t, --title          Titolo por tiu ĉi bendo\n"
 #~ " -l, --album          Nomo de la albumo\n"
 #~ " -a, --artist         Nomo de la artisto\n"
 #~ " -G, --genre          Muzikstilo de la bendo\n"
-#~ "                      Se multopaj enig-dosieroj estas indikitaj, "
-#~ "tiaokaze\n"
-#~ "                      multopaj ekzemploj de la antaÅ­aj kvin argumentoj "
-#~ "estos\n"
-#~ "                      uzitaj, laÅ­ la donita ordo. Se oni indikis malpli "
-#~ "da\n"
-#~ "                      titoloj ol dosieroj, OggEnc montros averton, kaj "
-#~ "reuzos\n"
-#~ "                      la lastan por la restantaj dosieroj. Se malpli da "
-#~ "bend-\n"
-#~ "                      numeroj estas indikitaj, la restantaj dosieroj "
-#~ "estos\n"
-#~ "                      nenumeritaj. Por la aliaj, la lasta etikedo estos "
-#~ "reuzata\n"
-#~ "                      por ĉiuj restantaj sen ajna averto (tiel ekzemple "
-#~ "vi\n"
-#~ "                      povas specifi daton kaj aplikigi ĝin por ĉiuj "
-#~ "aliaj\n"
+#~ "                      Se multopaj enig-dosieroj estas indikitaj, tiaokaze\n"
+#~ "                      multopaj ekzemploj de la antaÅ­aj kvin argumentoj estos\n"
+#~ "                      uzitaj, laÅ­ la donita ordo. Se oni indikis malpli da\n"
+#~ "                      titoloj ol dosieroj, OggEnc montros averton, kaj reuzos\n"
+#~ "                      la lastan por la restantaj dosieroj. Se malpli da bend-\n"
+#~ "                      numeroj estas indikitaj, la restantaj dosieroj estos\n"
+#~ "                      nenumeritaj. Por la aliaj, la lasta etikedo estos reuzata\n"
+#~ "                      por ĉiuj restantaj sen ajna averto (tiel ekzemple vi\n"
+#~ "                      povas specifi daton kaj aplikigi ĝin por ĉiuj aliaj\n"
 #~ "                      dosieroj.\n"
 #~ "\n"
 #~ "ENIG-DOSIEROJ:\n"
-#~ " Enigaj dosieroj de OggEnc aktuale devas esti laÅ­ la formoj 24, 16 aÅ­ 8-"
-#~ "bitaj\n"
-#~ " PCM WAV, AIFF aÅ­ AIFF/C, 32-bitaj IEEE-glitkomaj WAV kaj, laÅ­dezire, "
-#~ "FLAC aÅ­\n"
-#~ " Ogg FLAC. Dosieroj povas esti unukanalaj aÅ­ dukanalaj (aÅ­ plurkanalaj) "
-#~ "kaj je\n"
-#~ " iu ajn akiro-rapido. Alternative, la opcio --raw povas esti indikata por "
-#~ "ke oni\n"
-#~ " uzu krudan PCM-datuman dosieron, kiu devas esti 16-bita dukanala pezfina "
-#~ "PCM\n"
-#~ " ('senkapa wav'), krom se oni specifu kromajn parametrojn por kruda "
-#~ "reĝimo.\n"
+#~ " Enigaj dosieroj de OggEnc aktuale devas esti laÅ­ la formoj 24, 16 aÅ­ 8-bitaj\n"
+#~ " PCM WAV, AIFF aÅ­ AIFF/C, 32-bitaj IEEE-glitkomaj WAV kaj, laÅ­dezire, FLAC aÅ­\n"
+#~ " Ogg FLAC. Dosieroj povas esti unukanalaj aÅ­ dukanalaj (aÅ­ plurkanalaj) kaj je\n"
+#~ " iu ajn akiro-rapido. Alternative, la opcio --raw povas esti indikata por ke oni\n"
+#~ " uzu krudan PCM-datuman dosieron, kiu devas esti 16-bita dukanala pezfina PCM\n"
+#~ " ('senkapa wav'), krom se oni specifu kromajn parametrojn por kruda reĝimo.\n"
 #~ " Vi povas indiki akiron de dosiero el 'stdin' uzante la signon '-' kiel\n"
 #~ " enig-dosiernomon.\n"
 #~ " Laŭ tiu reĝimo, eligo iras al 'stdout', krom se elig-dosiernomo estis\n"
@@ -3281,12 +2910,8 @@
 #~ "\tSonluda grandeco: %ldm:%02ld.%03lds\n"
 #~ "\tMeznombra bitrapido: %f kb/s\n"
 
-#~ msgid ""
-#~ "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
-#~ "ogg.\n"
-#~ msgstr ""
-#~ "Averto: Truo estis trovita en la datumaro proksimume ĉe la deŝovo je %"
-#~ "I64d bitokoj. Disrompita 'ogg'.\n"
+#~ msgid "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted ogg.\n"
+#~ msgstr "Averto: Truo estis trovita en la datumaro proksimume ĉe la deŝovo je %I64d bitokoj. Disrompita 'ogg'.\n"
 
 #~ msgid ""
 #~ "Usage: \n"

Modified: trunk/vorbis-tools/po/es.po
===================================================================
--- trunk/vorbis-tools/po/es.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/es.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -5,8 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2002-07-19 22:30+1000\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,230 +14,223 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ogg123/buffer.c:117
-#, c-format
+#: ogg123/buffer.c:111
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Error: Memoria insuficiente en malloc_action().\n"
 
-#: ogg123/buffer.c:360
-#, c-format
+#: ogg123/buffer.c:344
 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:75
+#: ogg123/buffer.c:363
+msgid "malloc"
+msgstr "malloc"
+
+#: ogg123/callbacks.c:70
 msgid "Error: Device not available.\n"
 msgstr "Error: Dispositivo no disponible.\n"
 
-#: ogg123/callbacks.c:78
+#: ogg123/callbacks.c:73
 #, 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"
+msgstr "Error: %s requiere un nombre de fichero de salida que se ha de indicar con -f.\n"
 
-#: ogg123/callbacks.c:81
+#: ogg123/callbacks.c:76
 #, 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:85
+#: ogg123/callbacks.c:80
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Error: No se ha podido abrir el dispositivo %s\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:84
 #, 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:92
+#: ogg123/callbacks.c:87
 #, 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:95
+#: ogg123/callbacks.c:90
 #, 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:99
+#: ogg123/callbacks.c:94
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Error: El fichero %s ya existe.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:97
 #, 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:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Error: Memoria insuficiente en new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:174
+#: ogg123/callbacks.c:169
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Error: Memoria insuficiente en new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:233
+#: ogg123/callbacks.c:228
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Error: Memoria insuficiente en new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
+#: ogg123/callbacks.c:349
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Error: Memoria insuficiente en decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Error del sistema"
 
 # ¿"An,ba(Blisis sint,ba(Bctico" o s,bm(Bmplemente "an,ba(Blisis"? ¿Claridad vs. brevedad? - EM
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 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"
 
-#: ogg123/cfgfile_options.c:134
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Nombre"
 
-#: ogg123/cfgfile_options.c:137
+#. Description
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Descripción"
 
-#: ogg123/cfgfile_options.c:140
+#. Type
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Tipo"
 
-#: ogg123/cfgfile_options.c:143
+#. Default
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ogg123/cfgfile_options.c:169
-#, c-format
+#: ogg123/cfgfile_options.c:165
 msgid "none"
 msgstr "ninguno"
 
-#: ogg123/cfgfile_options.c:172
-#, c-format
+#: ogg123/cfgfile_options.c:168
 msgid "bool"
 msgstr "booleano"
 
-#: ogg123/cfgfile_options.c:175
-#, c-format
+#: ogg123/cfgfile_options.c:171
 msgid "char"
 msgstr "carácter"
 
-#: ogg123/cfgfile_options.c:178
-#, c-format
+#: ogg123/cfgfile_options.c:174
 msgid "string"
 msgstr "cadena"
 
-#: ogg123/cfgfile_options.c:181
-#, c-format
+#: ogg123/cfgfile_options.c:177
 msgid "int"
 msgstr "entero"
 
-#: ogg123/cfgfile_options.c:184
-#, c-format
+#: ogg123/cfgfile_options.c:180
 msgid "float"
 msgstr "coma flotante"
 
-#: ogg123/cfgfile_options.c:187
-#, c-format
+#: ogg123/cfgfile_options.c:183
 msgid "double"
 msgstr "doble precisión"
 
-#: ogg123/cfgfile_options.c:190
-#, c-format
+#: ogg123/cfgfile_options.c:186
 msgid "other"
 msgstr "otro"
 
 # ¿NULL por NULO? Aplico la misma estrategia que en el po franc,bi(Bs, m,ba(Bs que nada por consistencia - EM
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NULO)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:506 oggenc/oggenc.c:511
+#: oggenc/oggenc.c:516 oggenc/oggenc.c:521 oggenc/oggenc.c:526
+#: oggenc/oggenc.c:531
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Conseguido"
 
 # ¿tecla o clave? lo sabr,bi(B en cuanto mire las fuentes ;) - EM
 # clave, supongo... -Quique
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Clave no encontrada"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "No hay ninguna clave"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Valor no válido"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Tipo no válido en la lista de opciones"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Error desconocido"
 
 # "pasada" por que evidentemente se ha pasado un par,ba(Bmetro incorrecto - EM
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:74
 msgid "Internal error parsing command line options.\n"
-msgstr ""
-"Error interno durante el análisis de las opciones de línea de órdenes.\n"
+msgstr "Error interno durante el análisis de las opciones de línea de órdenes.\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:81
 #, 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:102
+#: ogg123/cmdline_options.c:93
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
 "=== Option was: %s\n"
 msgstr ""
-"=== Error \"%s\" durante el análisis de las opciones de configuración de la "
-"línea de órdenes.\n"
+"=== Error \"%s\" durante el análisis de las opciones de configuración de la línea de órdenes.\n"
 "=== La opción era: %s\n"
 
-#: ogg123/cmdline_options.c:109
-#, c-format
+#. not using the status interface here
+#: ogg123/cmdline_options.c:100
 msgid "Available options:\n"
 msgstr "Opciones disponibles:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:109
 #, 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:138
+#: ogg123/cmdline_options.c:129
 #, 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:143
+#: ogg123/cmdline_options.c:134
 msgid "=== Cannot specify output file without specifying a driver.\n"
-msgstr ""
-"=== No se puede especificar un fichero de salida sin indicar un "
-"controlador.\n"
+msgstr "=== No se puede especificar un fichero de salida sin indicar un controlador.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:149
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Formato de opción incorrecto: %s.\n"
@@ -247,280 +239,138 @@
 # 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:177
+#: ogg123/cmdline_options.c:164
 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:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:179
+#, 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:208
+#: ogg123/cmdline_options.c:186
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- ¡No se pueden reproducir todos los \"ceroenos\" fragmentos!\n"
 
 # chunk = trozo ???
-#: ogg123/cmdline_options.c:216
+#: ogg123/cmdline_options.c:194
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
 msgstr ""
 "--- Imposible reproducir cada fragmento 0 veces.\n"
-"--- Para hacer una decodificación de prueba use el controlador de salida "
-"nula.\n"
+"--- Para hacer una decodificación de prueba use el controlador de salida nula.\n"
 
-#: ogg123/cmdline_options.c:232
+#: ogg123/cmdline_options.c:206
 #, 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"
+msgstr "--- No se puede abrir el fichero con la lista de reproducción %s.  Omitido.\n"
 
-#: ogg123/cmdline_options.c:248
-msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:227
 #, 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"
+msgstr "--- El controlador %s indicado en el fichero de configuración no es válido.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== No se pudo cargar el controlador predefinido y no se indicaron "
-"controladores en el fichero de configuración. Saliendo.\n"
+#: ogg123/cmdline_options.c:237
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== No se pudo cargar el controlador predefinido y no se indicaron controladores en el fichero de configuración. Saliendo.\n"
 
-#: ogg123/cmdline_options.c:292
+# "Possible devices" por "las posibilidades..." para no alargar la línea demasiado
+#: ogg123/cmdline_options.c:258
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 de %s %s\n"
+" por la Fundación Xiph.org  (http://www.xiph.org/)\n"
+"\n"
+"Sintaxis: ogg123 [<opciones>] <fichero de entrada> ...\n"
+"\n"
+"  -h, --help     esta ayuda\n"
+"  -V, --version  muestra la versión de Ogg123 \n"
+"  -d, --device=d usa 'd' como dispositivo de salida\n"
+"      Las posibilidades son ('*'=en vivo, '@'=a fichero):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Opciones disponibles:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:279
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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"
+"  -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"
 "\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"
 msgstr ""
+"  -f, --file=fichero  indica el nombre de salida\n"
+"        de un dispositivo de fichero previamente indicado (con -d).\n"
+"  -k n, --skip n  Saltarse los primeros 'n' segundos.\n"
+"  -o, --device-option=k:v Pasar la opción especial k con el valor v \n"
+"        a un dispositivo previamente indicado (con -d).  \n"
+"        Ver la página man para más información.\n"
+"  -b n, --buffer n  usar un búfer de entrada de 'n' kilobytes\n"
+"  -p n, --prebuffer n  cargar n%% del búfer de entrada antes de reproducir\n"
+"  -v, --verbose  mostrar progreso y otras informaciones de estado\n"
+"  -q, --quiet    no mostrar nada (sin título)\n"
+"  -x n, --nth    reproducir cada n-avo bloque\n"
+"  -y n, --ntimes repetir cada bloque reproducido 'n' veces\n"
+"  -z, --shuffle  reproducción aleatoria\n"
+"\n"
+"ogg123 saltará a la canción siguiente al recibir SIGINT (Ctrl-C); dos SIGINT \n"
+"en 's' milisegundos hacen que ogg123 termine.\n"
+" -l, --delay=s  ajusta 's' [milisegundos] (predeterminado 500)\n"
 
-#: ogg123/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Fichero: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Opciones disponibles:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "El fichero de entrada no es ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Descripción"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Opciones disponibles:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
+#: ogg123/oggvorbis_format.c:106 ogg123/oggvorbis_format.c:321
+#: ogg123/oggvorbis_format.c:336 ogg123/oggvorbis_format.c:354
 msgid "Error: Out of memory.\n"
 msgstr "Error: Memoria insuficiente.\n"
 
-#: ogg123/format.c:82
-#, c-format
+#: ogg123/format.c:59
 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:145
+#: ogg123/http_transport.c:137
 msgid "Error: Could not set signal mask."
 msgstr "Error: Imposible establecer máscara de señal."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:191
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Error: Imposible crear búfer de entrada.\n"
 
-#: ogg123/ogg123.c:82
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "dispositivo de salida predefinido"
 
 # un poco largo ¿"mezclar lista"? "playlist=lista de temas" me parece más indicado que
 # "lista de ejecución" suena más cercano al tema sonido que "ejecución"- EM
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "ordenar la lista de reproducción al azar"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Imposible saltar %f segundos de audio."
-
-#: ogg123/ogg123.c:378
+#: ogg123/ogg123.c:261
 #, c-format
 msgid ""
 "\n"
@@ -529,376 +379,246 @@
 "\n"
 "Dispositivo de sonido:   %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:262
 #, c-format
 msgid "Author:   %s"
 msgstr "Autor:   %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:263
 #, c-format
 msgid "Comments: %s"
 msgstr "Comentarios: %s"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
+#: ogg123/ogg123.c:307 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:460
+#: ogg123/ogg123.c:341
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Error: Imposible crear búfer de audio.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:429
 #, 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:561
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Imposible abrir %s.\n"
 
 # supported / soportado, puagh - EM
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:440
 #, 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:577
+#: ogg123/ogg123.c:450
 #, 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"
+msgstr "Error en la apertura de %s usando el módulo %s.  El fichero puede estar dañado.\n"
 
-#: ogg123/ogg123.c:596
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
 msgstr "Reproduciendo: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:474
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Imposible saltar %f segundos de audio."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
 msgstr "Error: Fallo de decodificación \n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Error: Fallo del dispositivo %s.\n"
-
-#: ogg123/ogg123.c:743
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:585
 msgid "Done."
 msgstr "Hecho."
 
-#: ogg123/oggvorbis_format.c:157
+# "corte" suena más profesional  que "canción" EM
+# Lo dejamos en "pista" :-)  -Quique
+#: ogg123/oggvorbis_format.c:51
+msgid "Track number:"
+msgstr "Pista número: "
+
+#: ogg123/oggvorbis_format.c:52
+msgid "ReplayGain (Track):"
+msgstr "Ganancia de Reproducción (Pista):"
+
+#: ogg123/oggvorbis_format.c:53
+msgid "ReplayGain (Album):"
+msgstr "Ganancia de Reproducción (Álbum):"
+
+#: ogg123/oggvorbis_format.c:54
+msgid "ReplayGain (Track) Peak:"
+msgstr "Ganancia de Reproducción (Pista) Máximo:"
+
+#: ogg123/oggvorbis_format.c:55
+msgid "ReplayGain (Album) Peak:"
+msgstr "Ganancia de Reproducción (Álbum) Máximo"
+
+#: ogg123/oggvorbis_format.c:56
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ogg123/oggvorbis_format.c:57 ogg123/oggvorbis_format.c:58
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: ogg123/oggvorbis_format.c:167
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Hueco en el flujo de datos; probablemente inofensivo\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:173
 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:310
-#, 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:315
+#: ogg123/oggvorbis_format.c:402
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr ""
+msgid "Version is %d"
+msgstr "La versión es %d"
 
 # ventana / márgen / intervalo ??? EM
 # ni idea :( y kbabel señala un "error en la ecuación" :-?
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:406
 #, 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"
+msgstr "Sugerencia para la tasa de transferencia: superior=%ld nominal=%ld inferior=%ld intervalo=%ld"
 
-#: ogg123/oggvorbis_format.c:327
+#: ogg123/oggvorbis_format.c:414
 #, c-format
+msgid "Bitstream is %d channel, %ldHz"
+msgstr "El flujo de bits es de %d canal(es), %ldHz"
+
+#: ogg123/oggvorbis_format.c:419
+#, c-format
 msgid "Encoded by: %s"
 msgstr "Codificado por: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, c-format
+#: ogg123/playlist.c:41 ogg123/playlist.c:52
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Error: Memoria insuficiente en new_print_statistics_arg().\n"
 
-#: ogg123/playlist.c:222
+#: ogg123/playlist.c:214
 #, c-format
 msgid "Warning from playlist %s: Could not read directory %s.\n"
-msgstr ""
-"Aviso de la lista de reproducción %s: Imposible leer el directorio %s.\n"
+msgstr "Aviso de la lista de reproducción %s: Imposible leer el directorio %s.\n"
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
-#, c-format
+#: ogg123/playlist.c:259 ogg123/playlist.c:271
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Error: Memoria insuficiente en playlist_to_array().\n"
 
-#: ogg123/status.c:60
+#: ogg123/status.c:47
 #, c-format
 msgid "%sPrebuf to %.1f%%"
 msgstr "%sPrecarga a %.1f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sEn Pausa"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr "%sEOS (Fin de flujo)"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
-#, c-format
+#: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
+#: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Error de asignación de memoria en stats_init()\n"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Fichero: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Tiempo: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "de %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Transferencia de bits media: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr " Búfer de entrada %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr " Búfer de Salida %5.1f%%"
 
-#: ogg123/transport.c:71
-#, c-format
+#: ogg123/transport.c:67
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Error: Imposible asignar memoria en malloc_data_source_stats()\n"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 de %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, fuzzy, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr "Uso: vcut entrada.ogg salida1.ogg salida2.ogg punto_de_corte\n"
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "ERROR: Imposible abrir fichero de entrada \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "ERROR: Imposible abrir fichero de salida \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Error al abrir el fichero como vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Error al borrar el fichero antiguo %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"ERROR: No se han indicado ficheros de entrada. Use -h para obtener ayuda.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"ERROR: Múltiples ficheros de entrada con indicación de nombre de fichero de "
-"salida: se sugiere usar -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:39
 msgid "WAV file reader"
 msgstr "Lector de ficheros WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
 msgstr "Lector de ficheros AIFF/AIFC"
 
-#: oggenc/audio.c:53
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "Lector de ficheros WAV"
-
-#: oggenc/audio.c:54
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "Lector de ficheros WAV"
-
-#: oggenc/audio.c:131 oggenc/audio.c:425
-#, c-format
+#: oggenc/audio.c:117 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "AVISO: Final de fichero inesperado al leer la cabecera WAV\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:128
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Omitiendo fragmento del tipo \"%s\", longitud %d\n"
 
-#: oggenc/audio.c:168
-#, c-format
+#: oggenc/audio.c:146
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "AVISO: Final de fichero inesperado en fragmento de AIFF \n"
 
-#: oggenc/audio.c:254
-#, c-format
+#: oggenc/audio.c:231
 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:260
-#, c-format
+#: oggenc/audio.c:237
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "AVISO: Fragmento común truncado en la cabecera AIFF\n"
 
-#: oggenc/audio.c:268
-#, c-format
+#: oggenc/audio.c:245
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "AVISO: Fin de fichero inesperado al leer la cabecera AIFF\n"
 
-#: oggenc/audio.c:283
-#, c-format
+#: oggenc/audio.c:258
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "AVISO: Cabecera AIFF-C truncada.\n"
 
-#: oggenc/audio.c:297
-#, fuzzy, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
+#: oggenc/audio.c:263
+msgid "Warning: Can't handle compressed AIFF-C\n"
 msgstr "AVISO: Imposible manipular fichero AIFF-C comprimido\n"
 
-#: oggenc/audio.c:304
-#, c-format
+#: oggenc/audio.c:270
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "AVISO: Fragmento SSND no encontrado en fichero AIFF\n"
 
-#: oggenc/audio.c:310
-#, c-format
+#: oggenc/audio.c:276
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "AVISO: Fragmento SSND dañado en la cabecera AIFF\n"
 
-#: oggenc/audio.c:316
-#, c-format
+#: oggenc/audio.c:282
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "AVISO: Fin de fichero inesperado al leer cabecera AIFF\n"
 
-#: oggenc/audio.c:353
-#, c-format
+#: oggenc/audio.c:314
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
 " Must be 8 or 16 bit PCM.\n"
@@ -906,13 +626,11 @@
 "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:407
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "AVISO: Fragmento de formato desconocido en cabecera WAV\n"
 
-#: oggenc/audio.c:420
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -920,67 +638,36 @@
 "AVISO: Fragmento con formato NO VÁLIDO en la cabecera WAV.\n"
 " Intentando leer de todas formas (puede no funcionar)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: oggenc/audio.c:406
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
-" or type 3 floating point PCM)\n"
+" or type 3 floating point PCM\n"
 msgstr ""
 "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:467
-#, c-format
+#: oggenc/audio.c:455
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
-
-#: oggenc/audio.c:528
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
-"ERROR: El fichero WAV está en un subformato no soportado (tiene que ser PCM "
-"de 16 bits\n"
+"ERROR: El fichero WAV está en un subformato no soportado (tiene que ser PCM de 16 bits\n"
 "o PCM en coma flotante\n"
 
-#: oggenc/audio.c:604
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
+#: oggenc/audio.c:607
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "FALLO: Obtenidas cero muestras del resampler: su archivo será truncado. Por favor notifíquelo.\n"
 
-#: oggenc/audio.c:624
-#, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:630
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:732
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"FALLO: Obtenidas cero muestras del resampler: su archivo será truncado. Por "
-"favor notifíquelo.\n"
-
 # en el mundo del sonido "sampler" es de uso general,
 # "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:750
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr "Imposible inicializar resampler\n"
 
 # encoder / codificador ??? EM
-#: oggenc/encode.c:64
+#: oggenc/encode.c:59
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Definiendo opción avanzada del codificador \"%s\" a %s\n"
@@ -988,83 +675,53 @@
 # 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:101
+#: oggenc/encode.c:100
 #, 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:104
+#: oggenc/encode.c:103
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Opción avanzada \"%s\" no reconocida\n"
 
-#: oggenc/encode.c:111
-#, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
+#: oggenc/encode.c:133
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+msgstr "255 canales deberían ser suficientes para cualquiera. (Lo sentimos, vorbis no soporta más)\n"
 
-#: oggenc/encode.c:115 oggenc/encode.c:252
-#, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, fuzzy, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 canales deberían ser suficientes para cualquiera. (Lo sentimos, vorbis "
-"no soporta más)\n"
-
 # he cambiado bastante el texto ¿es OK? EM
 # He cambiado indicar por solicitar. -Quique
-#: oggenc/encode.c:182
-#, c-format
+#: oggenc/encode.c:141
 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:200
-#, c-format
+#: oggenc/encode.c:159
 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:245
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:247
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:263
-#, c-format
+#: oggenc/encode.c:183
 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"
+msgstr "Fallo en la inicialización de modo: parámetro de tasa de bits no válido\n"
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:237
 msgid "Failed writing header to output stream\n"
 msgstr "Fallo al escribir la cabecera en el flujo de salida\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:303
 msgid "Failed writing data to output stream\n"
 msgstr "Fallo al escribir datos en el flujo de salida\n"
 
-#: oggenc/encode.c:472
-#, fuzzy, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
+#: oggenc/encode.c:349
+#, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 msgstr "\t[%5.1f%%] [quedan %2dm%.2ds ] %c"
 
-#: oggenc/encode.c:482
-#, fuzzy, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+#: oggenc/encode.c:359
+#, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr "\tCodificando [%2dm%.2ds hasta ahora] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:377
 #, c-format
 msgid ""
 "\n"
@@ -1075,8 +732,7 @@
 "\n"
 "Codificación del fichero finalizada \"%s\"\n"
 
-#: oggenc/encode.c:502
-#, c-format
+#: oggenc/encode.c:379
 msgid ""
 "\n"
 "\n"
@@ -1086,7 +742,7 @@
 "\n"
 "Codificación finalizada.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:383
 #, c-format
 msgid ""
 "\n"
@@ -1095,17 +751,17 @@
 "\n"
 "\tLongitud del fichero:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:387
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tTiempo consumido: %dm %04.1fs\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:390
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tTasa:         %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:391
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1114,7 +770,7 @@
 "\tTasa de bits media: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:428
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1125,17 +781,17 @@
 "         %s%s%s \n"
 "con tasa de bits media %d kbps "
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
+#: oggenc/encode.c:452 oggenc/encode.c:458
 msgid "standard input"
 msgstr "entrada estándar"
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
+#: oggenc/encode.c:453 oggenc/encode.c:459
 msgid "standard output"
 msgstr "salida estándar"
 
-#: oggenc/encode.c:559
+#: oggenc/encode.c:436
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1146,7 +802,7 @@
 "         %s%s%s \n"
 "a una tasa de bits media aproximada de %d kbps (codificación VBR activada)\n"
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:444
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1157,7 +813,7 @@
 "         %s%s%s \n"
 "con nivel de calidad %2.2f usando VBR restringido "
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:451
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1168,7 +824,7 @@
 "         %s%s%s \n"
 "con calidad %2.2f\n"
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:457
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1179,726 +835,405 @@
 "         %s%s%s \n"
 "usando gestión de transferencia de bits"
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
+#: oggenc/oggenc.c:96
+#, c-format
+msgid ""
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 "%s%s\n"
 "ERROR: No se han indicado ficheros de entrada. Use -h para obtener ayuda.\n"
 
-#: oggenc/oggenc.c:118
-#, c-format
+#: oggenc/oggenc.c:111
 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:125
-#, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"ERROR: Múltiples ficheros de entrada con indicación de nombre de fichero de "
-"salida: se sugiere usar -n\n"
+#: oggenc/oggenc.c:118
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "ERROR: Múltiples ficheros de entrada con indicación de nombre de fichero de salida: se sugiere usar -n\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:172
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ERROR: Imposible abrir fichero de entrada \"%s\": %s\n"
 
-#: oggenc/oggenc.c:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "Lector de ficheros WAV"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:200
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Abriendo con el módulo %s: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:209
 #, 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"
+msgstr "ERROR: El fichero de entrada \"%s\" no está en ningún formato soportado\n"
 
-#: oggenc/oggenc.c:280
-#, c-format
+#: oggenc/oggenc.c:259
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
-msgstr ""
-"AVISO: No se indicó nombre de fichero, usando el predeterminado \"default.ogg"
-"\"\n"
+msgstr "AVISO: No se indicó nombre de fichero, usando el predeterminado \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:267
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"ERROR: Imposible crear los subdirectorios necesarios para el fichero de "
-"salida \"%s\"\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "ERROR: Imposible crear los subdirectorios necesarios para el fichero de salida \"%s\"\n"
 
-#: oggenc/oggenc.c:295
-#, 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:306
+#: oggenc/oggenc.c:278
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ERROR: Imposible abrir fichero de salida \"%s\": %s\n"
 
-#: oggenc/oggenc.c:350
+#: oggenc/oggenc.c:308
 #, 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:357
-#, c-format
+#: oggenc/oggenc.c:315
 msgid "Downmixing stereo to mono\n"
 msgstr "Mezclando a la baja de estéreo a mono\n"
 
-#: oggenc/oggenc.c:360
-#, fuzzy, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:318
+msgid "ERROR: 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:368
+#: oggenc/oggenc.c:365
 #, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 de %s %s\n"
-
-#: oggenc/oggenc.c:416
-#, c-format
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:417
-#, c-format
-msgid ""
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
+"                      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"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel. Using this will\n"
-"                      automatically enable managed bitrate mode (see\n"
-"                      --managed).\n"
+"                      encoding for a fixed-size channel.\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications. Using this will automatically\n"
-"                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
-" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
-"                      high), instead of specifying a particular bitrate.\n"
+"                      streaming applications.\n"
+" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
+"                      instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
+"                      Quality -1 is also possible, but may not be of\n"
+"                      acceptable quality.\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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
-" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
-"                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
-"                      used multiple times. The argument should be in the\n"
-"                      format \"tag=value\".\n"
+"                      used multiple times.\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\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 "
-"additional\n"
+" OggEnc input files must currently be 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"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
-" In this mode, output is to stdout unless an output filename is specified\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Sintaxis: oggenc [opciones] entrada.wav [...]\n"
+"\n"
+"OPCIONES:\n"
+" Generales:\n"
+" -Q, --quiet          No produce salida a stderr\n"
+" -h, --help           Muestra este texto de ayuda\n"
+" -r, --raw            Modo Raw (en bruto). Los ficheros se leen directamente\n"
+"                       como datos PCM\n"
+" -B, --raw-bits=n     Establece bits/muestra para la entrada en bruto. El valor\n"
+"                       predeterminado es 16\n"
+" -C, --raw-chan=n     Establece el número de canales para la entrada en bruto.\n"
+"                       El valor predeterminado es 2\n"
+" -R, --raw-rate=n     Establece muestras/seg para la entrada en bruto. Valor\n"
+"                       predeterminado: 44100\n"
+" -b, --bitrate        Elige una tasa de bits nominal para la codificación.\n"
+"                       Intenta codificar usando una tasa que dé este promedio.\n"
+"                       Toma un argumento en kbps Esto usa el motor de gestión\n"
+"                       de tasa de bits, y no se recomienda a la mayoría de los\n"
+"                       usuarios.\n"
+"                       Consulte -q, --quality, una mejor alternativa.\n"
+" -m, --min-bitrate    Especifica una tasa de bits mínima (en kbps). Útil para\n"
+"                      codificar para un canal de tamaño fijo.\n"
+" -M, --max-bitrate    Especifica una tasa de bits máxima en kbps. Útil para\n"
+"                      aplicaciones de streaming.\n"
+" -q, --quality        Especifica la calidad entre 0 (baja) y 10 (alta),\n"
+"                      en lugar de indicar una tasa de bits en particular.\n"
+"                      Este es el modo operativo normal.\n"
+"                      Se permiten fracciones de cantidades (p.ej. 2.75)\n"
+"                      La calidad -1 también es posible pero puede no ser aceptable\n"
+" --resample n         Remuestra los datos de entrada a la tasa de muestreo n (Hz)\n"
+" --downmix            Mezcla a la baja estéreo a mono. Se permite únicamente\n"
+"                      sobre entrada estéreo. -s, --serial         Especifica un número de serie para el flujo. Al\n"
+"                      codificar varios ficheros éste se verá incrementado por\n"
+"                      cada flujo posterior al primero.\n"
+"\n"
+" Nomenclatura:\n"
+" -o, --output=fn      Escribe el fichero a fn (válido sólo en modo de fichero\n"
+"                      único)\n"
+" -n, --names=cadena   Produce nombres de fichero en el formato de esa cadena\n"
+"                      reemplazando %%a, %%t, %%l, %%n, %%d por artista, título,\n"
+"                      álbum, número de pista, y fecha, respectivamente (véase\n"
+"                      más abajo cómo indicar éstos).\n"
+"                      %%%% pasa un %% literal.\n"
+" -X, --name-remove=s  Elimina los caracteres indicados de la lista de\n"
+"                      parámetros pasados a la cadena de formato -n. Útil para\n"
+"                      asegurar que los nombres de archivo sean válidos.\n"
+" -P, --name-replace=s Cambia los caracteres borrados por --name-remove con los\n"
+"                      caracteres indicados. Si esta cadena es más corta que la lista\n"
+"                      --name-remove o es omitida, los caracteres extra\n"
+"                      simplemente se eliminan.\n"
+"                      Las configuraciones predeterminadas para ambos argumentos\n"
+"                      anteriores dependen de la plataforma.\n"
+" -c, --comment=c      Añade la cadena indicada como un comentario extra. Puede\n"
+"                      usarse varias veces.\n"
+" -d, --date           Fecha para la pista (normalmente fecha de grabación)\n"
+" -N, --tracknum       Número de esta pista\n"
+" -t, --title          Título de esta pista \n"
+" -l, --album          Nombre del álbum\n"
+" -a, --artist         Nombre del artista\n"
+" -G, --genre          Género de la pista\n"
+"                      En caso de indicarse varios ficheros de entrada se\n"
+"                      usarán múltiples instancias de los cinco argumentos\n"
+"                      anteriores en el orden en que aparecen. Si se indican\n"
+"                      menos títulos que ficheros, OggEnc mostrará una\n"
+"                      advertencia y reutilizará el último para los ficheros\n"
+"                      restantes. Si se indica una cantidad menor de canciones,\n"
+"                      los ficheros restantes quedarán sin numerar. Para los\n"
+"                      demás se volverá a usar la opción final para todos los\n"
+"                      restantes sin aviso (de este modo puede indicar una fecha\n"
+"                      una vez, por ejemplo, y que esta se aplique en todos los\n"
+"                      ficheros)\n"
+"\n"
+"FICHEROS DE ENTRADA:\n"
+" Los ficheros de entrada para OggEnc deben ser actualmente PCM WAV, AIFF, o\n"
+" AIFF/C de 16 u 8 bits o WAV IEEE de coma flotante de 32 bits. Los ficheros\n"
+" pueden ser mono o estéreo (o de más canales) y a cualquier velocidad de\n"
+" muestreo.\n"
+" Como alternativa puede emplearse la opción --raw para usar un fichero de datos\n"
+" PCM en bruto, el cual tiene que ser un PCM estéreo de 16 bits y little-endian\n"
+" PCM ('wav sin cabecera'), a menos que se indiquen parámetros adicionales para\n"
+" el modo \"raw\" .\n"
+" Puede indicar que se tome el fichero de la entrada estándar usando - como\n"
+" nombre de fichero de entrada.\n"
+" En este modo, la salida será a stdout a menos que se indique un nombre de\n"
+" fichero de salida con -o\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:536
 #, 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"
+msgstr "AVISO: Ignorando carácter de escape ilegal '%c' en el formato del nombre\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
-#, c-format
+#: oggenc/oggenc.c:562 oggenc/oggenc.c:670 oggenc/oggenc.c:683
 msgid "Enabling bitrate management engine\n"
 msgstr "Activando motor de gestión de transferencia de bits\n"
 
-#: oggenc/oggenc.c:661
-#, 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:571
+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:664
+#: oggenc/oggenc.c:574
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "AVISO: Imposible leer argumento de endianness \"%s\"\n"
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:581
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "AVISO: Imposible leer frecuencia de remuestreo \"%s\"\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:587
 #, 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"
+msgstr "Aviso: Velocidad de remuestreo especificada como %d Hz. ¿Se refería a %d Hz?\n"
 
-#: oggenc/oggenc.c:687
-#, fuzzy, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Aviso: Imposible leer el directorio %s.\n"
-
-#: oggenc/oggenc.c:700
-#, c-format
+#: oggenc/oggenc.c:599
 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:718
-#, c-format
+#: oggenc/oggenc.c:610
 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:729
+#: oggenc/oggenc.c:621
 #, 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:766
+#: oggenc/oggenc.c:656
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "AVISO: Tasa de bits nominal \"%s\" no reconocida\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:664
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Aviso: Tasa de bits mínima \"%s\" no reconocida\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:677
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Aviso: Tasa de bits máxima \"%s\" no reconocida\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:689
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Opción de calidad \"%s\" no reconocida, ignorada\n"
 
-#: oggenc/oggenc.c:807
-#, c-format
+#: oggenc/oggenc.c:697
 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"
+msgstr "AVISO: Indicación de calidad demasiado alta, cambiando a calidad máxima.\n"
 
-#: oggenc/oggenc.c:813
-#, c-format
+#: oggenc/oggenc.c:703
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "AVISO: Indicados múltiples formatos de nombre, usando el final\n"
 
-#: oggenc/oggenc.c:822
-#, c-format
+#: oggenc/oggenc.c:712
 msgid "WARNING: Multiple name format filters specified, using final\n"
-msgstr ""
-"AVISO: Indicados múltiples filtros de formato de nombre, usando el final\n"
+msgstr "AVISO: Indicados múltiples filtros de formato de nombre, usando el final\n"
 
-#: oggenc/oggenc.c:831
-#, 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:721
+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:839
-#, c-format
+#: oggenc/oggenc.c:729
 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:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 de %s %s\n"
+#: oggenc/oggenc.c:748
+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"
 
-#: oggenc/oggenc.c:858
-#, 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"
-
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
-#, c-format
+#. Failed, so just set to 16
+#: oggenc/oggenc.c:753 oggenc/oggenc.c:757
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "AVISO: Valor de bits/muestras no válido, asumiendo 16.\n"
 
-#: oggenc/oggenc.c:874
-#, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"AVISO: Indicado número de canales para modo en bruto para datos que no están "
-"ese modo. Asumiendo entrada en bruto.\n"
+#: oggenc/oggenc.c:764
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "AVISO: Indicado número de canales para modo en bruto para datos que no están ese modo. Asumiendo entrada en bruto.\n"
 
-#: oggenc/oggenc.c:879
-#, c-format
+#. Failed, so just set to 2
+#: oggenc/oggenc.c:769
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "AVISO: Indicada cantidad de canales no válida, asumiendo 2.\n"
 
-#: oggenc/oggenc.c:890
-#, 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"
+#: oggenc/oggenc.c:780
+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"
 
-#: oggenc/oggenc.c:895
-#, c-format
+#. Failed, so just set to 44100
+#: oggenc/oggenc.c:785
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
-msgstr ""
-"Aviso: Especificada Velocidad de muestreo no válida, asumiendo 44100.\n"
+msgstr "Aviso: Especificada Velocidad de muestreo no válida, asumiendo 44100.\n"
 
-#: oggenc/oggenc.c:902
-#, c-format
+#: oggenc/oggenc.c:789
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "AVISO: Especificada opción desconocida, ignorada->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Imposible convertir comentario a UTF-8, no se puede añadir\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
-#, c-format
+#: oggenc/oggenc.c:811
 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:954
-#, c-format
+#: oggenc/oggenc.c:830
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
-msgstr ""
-"AVISO: No se indicaron suficientes títulos, usando ultimo título por "
-"defecto.\n"
+msgstr "AVISO: No se indicaron suficientes títulos, usando ultimo título por defecto.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Imposible crear el directorio \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Error durante la comprobación de existencia del directorio %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:167
 #, c-format
 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:212
-#, 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:220
+#: ogginfo/ogginfo2.c:156
 #, 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"
+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:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo2.c:164
 #, 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"
+msgid "Warning: Vorbis 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:266
+#: ogginfo/ogginfo2.c:168
 #, 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:342
-#, fuzzy, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Aviso: Secuencia UTF-8 no válida en el comentario %d (flujo %d): secuencia "
-"no válida\n"
-
-#: ogginfo/ogginfo2.c:356
-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:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Aviso: Falta indicador EOS en el flujo %d\n"
-
-#: ogginfo/ogginfo2.c:389
-#, 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:396
-#, 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:400
-#, 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:403
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Versión: %d\n"
-
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
-#, c-format
-msgid "Vendor: %s\n"
-msgstr "Distribuidor: %s\n"
-
-#: ogginfo/ogginfo2.c:406
-#, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Versión: %d\n"
-
-#: ogginfo/ogginfo2.c:408
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:416
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:429
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:431
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:433
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:437
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:439
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:441
-#, fuzzy
-msgid "Colourspace unspecified\n"
-msgstr "no se ha indicado ninguna acción\n"
-
-#: ogginfo/ogginfo2.c:444
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:446
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:448
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:450
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:452
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr "Tasa de bits máxima: %f kb/s\n"
-
-#: ogginfo/ogginfo2.c:453
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
-msgid "User comments section follows...\n"
-msgstr "Sigue la sección de comentarios del usuario...\n"
-
-#: ogginfo/ogginfo2.c:477
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Aviso: Falta indicador EOS en el flujo %d\n"
-
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Aviso: granulepos en el flujo %d se decrementa desde "
-
-#: ogginfo/ogginfo2.c:520
-msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-"Aviso: Imposible decodificar el paquete de cabecera vorbis - flujo vorbis no "
-"válido (%d)\n"
-
-#: ogginfo/ogginfo2.c:565
-#, 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"
-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:569
-#, 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"
+msgstr "Cabeceras vorbis analizadas para flujo %d, información a continuación...\n"
 
-#: ogginfo/ogginfo2.c:572
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid "Version: %d\n"
 msgstr "Versión: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:175
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Distribuidor: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:182
 #, c-format
+msgid "Vendor: %s\n"
+msgstr "Distribuidor: %s\n"
+
+#: ogginfo/ogginfo2.c:183
+#, c-format
 msgid "Channels: %d\n"
 msgstr "Canales: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:184
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1907,202 +1242,123 @@
 "Tasa de transferencia: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:187
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Tasa de bits nominal: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:190
 msgid "Nominal bitrate not set\n"
 msgstr "Tasa de bits nominal no especificada\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:193
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Tasa de bits máxima: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:196
 msgid "Upper bitrate not set\n"
 msgstr "Tasa de transferencia de bits máxima no especificada\n"
 
 # algo largo EM
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:199
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Tasa de transferencia de bits mínima: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:202
 msgid "Lower bitrate not set\n"
 msgstr "Tasa de transferencia de bits mínima no especificada\n"
 
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo2.c:205
+msgid "User comments section follows...\n"
+msgstr "Sigue la sección de comentarios del usuario...\n"
+
+#: ogginfo/ogginfo2.c:217
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
+msgid "Warning: Comment %d in stream %d is invalidly formatted, does not contain '=': \"%s\"\n"
+msgstr "Aviso: Comentario %d en el flujo %d tiene un formato no válido, no contiene '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:651
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
+# estoy por dejar "stream" EM
+#: ogginfo/ogginfo2.c:226
+#, 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:692
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Aviso: Imposible decodificar el paquete de cabecera vorbis - flujo vorbis no "
-"válido (%d)\n"
-
-#: ogginfo/ogginfo2.c:703
-#, fuzzy, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Aviso: Imposible decodificar el paquete de cabecera vorbis - flujo vorbis no "
-"válido (%d)\n"
-
-#: ogginfo/ogginfo2.c:734
-#, fuzzy, c-format
-msgid ""
-"Warning: Kate 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:738
-#, fuzzy, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr ""
-"Cabeceras vorbis analizadas para flujo %d, información a continuación...\n"
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Versión: %d\n"
-
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:257 ogginfo/ogginfo2.c:266
 #, c-format
-msgid "Language: %s\n"
-msgstr ""
+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:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Distribuidor: %s\n"
-
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
-msgid "No category set\n"
-msgstr "Tasa de bits nominal no especificada\n"
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:274
 #, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
+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:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
+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:783
-msgid "Unknown text directionality\n"
-msgstr ""
+#: ogginfo/ogginfo2.c:347
+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:795
-msgid "Invalid zero granulepos rate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:797
+#: ogginfo/ogginfo2.c:364
 #, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr ""
+msgid "Warning: granulepos in stream %d decreases from "
+msgstr "Aviso: granulepos en el flujo %d se decrementa desde "
 
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:365
+msgid " to "
+msgstr " a "
+
+#: ogginfo/ogginfo2.c:365
 msgid "\n"
 msgstr "\n"
 
-#: ogginfo/ogginfo2.c:828
+#: ogginfo/ogginfo2.c:384
 #, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %ld bytes\n"
+"\tPlayback length: %ldm:%02lds\n"
+"\tAverage bitrate: %f kbps\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:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:418
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Aviso: Falta indicador EOS en el flujo %d\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:537
 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:1074
+#: ogginfo/ogginfo2.c:549
 #, 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"
+msgstr "AVISO: Página de cabeceras no valida en el flujo de datos %d, contiene múltiples paquetes\n"
 
-#: ogginfo/ogginfo2.c:1088
-#, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1105
-#, fuzzy
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
+#: ogginfo/ogginfo2.c:574
+msgid "Warning: Hole in data found at approximate offset "
 msgstr "Aviso: encontrado vacío en los datos en el offset aproximado "
 
-#: ogginfo/ogginfo2.c:1129
+# ¿corrupto? EM
+#: ogginfo/ogginfo2.c:575
+msgid " bytes. Corrupted ogg.\n"
+msgstr " bytes. ogg corrupto.\n"
+
+#: ogginfo/ogginfo2.c:599
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "ERROR: Imposible abrir fichero de entrada \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:604
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2111,91 +1367,67 @@
 "Procesando fichero \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:613
 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:1151
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1154
+#: ogginfo/ogginfo2.c:618
+#, c-format
 msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1158
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1161
-#, fuzzy, c-format
-msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
-"This indicates a corrupt ogg file: %s.\n"
+"This indicates a corrupt ogg file.\n"
 msgstr ""
-"Aviso: página(s) posicionadas de forma ilegal para el flujo de datos lógico %"
-"d\n"
+"Aviso: página(s) posicionadas de forma ilegal para el flujo de datos lógico %d\n"
 "Esto indica un fichero ogg corrupto.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:625
 #, 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:1176
+#: ogginfo/ogginfo2.c:628
 #, 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:1180
+#: ogginfo/ogginfo2.c:632
 #, 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"
+msgstr "Aviso: Hallada señal de comienzo de flujo a mitad del flujo de datos %d\n"
 
-#: ogginfo/ogginfo2.c:1185
+#: ogginfo/ogginfo2.c:637
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
-msgstr ""
-"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"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "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:1200
+#: ogginfo/ogginfo2.c:652
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Flujo lógico %d finalizado\n"
 
-#: ogginfo/ogginfo2.c:1208
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:659
+#, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
+"Input probably not ogg.\n"
 msgstr ""
 "Error: No se encontraron datos ogg en el fichero \"%s\".\n"
 "La entrada probablemente no sea ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 de %s %s\n"
-
 # no soporte "support" :P
-#: ogginfo/ogginfo2.c:1225
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:670
 msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
+"ogginfo 1.0\n"
+"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] files1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
 "\t-h Show this help message\n"
 "\t-q Make less verbose. Once will remove detailed informative\n"
 "\t   messages, two will remove warnings\n"
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
+"\n"
 msgstr ""
 "ogginfo 1.0\n"
 "(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
@@ -2203,24 +1435,17 @@
 "Uso: ogginfo [opciones] ficheros1.ogg [fichero2.ogg ... ficheroN.ogg]\n"
 "Opciones soportadas:\n"
 "\t-h Muestra este mensaje de ayuda\n"
-"\t-q Menos comunicativo. Usado una vez obviará los mensajes informativos "
-"detallados\n"
+"\t-q Menos comunicativo. Usado una vez obviará los mensajes informativos detallados\n"
 "\t   , de forma doble obviará los avisos.\n"
 "\t-v Más comunicativo. Esto activará una comprobación más en detalle\n"
 "\t   de algunos tipos de flujos de datos.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1234
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:691
 msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
-"ogginfo is a tool for printing information about Ogg files\n"
+"Ogginfo is a tool for printing information about ogg files\n"
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
@@ -2230,12 +1455,9 @@
 "y para diagnosticar problemas.\n"
 "La ayuda completa se obtiene con \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
-#, c-format
+#: ogginfo/ogginfo2.c:720
 msgid "No input files specified. \"ogginfo -h\" for help\n"
-msgstr ""
-"No se han indicado ficheros de entrada. Use \"ogginfo -h\" para obtener "
-"ayuda.\n"
+msgstr "No se han indicado ficheros de entrada. Use \"ogginfo -h\" para obtener ayuda.\n"
 
 #: share/getopt.c:673
 #, c-format
@@ -2257,16 +1479,19 @@
 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"
@@ -2277,6 +1502,7 @@
 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"
@@ -2292,46 +1518,35 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: la opción `-W %s' no admite ningún argumento\n"
 
-#: vcut/vcut.c:149
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr "Error de paginación. Entrada dañada.\n"
 
-#: vcut/vcut.c:166
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr "Error en el flujo de bits, continuando\n"
 
-#: vcut/vcut.c:206
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr "Final de flujo encontrado antes del punto de corte.\n"
 
-#: vcut/vcut.c:215
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
-msgstr ""
-"Estableciendo final de flujo: el refresco de sincronización ha devuelto 0\n"
+msgstr "Estableciendo final de flujo: el refresco de sincronización ha devuelto 0\n"
 
-#: vcut/vcut.c:225
-#, c-format
+#: vcut/vcut.c:192
 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"
+msgstr "El punto de corte no está dentro del flujo. El segundo fichero estará vacío\n"
 
-#: vcut/vcut.c:277
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Caso especial no contemplado: ¿primer fichero demasiado corto?\n"
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. 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:353
-#, c-format
+#. 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:284
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -2339,756 +1554,241 @@
 "ERROR: Los dos primeros paquetes de audio no caben en una \n"
 "       única página ogg. El fichero puede no decodificarse correctamente.\n"
 
-#: vcut/vcut.c:373
-#, 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:378
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr "Error recuperable en la transferencia\n"
 
-#: vcut/vcut.c:387
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr "Error en la transferencia\n"
 
-#: vcut/vcut.c:449
-#, c-format
+#: vcut/vcut.c:330
+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:376
 msgid "Input not ogg.\n"
 msgstr "El fichero de entrada no es ogg.\n"
 
-#: vcut/vcut.c:459
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Error en la primera página\n"
 
-#: vcut/vcut.c:464
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "error en el primer paquete\n"
 
-#: vcut/vcut.c:470
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Error en cabecera primaria: ¿No es vorbis?\n"
 
-#: vcut/vcut.c:490
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Cabecera secundaria dañada\n"
 
-#: vcut/vcut.c:503
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "Fin de fichero (EOF) en las cabeceras\n"
 
-#: vcut/vcut.c:535
-#, fuzzy, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+#: vcut/vcut.c:456
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
 msgstr "Uso: vcut entrada.ogg salida1.ogg salida2.ogg punto_de_corte\n"
 
-#: vcut/vcut.c:539
-#, c-format
+#: vcut/vcut.c:460
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
 "\n"
 msgstr ""
 "AVISO: vcut todavía es código experimental.\n"
-"Compruebe que los ficheros de salida estén correctos antes de borrar las "
-"fuentes.\n"
+"Compruebe que los ficheros de salida estén correctos antes de borrar las fuentes.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Imposible abrir %s para lectura\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Imposible abrir %s para escritura\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Imposible analizar el punto de corte \"%s\"\n"
 
-#: vcut/vcut.c:570
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+#: vcut/vcut.c:484
+#, c-format
+msgid "Processing: Cutting at %lld\n"
 msgstr "Procesando: Cortando en %lld\n"
 
-#: vcut/vcut.c:572
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr "Procesando: Cortando en %lld\n"
-
-#: vcut/vcut.c:582
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr "Procesamiento fallido\n"
 
-#: vcut/vcut.c:604
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr "Error de lectura de cabeceras\n"
 
-#: vcut/vcut.c:627
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr "Error al escribir el primer fichero de salida\n"
 
-#: vcut/vcut.c:635
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr "Error al escribir el segundo fichero de salida\n"
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:220
+msgid "Input truncated or empty."
+msgstr "Entrada truncada o vacía."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:222
+msgid "Input is not an Ogg bitstream."
+msgstr "La entrada no es un flujo de bits Ogg."
+
+#: vorbiscomment/vcedit.c:239
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Error al leer la primera página del flujo de bits Ogg."
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:245
 msgid "Error reading initial header packet."
 msgstr "Error al leer el paquete inicial de las cabeceras."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Entrada truncada o vacía."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "La entrada no es un flujo de bits Ogg."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:251
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "El flujo de bits Ogg no contiene datos en formato vorbis."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "Fin de fichero antes que el final de las cabeceras vorbis."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "El flujo de bits Ogg no contiene datos en formato vorbis."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:274
 msgid "Corrupt secondary header."
 msgstr "Cabecera secundaria dañada."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:295
 msgid "EOF before end of vorbis headers."
 msgstr "Fin de fichero antes que el final de las cabeceras vorbis."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:448
 msgid "Corrupt or missing data, continuing..."
 msgstr "Datos dañados o faltan datos, continuando..."
 
-#: vorbiscomment/vcedit.c:875
-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/vcedit.c:487
+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:190 vorbiscomment/vcomment.c:216
+#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Error al abrir el fichero como vorbis: %s\n"
 
-#: vorbiscomment/vcomment.c:235
+#: vorbiscomment/vcomment.c:148
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Comentario defectuoso: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "comentario defectuoso: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:170
 #, 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"
 
-#: vorbiscomment/vcomment.c:274
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:187
 msgid "no action specified\n"
 msgstr "no se ha indicado ninguna acción\n"
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
-msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
+#: 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:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
+#: vorbiscomment/vcomment.c:287
 msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
+"   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 ""
+"Uso: \n"
+"  vorbiscomment [-l] fichero.ogg (para listar comentarios)\n"
+"  vorbiscomment -a entrada.ogg salida.ogg (para añadir comentarios)\n"
+"  vorbiscomment -w entrada.ogg salida.ogg (para modificar comentarios)\n"
+"\ten el caso de la escritura, se espera un nuevo grupo de comentarios \n"
+"\tcon el formato 'ETIQUETA=valor' desde la entrada estándar. Este grupo\n"
+"\treemplazará completamente al existente.\n"
+"   Ambas opciones -a y -w sólo pueden tomar un único nombre de fichero,\n"
+"   en cuyo caso se usará un fichero temporal.\n"
+"   -c puede usarse para leer comentarios de un fichero determinado\n"
+"   en lugar de la entrada estándar.\n"
+"   Ejemplo: vorbiscomment -a entrada.ogg -c comentarios.txt\n"
+"   añadirá comentarios a comentarios.txt para entrada.ogg\n"
+"   Finalmente, puede especificar cualquier cantidad de etiquetas a añadir\n"
+"   desde la línea de ordenes usando la opción -t. P.ej.\n"
+"   vorbiscomment -a entrada.ogg -t \"ARTISTA=Un Tío Feo\" -t \"TITULO=Uno Cualquiera\"\n"
+"   (nótese que cuando se usa esta opción la lectura de comentarios desde el fichero de \n"
+"   comentarios o la entrada estándar están desactivados)\n"
+"   En el modo en bruto (--raw, -R) se leerán y escribirán comentarios en utf8,\n"
+"   en vez de convertirlos al juego de caracteres del usuario. Esto es útil para\n"
+"   usar vorbiscomments en guiones. Sin embargo, esto no es suficiente para\n"
+"   viajes de ida y vuelta (round-tripping) generales de comentarios en todos\n"
+"   los casos.\n"
 
-#: vorbiscomment/vcomment.c:391
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Tipo no válido en la lista de opciones"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
+#: vorbiscomment/vcomment.c:371
 msgid "Internal error parsing command options\n"
 msgstr "Error interno al analizar las opciones de la línea de órdenes.\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:456
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Error de apertura del fichero de entrada '%s'.\n"
 
-#: vorbiscomment/vcomment.c:587
-#, c-format
+#: vorbiscomment/vcomment.c:465
 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"
+msgstr "Puede que el nombre de fichero de entrada no sea el mismo que el de salida.\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:476
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Error de apertura del fichero de salida '%s'.\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:491
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Error de apertura del fichero de comentarios '%s'.\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:508
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Error de apertura del fichero de comentarios '%s'\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:536
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Error al borrar el fichero antiguo %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:538
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Error al cambiar el nombre de %s a %s\n"
-
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Error al borrar el fichero antiguo %s\n"
-
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
-# "Possible devices" por "las posibilidades..." para no alargar la línea demasiado
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 de %s %s\n"
-#~ " por la Fundación Xiph.org  (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Sintaxis: ogg123 [<opciones>] <fichero de entrada> ...\n"
-#~ "\n"
-#~ "  -h, --help     esta ayuda\n"
-#~ "  -V, --version  muestra la versión de Ogg123 \n"
-#~ "  -d, --device=d usa 'd' como dispositivo de salida\n"
-#~ "      Las posibilidades son ('*'=en vivo, '@'=a fichero):\n"
-#~ "        "
-
-#~ 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"
-#~ "  -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"
-#~ "\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"
-#~ msgstr ""
-#~ "  -f, --file=fichero  indica el nombre de salida\n"
-#~ "        de un dispositivo de fichero previamente indicado (con -d).\n"
-#~ "  -k n, --skip n  Saltarse los primeros 'n' segundos.\n"
-#~ "  -o, --device-option=k:v Pasar la opción especial k con el valor v \n"
-#~ "        a un dispositivo previamente indicado (con -d).  \n"
-#~ "        Ver la página man para más información.\n"
-#~ "  -b n, --buffer n  usar un búfer de entrada de 'n' kilobytes\n"
-#~ "  -p n, --prebuffer n  cargar n%% del búfer de entrada antes de "
-#~ "reproducir\n"
-#~ "  -v, --verbose  mostrar progreso y otras informaciones de estado\n"
-#~ "  -q, --quiet    no mostrar nada (sin título)\n"
-#~ "  -x n, --nth    reproducir cada n-avo bloque\n"
-#~ "  -y n, --ntimes repetir cada bloque reproducido 'n' veces\n"
-#~ "  -z, --shuffle  reproducción aleatoria\n"
-#~ "\n"
-#~ "ogg123 saltará a la canción siguiente al recibir SIGINT (Ctrl-C); dos "
-#~ "SIGINT \n"
-#~ "en 's' milisegundos hacen que ogg123 termine.\n"
-#~ " -l, --delay=s  ajusta 's' [milisegundos] (predeterminado 500)\n"
-
-# "corte" suena más profesional  que "canción" EM
-# Lo dejamos en "pista" :-)  -Quique
-#~ msgid "Track number:"
-#~ msgstr "Pista número: "
-
-#~ msgid "ReplayGain (Track):"
-#~ msgstr "Ganancia de Reproducción (Pista):"
-
-#~ msgid "ReplayGain (Album):"
-#~ msgstr "Ganancia de Reproducción (Álbum):"
-
-#~ msgid "ReplayGain (Track) Peak:"
-#~ msgstr "Ganancia de Reproducción (Pista) Máximo:"
-
-#~ msgid "ReplayGain (Album) Peak:"
-#~ msgstr "Ganancia de Reproducción (Álbum) Máximo"
-
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
-#~ msgid "Comment:"
-#~ msgstr "Comentario:"
-
-#~ msgid "Version is %d"
-#~ msgstr "La versión es %d"
-
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " General:\n"
-#~ " -Q, --quiet          Produce no output to stderr\n"
-#~ " -h, --help           Print this help text\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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --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"
-#~ " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-#~ "                      encoding for a fixed-size channel.\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"
-#~ "                      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"
-#~ " --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"
-#~ "\n"
-#~ " Naming:\n"
-#~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times.\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 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"
-#~ " Alternatively, the --raw option may be used to use a raw PCM data file, "
-#~ "which\n"
-#~ " must be 16bit stereo little-endian PCM ('headerless wav'), unless "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an outfile filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Sintaxis: oggenc [opciones] entrada.wav [...]\n"
-#~ "\n"
-#~ "OPCIONES:\n"
-#~ " Generales:\n"
-#~ " -Q, --quiet          No produce salida a stderr\n"
-#~ " -h, --help           Muestra este texto de ayuda\n"
-#~ " -r, --raw            Modo Raw (en bruto). Los ficheros se leen "
-#~ "directamente\n"
-#~ "                       como datos PCM\n"
-#~ " -B, --raw-bits=n     Establece bits/muestra para la entrada en bruto. El "
-#~ "valor\n"
-#~ "                       predeterminado es 16\n"
-#~ " -C, --raw-chan=n     Establece el número de canales para la entrada en "
-#~ "bruto.\n"
-#~ "                       El valor predeterminado es 2\n"
-#~ " -R, --raw-rate=n     Establece muestras/seg para la entrada en bruto. "
-#~ "Valor\n"
-#~ "                       predeterminado: 44100\n"
-#~ " -b, --bitrate        Elige una tasa de bits nominal para la "
-#~ "codificación.\n"
-#~ "                       Intenta codificar usando una tasa que dé este "
-#~ "promedio.\n"
-#~ "                       Toma un argumento en kbps Esto usa el motor de "
-#~ "gestión\n"
-#~ "                       de tasa de bits, y no se recomienda a la mayoría "
-#~ "de los\n"
-#~ "                       usuarios.\n"
-#~ "                       Consulte -q, --quality, una mejor alternativa.\n"
-#~ " -m, --min-bitrate    Especifica una tasa de bits mínima (en kbps). Útil "
-#~ "para\n"
-#~ "                      codificar para un canal de tamaño fijo.\n"
-#~ " -M, --max-bitrate    Especifica una tasa de bits máxima en kbps. Útil "
-#~ "para\n"
-#~ "                      aplicaciones de streaming.\n"
-#~ " -q, --quality        Especifica la calidad entre 0 (baja) y 10 (alta),\n"
-#~ "                      en lugar de indicar una tasa de bits en "
-#~ "particular.\n"
-#~ "                      Este es el modo operativo normal.\n"
-#~ "                      Se permiten fracciones de cantidades (p.ej. 2.75)\n"
-#~ "                      La calidad -1 también es posible pero puede no ser "
-#~ "aceptable\n"
-#~ " --resample n         Remuestra los datos de entrada a la tasa de "
-#~ "muestreo n (Hz)\n"
-#~ " --downmix            Mezcla a la baja estéreo a mono. Se permite "
-#~ "únicamente\n"
-#~ "                      sobre entrada estéreo. -s, --serial         "
-#~ "Especifica un número de serie para el flujo. Al\n"
-#~ "                      codificar varios ficheros éste se verá incrementado "
-#~ "por\n"
-#~ "                      cada flujo posterior al primero.\n"
-#~ "\n"
-#~ " Nomenclatura:\n"
-#~ " -o, --output=fn      Escribe el fichero a fn (válido sólo en modo de "
-#~ "fichero\n"
-#~ "                      único)\n"
-#~ " -n, --names=cadena   Produce nombres de fichero en el formato de esa "
-#~ "cadena\n"
-#~ "                      reemplazando %%a, %%t, %%l, %%n, %%d por artista, "
-#~ "título,\n"
-#~ "                      álbum, número de pista, y fecha, respectivamente "
-#~ "(véase\n"
-#~ "                      más abajo cómo indicar éstos).\n"
-#~ "                      %%%% pasa un %% literal.\n"
-#~ " -X, --name-remove=s  Elimina los caracteres indicados de la lista de\n"
-#~ "                      parámetros pasados a la cadena de formato -n. Útil "
-#~ "para\n"
-#~ "                      asegurar que los nombres de archivo sean válidos.\n"
-#~ " -P, --name-replace=s Cambia los caracteres borrados por --name-remove "
-#~ "con los\n"
-#~ "                      caracteres indicados. Si esta cadena es más corta "
-#~ "que la lista\n"
-#~ "                      --name-remove o es omitida, los caracteres extra\n"
-#~ "                      simplemente se eliminan.\n"
-#~ "                      Las configuraciones predeterminadas para ambos "
-#~ "argumentos\n"
-#~ "                      anteriores dependen de la plataforma.\n"
-#~ " -c, --comment=c      Añade la cadena indicada como un comentario extra. "
-#~ "Puede\n"
-#~ "                      usarse varias veces.\n"
-#~ " -d, --date           Fecha para la pista (normalmente fecha de "
-#~ "grabación)\n"
-#~ " -N, --tracknum       Número de esta pista\n"
-#~ " -t, --title          Título de esta pista \n"
-#~ " -l, --album          Nombre del álbum\n"
-#~ " -a, --artist         Nombre del artista\n"
-#~ " -G, --genre          Género de la pista\n"
-#~ "                      En caso de indicarse varios ficheros de entrada se\n"
-#~ "                      usarán múltiples instancias de los cinco "
-#~ "argumentos\n"
-#~ "                      anteriores en el orden en que aparecen. Si se "
-#~ "indican\n"
-#~ "                      menos títulos que ficheros, OggEnc mostrará una\n"
-#~ "                      advertencia y reutilizará el último para los "
-#~ "ficheros\n"
-#~ "                      restantes. Si se indica una cantidad menor de "
-#~ "canciones,\n"
-#~ "                      los ficheros restantes quedarán sin numerar. Para "
-#~ "los\n"
-#~ "                      demás se volverá a usar la opción final para todos "
-#~ "los\n"
-#~ "                      restantes sin aviso (de este modo puede indicar una "
-#~ "fecha\n"
-#~ "                      una vez, por ejemplo, y que esta se aplique en "
-#~ "todos los\n"
-#~ "                      ficheros)\n"
-#~ "\n"
-#~ "FICHEROS DE ENTRADA:\n"
-#~ " Los ficheros de entrada para OggEnc deben ser actualmente PCM WAV, AIFF, "
-#~ "o\n"
-#~ " AIFF/C de 16 u 8 bits o WAV IEEE de coma flotante de 32 bits. Los "
-#~ "ficheros\n"
-#~ " pueden ser mono o estéreo (o de más canales) y a cualquier velocidad de\n"
-#~ " muestreo.\n"
-#~ " Como alternativa puede emplearse la opción --raw para usar un fichero de "
-#~ "datos\n"
-#~ " PCM en bruto, el cual tiene que ser un PCM estéreo de 16 bits y little-"
-#~ "endian\n"
-#~ " PCM ('wav sin cabecera'), a menos que se indiquen parámetros adicionales "
-#~ "para\n"
-#~ " el modo \"raw\" .\n"
-#~ " Puede indicar que se tome el fichero de la entrada estándar usando - "
-#~ "como\n"
-#~ " nombre de fichero de entrada.\n"
-#~ " En este modo, la salida será a stdout a menos que se indique un nombre "
-#~ "de\n"
-#~ " fichero de salida con -o\n"
-#~ "\n"
-
-#~ msgid " to "
-#~ msgstr " a "
-
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %ld bytes\n"
-#~ "\tPlayback length: %ldm:%02lds\n"
-#~ "\tAverage bitrate: %f kbps\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"
-
-# ¿corrupto? EM
-#~ msgid " bytes. Corrupted ogg.\n"
-#~ msgstr " bytes. ogg corrupto.\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 ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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"
-#~ "   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 ""
-#~ "Uso: \n"
-#~ "  vorbiscomment [-l] fichero.ogg (para listar comentarios)\n"
-#~ "  vorbiscomment -a entrada.ogg salida.ogg (para añadir comentarios)\n"
-#~ "  vorbiscomment -w entrada.ogg salida.ogg (para modificar comentarios)\n"
-#~ "\ten el caso de la escritura, se espera un nuevo grupo de comentarios \n"
-#~ "\tcon el formato 'ETIQUETA=valor' desde la entrada estándar. Este grupo\n"
-#~ "\treemplazará completamente al existente.\n"
-#~ "   Ambas opciones -a y -w sólo pueden tomar un único nombre de fichero,\n"
-#~ "   en cuyo caso se usará un fichero temporal.\n"
-#~ "   -c puede usarse para leer comentarios de un fichero determinado\n"
-#~ "   en lugar de la entrada estándar.\n"
-#~ "   Ejemplo: vorbiscomment -a entrada.ogg -c comentarios.txt\n"
-#~ "   añadirá comentarios a comentarios.txt para entrada.ogg\n"
-#~ "   Finalmente, puede especificar cualquier cantidad de etiquetas a "
-#~ "añadir\n"
-#~ "   desde la línea de ordenes usando la opción -t. P.ej.\n"
-#~ "   vorbiscomment -a entrada.ogg -t \"ARTISTA=Un Tío Feo\" -t \"TITULO=Uno "
-#~ "Cualquiera\"\n"
-#~ "   (nótese que cuando se usa esta opción la lectura de comentarios desde "
-#~ "el fichero de \n"
-#~ "   comentarios o la entrada estándar están desactivados)\n"
-#~ "   En el modo en bruto (--raw, -R) se leerán y escribirán comentarios en "
-#~ "utf8,\n"
-#~ "   en vez de convertirlos al juego de caracteres del usuario. Esto es "
-#~ "útil para\n"
-#~ "   usar vorbiscomments en guiones. Sin embargo, esto no es suficiente "
-#~ "para\n"
-#~ "   viajes de ida y vuelta (round-tripping) generales de comentarios en "
-#~ "todos\n"
-#~ "   los casos.\n"

Modified: trunk/vorbis-tools/po/fr.po
===================================================================
--- trunk/vorbis-tools/po/fr.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/fr.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -28,8 +28,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2002-07-19 22:30+1000\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,237 +36,231 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ogg123/buffer.c:117
-#, c-format
+#: ogg123/buffer.c:111
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Erreur : Plus de mémoire dans malloc_action().\n"
 
-#: ogg123/buffer.c:360
-#, c-format
+#: ogg123/buffer.c:344
 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"
+msgstr "Erreur : Impossible d'allouer de la mémoire dans malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:75
+#: ogg123/buffer.c:363
+msgid "malloc"
+msgstr "malloc"
+
+#: ogg123/callbacks.c:70
 msgid "Error: Device not available.\n"
 msgstr "Erreur : Périphérique indisponible.\n"
 
-#: ogg123/callbacks.c:78
+#: ogg123/callbacks.c:73
 #, 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:81
+#: ogg123/callbacks.c:76
 #, 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:85
+#: ogg123/callbacks.c:80
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Erreur : Impossible d'ouvrir le périphérique %s.\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:84
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Erreur : Erreur de périphérique %s.\n"
 
-#: ogg123/callbacks.c:92
+#: ogg123/callbacks.c:87
 #, 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"
+msgstr "Erreur : Impossible d'attribuer un fichier de sortie pour le périphérique %s.\n"
 
-#: ogg123/callbacks.c:95
+#: ogg123/callbacks.c:90
 #, 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:99
+#: ogg123/callbacks.c:94
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Erreur : Le fichier %s existe déjà.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:97
 #, 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:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
 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:174
+#: ogg123/callbacks.c:169
 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:233
+#: ogg123/callbacks.c:228
 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:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
+#: ogg123/callbacks.c:349
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Erreur : Plus de mémoire dans decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Erreur du système"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Erreur d'analyse : %s à la ligne %d de %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Nom"
 
-#: ogg123/cfgfile_options.c:137
+#. Description
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Description"
 
-#: ogg123/cfgfile_options.c:140
+#. Type
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Type"
 
-#: ogg123/cfgfile_options.c:143
+#. Default
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Par défaut"
 
-#: ogg123/cfgfile_options.c:169
-#, c-format
+#: ogg123/cfgfile_options.c:165
 msgid "none"
 msgstr "aucun"
 
-#: ogg123/cfgfile_options.c:172
-#, c-format
+#: ogg123/cfgfile_options.c:168
 msgid "bool"
 msgstr "booléen"
 
-#: ogg123/cfgfile_options.c:175
-#, c-format
+#: ogg123/cfgfile_options.c:171
 msgid "char"
 msgstr "caractère"
 
-#: ogg123/cfgfile_options.c:178
-#, c-format
+#: ogg123/cfgfile_options.c:174
 msgid "string"
 msgstr "chaîne"
 
-#: ogg123/cfgfile_options.c:181
-#, c-format
+#: ogg123/cfgfile_options.c:177
 msgid "int"
 msgstr "entier"
 
-#: ogg123/cfgfile_options.c:184
-#, c-format
+#: ogg123/cfgfile_options.c:180
 msgid "float"
 msgstr "flottant"
 
-#: ogg123/cfgfile_options.c:187
-#, c-format
+#: ogg123/cfgfile_options.c:183
 msgid "double"
 msgstr "double"
 
-#: ogg123/cfgfile_options.c:190
-#, c-format
+#: ogg123/cfgfile_options.c:186
 msgid "other"
 msgstr "Autre"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NUL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:506 oggenc/oggenc.c:511
+#: oggenc/oggenc.c:516 oggenc/oggenc.c:521 oggenc/oggenc.c:526
+#: oggenc/oggenc.c:531
 msgid "(none)"
 msgstr "(aucun)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Réussite"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Clé introuvable"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Pas de clé"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Valeur invalide"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Mauvais typage dans la liste des options"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:74
 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:90
+#: ogg123/cmdline_options.c:81
 #, 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:102
+#: ogg123/cmdline_options.c:93
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
 "=== Option was: %s\n"
 msgstr ""
-"=== Erreur « %s » lors de l'analyse de l'option donnée sur la ligne de "
-"commande\n"
+"=== Erreur « %s » lors de l'analyse de l'option donnée sur la ligne de commande\n"
 "=== L'option était : %s\n"
 
-#: ogg123/cmdline_options.c:109
-#, c-format
+#. not using the status interface here
+#: ogg123/cmdline_options.c:100
 msgid "Available options:\n"
 msgstr "Options disponibles :\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:109
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Pas de tel périphérique %s.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:129
 #, 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:143
+#: ogg123/cmdline_options.c:134
 msgid "=== Cannot specify output file without specifying a driver.\n"
-msgstr ""
-"=== Impossible de spécifier quel fichier de sortie utiliser sans pilote.\n"
+msgstr "=== Impossible de spécifier quel fichier de sortie utiliser sans pilote.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:149
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Format d'option incorrecte : %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:164
 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:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:179
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 de %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:186
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Impossible de jouer tous les « zéroièmes » tronçons !\n"
 
-#: ogg123/cmdline_options.c:216
+#: ogg123/cmdline_options.c:194
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -275,254 +268,115 @@
 "--- 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:232
+#: ogg123/cmdline_options.c:206
 #, 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:248
-msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:227
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
-msgstr ""
-"--- Le pilote %s indiqué dans le fichier de configuration est invalide.\n"
+msgstr "--- Le pilote %s indiqué dans le fichier de configuration est invalide.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Impossible de charger le pilote par défaut, et aucun autre pilote n'est "
-"indiqué dans le fichier de configuration. Terminaison.\n"
+#: ogg123/cmdline_options.c:237
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Impossible de charger le pilote par défaut, et aucun autre pilote n'est indiqué dans le fichier de configuration. Terminaison.\n"
 
-#: ogg123/cmdline_options.c:292
+# Ce « live » est la sortie audio de la machine (par opposition à sortie fichier)
+#: ogg123/cmdline_options.c:258
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 de %s %s\n"
+" par la fondation Xiph.org (http://www.xiph.org/)\n"
+"\n"
+"Usage: ogg123 [<options>] <fichier d'entré> ...\n"
+"\n"
+"  -h, --help     cette aide\n"
+"  -V, --version  indique la version d'Ogg123\n"
+"  -d, --device=d utiliser « d » comme périphérique de sortie\n"
+"      Les périphériques possibles sont ('*'=live, '@'=fichier):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Options disponibles :\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:279
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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"
+"  -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"
 "\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"
 msgstr ""
+"  -f, --file=fichier                 Spécifie le fichier de sortie pour un périphérique de\n"
+"                  fichier spécifié précédemment (à l'aide de -d).\n"
+"  -k n, --skip n Omet les « n » premières secondes\n"
+"  -o, --device-option=k:v                  Passe la valeur v à l'option spéciale k du périphérique\n"
+"                  précédemment spécifié (à l'aide de -d). Voir la page de\n"
+"                  manuel pour plus de détails.\n"
+"  -b n, --buffer n\n"
+"                 Utilise un tampon d'entrée de « n » kilooctets\n"
+"  -p n, --prebuffer n\n"
+"                 Charger n%% du tampon d'entrée avant de jouer\n"
+"  -v, --verbose  Afficher les progrès et autres informations d'état\n"
+"  -q, --quiet    N'affiche rien du tout (pas de titre)\n"
+"  -x n, --nth    Joue chaque «n»ième bloc\n"
+"  -y n, --ntimes Répète chaque bloc joué « n » fois\n"
+"  -z, --shuffle  Ordre aléatoire\n"
+"\n"
+"ogg123 passera à la chanson suivante à la réception de SIGINT (Ctrl-C) ;\n"
+"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/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Fichier : %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Options disponibles :\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "L'entrée n'est pas un ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Description"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Options disponibles :\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
+#: ogg123/oggvorbis_format.c:106 ogg123/oggvorbis_format.c:321
+#: ogg123/oggvorbis_format.c:336 ogg123/oggvorbis_format.c:354
 msgid "Error: Out of memory.\n"
 msgstr "Erreur : Plus de mémoire.\n"
 
-#: ogg123/format.c:82
-#, c-format
+#: ogg123/format.c:59
 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"
+msgstr "Erreur : Impossible d'allouer de la mémoire dans malloc_decoder_stat()\n"
 
-#: ogg123/http_transport.c:145
+#: ogg123/http_transport.c:137
 msgid "Error: Could not set signal mask."
 msgstr "Erreur : Impossible de fixer le masque de signal."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:191
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Erreur : Impossible de créer le tampon d'entrée.\n"
 
-#: ogg123/ogg123.c:82
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "pilote de sortie par défaut"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "mélange la liste des morceaux"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Impossible d'omettre %f secondes d'audio."
-
-#: ogg123/ogg123.c:378
+#: ogg123/ogg123.c:261
 #, c-format
 msgid ""
 "\n"
@@ -531,374 +385,241 @@
 "\n"
 "Périphérique audio : %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:262
 #, c-format
 msgid "Author:   %s"
 msgstr "Auteur : %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:263
 #, c-format
 msgid "Comments: %s"
 msgstr "Commentaires : %s"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
+#: ogg123/ogg123.c:307 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:460
+#: ogg123/ogg123.c:341
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Erreur : Impossible de créer les tampons audio.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:429
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Aucun module à lire depuis %s.\n"
 
-#: ogg123/ogg123.c:561
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Impossible d'ouvrir %s.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:440
 #, 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:577
+#: ogg123/ogg123.c:450
 #, 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"
+msgstr "Erreur lors de l'ouverture de %s avec le module %s. Le fichier est peut-être corrompu.\n"
 
-#: ogg123/ogg123.c:596
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
 msgstr "Écoute de : %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:474
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Impossible d'omettre %f secondes d'audio."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
 msgstr "Erreur : Échec du décodage.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Erreur : Erreur de périphérique %s.\n"
-
-#: ogg123/ogg123.c:743
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:585
 msgid "Done."
 msgstr "Terminé."
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:51
+msgid "Track number:"
+msgstr "Numéro de chanson :"
+
+#: ogg123/oggvorbis_format.c:52
+msgid "ReplayGain (Track):"
+msgstr "ReplayGain (Morceau) :"
+
+#: ogg123/oggvorbis_format.c:53
+msgid "ReplayGain (Album):"
+msgstr "ReplayGain (Album) :"
+
+#: ogg123/oggvorbis_format.c:54
+msgid "ReplayGain (Track) Peak:"
+msgstr "ReplayGain de crête (Morceau) :"
+
+#: ogg123/oggvorbis_format.c:55
+msgid "ReplayGain (Album) Peak:"
+msgstr "ReplayGain de crête (Album) :"
+
+#: ogg123/oggvorbis_format.c:56
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ogg123/oggvorbis_format.c:57 ogg123/oggvorbis_format.c:58
+msgid "Comment:"
+msgstr "Commentaire :"
+
+#: ogg123/oggvorbis_format.c:167
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Trou dans le flux ; sans doute inoffensif\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:173
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== La bibliothèque Vorbis indique une erreur de flux.\n"
 
-#: ogg123/oggvorbis_format.c:310
-#, fuzzy, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr "Le flux a %d canaux, %ldHz"
-
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:402
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr ""
+msgid "Version is %d"
+msgstr "Version est %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:406
 #, 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:327
+#: ogg123/oggvorbis_format.c:414
 #, c-format
+msgid "Bitstream is %d channel, %ldHz"
+msgstr "Le flux a %d canaux, %ldHz"
+
+#: ogg123/oggvorbis_format.c:419
+#, c-format
 msgid "Encoded by: %s"
 msgstr "Encodé par : %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, c-format
+#: ogg123/playlist.c:41 ogg123/playlist.c:52
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Erreur : Plus de mémoire dans create_playlist_member().\n"
 
-#: ogg123/playlist.c:222
+#: ogg123/playlist.c:214
 #, c-format
 msgid "Warning from playlist %s: Could not read directory %s.\n"
 msgstr "Attention : dans la liste %s, impossible de lire le répertoire %s.\n"
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
-#, c-format
+#: ogg123/playlist.c:259 ogg123/playlist.c:271
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Erreur : Plus de mémoire dans playlist_to_array().\n"
 
-#: ogg123/status.c:60
+#: ogg123/status.c:47
 #, c-format
 msgid "%sPrebuf to %.1f%%"
 msgstr "%sPrétampon à %.1f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sEn pause"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr "%sEOS"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
-#, c-format
+#: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
+#: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Erreur d'allocation mémoire dans stats_init()\n"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Fichier : %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Temps : %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "de %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Débit moyen : %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr " Tampon d'entrée %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr " Tampon de sortie %5.1f%%"
 
-#: ogg123/transport.c:71
-#, c-format
+#: ogg123/transport.c:67
 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"
+msgstr "Erreur : Impossible d'allouer de la mémoire dans malloc_data_source_stats()\n"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 de %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, fuzzy, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr ""
-"Usage : vcut fichier_entrée.ogg fichier_sortie1.ogg fichier_sortie2.ogg "
-"césure\n"
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "Erreur : impossible d'ouvrir le fichier d'entrée « %s » : %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "Erreur : impossible d'ouvrir le fichier de sortie « %s » : %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Impossible d'ouvrir le fichier comme un vorbis : %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Erreur lors de la suppression du vieux fichier %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"Erreur : aucun fichier d'entrée n'a été spécifié. Voir -h pour de l'aide.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"Erreur : plusieurs fichiers d'entrée pour le fichier de sortie spécifié : \n"
-" vous devriez peut-être utiliser -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:39
 msgid "WAV file reader"
 msgstr "lecteur de fichier WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
 msgstr "lecteur de fichier AIFF/AIFC"
 
-#: oggenc/audio.c:53
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "lecteur de fichier WAV"
-
-#: oggenc/audio.c:54
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "lecteur de fichier WAV"
-
-#: oggenc/audio.c:131 oggenc/audio.c:425
-#, c-format
+#: oggenc/audio.c:117 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
-msgstr ""
-"Attention : fin de fichier inattendue lors de la lecture des entêtes WAV\n"
+msgstr "Attention : fin de fichier inattendue lors de la lecture des entêtes WAV\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:128
 #, 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:168
-#, c-format
+#: oggenc/audio.c:146
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Attention : fin de fichier inattendue dans un tronçon AIFF\n"
 
-#: oggenc/audio.c:254
-#, c-format
+#: oggenc/audio.c:231
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Attention : aucun tronçon commun dans le fichier AIFF\n"
 
-#: oggenc/audio.c:260
-#, c-format
+#: oggenc/audio.c:237
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Attention : tronçon commun tronqué dans l'entête AIFF\n"
 
-#: oggenc/audio.c:268
-#, c-format
+#: oggenc/audio.c:245
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Attention : fin de fichier inattendue dans l'entête AIFF\n"
 
-#: oggenc/audio.c:283
-#, c-format
+#: oggenc/audio.c:258
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Attention : l'entête AIFF-C est tronqué.\n"
 
-#: oggenc/audio.c:297
-#, fuzzy, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
+#: oggenc/audio.c:263
+msgid "Warning: Can't handle compressed AIFF-C\n"
 msgstr "Attention : Je ne sais pas gérer l'AIFF-C compressé\n"
 
-#: oggenc/audio.c:304
-#, c-format
+#: oggenc/audio.c:270
 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:310
-#, c-format
+#: oggenc/audio.c:276
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Attention : tronçon SSND corrompu dans l'entête AIFF\n"
 
-#: oggenc/audio.c:316
-#, c-format
+#: oggenc/audio.c:282
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Attention : fin de fichier inattendue dans l'entête AIFF\n"
 
-#: oggenc/audio.c:353
-#, c-format
+#: oggenc/audio.c:314
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
 " Must be 8 or 16 bit PCM.\n"
@@ -906,13 +627,11 @@
 "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:407
-#, c-format
+#: oggenc/audio.c:357
 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:420
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -920,141 +639,82 @@
 "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:458
-#, fuzzy, c-format
+#: oggenc/audio.c:406
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
-" or type 3 floating point PCM)\n"
+" or type 3 floating point PCM\n"
 msgstr ""
 "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:467
-#, c-format
+#: oggenc/audio.c:455
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
-
-#: oggenc/audio.c:528
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
 "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:604
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
+#: oggenc/audio.c:607
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
 msgstr ""
-
-#: oggenc/audio.c:624
-#, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:630
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:732
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"BOGUE : zéro échantillon reçu du rééchantilloneur : votre fichier sera "
-"tronqué.\n"
+"BOGUE : zéro échantillon reçu du rééchantilloneur : votre fichier sera tronqué.\n"
 "Veuillez rapporter ce problème.\n"
 
-#: oggenc/audio.c:750
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr "Impossible d'initialiser le rééchantilloneur\n"
 
-#: oggenc/encode.c:64
+#: oggenc/encode.c:59
 #, 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:101
+#: oggenc/encode.c:100
 #, 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:104
+#: oggenc/encode.c:103
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Option avancée « %s » inconnue\n"
 
-#: oggenc/encode.c:111
-#, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
+#: oggenc/encode.c:133
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+msgstr "255 canaux devrait être suffisant pour tous. (désolé, vorbis ne permet pas d'en utiliser plus)\n"
 
-#: oggenc/encode.c:115 oggenc/encode.c:252
-#, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, fuzzy, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 canaux devrait être suffisant pour tous. (désolé, vorbis ne permet pas "
-"d'en utiliser plus)\n"
-
-#: oggenc/encode.c:182
-#, c-format
+#: oggenc/encode.c:141
 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:200
-#, c-format
+#: oggenc/encode.c:159
 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:245
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:247
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:263
-#, c-format
+#: oggenc/encode.c:183
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
-msgstr ""
-"Échec de l'initialisation du mode : paramètres invalides pour le débit\n"
+msgstr "Échec de l'initialisation du mode : paramètres invalides pour le débit\n"
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:237
 msgid "Failed writing header to output stream\n"
 msgstr "Écriture d'entêtes du flux de sortie infructueuse\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:303
 msgid "Failed writing data to output stream\n"
 msgstr "Écriture dans le flux de sortie infructueuse\n"
 
-#: oggenc/encode.c:472
-#, fuzzy, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
+#: oggenc/encode.c:349
+#, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 msgstr "\t[%5.1f%%] [%2dm%.2ds restant] %c"
 
-#: oggenc/encode.c:482
-#, fuzzy, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+#: oggenc/encode.c:359
+#, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr "\tEncodage [%2dm%.2ds pour l'instant] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:377
 #, c-format
 msgid ""
 "\n"
@@ -1065,8 +725,7 @@
 "\n"
 "Fin de l'encodage du fichier « %s »\n"
 
-#: oggenc/encode.c:502
-#, c-format
+#: oggenc/encode.c:379
 msgid ""
 "\n"
 "\n"
@@ -1076,7 +735,7 @@
 "\n"
 "Fin de l'encodage.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:383
 #, c-format
 msgid ""
 "\n"
@@ -1085,17 +744,17 @@
 "\n"
 "\tLongueur de fichier :  %dm %04.1fs\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:387
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tTemps écoulé : %dm %04.1fs\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:390
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tTaux:         %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:391
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1104,7 +763,7 @@
 "\tDébit moyen : %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:428
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1115,17 +774,17 @@
 "         en %s%s%s \n"
 "au débit moyen de %d kbps "
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
+#: oggenc/encode.c:452 oggenc/encode.c:458
 msgid "standard input"
 msgstr "entrée standard"
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
+#: oggenc/encode.c:453 oggenc/encode.c:459
 msgid "standard output"
 msgstr "sortie standard"
 
-#: oggenc/encode.c:559
+#: oggenc/encode.c:436
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1136,7 +795,7 @@
 "         en %s%s%s \n"
 "au débit approximatif de %d kbps (encodage VBR en cours)\n"
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:444
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1147,7 +806,7 @@
 "         en %s%s%s \n"
 "au niveau de qualité %2.2f en utilisant un VBR contraint "
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:451
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1158,7 +817,7 @@
 "         en %s%s%s \n"
 "à la qualité %2.2f\n"
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:457
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1169,742 +828,418 @@
 "         en %s%s%s \n"
 "en utilisant la gestion du débit "
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
+#: oggenc/oggenc.c:96
+#, c-format
+msgid ""
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 "%s%s\n"
 "Erreur : aucun fichier d'entrée n'a été spécifié. Voir -h pour de l'aide.\n"
 
-#: oggenc/oggenc.c:118
-#, c-format
+#: oggenc/oggenc.c:111
 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:125
-#, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
+#: oggenc/oggenc.c:118
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
 msgstr ""
 "Erreur : plusieurs fichiers d'entrée pour le fichier de sortie spécifié : \n"
 " vous devriez peut-être utiliser -n\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:172
 #, 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:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "lecteur de fichier WAV"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:200
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Ouverture avec le module %s : %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:209
 #, 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:280
-#, c-format
+#: oggenc/oggenc.c:259
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
-msgstr ""
-"Attention : pas de nom de fichier. Utilisation de « default.ogg » par "
-"défaut.\n"
+msgstr "Attention : pas de nom de fichier. Utilisation de « default.ogg » par défaut.\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:267
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"Erreur : impossible de créer les sous répertoires nécessaires pour le "
-"fichier de sortie « %s »\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "Erreur : impossible de créer les sous répertoires nécessaires pour le fichier de sortie « %s »\n"
 
-#: oggenc/oggenc.c:295
-#, 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:306
+#: oggenc/oggenc.c:278
 #, 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:350
+#: oggenc/oggenc.c:308
 #, 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:357
-#, c-format
+#: oggenc/oggenc.c:315
 msgid "Downmixing stereo to mono\n"
 msgstr "Démultiplexage de la stéréo en mono\n"
 
-#: oggenc/oggenc.c:360
-#, 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:318
+msgid "ERROR: 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:368
+#: oggenc/oggenc.c:365
 #, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 de %s %s\n"
-
-#: oggenc/oggenc.c:416
-#, c-format
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:417
-#, c-format
-msgid ""
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
+"                      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"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel. Using this will\n"
-"                      automatically enable managed bitrate mode (see\n"
-"                      --managed).\n"
+"                      encoding for a fixed-size channel.\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications. Using this will automatically\n"
-"                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
-" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
-"                      high), instead of specifying a particular bitrate.\n"
+"                      streaming applications.\n"
+" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
+"                      instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
+"                      Quality -1 is also possible, but may not be of\n"
+"                      acceptable quality.\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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
-" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
-"                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
-"                      used multiple times. The argument should be in the\n"
-"                      format \"tag=value\".\n"
+"                      used multiple times.\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\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 "
-"additional\n"
+" OggEnc input files must currently be 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"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
-" In this mode, output is to stdout unless an output filename is specified\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Usage: oggenc [options] entrée.wav [...]\n"
+"\n"
+"OPTIONS :\n"
+" Géneral :\n"
+" -Q, --quiet          Ne rien afficher sur stderr\n"
+" -h, --help           Afficher ce message d'aide\n"
+" -r, --raw            Mode brut. Les fichiers d'entrée sont des données PCM\n"
+" -B, --raw-bits=n     Indique bits/échantillon pour l'entrée brute. Par défaut : 16\n"
+" -C, --raw-chan=n     Indique le nombre de canaux pour l'entrée brute. Par défaut : 2\n"
+" -R, --raw-rate=n     Indique échantillon/sec pour l'entrée brute. Par défaut : 44100\n"
+" --raw-endianness     1 pour grand-boutiste (bigendian), 0 pour petit-boutiste.\n"
+"                      Par défaut : 0\n"
+" -b, --bitrate        Choisi un débit nominal auquel encoder. Essaye d'encoder à ce\n"
+"                      débit en moyenne. Prend un argument en kbps. Cela utilise\n"
+"                      le mécanisme de gestion du débit et n'est pas conseillé à \n"
+"                      tout le monde. Voir -q pour une meilleure solution.\n"
+" -m, --min-bitrate    Indique le débit minimum (en kbps). Utile pour encoder \n"
+"                      pour un canal de taille fixe.\n"
+" -M, --max-bitrate    Indique le débit minimum (en kbps). Utile les applications\n"
+"                      de diffusion en flux (streaming).\n"
+" -q, --quality        Indique une qualité entre 0 (basse) et 10 (haute), au lieu\n"
+"                      d'indiquer un débit particulier. C'est le mode normal.\n"
+"                      Les quantités fractionnaires (comme 2,75) sont possibles.\n"
+"                      La qualité -1 est aussi possible mais peut ne pas être\n"
+"                      d'une qualité acceptable.\n"
+" --resample n         Rééchantillone les données en entrée à n Hz.\n"
+" --downmix            Démultiplexe de la stéréo vers le mono. Possible uniquement \n"
+"                      pour des données en stéréo.\n"
+" -s, --serial         Indique le numéro de série du flux. Lors de l'encodage de\n"
+"                      plusieurs fichiers, ceci sera incrémenté de 1 pour chacun \n"
+"                      d'entre eux après le premier.\n"
+"\n"
+" Nommage :\n"
+" -o, --output=fich    Écrit dans fich (uniquement pour écrire un seul fichier)\n"
+" -n, --names=chaîne   Produit des noms de fichier à partir de cette chaîne, avec\n"
+"                      %%a, %%t, %%l, %%n, %%d remplacés respectivement par \n"
+"                      artiste, titre, album, numéro de chanson et date\n"
+"                      (voir plus bas pour les spécifications).\n"
+"                      %%%% donne un %% littéral.\n"
+" -X, --name-remove=s  Retire les caractères indiqués des arguments passés à la\n"
+"                      chaîne de formatage de -n. Pratique pour s'assurer de noms \n"
+"                      de fichiers légaux.\n"
+" -P, --name-replace=s Remplace les caractères retirés avec --name-remove par ceux\n"
+"                      spécifier. Si cette chaîne est plus courte que celle passée à\n"
+"                      l'option précédente ou si elle est omise, les caractères \n"
+"                      supplémentaires sont simplement supprimés.\n"
+"                      Les réglages par défaut de ces deux arguments dépendent de la\n"
+"                      plate-forme.\n"
+" -c, --comment=c      Ajoute la chaîne indiquée en commentaire supplémentaire. Cette\n"
+"                      option peut être utilisé plusieurs fois.\n"
+" -d, --date           Date du morceau (habituellement, date d'enregistrement)\n"
+" -N, --tracknum       Numéro du morceau \n"
+" -t, --title          Titre du morceau\n"
+" -l, --album          Nom de l'album\n"
+" -a, --artist         Nom de l'artiste\n"
+" -G, --genre          Genre du morceau\n"
+"                      Si plusieurs fichiers d'entrées sont utilisés, plusieurs\n"
+"                      instances des 5 arguments précédents vont être utilisés\n"
+"                      dans l'ordre où ils sont donnés. \n"
+"                      Si vous spécifiez moins de titre qu'il n'y a de fichiers, \n"
+"                      OggEnc affichera un avertissement et réutilisera le \n"
+"                      dernier donné pour les suivants.\n"
+"                      Si vous spécifiez moins de numéro de morceau que de \n"
+"                      fichiers, les suivants ne seront pas numérotés.\n"
+"                      Pour les autres tags, la dernière valeur donnée sera\n"
+"                      réutilisée sans avertissement (vous pouvez donc spécifier\n"
+"                      la date une seule fois et la voir utilisée pour tous les\n"
+"                      fichiers)\n"
+"\n"
+"FICHIERS D'ENTRÉE :\n"
+" Les fichiers d'entrée d'OggEnc doivent actuellement être des fichiers PCM WAV,\n"
+"   AIFF, ou AIFF/C en 16 ou 8 bit, ou bien des WAV en 32 bit et en virgule\n"
+"   flottante IEEE. Les fichiers peuvent être en mono ou stéréo (ou comporter\n"
+"   plus de canaux), et peuvent être à n'importe quel taux d'échantillonnage.\n"
+" Alternativement, l'option --raw permet d'utiliser un fichier PCM brut, qui doit\n"
+"   être un wav sans entête, c'est à dire être 16bit stéréo petit-boutiste\n"
+"   (little-endian), à moins que d'autres options ne soient utilisées pour\n"
+"   modifier le mode brut.\n"
+" Il est possible d'indiquer que le fichier à traiter doit être lu depuis\n"
+"   l'entrée standard en utilisant - comme nom de fichier. Dans ce cas, la sortie\n"
+"   est la sortie standard à moins qu'une autre destination ne soit indiquée avec\n"
+"   -o. \n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:536
 #, 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"
+msgstr "Attention : omition du caractère d'échappement illégal « %c » dans le nom de format\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
-#, c-format
+#: oggenc/oggenc.c:562 oggenc/oggenc.c:670 oggenc/oggenc.c:683
 msgid "Enabling bitrate management engine\n"
 msgstr "Mise en route du mécanisme de gestion du débit\n"
 
-#: oggenc/oggenc.c:661
-#, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:571
+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:664
+#: oggenc/oggenc.c:574
 #, 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:671
+#: oggenc/oggenc.c:581
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
-msgstr ""
-"ATTENTION : Impossible de lire la fréquence de rééchantillonage « %s »\n"
+msgstr "ATTENTION : Impossible de lire la fréquence de rééchantillonage « %s »\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:587
 #, 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"
+msgstr "Attention : le taux de rééchantillonage spécifié est %d Hz. Vouliez vous dire %d Hz ?\n"
 
-#: oggenc/oggenc.c:687
-#, 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:700
-#, c-format
+#: oggenc/oggenc.c:599
 msgid "No value for advanced encoder option found\n"
 msgstr "Valeur pour l'option avancée d'encodage introuvable\n"
 
-#: oggenc/oggenc.c:718
-#, c-format
+#: oggenc/oggenc.c:610
 msgid "Internal error parsing command line options\n"
-msgstr ""
-"Erreur interne lors de l'analyse des options sur la ligne de commande\n"
+msgstr "Erreur interne lors de l'analyse des options sur la ligne de commande\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Attention : commande illégale (« %s »). ignorée.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:656
 #, 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:774
+#: oggenc/oggenc.c:664
 #, 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:787
+#: oggenc/oggenc.c:677
 #, 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:799
+#: oggenc/oggenc.c:689
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Option de qualité « %s » inconnue, ignorée\n"
 
-#: oggenc/oggenc.c:807
-#, c-format
+#: oggenc/oggenc.c:697
 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"
+msgstr "ATTENTION : le réglage de la qualité est trop haut, retour au maximum possible.\n"
 
-#: oggenc/oggenc.c:813
-#, c-format
+#: oggenc/oggenc.c:703
 msgid "WARNING: Multiple name formats specified, using final\n"
-msgstr ""
-"ATTENTION : plusieurs noms de formats spécifiés. Utilisation du dernier\n"
+msgstr "ATTENTION : plusieurs noms de formats spécifiés. Utilisation du dernier\n"
 
-#: oggenc/oggenc.c:822
-#, c-format
+#: oggenc/oggenc.c:712
 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"
+msgstr "ATTENTION : plusieurs noms de filtres de formats spécifiés. Utilisation du dernier\n"
 
 # JCPCAP
-#: oggenc/oggenc.c:831
-#, 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:721
+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:839
-#, c-format
+#: oggenc/oggenc.c:729
 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:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 de %s %s\n"
-
-#: oggenc/oggenc.c:858
-#, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:748
+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"
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
-#, c-format
+#. Failed, so just set to 16
+#: oggenc/oggenc.c:753 oggenc/oggenc.c:757
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
-msgstr ""
-"ATTENTION : le bits/échantillon spécifié est invalide. Utilisation de 16.\n"
+msgstr "ATTENTION : le bits/échantillon spécifié est invalide. Utilisation de 16.\n"
 
-#: oggenc/oggenc.c:874
-#, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
+#: oggenc/oggenc.c:764
+msgid "WARNING: Raw channel count 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:879
-#, c-format
+#. Failed, so just set to 2
+#: oggenc/oggenc.c:769
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "Attention : Nombre de canaux invalide. Utilisation de 2.\n"
 
-#: oggenc/oggenc.c:890
-#, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:780
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
-"Attention : taux d'échantillonnage brut spécifié pour des données non-"
-"brutes.\n"
+"Attention : taux d'échantillonnage brut spécifié pour des données non-brutes.\n"
 " Les données sont supposées brutes.\n"
 
-#: oggenc/oggenc.c:895
-#, c-format
+#. Failed, so just set to 44100
+#: oggenc/oggenc.c:785
 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"
+msgstr "Attention : Le taux d'échantillonage spécifié n'est pas valide. Utilisation de 44100.\n"
 
-#: oggenc/oggenc.c:902
-#, c-format
+#: oggenc/oggenc.c:789
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "Attention : Option inconnue donnée, ignorée ->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr ""
-"Impossible de convertir les commentaires en UTF-8. Impossible de les "
-"ajouter\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
-#, c-format
+#: oggenc/oggenc.c:811
 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"
+msgstr "Impossible de convertir les commentaires en UTF-8. Impossible de les ajouter\n"
 
-#: oggenc/oggenc.c:954
-#, c-format
+#: oggenc/oggenc.c:830
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
-msgstr ""
-"Attention : pas assez de titres spécifiés, utilisation du dernier par "
-"défaut.\n"
+msgstr "Attention : pas assez de titres spécifiés, utilisation du dernier par défaut.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Impossible de créer le répertoire « %s » : %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Erreur lors de la vérification du répertoire %s : %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:167
 #, c-format
 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:212
-#, 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:220
+#: ogginfo/ogginfo2.c:156
 #, 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"
+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"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
-#, 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:266
-#, 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:342
-#, fuzzy, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Attention : séquence UTF-8 illégale dans le commentaire %d du flux %d : "
-"séquence invalide\n"
-
-#: ogginfo/ogginfo2.c:356
-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:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Attention: EOS non positionné dans le flux %d\n"
-
-#: ogginfo/ogginfo2.c:389
-#, 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:396
-#, 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:400
-#, 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:403
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Version : %d\n"
-
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
+#: ogginfo/ogginfo2.c:164
 #, c-format
-msgid "Vendor: %s\n"
-msgstr "Vendeur : %s\n"
+msgid "Warning: Vorbis 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:406
+#: ogginfo/ogginfo2.c:168
 #, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Version : %d\n"
-
-#: ogginfo/ogginfo2.c:408
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:416
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:429
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:431
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:433
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:437
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:439
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:441
-#, fuzzy
-msgid "Colourspace unspecified\n"
-msgstr "Pas d'action spécifiée\n"
-
-#: ogginfo/ogginfo2.c:444
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:446
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:448
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:450
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:452
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr "Débit maximal : %f kb/s\n"
-
-#: ogginfo/ogginfo2.c:453
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
-msgid "User comments section follows...\n"
-msgstr "Les commentaires de l'utilisateur suivent...\n"
-
-#: ogginfo/ogginfo2.c:477
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Attention: EOS non positionné dans le flux %d\n"
-
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Attention : le granulepos du flux %d a décru de "
-
-#: ogginfo/ogginfo2.c:520
-msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - 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:565
-#, 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"
-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:569
-#, 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:572
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid "Version: %d\n"
 msgstr "Version : %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:175
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Vendeur : %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:182
 #, c-format
+msgid "Vendor: %s\n"
+msgstr "Vendeur : %s\n"
+
+#: ogginfo/ogginfo2.c:183
+#, c-format
 msgid "Channels: %d\n"
 msgstr "Canaux : %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:184
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1913,201 +1248,120 @@
 "Taux : %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:187
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Débit nominal : %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:190
 msgid "Nominal bitrate not set\n"
 msgstr "Pas de débit nominal indiqué\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:193
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Débit maximal : %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:196
 msgid "Upper bitrate not set\n"
 msgstr "Pas de débit maximal indiqué\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:199
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Débit minimal : %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:202
 msgid "Lower bitrate not set\n"
 msgstr "Pas de débit minimal indiqué\n"
 
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo2.c:205
+msgid "User comments section follows...\n"
+msgstr "Les commentaires de l'utilisateur suivent...\n"
+
+#: ogginfo/ogginfo2.c:217
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
+msgid "Warning: Comment %d in stream %d is invalidly formatted, 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:651
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
+#: ogginfo/ogginfo2.c:226
+#, 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:692
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Attention : Impossible de décoder l'entête du paquet vorbis - flux vorbis "
-"invalide (%d)\n"
-
-#: ogginfo/ogginfo2.c:703
-#, fuzzy, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Attention : Impossible de décoder l'entête du paquet vorbis - flux vorbis "
-"invalide (%d)\n"
-
-# FIXME
-#: ogginfo/ogginfo2.c:734
-#, fuzzy, c-format
-msgid ""
-"Warning: Kate 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:738
-#, fuzzy, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr "Entêtes Vorbis du flux %d analysés, les informations suivent...\n"
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Version : %d\n"
-
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:257 ogginfo/ogginfo2.c:266
 #, c-format
-msgid "Language: %s\n"
-msgstr ""
+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:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Vendeur : %s\n"
-
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
-msgid "No category set\n"
-msgstr "Pas de débit nominal indiqué\n"
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:274
 #, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
+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:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
+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:783
-msgid "Unknown text directionality\n"
-msgstr ""
+#: ogginfo/ogginfo2.c:347
+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:795
-msgid "Invalid zero granulepos rate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:797
+#: ogginfo/ogginfo2.c:364
 #, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr ""
+msgid "Warning: granulepos in stream %d decreases from "
+msgstr "Attention : le granulepos du flux %d a décru de "
 
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:365
+msgid " to "
+msgstr " à "
+
+#: ogginfo/ogginfo2.c:365
 msgid "\n"
 msgstr "\n"
 
-#: ogginfo/ogginfo2.c:828
+#: ogginfo/ogginfo2.c:384
 #, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %ld bytes\n"
+"\tPlayback length: %ldm:%02lds\n"
+"\tAverage bitrate: %f kbps\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:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:418
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Attention: EOS non positionné dans le flux %d\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:537
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Attention : Page d'entête invalide, aucun paquet trouvé\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:549
 #, 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"
+msgstr "Attention : Page d'entête invalide pour le flux %d, elle contient plusieurs paquets\n"
 
-#: ogginfo/ogginfo2.c:1088
-#, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1105
-#, fuzzy
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
+#: ogginfo/ogginfo2.c:574
+msgid "Warning: Hole in data found at approximate offset "
 msgstr "Attention : trou trouvé dans les données après environ "
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:575
+msgid " bytes. Corrupted ogg.\n"
+msgstr " octets. Ogg corrompu.\n"
+
+#: ogginfo/ogginfo2.c:599
 #, 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:1134
+#: ogginfo/ogginfo2.c:604
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2116,89 +1370,66 @@
 "Traitement du fichier « %s »...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:613
 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:1151
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1154
+#: ogginfo/ogginfo2.c:618
+#, c-format
 msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1158
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1161
-#, fuzzy, c-format
-msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
-"This indicates a corrupt ogg file: %s.\n"
+"This indicates a corrupt ogg file.\n"
 msgstr ""
 "Attention : page(s) mal placée(s) dans le flux logique %d\n"
 "Ceci indique un fichier ogg corrompu.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:625
 #, 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:1176
+#: ogginfo/ogginfo2.c:628
 #, 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"
+msgstr "Attention : le fanion de début de flux n'est pas positionné dans le flux %d\n"
 
-#: ogginfo/ogginfo2.c:1180
+#: ogginfo/ogginfo2.c:632
 #, 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:1185
+#: ogginfo/ogginfo2.c:637
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
-msgstr ""
-"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"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "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:1200
+#: ogginfo/ogginfo2.c:652
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Fin du flux logique %d\n"
 
-#: ogginfo/ogginfo2.c:1208
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:659
+#, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
+"Input probably not ogg.\n"
 msgstr ""
 "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:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 de %s %s\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:670
 msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
+"ogginfo 1.0\n"
+"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] files1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
 "\t-h Show this help message\n"
 "\t-q Make less verbose. Once will remove detailed informative\n"
 "\t   messages, two will remove warnings\n"
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
+"\n"
 msgstr ""
 "ogginfo 1.0\n"
 "(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
@@ -2212,17 +1443,11 @@
 "           détaillés pour certains types de flux.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1234
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:691
 msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
-"ogginfo is a tool for printing information about Ogg files\n"
+"Ogginfo is a tool for printing information about ogg files\n"
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
@@ -2233,12 +1458,9 @@
 "concernant.\n"
 "Pour avoir toute l'aide, faites « ogginfo -h ».\n"
 
-#: ogginfo/ogginfo2.c:1280
-#, c-format
+#: ogginfo/ogginfo2.c:720
 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 "
-"l'aide.\n"
+msgstr "Aucun fichier d'entrée n'a été spécifié. Faites « ogginfo -h » pour de l'aide.\n"
 
 #: share/getopt.c:673
 #, c-format
@@ -2260,16 +1482,19 @@
 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"
@@ -2280,6 +1505,7 @@
 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"
@@ -2295,43 +1521,35 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s : l'option « -W %s » n'admet pas d'argument\n"
 
-#: vcut/vcut.c:149
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr "Erreur de page. Entrée corrompue.\n"
 
-#: vcut/vcut.c:166
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr "Erreur de flux, on continue\n"
 
-#: vcut/vcut.c:206
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr "Fin de flux trouvée avant le point de césure.\n"
 
-#: vcut/vcut.c:215
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Placement de eos : la mise à jour de sync a retourné 0\n"
 
-#: vcut/vcut.c:225
-#, c-format
+#: vcut/vcut.c:192
 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:277
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Cas spécial non traité : le premier fichier est il trop petit ?\n"
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr "Point de césure au delà du flux. Le second fichier sera vide\n"
-
-#: vcut/vcut.c:353
-#, c-format
+#. 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:284
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -2339,755 +1557,242 @@
 "Erreur : Les deux premiers paquets audio ne rentrent pas sur une page ogg.\n"
 "         Il sera peut-être impossible de décoder ce fichier.\n"
 
-#: vcut/vcut.c:373
-#, 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:378
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr "Erreur non fatale dans le flux\n"
 
-#: vcut/vcut.c:387
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr "Erreur dans le flux\n"
 
-#: vcut/vcut.c:449
-#, c-format
+#: vcut/vcut.c:330
+msgid "Update sync returned 0, setting eos\n"
+msgstr "La mise à jour de sync a retourné 0, positionnement de eos\n"
+
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "L'entrée n'est pas un ogg.\n"
 
-#: vcut/vcut.c:459
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Erreur à la première page\n"
 
-#: vcut/vcut.c:464
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "erreur dans le premier paquet\n"
 
-#: vcut/vcut.c:470
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Erreur dans l'entête primaire : pas du vorbis ?\n"
 
-#: vcut/vcut.c:490
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Entête secondaire corrompu\n"
 
-#: vcut/vcut.c:503
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "EOF dans les entêtes\n"
 
-#: vcut/vcut.c:535
-#, fuzzy, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
-msgstr ""
-"Usage : vcut fichier_entrée.ogg fichier_sortie1.ogg fichier_sortie2.ogg "
-"césure\n"
+#: vcut/vcut.c:456
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
+msgstr "Usage : vcut fichier_entrée.ogg fichier_sortie1.ogg fichier_sortie2.ogg césure\n"
 
-#: vcut/vcut.c:539
-#, c-format
+#: vcut/vcut.c:460
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
 "\n"
 msgstr ""
 "Attention : vcut est encore un code expérimental.\n"
-"Vérifiez que les fichiers produits soient corrects avant d'effacer les "
-"sources.\n"
+"Vérifiez que les fichiers produits soient corrects avant d'effacer les sources.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Impossible d'ouvrir %s pour le lire\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Impossible d'ouvrir %s pour y écrire\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "point de césure « %s » incompréhensible\n"
 
-#: vcut/vcut.c:570
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+#: vcut/vcut.c:484
+#, c-format
+msgid "Processing: Cutting at %lld\n"
 msgstr "Traitement : Coupure à %lld\n"
 
-#: vcut/vcut.c:572
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr "Traitement : Coupure à %lld\n"
-
-#: vcut/vcut.c:582
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr "Échec du traitement\n"
 
-#: vcut/vcut.c:604
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr "Erreur lors de la lecture des entêtes\n"
 
-#: vcut/vcut.c:627
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr "Erreur lors de l'écriture du premier fichier de sortie\n"
 
-#: vcut/vcut.c:635
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr "Erreur lors de l'écriture du second fichier de sortie\n"
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:220
+msgid "Input truncated or empty."
+msgstr "Entrée tronquée ou vide."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:222
+msgid "Input is not an Ogg bitstream."
+msgstr "L'entrée n'est pas un flux Ogg."
+
+#: vorbiscomment/vcedit.c:239
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Erreur lors de la lecture de la première page du flux Ogg."
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:245
 msgid "Error reading initial header packet."
 msgstr "Erreur lors de la lecture du paquet d'entête initial."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Entrée tronquée ou vide."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "L'entrée n'est pas un flux Ogg."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:251
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Le flux Ogg ne contient pas de données vorbis."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "Fin de fichier avant la fin des entêtes vorbis."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Le flux Ogg ne contient pas de données vorbis."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:274
 msgid "Corrupt secondary header."
 msgstr "Entête secondaire corrompu."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:295
 msgid "EOF before end of vorbis headers."
 msgstr "Fin de fichier avant la fin des entêtes vorbis."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:448
 msgid "Corrupt or missing data, continuing..."
 msgstr "Données corrompues ou manquantes, on continue..."
 
-#: vorbiscomment/vcedit.c:875
-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/vcedit.c:487
+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:190 vorbiscomment/vcomment.c:216
+#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
 #, 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:235
+#: vorbiscomment/vcomment.c:148
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Mauvais commentaire : « %s »\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "mauvais commentaire : « %s »\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:170
 #, 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"
 
-#: vorbiscomment/vcomment.c:274
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:187
 msgid "no action specified\n"
 msgstr "Pas d'action spécifiée\n"
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
-msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
+#: 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:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
+#: vorbiscomment/vcomment.c:287
 msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
+"   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 ""
+"Usage: \n"
+"  vorbiscomment [-l] fichier.ogg (pour lister les commentaires)\n"
+"  vorbiscomment -a entrée.ogg sortie.ogg (pour ajouter des commentaires)\n"
+"  vorbiscomment -w entrée.ogg sortie.ogg (pour modifier les commentaires)\n"
+"\tLors de l'écriture, un nouvel ensemble de commentaires de forme\n"
+"\t'TAG=valeur' est attendu sur stdin. Cet ensemble remplacera\n"
+"\tcomplètement les commentaires existants.\n"
+"   -a et -w peuvent aussi s'utiliser avec un seul nom de fichier.\n"
+"     Dans ce cas, un fichier temporaire sera utilisé.\n"
+"   -c peut être utilisé pour lire les commentaires depuis le \n"
+"     fichier spécifié à la place de stdin.\n"
+"   Exemple : vorbiscomment -a entrée.ogg -c commentaires.txt\n"
+"     Ceci ajoutera les commentaires contenus dans commentaires.txt\n"
+"     à ceux déjà présents dans entrée.ogg\n"
+"   Enfin, vous pouvez spécifier des tags additionnels grâce à l'option\n"
+"     de ligne de commande -t. Par exemple :\n"
+"     vorbiscomment -a entrée.ogg -t \"ARTIST=Un mec\" -t \"TITLE=Un titre\"\n"
+"     (remarquez qu'utiliser ceci empêche de lire les commentaires depuis\n"
+"     l'entrée standard ou depuis un fichier)\n"
+"   Le mode brut (--raw, -R) permet de lire et d'écrire les commentaires\n"
+"      en utf8 au lieu de les convertir dans l'encodage de l'utilisateur.\n"
+"      C'est pratique pour utiliser vorbiscomment dans des scripts, mais \n"
+"      ce n'est pas suffisant pour résoudre les problèmes d'encodage dans\n"
+"      tous les cas.\n"
 
-#: vorbiscomment/vcomment.c:391
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Mauvais typage dans la liste des options"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
+#: vorbiscomment/vcomment.c:371
 msgid "Internal error parsing command options\n"
 msgstr "Erreur interne lors de l'analyse des options de commande.\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:456
 #, 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:587
-#, c-format
+#: vorbiscomment/vcomment.c:465
 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:598
+#: vorbiscomment/vcomment.c:476
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Erreur lors de l'ouverture du fichier de sortie « %s ».\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:491
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Erreur lors de l'ouverture du fichier de commentaires « %s ».\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:508
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Erreur lors de l'ouverture du fichier de commentaires « %s »\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:536
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Erreur lors de la suppression du vieux fichier %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:538
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Erreur lors du renommage de %s en %s\n"
-
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Erreur lors de la suppression du vieux fichier %s\n"
-
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
-# Ce « live » est la sortie audio de la machine (par opposition à sortie fichier)
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 de %s %s\n"
-#~ " par la fondation Xiph.org (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <fichier d'entré> ...\n"
-#~ "\n"
-#~ "  -h, --help     cette aide\n"
-#~ "  -V, --version  indique la version d'Ogg123\n"
-#~ "  -d, --device=d utiliser « d » comme périphérique de sortie\n"
-#~ "      Les périphériques possibles sont ('*'=live, '@'=fichier):\n"
-#~ "        "
-
-#~ 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"
-#~ "  -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"
-#~ "\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"
-#~ msgstr ""
-#~ "  -f, --file=fichier                 Spécifie le fichier de sortie pour "
-#~ "un périphérique de\n"
-#~ "                  fichier spécifié précédemment (à l'aide de -d).\n"
-#~ "  -k n, --skip n Omet les « n » premières secondes\n"
-#~ "  -o, --device-option=k:v                  Passe la valeur v à l'option "
-#~ "spéciale k du périphérique\n"
-#~ "                  précédemment spécifié (à l'aide de -d). Voir la page "
-#~ "de\n"
-#~ "                  manuel pour plus de détails.\n"
-#~ "  -b n, --buffer n\n"
-#~ "                 Utilise un tampon d'entrée de « n » kilooctets\n"
-#~ "  -p n, --prebuffer n\n"
-#~ "                 Charger n%% du tampon d'entrée avant de jouer\n"
-#~ "  -v, --verbose  Afficher les progrès et autres informations d'état\n"
-#~ "  -q, --quiet    N'affiche rien du tout (pas de titre)\n"
-#~ "  -x n, --nth    Joue chaque «n»ième bloc\n"
-#~ "  -y n, --ntimes Répète chaque bloc joué « n » fois\n"
-#~ "  -z, --shuffle  Ordre aléatoire\n"
-#~ "\n"
-#~ "ogg123 passera à la chanson suivante à la réception de SIGINT (Ctrl-C) ;\n"
-#~ "Deux SIGINT en moins de s millisecondes et ogg123 s'arrêtera.\n"
-#~ "  -l, --delay=s  Fixe s [millisecondes] (500 par défaut).\n"
-
-#~ msgid "Track number:"
-#~ msgstr "Numéro de chanson :"
-
-#~ msgid "ReplayGain (Track):"
-#~ msgstr "ReplayGain (Morceau) :"
-
-#~ msgid "ReplayGain (Album):"
-#~ msgstr "ReplayGain (Album) :"
-
-#~ msgid "ReplayGain (Track) Peak:"
-#~ msgstr "ReplayGain de crête (Morceau) :"
-
-#~ msgid "ReplayGain (Album) Peak:"
-#~ msgstr "ReplayGain de crête (Album) :"
-
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
-#~ msgid "Comment:"
-#~ msgstr "Commentaire :"
-
-#~ msgid "Version is %d"
-#~ msgstr "Version est %d"
-
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " General:\n"
-#~ " -Q, --quiet          Produce no output to stderr\n"
-#~ " -h, --help           Print this help text\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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --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"
-#~ " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-#~ "                      encoding for a fixed-size channel.\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"
-#~ "                      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"
-#~ " --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"
-#~ "\n"
-#~ " Naming:\n"
-#~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times.\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 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"
-#~ " Alternatively, the --raw option may be used to use a raw PCM data file, "
-#~ "which\n"
-#~ " must be 16bit stereo little-endian PCM ('headerless wav'), unless "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an outfile filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] entrée.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS :\n"
-#~ " Géneral :\n"
-#~ " -Q, --quiet          Ne rien afficher sur stderr\n"
-#~ " -h, --help           Afficher ce message d'aide\n"
-#~ " -r, --raw            Mode brut. Les fichiers d'entrée sont des données "
-#~ "PCM\n"
-#~ " -B, --raw-bits=n     Indique bits/échantillon pour l'entrée brute. Par "
-#~ "défaut : 16\n"
-#~ " -C, --raw-chan=n     Indique le nombre de canaux pour l'entrée brute. "
-#~ "Par défaut : 2\n"
-#~ " -R, --raw-rate=n     Indique échantillon/sec pour l'entrée brute. Par "
-#~ "défaut : 44100\n"
-#~ " --raw-endianness     1 pour grand-boutiste (bigendian), 0 pour petit-"
-#~ "boutiste.\n"
-#~ "                      Par défaut : 0\n"
-#~ " -b, --bitrate        Choisi un débit nominal auquel encoder. Essaye "
-#~ "d'encoder à ce\n"
-#~ "                      débit en moyenne. Prend un argument en kbps. Cela "
-#~ "utilise\n"
-#~ "                      le mécanisme de gestion du débit et n'est pas "
-#~ "conseillé à \n"
-#~ "                      tout le monde. Voir -q pour une meilleure "
-#~ "solution.\n"
-#~ " -m, --min-bitrate    Indique le débit minimum (en kbps). Utile pour "
-#~ "encoder \n"
-#~ "                      pour un canal de taille fixe.\n"
-#~ " -M, --max-bitrate    Indique le débit minimum (en kbps). Utile les "
-#~ "applications\n"
-#~ "                      de diffusion en flux (streaming).\n"
-#~ " -q, --quality        Indique une qualité entre 0 (basse) et 10 (haute), "
-#~ "au lieu\n"
-#~ "                      d'indiquer un débit particulier. C'est le mode "
-#~ "normal.\n"
-#~ "                      Les quantités fractionnaires (comme 2,75) sont "
-#~ "possibles.\n"
-#~ "                      La qualité -1 est aussi possible mais peut ne pas "
-#~ "être\n"
-#~ "                      d'une qualité acceptable.\n"
-#~ " --resample n         Rééchantillone les données en entrée à n Hz.\n"
-#~ " --downmix            Démultiplexe de la stéréo vers le mono. Possible "
-#~ "uniquement \n"
-#~ "                      pour des données en stéréo.\n"
-#~ " -s, --serial         Indique le numéro de série du flux. Lors de "
-#~ "l'encodage de\n"
-#~ "                      plusieurs fichiers, ceci sera incrémenté de 1 pour "
-#~ "chacun \n"
-#~ "                      d'entre eux après le premier.\n"
-#~ "\n"
-#~ " Nommage :\n"
-#~ " -o, --output=fich    Écrit dans fich (uniquement pour écrire un seul "
-#~ "fichier)\n"
-#~ " -n, --names=chaîne   Produit des noms de fichier à partir de cette "
-#~ "chaîne, avec\n"
-#~ "                      %%a, %%t, %%l, %%n, %%d remplacés respectivement "
-#~ "par \n"
-#~ "                      artiste, titre, album, numéro de chanson et date\n"
-#~ "                      (voir plus bas pour les spécifications).\n"
-#~ "                      %%%% donne un %% littéral.\n"
-#~ " -X, --name-remove=s  Retire les caractères indiqués des arguments passés "
-#~ "à la\n"
-#~ "                      chaîne de formatage de -n. Pratique pour s'assurer "
-#~ "de noms \n"
-#~ "                      de fichiers légaux.\n"
-#~ " -P, --name-replace=s Remplace les caractères retirés avec --name-remove "
-#~ "par ceux\n"
-#~ "                      spécifier. Si cette chaîne est plus courte que "
-#~ "celle passée à\n"
-#~ "                      l'option précédente ou si elle est omise, les "
-#~ "caractères \n"
-#~ "                      supplémentaires sont simplement supprimés.\n"
-#~ "                      Les réglages par défaut de ces deux arguments "
-#~ "dépendent de la\n"
-#~ "                      plate-forme.\n"
-#~ " -c, --comment=c      Ajoute la chaîne indiquée en commentaire "
-#~ "supplémentaire. Cette\n"
-#~ "                      option peut être utilisé plusieurs fois.\n"
-#~ " -d, --date           Date du morceau (habituellement, date "
-#~ "d'enregistrement)\n"
-#~ " -N, --tracknum       Numéro du morceau \n"
-#~ " -t, --title          Titre du morceau\n"
-#~ " -l, --album          Nom de l'album\n"
-#~ " -a, --artist         Nom de l'artiste\n"
-#~ " -G, --genre          Genre du morceau\n"
-#~ "                      Si plusieurs fichiers d'entrées sont utilisés, "
-#~ "plusieurs\n"
-#~ "                      instances des 5 arguments précédents vont être "
-#~ "utilisés\n"
-#~ "                      dans l'ordre où ils sont donnés. \n"
-#~ "                      Si vous spécifiez moins de titre qu'il n'y a de "
-#~ "fichiers, \n"
-#~ "                      OggEnc affichera un avertissement et réutilisera "
-#~ "le \n"
-#~ "                      dernier donné pour les suivants.\n"
-#~ "                      Si vous spécifiez moins de numéro de morceau que "
-#~ "de \n"
-#~ "                      fichiers, les suivants ne seront pas numérotés.\n"
-#~ "                      Pour les autres tags, la dernière valeur donnée "
-#~ "sera\n"
-#~ "                      réutilisée sans avertissement (vous pouvez donc "
-#~ "spécifier\n"
-#~ "                      la date une seule fois et la voir utilisée pour "
-#~ "tous les\n"
-#~ "                      fichiers)\n"
-#~ "\n"
-#~ "FICHIERS D'ENTRÉE :\n"
-#~ " Les fichiers d'entrée d'OggEnc doivent actuellement être des fichiers "
-#~ "PCM WAV,\n"
-#~ "   AIFF, ou AIFF/C en 16 ou 8 bit, ou bien des WAV en 32 bit et en "
-#~ "virgule\n"
-#~ "   flottante IEEE. Les fichiers peuvent être en mono ou stéréo (ou "
-#~ "comporter\n"
-#~ "   plus de canaux), et peuvent être à n'importe quel taux "
-#~ "d'échantillonnage.\n"
-#~ " Alternativement, l'option --raw permet d'utiliser un fichier PCM brut, "
-#~ "qui doit\n"
-#~ "   être un wav sans entête, c'est à dire être 16bit stéréo petit-"
-#~ "boutiste\n"
-#~ "   (little-endian), à moins que d'autres options ne soient utilisées "
-#~ "pour\n"
-#~ "   modifier le mode brut.\n"
-#~ " Il est possible d'indiquer que le fichier à traiter doit être lu depuis\n"
-#~ "   l'entrée standard en utilisant - comme nom de fichier. Dans ce cas, la "
-#~ "sortie\n"
-#~ "   est la sortie standard à moins qu'une autre destination ne soit "
-#~ "indiquée avec\n"
-#~ "   -o. \n"
-#~ "\n"
-
-#~ msgid " to "
-#~ msgstr " à "
-
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %ld bytes\n"
-#~ "\tPlayback length: %ldm:%02lds\n"
-#~ "\tAverage bitrate: %f kbps\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"
-
-#~ msgid " bytes. Corrupted ogg.\n"
-#~ msgstr " octets. Ogg corrompu.\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 ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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"
-#~ "   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 ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] fichier.ogg (pour lister les commentaires)\n"
-#~ "  vorbiscomment -a entrée.ogg sortie.ogg (pour ajouter des commentaires)\n"
-#~ "  vorbiscomment -w entrée.ogg sortie.ogg (pour modifier les "
-#~ "commentaires)\n"
-#~ "\tLors de l'écriture, un nouvel ensemble de commentaires de forme\n"
-#~ "\t'TAG=valeur' est attendu sur stdin. Cet ensemble remplacera\n"
-#~ "\tcomplètement les commentaires existants.\n"
-#~ "   -a et -w peuvent aussi s'utiliser avec un seul nom de fichier.\n"
-#~ "     Dans ce cas, un fichier temporaire sera utilisé.\n"
-#~ "   -c peut être utilisé pour lire les commentaires depuis le \n"
-#~ "     fichier spécifié à la place de stdin.\n"
-#~ "   Exemple : vorbiscomment -a entrée.ogg -c commentaires.txt\n"
-#~ "     Ceci ajoutera les commentaires contenus dans commentaires.txt\n"
-#~ "     à ceux déjà présents dans entrée.ogg\n"
-#~ "   Enfin, vous pouvez spécifier des tags additionnels grâce à l'option\n"
-#~ "     de ligne de commande -t. Par exemple :\n"
-#~ "     vorbiscomment -a entrée.ogg -t \"ARTIST=Un mec\" -t \"TITLE=Un titre"
-#~ "\"\n"
-#~ "     (remarquez qu'utiliser ceci empêche de lire les commentaires depuis\n"
-#~ "     l'entrée standard ou depuis un fichier)\n"
-#~ "   Le mode brut (--raw, -R) permet de lire et d'écrire les commentaires\n"
-#~ "      en utf8 au lieu de les convertir dans l'encodage de l'utilisateur.\n"
-#~ "      C'est pratique pour utiliser vorbiscomment dans des scripts, mais \n"
-#~ "      ce n'est pas suffisant pour résoudre les problèmes d'encodage dans\n"
-#~ "      tous les cas.\n"

Modified: trunk/vorbis-tools/po/hr.po
===================================================================
--- trunk/vorbis-tools/po/hr.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/hr.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -5,8 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 0.99.1.3.1\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2002-02-05 10:31+0100\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,16 +15,18 @@
 "Plural-Forms: nplurals=2; plural=(n==1?0:1);\n"
 "X-Generator: TransDict server\n"
 
-#: ogg123/buffer.c:117
-#, c-format
+#: ogg123/buffer.c:107
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr ""
 
-#: ogg123/buffer.c:360
-#, c-format
+#: ogg123/buffer.c:338
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr ""
 
+#: ogg123/buffer.c:357
+msgid "malloc"
+msgstr ""
+
 #: ogg123/callbacks.c:75
 msgid "Error: Device not available.\n"
 msgstr ""
@@ -70,928 +71,573 @@
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr ""
 
-#: ogg123/callbacks.c:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:127 ogg123/callbacks.c:132
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr ""
 
-#: ogg123/callbacks.c:174
+#: ogg123/callbacks.c:175
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr ""
 
-#: ogg123/callbacks.c:233
+#: ogg123/callbacks.c:234
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr ""
 
-#: ogg123/callbacks.c:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: ogg123/callbacks.c:280 ogg123/callbacks.c:299 ogg123/callbacks.c:336 ogg123/callbacks.c:355
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:134
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Ime"
 
-#: ogg123/cfgfile_options.c:137
+#. Description
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Opis"
 
-#: ogg123/cfgfile_options.c:140
+#. Type
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Tip"
 
-#: ogg123/cfgfile_options.c:143
+#. Default
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: ogg123/cfgfile_options.c:169
-#, c-format
+#: ogg123/cfgfile_options.c:165
 msgid "none"
 msgstr "ništa"
 
-#: ogg123/cfgfile_options.c:172
-#, c-format
+#: ogg123/cfgfile_options.c:168
 msgid "bool"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:175
-#, c-format
+#: ogg123/cfgfile_options.c:171
 msgid "char"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:178
-#, c-format
+#: ogg123/cfgfile_options.c:174
 msgid "string"
 msgstr "niz znakova"
 
-#: ogg123/cfgfile_options.c:181
-#, c-format
+#: ogg123/cfgfile_options.c:177
 msgid "int"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:184
-#, c-format
+#: ogg123/cfgfile_options.c:180
 msgid "float"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:187
-#, c-format
+#: ogg123/cfgfile_options.c:183
 msgid "double"
 msgstr "dvostruki"
 
-#: ogg123/cfgfile_options.c:190
-#, c-format
+#: ogg123/cfgfile_options.c:186
 msgid "other"
 msgstr "drugi"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:465 oggenc/oggenc.c:470 oggenc/oggenc.c:475 oggenc/oggenc.c:480 oggenc/oggenc.c:485 oggenc/oggenc.c:490
 msgid "(none)"
 msgstr "(nijedan)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Uspjeh"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Ključ nije pronađen"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Nema ključa"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Neispravna vrijednost"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Neispravni tip u popisu opcija"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ogg123/cmdline_options.c:83
-msgid "Internal error parsing command line options.\n"
+#: ogg123/cmdline_options.c:69
+msgid "Internal error: long option given when none expected.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:75
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr ""
 
-#: ogg123/cmdline_options.c:102
+#: ogg123/cmdline_options.c:87
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
 "=== Option was: %s\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:109
-#, c-format
+#. not using the status interface here
+#: ogg123/cmdline_options.c:94
 msgid "Available options:\n"
 msgstr "Raspoložive opcije:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:103
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:123
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:143
+#: ogg123/cmdline_options.c:128
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:143
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:158
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:173
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 iz %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:180
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:216
+#: ogg123/cmdline_options.c:188
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:232
+#: ogg123/cmdline_options.c:215
 #, c-format
-msgid "--- Cannot open playlist file %s.  Skipped.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:248
-msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:261
-#, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
+#: ogg123/cmdline_options.c:225
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:292
+#: ogg123/cmdline_options.c:246
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiphophorus Team (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Raspoložive opcije:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:267
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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"
+"  -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"
 "\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"
 msgstr ""
 
-#: ogg123/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Datoteka: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Raspoložive opcije:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, c-format
-msgid "Input options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Opis"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Raspoložive opcije:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:207 ogg123/oggvorbis_format.c:109
 msgid "Error: Out of memory.\n"
 msgstr "Greška: Nedovoljno memorije.\n"
 
-#: ogg123/format.c:82
-#, c-format
+#: ogg123/format.c:59
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr ""
 
-#: ogg123/http_transport.c:145
+#: ogg123/http_transport.c:119
+msgid "Error: Out of memory in new_curl_thread_arg().\n"
+msgstr ""
+
+#: ogg123/http_transport.c:144
 msgid "Error: Could not set signal mask."
 msgstr ""
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:196
 msgid "Error: Unable to create input buffer.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:82
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:72
 msgid "default output device"
 msgstr ""
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:74
 msgid "shuffle playlist"
 msgstr ""
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
+#: ogg123/ogg123.c:255
 #, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr ""
-
-#: ogg123/ogg123.c:378
-#, c-format
 msgid ""
 "\n"
-"Audio Device:   %s"
+"Device:   %s"
 msgstr ""
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:256
 #, c-format
 msgid "Author:   %s"
 msgstr "Autor:   %s"
 
-#: ogg123/ogg123.c:380
-#, fuzzy, c-format
-msgid "Comments: %s"
+#: ogg123/ogg123.c:257
+#, c-format
+msgid "Comments: %s\n"
 msgstr "Komentari: %s\n"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
-#, c-format
-msgid "Warning: Could not read directory %s.\n"
-msgstr ""
-
-#: ogg123/ogg123.c:460
+#: ogg123/ogg123.c:313
 msgid "Error: Could not create audio buffer.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:387
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:561
+#: ogg123/ogg123.c:392
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Ne mogu otvoriti %s.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:398
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:577
+#: ogg123/ogg123.c:405
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:596
+#: ogg123/ogg123.c:430
 #, c-format
 msgid "Playing: %s"
 msgstr "Reproduciram: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:435
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr ""
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:473
 msgid "Error: Decoding failure.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:705
-msgid "Error: buffer write failed.\n"
-msgstr ""
-
-#: ogg123/ogg123.c:743
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:546
 msgid "Done."
 msgstr "Gotovo."
 
-#: ogg123/oggvorbis_format.c:157
-msgid "--- Hole in the stream; probably harmless\n"
-msgstr ""
-
-#: ogg123/oggvorbis_format.c:163
-msgid "=== Vorbis library reported a stream error.\n"
-msgstr ""
-
-#: ogg123/oggvorbis_format.c:310
+#: ogg123/oggvorbis_format.c:50
 #, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr ""
+msgid "Artist: %s"
+msgstr "Umjetnik: %s"
 
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:51
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr ""
+msgid "Album: %s"
+msgstr "Album: %s"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:52
 #, c-format
-msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
-msgstr ""
+msgid "Title: %s"
+msgstr "Naslov: %s"
 
-#: ogg123/oggvorbis_format.c:327
+#: ogg123/oggvorbis_format.c:53
 #, c-format
-msgid "Encoded by: %s"
-msgstr "Enkodirao: %s"
+msgid "Version: %s"
+msgstr "Inačica: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, fuzzy, c-format
-msgid "Error: Out of memory in create_playlist_member().\n"
-msgstr "Greška: Nedovoljno memorije.\n"
-
-#: ogg123/playlist.c:222
+#: ogg123/oggvorbis_format.c:54
 #, c-format
-msgid "Warning from playlist %s: Could not read directory %s.\n"
-msgstr ""
+msgid "Track number: %s"
+msgstr "Broj pjesme: %s"
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
-#, fuzzy, c-format
-msgid "Error: Out of memory in playlist_to_array().\n"
-msgstr "Greška: Nedovoljno memorije.\n"
-
-#: ogg123/status.c:60
+#: ogg123/oggvorbis_format.c:55
 #, c-format
-msgid "%sPrebuf to %.1f%%"
-msgstr ""
+msgid "Organization: %s"
+msgstr "Organizacija: %s"
 
-#: ogg123/status.c:65
+#: ogg123/oggvorbis_format.c:56
 #, c-format
-msgid "%sPaused"
-msgstr ""
+msgid "Genre: %s"
+msgstr "Žanr: %s"
 
-#: ogg123/status.c:69
+#: ogg123/oggvorbis_format.c:57
 #, c-format
-msgid "%sEOS"
-msgstr ""
+msgid "Description: %s"
+msgstr "Opis: %s"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
+#: ogg123/oggvorbis_format.c:58
 #, c-format
-msgid "Memory allocation error in stats_init()\n"
-msgstr ""
+msgid "Date: %s"
+msgstr "Nadnevak: %s"
 
-#: ogg123/status.c:211
+#: ogg123/oggvorbis_format.c:59
 #, c-format
-msgid "File: %s"
-msgstr "Datoteka: %s"
+msgid "Location: %s"
+msgstr "Mjesto: %s"
 
-#: ogg123/status.c:217
+#: ogg123/oggvorbis_format.c:60
 #, c-format
-msgid "Time: %s"
-msgstr "Vrijeme: %s"
+msgid "Copyright %s"
+msgstr "Autorska prava %s"
 
-#: ogg123/status.c:245
+#: ogg123/oggvorbis_format.c:61
 #, c-format
-msgid "of %s"
-msgstr ""
+msgid "Comment: %s"
+msgstr "Komentar: %s"
 
-#: ogg123/status.c:265
-#, c-format
-msgid "Avg bitrate: %5.1f"
+#: ogg123/oggvorbis_format.c:170
+msgid "--- Hole in the stream; probably harmless\n"
 msgstr ""
 
-#: ogg123/status.c:271
-#, c-format
-msgid " Input Buffer %5.1f%%"
+#: ogg123/oggvorbis_format.c:176
+msgid "=== Vorbis library reported a stream error.\n"
 msgstr ""
 
-#: ogg123/status.c:290
+#: ogg123/oggvorbis_format.c:370
 #, c-format
-msgid " Output Buffer %5.1f%%"
-msgstr ""
+msgid "Version is %d"
+msgstr "Inačica je %d"
 
-#: ogg123/transport.c:71
+#: ogg123/oggvorbis_format.c:374
 #, c-format
-msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
+msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr ""
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 iz %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
+#: ogg123/oggvorbis_format.c:382
 #, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
+msgid "Bitstream is %d channel, %ldHz"
 msgstr ""
 
-#: oggdec/oggdec.c:57
+#: ogg123/oggvorbis_format.c:387
 #, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr ""
+msgid "Encoded by: %s"
+msgstr "Enkodirao: %s"
 
-#: oggdec/oggdec.c:58
+#: ogg123/status.c:47
 #, c-format
-msgid "Supported options:\n"
+msgid "%sPrebuf to %1.f%%"
 msgstr ""
 
-#: oggdec/oggdec.c:59
+#: ogg123/status.c:52
 #, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
+msgid "%sPaused"
 msgstr ""
 
-#: oggdec/oggdec.c:60
+#: ogg123/status.c:56
 #, c-format
-msgid " --help,  -h      Produce this help message.\n"
+msgid "%sEOS"
 msgstr ""
 
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
+#: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223 ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
+msgid "Memory allocation error in stats_init()\n"
 msgstr ""
 
-#: oggdec/oggdec.c:62
+#: ogg123/status.c:198
 #, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
+msgid "File: %s"
+msgstr "Datoteka: %s"
 
-#: oggdec/oggdec.c:63
+#: ogg123/status.c:204
 #, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
+msgid "Time: %s"
+msgstr "Vrijeme: %s"
 
-#: oggdec/oggdec.c:65
+#: ogg123/status.c:232
 #, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
+msgid "of %s"
 msgstr ""
 
-#: oggdec/oggdec.c:67
+#: ogg123/status.c:252
 #, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
+msgid "Avg bitrate: %5.1f"
 msgstr ""
 
-#: oggdec/oggdec.c:68
+#: ogg123/status.c:258
 #, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
+msgid " Input Buffer %5.1f%%"
 msgstr ""
 
-#: oggdec/oggdec.c:114
+#: ogg123/status.c:277
 #, c-format
-msgid "Internal error: Unrecognised argument\n"
+msgid " Output Buffer %5.1f%%"
 msgstr ""
 
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
+#: ogg123/transport.c:59
+msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr ""
 
-#: oggdec/oggdec.c:195
-#, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:217
-#, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:266
-#, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr ""
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, c-format
-msgid "Error writing to file: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:371
-#, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-
-#: oggdec/oggdec.c:376
-#, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:38
 msgid "WAV file reader"
 msgstr ""
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:39
 msgid "AIFF/AIFC file reader"
 msgstr ""
 
-#: oggenc/audio.c:53
-msgid "FLAC file reader"
-msgstr ""
-
-#: oggenc/audio.c:54
-msgid "Ogg FLAC file reader"
-msgstr ""
-
-#: oggenc/audio.c:131 oggenc/audio.c:425
-#, c-format
+#: oggenc/audio.c:112 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr ""
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:123
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr ""
 
-#: oggenc/audio.c:168
-#, c-format
+#: oggenc/audio.c:141
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr ""
 
-#: oggenc/audio.c:254
-#, c-format
+#: oggenc/audio.c:226
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr ""
 
-#: oggenc/audio.c:260
-#, c-format
+#: oggenc/audio.c:232
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:268
-#, c-format
+#: oggenc/audio.c:240
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:283
-#, c-format
+#: oggenc/audio.c:253
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr ""
 
-#: oggenc/audio.c:297
-#, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
+#: oggenc/audio.c:258
+msgid "Warning: Can't handle compressed AIFF-C\n"
 msgstr ""
 
-#: oggenc/audio.c:304
-#, c-format
+#: oggenc/audio.c:265
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr ""
 
-#: oggenc/audio.c:310
-#, c-format
+#: oggenc/audio.c:271
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:316
-#, c-format
+#: oggenc/audio.c:277
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:353
+#: oggenc/audio.c:290 oggenc/audio.c:417
 #, c-format
 msgid ""
+"Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
+" At other than 44.1/48 kHz quality will be degraded.\n"
+msgstr ""
+
+#: oggenc/audio.c:314
+msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
 " Must be 8 or 16 bit PCM.\n"
 msgstr ""
 
-#: oggenc/audio.c:407
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr ""
 
-#: oggenc/audio.c:420
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
 msgstr ""
 
-#: oggenc/audio.c:458
-#, c-format
+#: oggenc/audio.c:406
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
-" or type 3 floating point PCM)\n"
+" or type 3 floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:467
-#, c-format
+#: oggenc/audio.c:460
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:528
+#: oggenc/audio.c:558
 #, c-format
 msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
+"Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
+" At other than 44.1/48 kHz quality will be significantly degraded.\n"
 msgstr ""
 
-#: oggenc/audio.c:604
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:624
-#, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:630
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:732
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-
-#: oggenc/audio.c:750
-#, c-format
-msgid "Couldn't initialise resampler\n"
-msgstr ""
-
-#: oggenc/encode.c:64
-#, c-format
-msgid "Setting advanced encoder option \"%s\" to %s\n"
-msgstr ""
-
-#: oggenc/encode.c:101
-#, c-format
-msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
-msgstr ""
-
-#: oggenc/encode.c:104
-#, fuzzy, c-format
-msgid "Unrecognised advanced option \"%s\"\n"
-msgstr "%s: neprepoznata opcija `--%s'\n"
-
-#: oggenc/encode.c:111
-#, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:115 oggenc/encode.c:252
-#, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-
-#: oggenc/encode.c:182
-#, c-format
-msgid "Requesting a minimum or maximum bitrate requires --managed\n"
-msgstr ""
-
-#: oggenc/encode.c:200
-#, c-format
+#: oggenc/encode.c:59
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 
-#: oggenc/encode.c:245
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:247
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:263
-#, c-format
+#: oggenc/encode.c:71
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:110
 msgid "Failed writing header to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:178
 msgid "Failed writing data to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:472
+#: oggenc/encode.c:224
 #, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 msgstr ""
 
-#: oggenc/encode.c:482
+#: oggenc/encode.c:234
 #, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr ""
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:252
 #, c-format
 msgid ""
 "\n"
@@ -999,1046 +645,412 @@
 "Done encoding file \"%s\"\n"
 msgstr ""
 
-#: oggenc/encode.c:502
-#, c-format
+#: oggenc/encode.c:254
 msgid ""
 "\n"
 "\n"
 "Done encoding.\n"
 msgstr ""
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:258
 #, c-format
 msgid ""
 "\n"
 "\tFile length:  %dm %04.1fs\n"
 msgstr ""
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:262
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr ""
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:265
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr ""
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:266
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
 "\n"
 msgstr ""
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:290
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at average bitrate %d kbps "
+"         %s%s%s at quality %2.2f\n"
 msgstr ""
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:291 oggenc/encode.c:298
 msgid "standard input"
 msgstr ""
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:292 oggenc/encode.c:299
 msgid "standard output"
 msgstr ""
 
-#: oggenc/encode.c:559
+#: oggenc/encode.c:295
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at approximate bitrate %d kbps (VBR encoding enabled)\n"
+"         %s%s%s at bitrate %d kbps,\n"
+"using full bitrate management engine\n"
 msgstr ""
 
-#: oggenc/encode.c:567
+#: oggenc/oggenc.c:90
 #, c-format
 msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at quality level %2.2f using constrained VBR "
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 
-#: oggenc/encode.c:574
-#, c-format
-msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at quality %2.2f\n"
-msgstr ""
-
-#: oggenc/encode.c:580
-#, c-format
-msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"using bitrate management "
-msgstr ""
-
-#: oggenc/oggenc.c:103
-#, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:118
-#, c-format
+#: oggenc/oggenc.c:105
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr ""
 
-#: oggenc/oggenc.c:125
-#, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
+#: oggenc/oggenc.c:112
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:166
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:202
-msgid "RAW file reader"
-msgstr ""
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:193
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:202
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr ""
 
-#: oggenc/oggenc.c:280
-#, c-format
+#: oggenc/oggenc.c:249
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:257
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:295
+#: oggenc/oggenc.c:268
 #, c-format
-msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:306
-#, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:350
-#, c-format
-msgid "Resampling input from %d Hz to %d Hz\n"
-msgstr ""
-
-#: oggenc/oggenc.c:357
-#, c-format
-msgid "Downmixing stereo to mono\n"
-msgstr ""
-
-#: oggenc/oggenc.c:360
-#, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
-msgstr ""
-
-#: oggenc/oggenc.c:368
-#, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 iz %s %s\n"
-
-#: oggenc/oggenc.c:416
-#, c-format
+#: oggenc/oggenc.c:316
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"WARNING: Usage of the bitrate options (-b, -m, -M) has been deprecated\n"
+"To use these, you must specify that you wish to use managed mode, using\n"
+"the --managed option.\n"
+"This will cause oggenc to enable the full bitrate management engine.\n"
+"You should do this ONLY if bitrate management is critical to your usage\n"
+"(for example, certain audio streaming applications).\n"
+"Usage of the bitrate management engine will generally decrease quality,\n"
+"using the normal fully VBR modes (quality specified using -q) is\n"
+"very highly recommended for most users.\n"
+"Usage of the -managed option will become MANDATORY in the next release.\n"
 "\n"
 msgstr ""
 
-#: oggenc/oggenc.c:417
+#: oggenc/oggenc.c:331
 #, c-format
 msgid ""
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
+"\n"
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\n"
-" --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
+" -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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\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. 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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
+"                      argument in kbps.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel. Using this will\n"
-"                      automatically enable managed bitrate mode (see\n"
-"                      --managed).\n"
+"                      encoding for a fixed-size channel.\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications. Using this will automatically\n"
-"                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
-" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
-"                      high), instead of specifying a particular bitrate.\n"
+"                      streaming applications.\n"
+" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
+"                      instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
-" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
-"                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
-"                      used multiple times. The argument should be in the\n"
-"                      format \"tag=value\".\n"
+"                      used multiple times.\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\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 "
-"additional\n"
+" OggEnc input files must currently be 16 or 8 bit PCM WAV, AIFF, or AIFF/C\n"
+" files. Files may be mono or stereo (or more channels) and any sample rate.\n"
+" However, the encoder is only tuned for rates of 44.1 and 48 kHz and while\n"
+" other rates will be accepted quality will be significantly degraded.\n"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
-" In this mode, output is to stdout unless an output filename is specified\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:495
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
-#, c-format
+#: oggenc/oggenc.c:518
 msgid "Enabling bitrate management engine\n"
 msgstr ""
 
-#: oggenc/oggenc.c:661
-#, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:664
-#, c-format
-msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:671
-#, c-format
-msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:677
-#, c-format
-msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
-msgstr ""
-
-#: oggenc/oggenc.c:687
-#, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:700
-#, c-format
-msgid "No value for advanced encoder option found\n"
-msgstr ""
-
-#: oggenc/oggenc.c:718
-#, c-format
+#: oggenc/oggenc.c:522
 msgid "Internal error parsing command line options\n"
 msgstr ""
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:569
 #, c-format
-msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:766
-#, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:582
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:594
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:600
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr ""
 
-#: oggenc/oggenc.c:807
-#, c-format
+#: oggenc/oggenc.c:607
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:813
-#, c-format
+#: oggenc/oggenc.c:612
+msgid "WARNING: negative quality specified, setting to minimum.\n"
+msgstr ""
+
+#: oggenc/oggenc.c:618
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:822
-#, c-format
+#: oggenc/oggenc.c:627
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:831
-#, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
+#: oggenc/oggenc.c:636
+msgid "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:839
-#, c-format
+#: oggenc/oggenc.c:644
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 iz %s %s\n"
-
-#: oggenc/oggenc.c:858
-#, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:663
+msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
-#, c-format
+#. Failed, so just set to 16
+#: oggenc/oggenc.c:668 oggenc/oggenc.c:672
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:874
-#, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
+#: oggenc/oggenc.c:679
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:879
-#, c-format
+#. Failed, so just set to 2
+#: oggenc/oggenc.c:684
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:890
-#, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:695
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:895
-#, c-format
+#. Failed, so just set to 44100
+#: oggenc/oggenc.c:700
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:902
-#, c-format
+#: oggenc/oggenc.c:704
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr ""
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr ""
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
-#, c-format
+#: oggenc/oggenc.c:726
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:954
-#, c-format
+#: oggenc/oggenc.c:745
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:139
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:146
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr ""
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:157
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:212
+#: ogginfo/ogginfo.c:33
 #, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
+msgid "Usage: %s [filename1.ogg] ... [filenameN.ogg]\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo.c:38
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgid "filename=%s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo.c:68
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
+msgid "vendor=%s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:266
+#: ogginfo/ogginfo.c:70
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+"version=%d\n"
+"channels=%d\n"
+"rate=%ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:342
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
+#: ogginfo/ogginfo.c:75
+msgid "bitrate_upper="
 msgstr ""
 
-#: ogginfo/ogginfo2.c:356
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+#: ogginfo/ogginfo.c:77 ogginfo/ogginfo.c:83 ogginfo/ogginfo.c:89
+msgid "none\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
+#: ogginfo/ogginfo.c:81
+msgid "bitrate_nominal="
 msgstr ""
 
-#: ogginfo/ogginfo2.c:389
-#, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+#: ogginfo/ogginfo.c:87
+msgid "bitrate_lower="
 msgstr ""
 
-#: ogginfo/ogginfo2.c:396
+#: ogginfo/ogginfo.c:91
 #, 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"
+msgid "%ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:400
+#: ogginfo/ogginfo.c:100
 #, c-format
-msgid "Theora headers parsed for stream %d, information follows...\n"
+msgid "bitrate_average=%ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:403
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Inačica: %s"
-
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
-#, fuzzy, c-format
-msgid "Vendor: %s\n"
-msgstr "Žanr: %s"
-
-#: ogginfo/ogginfo2.c:406
+#: ogginfo/ogginfo.c:101
 #, c-format
-msgid "Width: %d\n"
+msgid "length=%f\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:407
+#: ogginfo/ogginfo.c:102
 #, c-format
-msgid "Height: %d\n"
+msgid "playtime=%ld:%02ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:408
+#: ogginfo/ogginfo.c:300
 #, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
+msgid "Unable to open \"%s\": %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:411
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:416
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
+#: ogginfo/ogginfo.c:319
 #, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:429
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:431
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:433
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:437
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:439
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:441
-msgid "Colourspace unspecified\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:444
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:446
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:448
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:450
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:452
-#, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:453
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
-msgid "User comments section follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:477
-msgid "Warning: Expected frame %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:520
 msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:557
-#, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:565
-#, 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"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:569
-#, c-format
-msgid "Vorbis headers parsed for stream %d, information follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:572
-#, fuzzy, c-format
-msgid "Version: %d\n"
-msgstr "Inačica: %s"
-
-#: ogginfo/ogginfo2.c:576
-#, c-format
-msgid "Vendor: %s (%s)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:584
-#, c-format
-msgid "Channels: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:585
-#, fuzzy, c-format
-msgid ""
-"Rate: %ld\n"
 "\n"
-msgstr "Nadnevak: %s"
-
-#: ogginfo/ogginfo2.c:588
-#, c-format
-msgid "Nominal bitrate: %f kb/s\n"
+"serial=%ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:591
-msgid "Nominal bitrate not set\n"
+#: ogginfo/ogginfo.c:320
+msgid "header_integrity=pass\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:594
-#, c-format
-msgid "Upper bitrate: %f kb/s\n"
+#: ogginfo/ogginfo.c:323
+msgid "header_integrity=fail\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:597
-msgid "Upper bitrate not set\n"
+#: ogginfo/ogginfo.c:328
+msgid "stream_integrity=pass\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:600
-#, c-format
-msgid "Lower bitrate: %f kb/s\n"
+#: ogginfo/ogginfo.c:331
+msgid "stream_integrity=fail\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:603
-msgid "Lower bitrate not set\n"
+#: ogginfo/ogginfo.c:334
+msgid "stream_truncated=false\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:630
-#, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
+#: ogginfo/ogginfo.c:336
+msgid "stream_truncated=true\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:651
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:692
+#: ogginfo/ogginfo.c:344
 #, c-format
 msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:703
-#, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:734
-#, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:738
-#, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Inačica: %s"
-
-#: ogginfo/ogginfo2.c:747
-#, c-format
-msgid "Language: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Nadnevak: %s"
-
-#: ogginfo/ogginfo2.c:756
-msgid "No category set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
-#, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
-#, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:783
-msgid "Unknown text directionality\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:795
-msgid "Invalid zero granulepos rate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:797
-#, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:810
-msgid "\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:828
-#, c-format
-msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
-#, c-format
-msgid "Warning: EOS not set on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1048
-msgid "Warning: Invalid header page, no packet found\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1074
-#, c-format
-msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1088
-#, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1105
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1129
-#, c-format
-msgid "Error opening input file \"%s\": %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1134
-#, c-format
-msgid ""
-"Processing file \"%s\"...\n"
 "\n"
+"total_length=%f\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1143
-msgid "Could not find a processor for stream, bailing\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1151
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1158
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1161
+#: ogginfo/ogginfo.c:345
 #, c-format
-msgid ""
-"Warning: illegally placed page(s) for logical stream %d\n"
-"This indicates a corrupt ogg file: %s.\n"
+msgid "total_playtime=%ld:%02ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1173
-#, c-format
-msgid "New logical stream (#%d, serial: %08x): type %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1176
-#, c-format
-msgid "Warning: stream start flag not set on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1180
-#, c-format
-msgid "Warning: stream start flag found in mid-stream on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1185
-#, 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:1200
-#, c-format
-msgid "Logical stream %d ended\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1208
-#, c-format
-msgid ""
-"Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 iz %s %s\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, c-format
-msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
-"\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
-"Flags supported:\n"
-"\t-h Show this help message\n"
-"\t-q Make less verbose. Once will remove detailed informative\n"
-"\t   messages, two will remove warnings\n"
-"\t-v Make more verbose. This may enable more detailed checks\n"
-"\t   for some stream types.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1234
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, c-format
-msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
-"\n"
-"ogginfo is a tool for printing information about Ogg files\n"
-"and for diagnosing problems with them.\n"
-"Full help shown with \"ogginfo -h\".\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1280
-#, c-format
-msgid "No input files specified. \"ogginfo -h\" for help\n"
-msgstr ""
-
 #: share/getopt.c:673
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -2059,16 +1071,19 @@
 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"
@@ -2079,6 +1094,7 @@
 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"
@@ -2094,418 +1110,230 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opcija `-W %s' ne dopušta argument\n"
 
-#: vcut/vcut.c:149
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr ""
 
-#: vcut/vcut.c:166
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr ""
 
-#: vcut/vcut.c:206
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr ""
 
-#: vcut/vcut.c:215
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr ""
 
-#: vcut/vcut.c:225
-#, c-format
+#: vcut/vcut.c:192
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr ""
 
-#: vcut/vcut.c:277
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr ""
 
-#: vcut/vcut.c:327
-#, c-format
-msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr ""
-
-#: vcut/vcut.c:353
-#, c-format
+#. 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:284
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
 msgstr ""
 
-#: vcut/vcut.c:373
-#, c-format
-msgid "Update sync returned 0, setting eos\n"
-msgstr ""
-
-#: vcut/vcut.c:378
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr ""
 
-#: vcut/vcut.c:387
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr ""
 
-#: vcut/vcut.c:449
-#, c-format
+#: vcut/vcut.c:330
+msgid "Update sync returned 0, setting eos\n"
+msgstr ""
+
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr ""
 
-#: vcut/vcut.c:459
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr ""
 
-#: vcut/vcut.c:464
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr ""
 
-#: vcut/vcut.c:470
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr ""
 
-#: vcut/vcut.c:490
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr ""
 
-#: vcut/vcut.c:503
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr ""
 
-#: vcut/vcut.c:535
-#, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+#: vcut/vcut.c:456
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
 msgstr ""
 
-#: vcut/vcut.c:539
-#, c-format
+#: vcut/vcut.c:460
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
 "\n"
 msgstr ""
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr ""
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr ""
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr ""
 
-#: vcut/vcut.c:570
+#: vcut/vcut.c:484
 #, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+msgid "Processing: Cutting at %lld\n"
 msgstr ""
 
-#: vcut/vcut.c:572
-#, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr ""
-
-#: vcut/vcut.c:582
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr ""
 
-#: vcut/vcut.c:604
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr ""
 
-#: vcut/vcut.c:627
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr ""
 
-#: vcut/vcut.c:635
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr ""
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
+#: vorbiscomment/vcedit.c:214
+msgid "Input truncated or empty."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
-msgid "Error reading first page of Ogg bitstream."
+#: vorbiscomment/vcedit.c:216
+msgid "Input is not an Ogg bitstream."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
-msgid "Error reading initial header packet."
+#: vorbiscomment/vcedit.c:232
+msgid "Error reading first page of Ogg bitstream."
 msgstr ""
 
 #: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
+msgid "Error reading initial header packet."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:244
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:579
-msgid "EOF before recognised stream."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:595
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:267
 msgid "Corrupt secondary header."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:288
 msgid "EOF before end of vorbis headers."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:444
 msgid "Corrupt or missing data, continuing..."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:875
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+#: vorbiscomment/vcedit.c:479
+msgid "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr ""
 
-#: vorbiscomment/vcomment.c:190 vorbiscomment/vcomment.c:216
+#: vorbiscomment/vcomment.c:100 vorbiscomment/vcomment.c:122
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:235
+#: vorbiscomment/vcomment.c:138
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:150
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:274
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:173
 msgid "no action specified\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
-msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
+#: vorbiscomment/vcomment.c:250
+msgid "Couldn't convert comment to UTF8, cannot add\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
+#: vorbiscomment/vcomment.c:268
 msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:391
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Neispravni tip u popisu opcija"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
+#: vorbiscomment/vcomment.c:339
 msgid "Internal error parsing command options\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:422
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:587
+#: vorbiscomment/vcomment.c:438
 #, c-format
-msgid "Input filename may not be the same as output filename\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:598
-#, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:453
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:470
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr ""
-
-#: vorbiscomment/vcomment.c:664
-#, c-format
-msgid "Error removing old file %s\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:666
-#, c-format
-msgid "Error renaming %s to %s\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:676
-#, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr ""
-
-#~ msgid "Artist: %s"
-#~ msgstr "Umjetnik: %s"
-
-#~ msgid "Album: %s"
-#~ msgstr "Album: %s"
-
-#~ msgid "Title: %s"
-#~ msgstr "Naslov: %s"
-
-#~ msgid "Track number: %s"
-#~ msgstr "Broj pjesme: %s"
-
-#~ msgid "Organization: %s"
-#~ msgstr "Organizacija: %s"
-
-#~ msgid "Description: %s"
-#~ msgstr "Opis: %s"
-
-#~ msgid "Location: %s"
-#~ msgstr "Mjesto: %s"
-
-#~ msgid "Copyright %s"
-#~ msgstr "Autorska prava %s"
-
-#~ msgid "Comment: %s"
-#~ msgstr "Komentar: %s"
-
-#~ msgid "Version is %d"
-#~ msgstr "Inačica je %d"

Modified: trunk/vorbis-tools/po/hu.po
===================================================================
--- trunk/vorbis-tools/po/hu.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/hu.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -5,8 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2002-07-19 22:30+1000\n"
 "PO-Revision-Date: 2004-05-07 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"
@@ -14,187 +13,185 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ogg123/buffer.c:117
-#, c-format
+#: ogg123/buffer.c:111
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Hiba: Elfogyott a memória a malloc_action()-ban.\n"
 
-#: ogg123/buffer.c:360
-#, c-format
+#: ogg123/buffer.c:344
 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:75
+#: ogg123/buffer.c:363
+msgid "malloc"
+msgstr "malloc"
+
+#: ogg123/callbacks.c:70
 msgid "Error: Device not available.\n"
 msgstr "Hiba: Eszköz nem áll rendelkezésre.\n"
 
-#: ogg123/callbacks.c:78
+#: ogg123/callbacks.c:73
 #, 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:81
+#: ogg123/callbacks.c:76
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Hiba: Nem támogatott opcióérték a %s eszköznek.\n"
 
-#: ogg123/callbacks.c:85
+#: ogg123/callbacks.c:80
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Hiba: Nem lehet megnyitni a %s eszközt.\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:84
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Hiba: %s eszköz hibás.\n"
 
-#: ogg123/callbacks.c:92
+#: ogg123/callbacks.c:87
 #, 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:95
+#: ogg123/callbacks.c:90
 #, 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:99
+#: ogg123/callbacks.c:94
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Hiba: A %s fájl már létezik.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:97
 #, 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:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
 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:174
+#: ogg123/callbacks.c:169
 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:233
+#: ogg123/callbacks.c:228
 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:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
+#: ogg123/callbacks.c:349
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
-msgstr ""
-"Hiba: Elfogyott a  memória a decoder_buffered_metadata_callback()-ban .\n"
+msgstr "Hiba: Elfogyott a  memória a decoder_buffered_metadata_callback()-ban .\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Rendszerhiba"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Értelmezési hiba: %s a(z) %d. sorban %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Név"
 
-#: ogg123/cfgfile_options.c:137
+#. Description
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Leírás"
 
-#: ogg123/cfgfile_options.c:140
+#. Type
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Típus"
 
-#: ogg123/cfgfile_options.c:143
+#. Default
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: ogg123/cfgfile_options.c:169
-#, c-format
+#: ogg123/cfgfile_options.c:165
 msgid "none"
 msgstr "nincs"
 
-#: ogg123/cfgfile_options.c:172
-#, c-format
+#: ogg123/cfgfile_options.c:168
 msgid "bool"
 msgstr "logikai"
 
-#: ogg123/cfgfile_options.c:175
-#, c-format
+#: ogg123/cfgfile_options.c:171
 msgid "char"
 msgstr "karakter"
 
-#: ogg123/cfgfile_options.c:178
-#, c-format
+#: ogg123/cfgfile_options.c:174
 msgid "string"
 msgstr "karakterlánc"
 
-#: ogg123/cfgfile_options.c:181
-#, c-format
+#: ogg123/cfgfile_options.c:177
 msgid "int"
 msgstr "egész"
 
-#: ogg123/cfgfile_options.c:184
-#, c-format
+#: ogg123/cfgfile_options.c:180
 msgid "float"
 msgstr "lengõpontos szám"
 
-#: ogg123/cfgfile_options.c:187
-#, c-format
+#: ogg123/cfgfile_options.c:183
 msgid "double"
 msgstr "duplapontos"
 
-#: ogg123/cfgfile_options.c:190
-#, c-format
+#: ogg123/cfgfile_options.c:186
 msgid "other"
 msgstr "más"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:506 oggenc/oggenc.c:511
+#: oggenc/oggenc.c:516 oggenc/oggenc.c:521 oggenc/oggenc.c:526
+#: oggenc/oggenc.c:531
 msgid "(none)"
 msgstr "(nincs)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Sikerült"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Kulcs nem található"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Nincs kulcs"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Rossz érték"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Rossz típus az opciók között"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:74
 msgid "Internal error parsing command line options.\n"
 msgstr "Belsõ hiba a parancssori opciók elemzése során\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:81
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Bevitel puffer mérete kisebb, mint %d kB."
 
-#: ogg123/cmdline_options.c:102
+#: ogg123/cmdline_options.c:93
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -203,45 +200,44 @@
 "===Hiba \"%s\" a parancssori opciók értelmezése közben.\n"
 "===A hibás opció: %s\n"
 
-#: ogg123/cmdline_options.c:109
-#, c-format
+#. not using the status interface here
+#: ogg123/cmdline_options.c:100
 msgid "Available options:\n"
 msgstr "Rendelkezésre álló opciók:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:109
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Nincs ilyen eszköz: %s.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:129
 #, 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:143
+#: ogg123/cmdline_options.c:134
 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"
+msgstr "=== Nem lehet meghatározni a kimeneti fájlt meghajtó meghatározása nélkül.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:149
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "==== Érvénytelen kimeneti formátum: %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:164
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "---  Elõbuffer értéke érvénytelen. Érvényes tartomány: 0-100.\n"
 
-#: ogg123/cmdline_options.c:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:179
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 a %s %s -ból\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:186
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Nem lehet lejátszani a 0-dik csonkokat!\n"
 
-#: ogg123/cmdline_options.c:216
+#: ogg123/cmdline_options.c:194
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -249,253 +245,112 @@
 "--- Nem lehet lejátszani minden csonkot 0-szor.\n"
 "--- A dekódólás kipróbálásához használja a null kimeneti meghajtót.\n"
 
-#: ogg123/cmdline_options.c:232
+#: ogg123/cmdline_options.c:206
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Nem lehet megnyitni a lejátszandó számok fájlját: %s. Átugorva.\n"
 
-#: ogg123/cmdline_options.c:248
-msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:227
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
-msgstr ""
-"--- A konfigurációs állományban meghatározott %s meghajtó érvénytelen.\n"
+msgstr "--- A konfigurációs állományban meghatározott %s meghajtó érvénytelen.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Nem lehet betölteni az alapértelmezés szerinti meghajtót, és nincs "
-"meghajtó meghatározva a konfigurációs fájlban. Kilépés.\n"
+#: ogg123/cmdline_options.c:237
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Nem lehet betölteni az alapértelmezés szerinti meghajtót, és nincs meghajtó meghatározva a konfigurációs fájlban. Kilépés.\n"
 
-#: ogg123/cmdline_options.c:292
+#: ogg123/cmdline_options.c:258
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 a %s %s-ból\n"
+"Xiphophorus Team (http://www.xiph.org/)\n"
+"Magyarra fordította Gábor István <stive at mezobereny.hu>\n"
+"Használat: ogg123 [<opciók>] <bemeneti fájl> ...\n"
+"\n"
+"  -h, --help     ez a segítség\n"
+"  -V, --version  az Ogg123 verziójának a megjelenítése\n"
+"  -d, --device=d a 'd' kimeneti eszköz meghatározása\n"
+"      Lehetséges eszközök ('*'=live, '@'=file):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Rendelkezésre álló opciók:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:279
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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"
+"  -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"
 "\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"
 msgstr ""
+"  -f, --file=fájlnév  Beállítja a kimeneti fájlnevet az elõzõleg\n"
+"      meghatározott eszközhöz (a '-d'-vel).\n"
+"  -k n, --skip n  Átugorja az elsõ 'n' másodpercet\n"
+"  -o, --device-option=k:v átírja a speciális opciót a k értékével\n"
+"      a v elõzõleg meghatázott eszközt (a '-d'-vel).  További\n"
+"      információhoz nézze meg man lapot.\n"
+"  -b n, --buffer n   'n' kilobájt bemeneti puffert használ\n"
+"  -p n, --prebuffer n  betölt n%% a bemeneti pufferbe lejátszás elõtt\n"
+"  -v, --verbose  megjeleníti a folyamatot és egyéb adatokat\n"
+"  -q, --quiet    nem ír ki semmit (még a címet sem)\n"
+"  -x n, --nth    minden 'n'-edik blokkot játsz le\n"
+"  -y n, --ntimes megismétel minden lejátszott blokkot 'n'-szer\n"
+"  -z, --shuffle  véletlen lejátszás\n"
+"\n"
+"ogg123 átugrik a következõ számra ha egy SIGINT (Ctrl-C) jelet kap; két SIGINT\n"
+"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/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Fájl: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Rendelkezésre álló opciók:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "A bemenet nem ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Leírás"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Rendelkezésre álló opciók:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
+#: ogg123/oggvorbis_format.c:106 ogg123/oggvorbis_format.c:321
+#: ogg123/oggvorbis_format.c:336 ogg123/oggvorbis_format.c:354
 msgid "Error: Out of memory.\n"
 msgstr "Hiba: Elfogyott a memória.\n"
 
-#: ogg123/format.c:82
-#, c-format
+#: ogg123/format.c:59
 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:145
+#: ogg123/http_transport.c:137
 msgid "Error: Could not set signal mask."
 msgstr "Hiba: Nem lehet beállítani a szignálmaszkot."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:191
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Hiba: Nem lehet létrehozni a bemeneti puffert.\n"
 
-#: ogg123/ogg123.c:82
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "alapértelmezés szerinti kimeneti eszköz"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "véletelen lejátszási lista"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Nem lehet átugrani %f másodpercet ."
-
-#: ogg123/ogg123.c:378
+#: ogg123/ogg123.c:261
 #, c-format
 msgid ""
 "\n"
@@ -504,371 +359,241 @@
 "\n"
 "Audioeszköz:   %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:262
 #, c-format
 msgid "Author:   %s"
 msgstr "Szerzõ:   %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:263
 #, fuzzy, c-format
 msgid "Comments: %s"
 msgstr "Megjegyzések: %s\n"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
+#: ogg123/ogg123.c:307 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Figyelmeztetés: Nem lehet olvasni a könyvtárat: %s.\n"
 
-#: ogg123/ogg123.c:460
+#: ogg123/ogg123.c:341
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Hiba: Nem lehet létrehozni az audiopuffert.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:429
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Nem találtam modult a %s beolvasása során.\n"
 
-#: ogg123/ogg123.c:561
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Nem lehet megnyitni %s-t.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:440
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "A(z) %s fájl formátum nem támogatott.\n"
 
-#: ogg123/ogg123.c:577
+#: ogg123/ogg123.c:450
 #, 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"
+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:596
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
 msgstr "Lejátszás: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:474
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Nem lehet átugrani %f másodpercet ."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
 msgstr "Hiba: Dekódolás nem sikerült.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Hiba: %s eszköz hibás.\n"
-
-#: ogg123/ogg123.c:743
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:585
 msgid "Done."
 msgstr "Kész."
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:51
+msgid "Track number:"
+msgstr "Sáv száma:"
+
+#: ogg123/oggvorbis_format.c:52
+msgid "ReplayGain (Track):"
+msgstr ""
+
+#: ogg123/oggvorbis_format.c:53
+msgid "ReplayGain (Album):"
+msgstr ""
+
+#: ogg123/oggvorbis_format.c:54
+msgid "ReplayGain (Track) Peak:"
+msgstr ""
+
+#: ogg123/oggvorbis_format.c:55
+msgid "ReplayGain (Album) Peak:"
+msgstr ""
+
+#: ogg123/oggvorbis_format.c:56
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ogg123/oggvorbis_format.c:57 ogg123/oggvorbis_format.c:58
+msgid "Comment:"
+msgstr "Megjegyzés:"
+
+#: ogg123/oggvorbis_format.c:167
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Lyuk a adatfolyamban, valószínûleg ártalmatlan\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:173
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== A vorbis programozói könyvtár adatfolyamhibát jelentett.\n"
 
-#: ogg123/oggvorbis_format.c:310
-#, fuzzy, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr "A bitfolyam %d csatornás, %ld Hz"
-
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:402
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr ""
+msgid "Version is %d"
+msgstr "Verzió: %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:406
 #, 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:327
+#: ogg123/oggvorbis_format.c:414
 #, c-format
+msgid "Bitstream is %d channel, %ldHz"
+msgstr "A bitfolyam %d csatornás, %ld Hz"
+
+#: ogg123/oggvorbis_format.c:419
+#, c-format
 msgid "Encoded by: %s"
 msgstr "Kódolva: %s módszerrel"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, c-format
+#: ogg123/playlist.c:41 ogg123/playlist.c:52
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Hiba: Elfogyott a  memória a create_playlist_member()-ben.\n"
 
-#: ogg123/playlist.c:222
+#: ogg123/playlist.c:214
 #, c-format
 msgid "Warning from playlist %s: Could not read directory %s.\n"
 msgstr ""
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
-#, c-format
+#: ogg123/playlist.c:259 ogg123/playlist.c:271
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Hiba: Elfogyott a memória a playlist_to_array()-ben.\n"
 
-#: ogg123/status.c:60
+#: ogg123/status.c:47
 #, c-format
 msgid "%sPrebuf to %.1f%%"
 msgstr "%sElõpufferelés %1.f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sMegállítva"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr "%sEOS"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
-#, c-format
+#: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
+#: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Memóriakiosztási hiba a stats_init()-ben\n"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Fájl: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Idõ: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "/ %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Átl. bitráta: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr "Bemeneti puffer %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr "Kimeneti puffer %5.1f%%"
 
-#: ogg123/transport.c:71
-#, c-format
+#: ogg123/transport.c:67
 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"
+msgstr "Hiba: Nem tudom lefoglalni a memóriát a malloc_data_source_stats()-ban\n"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 a %s %s -ból\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, fuzzy, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr "Használat: vcut befájl.ogg kifájl1.ogg kifájl2.ogg vágásipont\n"
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s fájlt\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s kimenet fájlt\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Sikertelen a '%s' fájl megnyitása mint vorbis\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"HIBA: Nincs bemeneti fájl meghatározva. Használja a '-h' segítségért.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"HIBA: Több bemeneti fájlt adott meg mikor határozta a kimeneti fájlnevet, "
-"javaslom használja a '-n'-t\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:39
 msgid "WAV file reader"
 msgstr "WAV-fájl olvasó"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
 msgstr "AIFF/AIFC-fájl olvasó"
 
-#: oggenc/audio.c:53
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "WAV-fájl olvasó"
-
-#: oggenc/audio.c:54
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "WAV-fájl olvasó"
-
-#: oggenc/audio.c:131 oggenc/audio.c:425
-#, c-format
+#: oggenc/audio.c:117 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Figyelmeztetés: Váratlan fájlvég a WAV-fejlécben\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:128
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "\"%s\" típusú csonk átugrása, hossz: %d\n"
 
-#: oggenc/audio.c:168
-#, c-format
+#: oggenc/audio.c:146
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Figyelmeztetés: Váratlan fájl vég az AIFF csonkban\n"
 
-#: oggenc/audio.c:254
-#, c-format
+#: oggenc/audio.c:231
 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:260
-#, c-format
+#: oggenc/audio.c:237
 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:268
-#, c-format
+#: oggenc/audio.c:245
 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:283
-#, c-format
+#: oggenc/audio.c:258
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Figyelmeztetés: AIFF-C fejléc csonkított.\n"
 
-#: oggenc/audio.c:297
-#, fuzzy, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
+#: oggenc/audio.c:263
+msgid "Warning: Can't handle compressed AIFF-C\n"
 msgstr "Figyelmeztetés: Nem tudom kezelni a tömörített AIFF-C-t\n"
 
-#: oggenc/audio.c:304
-#, c-format
+#: oggenc/audio.c:270
 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:310
-#, c-format
+#: oggenc/audio.c:276
 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:316
-#, c-format
+#: oggenc/audio.c:282
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Figyelmeztetés: Váratlan fájlvég az AIFF fejlécben\n"
 
-#: oggenc/audio.c:353
-#, c-format
+#: oggenc/audio.c:314
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
 " Must be 8 or 16 bit PCM.\n"
@@ -876,13 +601,11 @@
 "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:407
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Figyelmeztetés: Ismeretlen formátumú csonk a WAV fejlécben\n"
 
-#: oggenc/audio.c:420
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -890,137 +613,80 @@
 "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:458
-#, fuzzy, c-format
+#: oggenc/audio.c:406
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
-" or type 3 floating point PCM)\n"
+" or type 3 floating point PCM\n"
 msgstr ""
 "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:467
-#, c-format
+#: oggenc/audio.c:455
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
-
-#: oggenc/audio.c:528
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
 "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:604
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
+#: oggenc/audio.c:607
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
 msgstr ""
 
-#: oggenc/audio.c:624
-#, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:630
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:732
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-
-#: oggenc/audio.c:750
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr ""
 
-#: oggenc/encode.c:64
+#: oggenc/encode.c:59
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr ""
 
-#: oggenc/encode.c:101
+#: oggenc/encode.c:100
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr ""
 
-#: oggenc/encode.c:104
+#: oggenc/encode.c:103
 #, fuzzy, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "%s: a `--%s' kapcsoló ismeretlen\n"
 
-#: oggenc/encode.c:111
-#, c-format
-msgid "Failed to set advanced rate management parameters\n"
+#: oggenc/encode.c:133
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
 msgstr ""
 
-#: oggenc/encode.c:115 oggenc/encode.c:252
-#, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-
-#: oggenc/encode.c:182
-#, c-format
+#: oggenc/encode.c:141
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr ""
 
-#: oggenc/encode.c:200
-#, c-format
+#: oggenc/encode.c:159
 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"
+msgstr "Mód installáció nem sikerült: ennek a minõségnek érvénytelen a paramétere\n"
 
-#: oggenc/encode.c:245
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:247
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:263
-#, c-format
+#: oggenc/encode.c:183
 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"
+msgstr "Mód installáció nem sikerült: ennek a bitrátának érvénytelen a paramétere\n"
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:237
 msgid "Failed writing header to output stream\n"
 msgstr "Nem sikerült a fejléc kiírása\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:303
 msgid "Failed writing data to output stream\n"
 msgstr "Nem sikerült az adatfolyam írása\n"
 
-#: oggenc/encode.c:472
-#, fuzzy, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
+#: oggenc/encode.c:349
+#, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 msgstr "\t[%5.1f%%] [%2dm%.2ds van még hátra] %c"
 
-#: oggenc/encode.c:482
-#, fuzzy, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+#: oggenc/encode.c:359
+#, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr "\tKódólás [%2dm%.2ds telt el eddig] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:377
 #, c-format
 msgid ""
 "\n"
@@ -1031,8 +697,7 @@
 "\n"
 "Kész a \"%s\" fájl kódolása \n"
 
-#: oggenc/encode.c:502
-#, c-format
+#: oggenc/encode.c:379
 msgid ""
 "\n"
 "\n"
@@ -1042,7 +707,7 @@
 "\n"
 "Kódólás kész.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:383
 #, c-format
 msgid ""
 "\n"
@@ -1051,17 +716,17 @@
 "\n"
 "\tFájl mérete:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:387
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tEltelt idõ: %dm %04.1fs\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:390
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tRáta:         %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:391
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1070,7 +735,7 @@
 "\tÁtlagos bitráta: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:428
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1080,17 +745,17 @@
 "Kódólás %s%s%s  \n"
 "         %s%s%s midõségben %2.2f\n"
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
+#: oggenc/encode.c:452 oggenc/encode.c:458
 msgid "standard input"
 msgstr "szabványos bemenet"
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
+#: oggenc/encode.c:453 oggenc/encode.c:459
 msgid "standard output"
 msgstr "szabványos kimenet"
 
-#: oggenc/encode.c:559
+#: oggenc/encode.c:436
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1101,7 +766,7 @@
 "         %s%s%s bitráta %d kbps,\n"
 "teljes bitrátakezelõ motort használom\n"
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:444
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1111,7 +776,7 @@
 "Kódólás %s%s%s  \n"
 "         %s%s%s midõségben %2.2f\n"
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:451
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1121,7 +786,7 @@
 "Kódólás %s%s%s  \n"
 "         %s%s%s midõségben %2.2f\n"
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:457
 #, fuzzy, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1132,1000 +797,586 @@
 "         %s%s%s bitráta %d kbps,\n"
 "teljes bitrátakezelõ motort használom\n"
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
+#: oggenc/oggenc.c:96
+#, c-format
+msgid ""
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 "%s%s\n"
 "HIBA: Nincs bemeneti fájl meghatározva. Használja a '-h' segítségért.\n"
 
-#: oggenc/oggenc.c:118
-#, c-format
+#: oggenc/oggenc.c:111
 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:125
-#, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"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:118
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "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:186
+#: oggenc/oggenc.c:172
 #, 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:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "WAV-fájl olvasó"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:200
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "A %s megnyitása %s modullal \n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:209
 #, 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:280
-#, c-format
+#: oggenc/oggenc.c:259
 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"
+msgstr "FIGYELEM: Nem határozott meg fájlnevet, az alapértelmezés szerinti \"default.ogg\"-t használom\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:267
 #, 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"
+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:295
-#, 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:306
+#: oggenc/oggenc.c:278
 #, 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:350
+#: oggenc/oggenc.c:308
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr ""
 
-#: oggenc/oggenc.c:357
-#, c-format
+#: oggenc/oggenc.c:315
 msgid "Downmixing stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:360
-#, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:318
+msgid "ERROR: Can't downmix except from stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:368
-#, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:414
+#: oggenc/oggenc.c:365
 #, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 a %s %s -ból\n"
-
-#: oggenc/oggenc.c:416
-#, c-format
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:417
-#, c-format
-msgid ""
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
+"                      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"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel. Using this will\n"
-"                      automatically enable managed bitrate mode (see\n"
-"                      --managed).\n"
+"                      encoding for a fixed-size channel.\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications. Using this will automatically\n"
-"                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
-" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
-"                      high), instead of specifying a particular bitrate.\n"
+"                      streaming applications.\n"
+" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
+"                      instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
+"                      Quality -1 is also possible, but may not be of\n"
+"                      acceptable quality.\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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
-" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
-"                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
-"                      used multiple times. The argument should be in the\n"
-"                      format \"tag=value\".\n"
+"                      used multiple times.\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\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 "
-"additional\n"
+" OggEnc input files must currently be 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"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
-" In this mode, output is to stdout unless an output filename is specified\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Használat: oggenc [opciók] input.wav [...]\n"
+"\n"
+"OPCIÓK:\n"
+" Általásnos:\n"
+" -Q, --quiet          Nemír kisemmit az stderr-re\n"
+" -h, --help           Kiírja ezt a szöveget\n"
+" -r, --raw            Nyers mód. A bemeneti fájlt közvetleül mint PCM adat olvassa\n"
+" -B, --raw-bits=n     Beállítja a bitenkénti minta vételezést a nyers bemenethez. Alapból 16\n"
+" -C, --raw-chan=n     Beállítja a csatornák számát. Alapbólis 2\n"
+" -R, --raw-rate=n     Beállítja a másodpercenkéni mintavételezések számát a nyers bemenethez. Alapból 44100\n"
+" -b, --bitrate        A kódólás átlagos bitrátájának kiválasztása. Ez használja\n"
+"                      a kódólás átlagos bitrátájaként. Ez az érték\n"
+"                      kbps-ban értendõ.\n"
+" -m, --min-bitrate    Meghatározza az minimális bitrátát(kbps-ban). Hasznos\n"
+"                      fix méretû csatornáknál.\n"
+" -M, --max-bitrate    Meghatározza az maximális bitrátát(kbps-ban). Hasznos\n"
+"                      az adatfolyamoknál.\n"
+" -q, --quality        A minõség meghatározása 0 (alacsony) és 10 (magas) között,\n"
+"                      használhatja a bitráta meghatározás helyett.\n"
+"                      Ez a normális mûvelet.\n"
+"                      Meghatározhat tört értékeket (pl. 2.75) \n"
+" -s, --serial         A folyamat sorozat számának a meghatározása. Ha több fájlt\n"
+"                      kódól akkor ez a szám automatikusan növekszik\n"
+"                      minden folyamat után.\n"
+"\n"
+" Nevezés:\n"
+" -o, --output=fn      Kiírja a fájlt fn névvel (csak egy fájlos módban használható)\n"
+" -n, --names=sztring   Ezzel a sztringgel nevezi el a fájlokat, ahol a %%a az elõadót, %%t a címet\n"
+"                              %%l az albumot,%%n a sáv számot és a %%d pedig a dátumot jelenti\n"
+"                      %%%% %%.\n"
+" -X, --name-remove=s  Eltávolítja a meghatározott karakterket a '-n' formájú\n"
+"                      sztringekbõl . Hasznos lehet az érvényes formátumú fájlnevek létrehozását.\n"
+" -P, --name-replace=s Kicseréli az eltávolított karaktereket amit a  --name-remove-vel\n"
+"                      határozott. Ha a lista rövidebb mint a \n"
+"                      --name-remove lista vagy nincs meghatározva akkor az extra\n"
+"                      karaktereket egyszerûen eltávolítja.\n"
+"                      Az alapbeállítások platformfüggõ\n"
+" -c, --comment=c      A meghatározott sztringek megjegyzésként hozzádja a fájlhoz. Ezt sok helyen\n"
+"                        használható.\n"
+" -d, --date           A sáv dátumának meghatározása \n"
+" -N, --tracknum       A sáv számának a meghatározása\n"
+" -t, --title          A sáv címe\n"
+" -l, --album          Az album neve\n"
+" -a, --artist         Az elõadó neve\n"
+" -G, --genre          A sáv stílusa\n"
+"                      Ha több bementi fájl ad meg  akkor az elõzõ öt\n"
+"                      paramétert használja fel,\n"
+"                      Ha kevesebb címet határozz meg\n"
+"                      mint ahány fájl van akkor az OggEnc egy figyelmezetést küld\n"
+"                      és felhasználja az utolsó címet a fájl átnevezésre. Ha kevesebb\n"
+"                      sávot ad meg akkor nem fogja számozni a fájlokat.\n"
+"                      Egyébként minden utolsó tagot újra felhasznál\n"
+"                      minden további figyelmezetés nélkül(pl. így csak egyszer kell meghatározni a dátumot\n"
+"                      és az összes fájl ezt használja)\n"
+"\n"
+"BEMENETI FÁJLOK:\n"
+" Az OggEnc bemeneti fájljai jelenleg 16 vagy 8 bites PCM WAV, AIFF, vagy AIFF/C\n"
+" fájlok. A fájlok lehetnek monok vagy sztereók (vagy több csatornások) és bármilyen mintavételezésû.\n"
+" Habár a kódoló csak 44.1 és 48 kHz mûködik és minden egyéb\n"
+" frekvencia a minõség romlásához vezet.\n"
+" Esetleg, a '--raw' opcióval használhat nyers PCM adat fájlokat, amelyek\n"
+" 16 bites sztereó little-endian PCM ('headerless wav') kell lennie, de semilyen egyéb\n"
+" paramétert nem használhat a nyers módban.\n"
+" A '-' -el meghatározhatja hogy stdin-t használja mint bemeneti fájlnév.\n"
+" Ebben a módban az alapértelemezett kimenet az stdout.  A kimeneti fájlt \n"
+"a '-o'-val hatázhatja meg\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:536
 #, 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:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
-#, c-format
+#: oggenc/oggenc.c:562 oggenc/oggenc.c:670 oggenc/oggenc.c:683
 msgid "Enabling bitrate management engine\n"
 msgstr "A bitrára kezelés motor engedélyezése\n"
 
-#: oggenc/oggenc.c:661
-#, 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:571
+#, fuzzy
+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:664
+#: oggenc/oggenc.c:574
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:581
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:587
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 
-#: oggenc/oggenc.c:687
-#, fuzzy, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Figyelmeztetés: Nem lehet olvasni a könyvtárat: %s.\n"
-
-#: oggenc/oggenc.c:700
-#, c-format
+#: oggenc/oggenc.c:599
 msgid "No value for advanced encoder option found\n"
 msgstr ""
 
-#: oggenc/oggenc.c:718
-#, c-format
+#: oggenc/oggenc.c:610
 msgid "Internal error parsing command line options\n"
 msgstr "Belsõ hiba a parancs sori opció elemzése során\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:656
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Figyelmeztetés: névleges \"%s\" nem értelmezhetõ\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:664
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Figyelmeztetés: minimális \"%s\" nem értelmezhetõ\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:677
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Figyelmeztetés: maximális \"%s\" nem értelmezhetõ\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:689
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Minõség opciók \"%s\" nem értelmezhetõ\n"
 
-#: oggenc/oggenc.c:807
-#, c-format
+#: oggenc/oggenc.c:697
 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"
+msgstr "FIGYELEM: a minõség túl magasra lett állítva, a maximálisra beállítva.\n"
 
-#: oggenc/oggenc.c:813
-#, c-format
+#: oggenc/oggenc.c:703
 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"
+msgstr "FIGYELEM: Többszörös név formátumot hatázott meg, az utolsót használom\n"
 
-#: oggenc/oggenc.c:822
-#, c-format
+#: oggenc/oggenc.c:712
 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"
+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:831
-#, 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:721
+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:839
-#, c-format
+#: oggenc/oggenc.c:729
 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:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 a %s %s -ból\n"
+#: oggenc/oggenc.c:748
+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"
 
-#: oggenc/oggenc.c:858
-#, 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"
-
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
-#, c-format
+#. Failed, so just set to 16
+#: oggenc/oggenc.c:753 oggenc/oggenc.c:757
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
-msgstr ""
-"FIGYELEM: Érénytelen mintavételezést határozott meg, 16-ost használom.\n"
+msgstr "FIGYELEM: Érénytelen mintavételezést határozott meg, 16-ost használom.\n"
 
-#: oggenc/oggenc.c:874
-#, c-format
-msgid ""
-"WARNING: Raw channel count 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:764
+msgid "WARNING: Raw channel count 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:879
-#, c-format
+#. Failed, so just set to 2
+#: oggenc/oggenc.c:769
 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"
+msgstr "FIGYELEM: Érvénytelen csatorna számlálót határozott meg, 2-est használom.\n"
 
-#: oggenc/oggenc.c:890
-#, 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"
+#: oggenc/oggenc.c:780
+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"
 
-#: oggenc/oggenc.c:895
-#, c-format
+#. Failed, so just set to 44100
+#: oggenc/oggenc.c:785
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
-msgstr ""
-"FIGYELEM: Événytelen mintavételezést határott meg 44100-at használom.\n"
+msgstr "FIGYELEM: Événytelen mintavételezést határott meg 44100-at használom.\n"
 
-#: oggenc/oggenc.c:902
-#, c-format
+#: oggenc/oggenc.c:789
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "FIGYELEM Ismeretlen opciót határozott meg, elutasítva->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid 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:935 vorbiscomment/vcomment.c:357
-#, c-format
+#: oggenc/oggenc.c:811
 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"
+msgstr "Nem lehet a megjegyzést átalakítani UTF-8 -ra, hozzáadás nem sikertelen\n"
 
-#: oggenc/oggenc.c:954
-#, c-format
+#: oggenc/oggenc.c:830
 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"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Nem lehet létrehozni a könyvtárat \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Hiba a könyvtár létezésének a vizsgálata során %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:167
 #, c-format
 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:212
+#: ogginfo/ogginfo2.c:156
 #, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
+msgid "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo2.c:164
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgid "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:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo2.c:168
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:266
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:342
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:356
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Figyelmeztetés: maximális \"%s\" nem értelmezhetõ\n"
-
-#: ogginfo/ogginfo2.c:389
-#, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:396
-#, 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:400
-#, c-format
-msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:403
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Verzió: %s"
-
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
-#, fuzzy, c-format
-msgid "Vendor: %s\n"
-msgstr "forgalmazó=%s\n"
-
-#: ogginfo/ogginfo2.c:406
-#, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Verzió: %s"
-
-#: ogginfo/ogginfo2.c:408
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:416
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:429
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:431
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:433
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:437
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:439
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:441
-#, fuzzy
-msgid "Colourspace unspecified\n"
-msgstr "nem határozott meg mûveletet\n"
-
-#: ogginfo/ogginfo2.c:444
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:446
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:448
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:450
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:452
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr ""
-"\tÁtlagos bitráta: %.1f kb/s\n"
-"\n"
-
-#: ogginfo/ogginfo2.c:453
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
-msgid "User comments section follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:477
-msgid "Warning: Expected frame %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:520
-msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:557
-#, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:565
-#, 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"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:569
-#, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:572
+#: ogginfo/ogginfo2.c:171
 #, fuzzy, c-format
 msgid "Version: %d\n"
 msgstr "Verzió: %s"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:175
 #, fuzzy, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "forgalmazó=%s\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:182
+#, fuzzy, c-format
+msgid "Vendor: %s\n"
+msgstr "forgalmazó=%s\n"
+
+#: ogginfo/ogginfo2.c:183
 #, c-format
 msgid "Channels: %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:184
 #, fuzzy, c-format
 msgid ""
 "Rate: %ld\n"
 "\n"
 msgstr "Dátum: %s"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:187
 #, fuzzy, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr ""
 "\tÁtlagos bitráta: %.1f kb/s\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:190
 #, fuzzy
 msgid "Nominal bitrate not set\n"
 msgstr "Figyelmeztetés: névleges \"%s\" nem értelmezhetõ\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:193
 #, fuzzy, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr ""
 "\tÁtlagos bitráta: %.1f kb/s\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:196
 msgid "Upper bitrate not set\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:199
 #, fuzzy, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr ""
 "\tÁtlagos bitráta: %.1f kb/s\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:202
 msgid "Lower bitrate not set\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:630
-#, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
+#: ogginfo/ogginfo2.c:205
+msgid "User comments section follows...\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:651
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:692
+#: ogginfo/ogginfo2.c:217
 #, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
+msgid "Warning: Comment %d in stream %d is invalidly formatted, does not contain '=': \"%s\"\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:703
+#: ogginfo/ogginfo2.c:226
 #, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
+msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:257 ogginfo/ogginfo2.c:266
 #, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:738
+#: ogginfo/ogginfo2.c:274
 #, c-format
-msgid "Kate 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:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Verzió: %s"
-
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Language: %s\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:750
-msgid "No language set\n"
+#: ogginfo/ogginfo2.c:347
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "forgalmazó=%s\n"
-
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
-msgid "No category set\n"
-msgstr "Figyelmeztetés: névleges \"%s\" nem értelmezhetõ\n"
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:364
 #, c-format
-msgid "Character encoding: %s\n"
+msgid "Warning: granulepos in stream %d decreases from "
 msgstr ""
 
-#: ogginfo/ogginfo2.c:768
-msgid "Unknown character encoding\n"
+#: ogginfo/ogginfo2.c:365
+msgid " to "
 msgstr ""
 
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
-#, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:783
-msgid "Unknown text directionality\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:795
-msgid "Invalid zero granulepos rate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:797
-#, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:365
 msgid "\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:828
+#: ogginfo/ogginfo2.c:384
 #, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %ld bytes\n"
+"\tPlayback length: %ldm:%02lds\n"
+"\tAverage bitrate: %f kbps\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:418
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:537
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:549
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1088
-#, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
+#: ogginfo/ogginfo2.c:574
+msgid "Warning: Hole in data found at approximate offset "
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1105
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
+#: ogginfo/ogginfo2.c:575
+msgid " bytes. Corrupted ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:599
 #, 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:1134
+#: ogginfo/ogginfo2.c:604
 #, fuzzy, c-format
 msgid ""
 "Processing file \"%s\"...\n"
 "\n"
 msgstr "Feldolgozás sikertelen\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:613
 #, fuzzy
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "A '%s'-t nem lehet megnyitni olvasásra\n"
 
-#: ogginfo/ogginfo2.c:1151
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1158
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1161
+#: ogginfo/ogginfo2.c:618
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
-"This indicates a corrupt ogg file: %s.\n"
+"This indicates a corrupt ogg file.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:625
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1176
+#: ogginfo/ogginfo2.c:628
 #, 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:1180
+#: ogginfo/ogginfo2.c:632
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1185
+#: ogginfo/ogginfo2.c:637
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1200
+#: ogginfo/ogginfo2.c:652
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1208
+#: ogginfo/ogginfo2.c:659
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
+"Input probably not ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 a %s %s -ból\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, c-format
+#: ogginfo/ogginfo2.c:670
 msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
+"ogginfo 1.0\n"
+"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] files1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
 "\t-h Show this help message\n"
 "\t-q Make less verbose. Once will remove detailed informative\n"
 "\t   messages, two will remove warnings\n"
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
+"\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1234
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, c-format
+#: ogginfo/ogginfo2.c:691
 msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
-"ogginfo is a tool for printing information about Ogg files\n"
+"Ogginfo is a tool for printing information about ogg files\n"
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1280
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:720
+#, fuzzy
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""
 "%s%s\n"
@@ -2151,16 +1402,19 @@
 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"
@@ -2171,6 +1425,7 @@
 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"
@@ -2186,43 +1441,35 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: a `-W %s' kapcsoló nem enged meg argumentumot\n"
 
-#: vcut/vcut.c:149
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr "Lap hiba. Sérült bemenet.\n"
 
-#: vcut/vcut.c:166
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr "Bitfolyamat hiba, folyatatás\n"
 
-#: vcut/vcut.c:206
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr "EOS-t találtam a kivágási pont elõtt.\n"
 
-#: vcut/vcut.c:215
-#, c-format
+#: vcut/vcut.c:182
 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:225
-#, c-format
+#: vcut/vcut.c:192
 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:277
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Kezelhetlen speciális eset: az elsõ fájl túl rövid?\n"
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. 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:353
-#, c-format
+#. 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:284
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -2230,59 +1477,47 @@
 "HIBA: Az elsõ két audio csomagot nem lehet egy\n"
 "         ogg lapra helyezni. A fájl visszakódólás nem helyes.\n"
 
-#: vcut/vcut.c:373
-#, 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:378
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr "Helyrehozható adatfolyam hiba\n"
 
-#: vcut/vcut.c:387
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr "Adatfolyam hiba\n"
 
-#: vcut/vcut.c:449
-#, c-format
+#: vcut/vcut.c:330
+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:376
 msgid "Input not ogg.\n"
 msgstr "A bemenet nem ogg.\n"
 
-#: vcut/vcut.c:459
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Hiba  elsõ oldalon\n"
 
-#: vcut/vcut.c:464
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "hiba az elsõ csomagban\n"
 
-#: vcut/vcut.c:470
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Hiba az elsõdleges fejlécben: lehet, hogy nem vorbis?\n"
 
-#: vcut/vcut.c:490
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Másodlagos fejléc sérült\n"
 
-#: vcut/vcut.c:503
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "Fájl vég jel a fejlécben\n"
 
-#: vcut/vcut.c:535
-#, fuzzy, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+#: vcut/vcut.c:456
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
 msgstr "Használat: vcut befájl.ogg kifájl1.ogg kifájl2.ogg vágásipont\n"
 
-#: vcut/vcut.c:539
-#, c-format
+#: vcut/vcut.c:460
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -2292,615 +1527,191 @@
 " Ellenõrizze a kimeneti fájl helyeséges mielõtt letörli az eredetit\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "A '%s'-t nem lehet megnyitni olvasásra\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "A '%s'-t nem lehet megnyitni írásra\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Nem tudom értelmezni a vágásipontot\"%s\"\n"
 
-#: vcut/vcut.c:570
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+#: vcut/vcut.c:484
+#, c-format
+msgid "Processing: Cutting at %lld\n"
 msgstr "Feldolgozás: Vágás a %lld -nél\n"
 
-#: vcut/vcut.c:572
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr "Feldolgozás: Vágás a %lld -nél\n"
-
-#: vcut/vcut.c:582
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr "Feldolgozás sikertelen\n"
 
-#: vcut/vcut.c:604
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr "Hiba a fejléc olvasása közben\n"
 
-#: vcut/vcut.c:627
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr "Hiba az elsõ kimeneti fájl írása közben\n"
 
-#: vcut/vcut.c:635
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr "Hiba az második kimeneti fájl írása közben\n"
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:220
+msgid "Input truncated or empty."
+msgstr "A bemenet megcsonkított vagy üres."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:222
+msgid "Input is not an Ogg bitstream."
+msgstr "A bemenet nem Ogg adatfolyam."
+
+#: vorbiscomment/vcedit.c:239
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Hiba az elsõ oldal Ogg adatfolyam olvasása közben."
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:245
 msgid "Error reading initial header packet."
 msgstr "Hiba a kezdõ fejléc csomag olvasása közben."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "A bemenet megcsonkított vagy üres."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "A bemenet nem Ogg adatfolyam."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:251
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Ogg adatfolyam nem tartalmaz vorbis adatokat."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "Fájl vég jel a vorbis fejléc vége elõtt."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg adatfolyam nem tartalmaz vorbis adatokat."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:274
 msgid "Corrupt secondary header."
 msgstr "Sérült másodlagos fejléc."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:295
 msgid "EOF before end of vorbis headers."
 msgstr "Fájl vég jel a vorbis fejléc vége elõtt."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:448
 msgid "Corrupt or missing data, continuing..."
 msgstr "Sérült vagy hiányzó adatok, folytatás..."
 
-#: vorbiscomment/vcedit.c:875
-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/vcedit.c:487
+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:190 vorbiscomment/vcomment.c:216
+#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
 #, 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:235
+#: vorbiscomment/vcomment.c:148
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Rossz megjegyzés: '%s'\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "rossz megjegyzés: '%s'\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:170
 #, 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"
 
-#: vorbiscomment/vcomment.c:274
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:187
 msgid "no action specified\n"
 msgstr "nem határozott meg mûveletet\n"
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
-msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
+#: 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:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
+#: vorbiscomment/vcomment.c:287
+#, fuzzy
 msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
+"   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 ""
+"Használat: \n"
+"  vorbiscomment [-l] fájl.ogg (a megjegyzések listája)\n"
+"  vorbiscomment -a be.ogg ki.ogg (megjegyzés hozzáadása)\n"
+"  vorbiscomment -w be.ogg ki.ogg (megjegyzés módosítása)\n"
+"\taz új parancsokat a következõ formában várja\n"
+"\t'TAG=érték' az stdin-en. Így teljes mértékben\n"
+"\tkicserélheti a létezõ adatokat.\n"
+"   A '-a'-t és a '-w'-t használhatja egy fájl névvel,\n"
+"   ekkor egy ideiglenes fájlt fog használni.\n"
+"   '-c'-vel meghatározhat egy fájlt ahonnan veszi a megjegyzéseket\n"
+"   az stdin helyet.\n"
+"   Pl: vorbiscomment -a be.ogg -c megjegyzések.txt\n"
+"   ez hozzáfûzi a 'megjegyzések.txt' tartalmát a 'be.ogg'-hoz\n"
+"   Végezetül, a '-t'-vel heghatározhatja parancssorban \n"
+"   a TAGokat. pl.\n"
+"   vorbiscomment -a be.ogg -t \"ARTIST=Egy srác\" -t \"TITLE=Egy cím\"\n"
+"   (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:391
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Rossz típus az opciók között"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
+#: vorbiscomment/vcomment.c:371
 msgid "Internal error parsing command options\n"
 msgstr "Belsõ hiba a parancs opciójának az értelmezése során\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:456
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Hiba a '%s' bemeneti fájl megnyitása során.\n"
 
-#: vorbiscomment/vcomment.c:587
-#, c-format
+#: vorbiscomment/vcomment.c:465
 msgid "Input filename may not be the same as output filename\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:476
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Hiba a '%s' kimeneti fájl megnyitása során.\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:491
 #, 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:630
+#: vorbiscomment/vcomment.c:508
 #, 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:664
+#: vorbiscomment/vcomment.c:536
 #, 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:666
+#: vorbiscomment/vcomment.c:538
 #, fuzzy, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Hiba a fejléc olvasása közben\n"
 
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Hiba a '%s' megjegyzés fájl megnyitása során.\n"
-
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 a %s %s-ból\n"
-#~ "Xiphophorus Team (http://www.xiph.org/)\n"
-#~ "Magyarra fordította Gábor István <stive at mezobereny.hu>\n"
-#~ "Használat: ogg123 [<opciók>] <bemeneti fájl> ...\n"
-#~ "\n"
-#~ "  -h, --help     ez a segítség\n"
-#~ "  -V, --version  az Ogg123 verziójának a megjelenítése\n"
-#~ "  -d, --device=d a 'd' kimeneti eszköz meghatározása\n"
-#~ "      Lehetséges eszközök ('*'=live, '@'=file):\n"
-#~ "        "
-
-#~ 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"
-#~ "  -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"
-#~ "\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"
-#~ msgstr ""
-#~ "  -f, --file=fájlnév  Beállítja a kimeneti fájlnevet az elõzõleg\n"
-#~ "      meghatározott eszközhöz (a '-d'-vel).\n"
-#~ "  -k n, --skip n  Átugorja az elsõ 'n' másodpercet\n"
-#~ "  -o, --device-option=k:v átírja a speciális opciót a k értékével\n"
-#~ "      a v elõzõleg meghatázott eszközt (a '-d'-vel).  További\n"
-#~ "      információhoz nézze meg man lapot.\n"
-#~ "  -b n, --buffer n   'n' kilobájt bemeneti puffert használ\n"
-#~ "  -p n, --prebuffer n  betölt n%% a bemeneti pufferbe lejátszás elõtt\n"
-#~ "  -v, --verbose  megjeleníti a folyamatot és egyéb adatokat\n"
-#~ "  -q, --quiet    nem ír ki semmit (még a címet sem)\n"
-#~ "  -x n, --nth    minden 'n'-edik blokkot játsz le\n"
-#~ "  -y n, --ntimes megismétel minden lejátszott blokkot 'n'-szer\n"
-#~ "  -z, --shuffle  véletlen lejátszás\n"
-#~ "\n"
-#~ "ogg123 átugrik a következõ számra ha egy SIGINT (Ctrl-C) jelet kap; két "
-#~ "SIGINT\n"
-#~ "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"
-
-#~ msgid "Track number:"
-#~ msgstr "Sáv száma:"
-
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
-#~ msgid "Comment:"
-#~ msgstr "Megjegyzés:"
-
-#~ msgid "Version is %d"
-#~ msgstr "Verzió: %d"
-
-#, fuzzy
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " General:\n"
-#~ " -Q, --quiet          Produce no output to stderr\n"
-#~ " -h, --help           Print this help text\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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --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"
-#~ " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-#~ "                      encoding for a fixed-size channel.\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"
-#~ "                      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"
-#~ " --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"
-#~ "\n"
-#~ " Naming:\n"
-#~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times.\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 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"
-#~ " Alternatively, the --raw option may be used to use a raw PCM data file, "
-#~ "which\n"
-#~ " must be 16bit stereo little-endian PCM ('headerless wav'), unless "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an outfile filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Használat: oggenc [opciók] input.wav [...]\n"
-#~ "\n"
-#~ "OPCIÓK:\n"
-#~ " Általásnos:\n"
-#~ " -Q, --quiet          Nemír kisemmit az stderr-re\n"
-#~ " -h, --help           Kiírja ezt a szöveget\n"
-#~ " -r, --raw            Nyers mód. A bemeneti fájlt közvetleül mint PCM "
-#~ "adat olvassa\n"
-#~ " -B, --raw-bits=n     Beállítja a bitenkénti minta vételezést a nyers "
-#~ "bemenethez. Alapból 16\n"
-#~ " -C, --raw-chan=n     Beállítja a csatornák számát. Alapbólis 2\n"
-#~ " -R, --raw-rate=n     Beállítja a másodpercenkéni mintavételezések számát "
-#~ "a nyers bemenethez. Alapból 44100\n"
-#~ " -b, --bitrate        A kódólás átlagos bitrátájának kiválasztása. Ez "
-#~ "használja\n"
-#~ "                      a kódólás átlagos bitrátájaként. Ez az érték\n"
-#~ "                      kbps-ban értendõ.\n"
-#~ " -m, --min-bitrate    Meghatározza az minimális bitrátát(kbps-ban). "
-#~ "Hasznos\n"
-#~ "                      fix méretû csatornáknál.\n"
-#~ " -M, --max-bitrate    Meghatározza az maximális bitrátát(kbps-ban). "
-#~ "Hasznos\n"
-#~ "                      az adatfolyamoknál.\n"
-#~ " -q, --quality        A minõség meghatározása 0 (alacsony) és 10 (magas) "
-#~ "között,\n"
-#~ "                      használhatja a bitráta meghatározás helyett.\n"
-#~ "                      Ez a normális mûvelet.\n"
-#~ "                      Meghatározhat tört értékeket (pl. 2.75) \n"
-#~ " -s, --serial         A folyamat sorozat számának a meghatározása. Ha "
-#~ "több fájlt\n"
-#~ "                      kódól akkor ez a szám automatikusan növekszik\n"
-#~ "                      minden folyamat után.\n"
-#~ "\n"
-#~ " Nevezés:\n"
-#~ " -o, --output=fn      Kiírja a fájlt fn névvel (csak egy fájlos módban "
-#~ "használható)\n"
-#~ " -n, --names=sztring   Ezzel a sztringgel nevezi el a fájlokat, ahol a %%"
-#~ "a az elõadót, %%t a címet\n"
-#~ "                              %%l az albumot,%%n a sáv számot és a %%d "
-#~ "pedig a dátumot jelenti\n"
-#~ "                      %%%% %%.\n"
-#~ " -X, --name-remove=s  Eltávolítja a meghatározott karakterket a '-n' "
-#~ "formájú\n"
-#~ "                      sztringekbõl . Hasznos lehet az érvényes formátumú "
-#~ "fájlnevek létrehozását.\n"
-#~ " -P, --name-replace=s Kicseréli az eltávolított karaktereket amit a  --"
-#~ "name-remove-vel\n"
-#~ "                      határozott. Ha a lista rövidebb mint a \n"
-#~ "                      --name-remove lista vagy nincs meghatározva akkor "
-#~ "az extra\n"
-#~ "                      karaktereket egyszerûen eltávolítja.\n"
-#~ "                      Az alapbeállítások platformfüggõ\n"
-#~ " -c, --comment=c      A meghatározott sztringek megjegyzésként hozzádja a "
-#~ "fájlhoz. Ezt sok helyen\n"
-#~ "                        használható.\n"
-#~ " -d, --date           A sáv dátumának meghatározása \n"
-#~ " -N, --tracknum       A sáv számának a meghatározása\n"
-#~ " -t, --title          A sáv címe\n"
-#~ " -l, --album          Az album neve\n"
-#~ " -a, --artist         Az elõadó neve\n"
-#~ " -G, --genre          A sáv stílusa\n"
-#~ "                      Ha több bementi fájl ad meg  akkor az elõzõ öt\n"
-#~ "                      paramétert használja fel,\n"
-#~ "                      Ha kevesebb címet határozz meg\n"
-#~ "                      mint ahány fájl van akkor az OggEnc egy "
-#~ "figyelmezetést küld\n"
-#~ "                      és felhasználja az utolsó címet a fájl átnevezésre. "
-#~ "Ha kevesebb\n"
-#~ "                      sávot ad meg akkor nem fogja számozni a fájlokat.\n"
-#~ "                      Egyébként minden utolsó tagot újra felhasznál\n"
-#~ "                      minden további figyelmezetés nélkül(pl. így csak "
-#~ "egyszer kell meghatározni a dátumot\n"
-#~ "                      és az összes fájl ezt használja)\n"
-#~ "\n"
-#~ "BEMENETI FÁJLOK:\n"
-#~ " Az OggEnc bemeneti fájljai jelenleg 16 vagy 8 bites PCM WAV, AIFF, vagy "
-#~ "AIFF/C\n"
-#~ " fájlok. A fájlok lehetnek monok vagy sztereók (vagy több csatornások) és "
-#~ "bármilyen mintavételezésû.\n"
-#~ " Habár a kódoló csak 44.1 és 48 kHz mûködik és minden egyéb\n"
-#~ " frekvencia a minõség romlásához vezet.\n"
-#~ " Esetleg, a '--raw' opcióval használhat nyers PCM adat fájlokat, amelyek\n"
-#~ " 16 bites sztereó little-endian PCM ('headerless wav') kell lennie, de "
-#~ "semilyen egyéb\n"
-#~ " paramétert nem használhat a nyers módban.\n"
-#~ " A '-' -el meghatározhatja hogy stdin-t használja mint bemeneti fájlnév.\n"
-#~ " Ebben a módban az alapértelemezett kimenet az stdout.  A kimeneti "
-#~ "fájlt \n"
-#~ "a '-o'-val hatázhatja meg\n"
-#~ "\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"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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"
-#~ "   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 ""
-#~ "Használat: \n"
-#~ "  vorbiscomment [-l] fájl.ogg (a megjegyzések listája)\n"
-#~ "  vorbiscomment -a be.ogg ki.ogg (megjegyzés hozzáadása)\n"
-#~ "  vorbiscomment -w be.ogg ki.ogg (megjegyzés módosítása)\n"
-#~ "\taz új parancsokat a következõ formában várja\n"
-#~ "\t'TAG=érték' az stdin-en. Így teljes mértékben\n"
-#~ "\tkicserélheti a létezõ adatokat.\n"
-#~ "   A '-a'-t és a '-w'-t használhatja egy fájl névvel,\n"
-#~ "   ekkor egy ideiglenes fájlt fog használni.\n"
-#~ "   '-c'-vel meghatározhat egy fájlt ahonnan veszi a megjegyzéseket\n"
-#~ "   az stdin helyet.\n"
-#~ "   Pl: vorbiscomment -a be.ogg -c megjegyzések.txt\n"
-#~ "   ez hozzáfûzi a 'megjegyzések.txt' tartalmát a 'be.ogg'-hoz\n"
-#~ "   Végezetül, a '-t'-vel heghatározhatja parancssorban \n"
-#~ "   a TAGokat. pl.\n"
-#~ "   vorbiscomment -a be.ogg -t \"ARTIST=Egy srác\" -t \"TITLE=Egy cím\"\n"
-#~ "   (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"
-
 #~ msgid "Internal error: long option given when none expected.\n"
 #~ msgstr "Belsõ hiba: hosszú opciót használt amikor nem azt vártam.\n"
 
@@ -2932,16 +1743,14 @@
 #~ "Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
 #~ " At other than 44.1/48 kHz quality will be degraded.\n"
 #~ msgstr ""
-#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f "
-#~ "kHz).\n"
+#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f kHz).\n"
 #~ " Minden 44.1/48 kHz-tõl eltérõ frekvencia a minõség romlásához vezethet.\n"
 
 #~ msgid ""
 #~ "Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
 #~ " At other than 44.1/48 kHz quality will be significantly degraded.\n"
 #~ msgstr ""
-#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f "
-#~ "kHz).\n"
+#~ "Figyelmeztetés:A vorbis jelenleg nincs erre a bemenetre hangolva(%.3f kHz).\n"
 #~ " Minden 44.1/48 kHz-tõl eltérõ frekvencia a minõség romlásához vezethet.\n"
 
 #~ msgid ""
@@ -2964,16 +1773,13 @@
 #~ "Javaslom hogy CSAK végszükség esetén használja\n"
 #~ "(pl. bizonyos audio folyam alkalmazásoknál).\n"
 #~ "A bitráta kezelõ motor általában minõség romláshoz vezet,\n"
-#~ "használja a normális VBR módokat (a minõséget a '-q'val határozhatja "
-#~ "meg) \n"
+#~ "használja a normális VBR módokat (a minõséget a '-q'val határozhatja meg) \n"
 #~ "nagyon ajánlott, hogy értse a dolgát.\n"
 #~ "A -managed opció használata kötelezõ lesz a következõ kiadásban.\n"
 #~ "\n"
 
 #~ msgid "WARNING: negative quality specified, setting to minimum.\n"
-#~ msgstr ""
-#~ "FIGYELEM: a minõség túl alacsonyra lett állítva, a minimálisra "
-#~ "beállítva.\n"
+#~ msgstr "FIGYELEM: a minõség túl alacsonyra lett állítva, a minimálisra beállítva.\n"
 
 #~ msgid "Usage: %s [filename1.ogg] ... [filenameN.ogg]\n"
 #~ msgstr "Használat: %s [fájlnév1.ogg] ... [fájlnévN.ogg]\n"

Modified: trunk/vorbis-tools/po/nl.po
===================================================================
--- trunk/vorbis-tools/po/nl.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/nl.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -3,13 +3,13 @@
 # Taco Witte <T.C.Witte at phys.uu.nl>, 2002.
 # Elros Cyriatan <cyriatan at fastmail.fm>, 2003, 2004.
 # niet vertaald: bitrate, engine
-#
-#
+# 
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2002-07-19 22:30+1000\n"
 "PO-Revision-Date: 2004-01-03 14:56+0100\n"
 "Last-Translator: Elros Cyriatan <cyriatan at fastmail.fm>\n"
 "Language-Team: Dutch <vertaling at nl.linux.org>\n"
@@ -17,186 +17,185 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ogg123/buffer.c:117
-#, c-format
+#: ogg123/buffer.c:111
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Fout: geheugentekort in malloc_action().\n"
 
-#: ogg123/buffer.c:360
-#, c-format
+#: ogg123/buffer.c:344
 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:75
+#: ogg123/buffer.c:363
+msgid "malloc"
+msgstr "malloc"
+
+#: ogg123/callbacks.c:70
 msgid "Error: Device not available.\n"
 msgstr "Fout: apparaat niet beschikbaar.\n"
 
-#: ogg123/callbacks.c:78
+#: ogg123/callbacks.c:73
 #, 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:81
+#: ogg123/callbacks.c:76
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Fout: niet ondersteunde optiewaarde naar apparaat %s.\n"
 
-#: ogg123/callbacks.c:85
+#: ogg123/callbacks.c:80
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Fout: kan apparaat %s niet openen.\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:84
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Fout: apparaat %s mislukking.\n"
 
-#: ogg123/callbacks.c:92
+#: ogg123/callbacks.c:87
 #, 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:95
+#: ogg123/callbacks.c:90
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Fout: kan bestand %s niet openen in schrijfmodus.\n"
 
-#: ogg123/callbacks.c:99
+#: ogg123/callbacks.c:94
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Fout: bestand %s bestaat al.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:97
 #, 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:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Fout: geheugentekort in new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:174
+#: ogg123/callbacks.c:169
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Fout: geheugentekort in new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:233
+#: ogg123/callbacks.c:228
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Fout: geheugentekort in new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
+#: ogg123/callbacks.c:349
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Fout: geheugentekort in decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Systeemfout"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Leesfout: %s op regel %d van %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Naam"
 
-#: ogg123/cfgfile_options.c:137
+#. Description
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Beschrijving"
 
-#: ogg123/cfgfile_options.c:140
+#. Type
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Soort"
 
-#: ogg123/cfgfile_options.c:143
+#. Default
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Standaard"
 
-#: ogg123/cfgfile_options.c:169
-#, c-format
+#: ogg123/cfgfile_options.c:165
 msgid "none"
 msgstr "geen"
 
-#: ogg123/cfgfile_options.c:172
-#, c-format
+#: ogg123/cfgfile_options.c:168
 msgid "bool"
 msgstr "bool"
 
-#: ogg123/cfgfile_options.c:175
-#, c-format
+#: ogg123/cfgfile_options.c:171
 msgid "char"
 msgstr "char"
 
-#: ogg123/cfgfile_options.c:178
-#, c-format
+#: ogg123/cfgfile_options.c:174
 msgid "string"
 msgstr "string"
 
-#: ogg123/cfgfile_options.c:181
-#, c-format
+#: ogg123/cfgfile_options.c:177
 msgid "int"
 msgstr "int"
 
-#: ogg123/cfgfile_options.c:184
-#, c-format
+#: ogg123/cfgfile_options.c:180
 msgid "float"
 msgstr "float"
 
-#: ogg123/cfgfile_options.c:187
-#, c-format
+#: ogg123/cfgfile_options.c:183
 msgid "double"
 msgstr "double"
 
-#: ogg123/cfgfile_options.c:190
-#, c-format
+#: ogg123/cfgfile_options.c:186
 msgid "other"
 msgstr "anders"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:506 oggenc/oggenc.c:511
+#: oggenc/oggenc.c:516 oggenc/oggenc.c:521 oggenc/oggenc.c:526
+#: oggenc/oggenc.c:531
 msgid "(none)"
 msgstr "(geen)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Succes"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Sleutel niet gevonden"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Geen sleutel"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Onjuiste waarde"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Onjuiste soort in optielijst"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:74
 msgid "Internal error parsing command line options.\n"
 msgstr "Interne fout bij inlezen opdrachtregel opties\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:81
 #, 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:102
+#: ogg123/cmdline_options.c:93
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -205,300 +204,156 @@
 "=== Fout \"%s\" bij lezen configuratie optie van opdrachtregel.\n"
 "=== Optie was: %s\n"
 
-#: ogg123/cmdline_options.c:109
-#, c-format
+#. not using the status interface here
+#: ogg123/cmdline_options.c:100
 msgid "Available options:\n"
 msgstr "Beschikbare opties:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:109
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Zo'n apparaat bestaat niet, %s.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:129
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Stuurprogramma %s is geen bestandsuitvoer stuurprogramma.\n"
 
-#: ogg123/cmdline_options.c:143
+#: ogg123/cmdline_options.c:134
 msgid "=== Cannot specify output file without specifying a driver.\n"
-msgstr ""
-"=== Kan uitvoerbestand niet aangeven zonder een uitvoer stuurprogramma aan "
-"te geven.\n"
+msgstr "=== Kan uitvoerbestand niet aangeven zonder een uitvoer stuurprogramma aan te geven.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:149
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Onjuist optie formaat: %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:164
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Voorbuffer waarde onjuist. Bereik is 0-100.\n"
 
-#: ogg123/cmdline_options.c:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:179
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 van %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:186
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Kan niet elk 0de stuk afspelen!\n"
 
-#: ogg123/cmdline_options.c:216
+#: ogg123/cmdline_options.c:194
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
 msgstr ""
 "--- Kan niet elk stuk 0 keer afspelen.\n"
-"--- Om het decoderen te testen, kan je het null uitvoer stuurprogramma "
-"gebruiken.\n"
+"--- Om het decoderen te testen, kan je het null uitvoer stuurprogramma gebruiken.\n"
 
-#: ogg123/cmdline_options.c:232
+#: ogg123/cmdline_options.c:206
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Kan afspeellijst bestand %s niet openen.  Overgeslagen.\n"
 
-#: ogg123/cmdline_options.c:248
-msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:227
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Aangegeven stuurprogramma %s in configuratiebestand is onjuist.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Kon standaard stuurprogramma niet laden, en geen stuurprogramma "
-"aangegeven in configuratiebestand. Afsluiten.\n"
+#: ogg123/cmdline_options.c:237
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Kon standaard stuurprogramma niet laden, en geen stuurprogramma aangegeven in configuratiebestand. Afsluiten.\n"
 
-#: ogg123/cmdline_options.c:292
+#: ogg123/cmdline_options.c:258
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 van %s %s\n"
+" van de Xiph.org Foundation (http://www.xiph.org/)\n"
+"\n"
+"Gebruik: ogg123 [<opties>] <invoerbestand> ...\n"
+"\n"
+"  -h, --help     deze hulp\n"
+"  -V, --version  versie weergeven\n"
+"  -d, --device=d gebruikt 'd' als uitvoerapparaat\n"
+"      Mogelijke apparaten zijn ('*'=live, '@'=bestand):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Beschikbare opties:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:279
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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"
+"  -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"
 "\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"
 msgstr ""
+"  -f, --file=bestandsnaam    de bestandsnaam voor uitvoer instellen voor\n"
+"      een eerder aangegeven bestandsapparaat (met -d).\n"
+"  -k n, --skip n             eerste 'n' seconden overslaan\n"
+"  -o, --device-option=k:v    speciale optie k met waarde v meegeven aan\n"
+"      eerder aangegeven apparaat (met -d). Zie man pagina voor meer info.\n"
+"  -b n, --buffer n           een invoerbuffer van 'n' kilobytes gebruiken\n"
+"  -p n, --prebuffer n        n%% van invoerbuffer laden voor afspelen\n"
+"  -v, --verbose              voortgang en andere status informatie weergeven\n"
+"  -q, --quiet                niets weergeven (geen titel)\n"
+"  -x n, --nth                elk 'n'de blok afspelen\n"
+"  -y n, --ntimes             elk afgespeeld blok 'n' keer herhalen\n"
+"  -z, --shuffle              afspelen in willekeurige volgorde\n"
+"\n"
+"ogg123 zal het volgende liedje overslaan bij SIGINT (Ctrl-C); twee keer SIGINTs\n"
+"binnen s milliseconden breekt ogg123 af.\n"
+"  -l, --delay=s              s instellen [milliseconden] (standaard 500).\n"
 
-#: ogg123/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Bestand: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Beschikbare opties:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "Invoer niet ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Beschrijving"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Beschikbare opties:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
+#: ogg123/oggvorbis_format.c:106 ogg123/oggvorbis_format.c:321
+#: ogg123/oggvorbis_format.c:336 ogg123/oggvorbis_format.c:354
 msgid "Error: Out of memory.\n"
 msgstr "Fout: geheugentekort.\n"
 
-#: ogg123/format.c:82
-#, c-format
+#: ogg123/format.c:59
 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:145
+#: ogg123/http_transport.c:137
 msgid "Error: Could not set signal mask."
 msgstr "Fout: kon signaal masker niet instellen."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:191
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Error: kan geen invoerbuffer maken.\n"
 
-#: ogg123/ogg123.c:82
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "standaard uitvoer apparaat"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "afspeellijst schudden"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Kon niet %f seconden overslaan."
-
-#: ogg123/ogg123.c:378
+#: ogg123/ogg123.c:261
 #, c-format
 msgid ""
 "\n"
@@ -507,369 +362,241 @@
 "\n"
 "Audio apparaat:   %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:262
 #, c-format
 msgid "Author:   %s"
 msgstr "Auteur:   %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:263
 #, c-format
 msgid "Comments: %s"
 msgstr "Opmerkingen: %s"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
+#: ogg123/ogg123.c:307 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:460
+#: ogg123/ogg123.c:341
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Fout: kon geen audio buffer maken.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:429
 #, 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:561
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Kan %s niet openen.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:440
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Het bestandsformaat van %s wordt niet ondersteund.\n"
 
-#: ogg123/ogg123.c:577
+#: ogg123/ogg123.c:450
 #, 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"
+msgstr "Fout bij openen %s met module %s.  Mogelijk is het bestand beschadigd.\n"
 
-#: ogg123/ogg123.c:596
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
 msgstr "Afspelen: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:474
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Kon niet %f seconden overslaan."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
 msgstr "Fout: decoderen mislukt.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Fout: apparaat %s mislukking.\n"
-
-#: ogg123/ogg123.c:743
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:585
 msgid "Done."
 msgstr "Klaar."
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:51
+msgid "Track number:"
+msgstr "Spoornummer:"
+
+#: ogg123/oggvorbis_format.c:52
+msgid "ReplayGain (Track):"
+msgstr "AangepasteGeluidssterkte (ReplayGain) (Spoor):"
+
+#: ogg123/oggvorbis_format.c:53
+msgid "ReplayGain (Album):"
+msgstr "HerspeelFactor (Album):"
+
+#: ogg123/oggvorbis_format.c:54
+msgid "ReplayGain (Track) Peak:"
+msgstr "HerspeelFactor (Spoor) piek:"
+
+#: ogg123/oggvorbis_format.c:55
+msgid "ReplayGain (Album) Peak:"
+msgstr "HerspeelFactor (Album) piek:"
+
+#: ogg123/oggvorbis_format.c:56
+msgid "Copyright"
+msgstr "Auteursrecht"
+
+#: ogg123/oggvorbis_format.c:57 ogg123/oggvorbis_format.c:58
+msgid "Comment:"
+msgstr "Opmerking:"
+
+#: ogg123/oggvorbis_format.c:167
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Gat in stroom; waarschijnlijk niet erg\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:173
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Vorbis bibliotheek heeft stroomfout gerapporteerd.\n"
 
-#: ogg123/oggvorbis_format.c:310
-#, fuzzy, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr "Bitstroom is %d kanaals, %ldHz"
-
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:402
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr ""
+msgid "Version is %d"
+msgstr "Versie is %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:406
 #, 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:327
+#: ogg123/oggvorbis_format.c:414
 #, c-format
+msgid "Bitstream is %d channel, %ldHz"
+msgstr "Bitstroom is %d kanaals, %ldHz"
+
+#: ogg123/oggvorbis_format.c:419
+#, c-format
 msgid "Encoded by: %s"
 msgstr "Gecodeerd door: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, c-format
+#: ogg123/playlist.c:41 ogg123/playlist.c:52
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Fout: Geheugentekort in create_playlist_member().\n"
 
-#: ogg123/playlist.c:222
+#: ogg123/playlist.c:214
 #, c-format
 msgid "Warning from playlist %s: Could not read directory %s.\n"
 msgstr "Waarschuwing over afspeellijst %s: Kon map %s niet lezen.\n"
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
-#, c-format
+#: ogg123/playlist.c:259 ogg123/playlist.c:271
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Fout: Geheugentekort in playlist_to_array().\n"
 
-#: ogg123/status.c:60
+#: ogg123/status.c:47
 #, c-format
 msgid "%sPrebuf to %.1f%%"
 msgstr "%sVoorbuffer voor %.1f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%s gepauzeerd"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr "%sEOS"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
-#, c-format
+#: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
+#: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Geheugen reserveringsfout in stats_init()\n"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Bestand: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Tijd: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "van %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Gemiddelde bitrate: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr " Invoerbuffer %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr " Uitvoerbuffer %5.1f%%"
 
-#: ogg123/transport.c:71
-#, c-format
+#: ogg123/transport.c:67
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Fout: kon geen geheugen reserveren in malloc_data_source_stats()\n"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 van %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, fuzzy, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr "Gebruik: vcut inbestand.ogg uitbestand1.ogg uitbestand2.ogg knippunt\n"
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "FOUT: Kan invoerbestand \"%s\" niet openen: %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "FOUT: Kan niet uitvoerbestand \"%s\" openen: %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Openen bestand als vorbis mislukt: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Fout bij verwijderen oude bestand %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"FOUT: Geen invoerbestanden aangegeven. Gebruik -h voor hulp.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"FOUT: Meerdere invoerbestanden met aangegeven uitvoer bestandsnaam: "
-"misschien -n gebruiken\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:39
 msgid "WAV file reader"
 msgstr "WAV bestandslezer"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
 msgstr "AIFF/AIFC bestandslezer"
 
-#: oggenc/audio.c:53
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "WAV bestandslezer"
-
-#: oggenc/audio.c:54
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "WAV bestandslezer"
-
-#: oggenc/audio.c:131 oggenc/audio.c:425
-#, c-format
+#: oggenc/audio.c:117 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Waarschuwing: onverwachte EOF bij lezen WAV kop\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:128
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Overslaan stuk van soort \"%s\", lengte %d\n"
 
-#: oggenc/audio.c:168
-#, c-format
+#: oggenc/audio.c:146
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Waarschuwing: onverwacht EOF in AIFF stuk\n"
 
-#: oggenc/audio.c:254
-#, c-format
+#: oggenc/audio.c:231
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Waarschuwing: geen algemeen stuk gevonden in AIFF bestand\n"
 
-#: oggenc/audio.c:260
-#, c-format
+#: oggenc/audio.c:237
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Waarschuwing: afgekapt algemeen stuk in AIFF kop\n"
 
-#: oggenc/audio.c:268
-#, c-format
+#: oggenc/audio.c:245
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Waarschuwing: onverwacht EOF bij lezen AIFF kop\n"
 
-#: oggenc/audio.c:283
-#, c-format
+#: oggenc/audio.c:258
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Waarschuwing: AIFF-C kop afgekapt.\n"
 
-#: oggenc/audio.c:297
-#, fuzzy, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
+#: oggenc/audio.c:263
+msgid "Warning: Can't handle compressed AIFF-C\n"
 msgstr "Waarschuwing: kan ingepakt AIFF-C niet verwerken\n"
 
-#: oggenc/audio.c:304
-#, c-format
+#: oggenc/audio.c:270
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Waarschuwing: geen SSND stuk gevonden in AIFF bestand\n"
 
-#: oggenc/audio.c:310
-#, c-format
+#: oggenc/audio.c:276
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Waarschuwing: beschadigd SSND stuk in AIFF kop\n"
 
-#: oggenc/audio.c:316
-#, c-format
+#: oggenc/audio.c:282
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Waarschuwing: onverwacht EOF bij lezen AIFF kop\n"
 
-#: oggenc/audio.c:353
-#, c-format
+#: oggenc/audio.c:314
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
 " Must be 8 or 16 bit PCM.\n"
@@ -877,13 +604,11 @@
 "Waarschuwing: OggEnc ondersteunt deze soort AIFF/AIFC bestanden niet\n"
 " Het moet 8 of 16 bit PCM zijn.\n"
 
-#: oggenc/audio.c:407
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Waarschuwing: stuk in WAV kop met niet herkend formaat\n"
 
-#: oggenc/audio.c:420
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -891,139 +616,80 @@
 "Waarschuwing: stuk in WAV kop met ONJUIST formaat.\n"
 " Toch proberen te lezen (werkt mogelijk niet)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: oggenc/audio.c:406
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
-" or type 3 floating point PCM)\n"
+" or type 3 floating point PCM\n"
 msgstr ""
 "FOUT: soort WAV bestand is niet ondersteund (moet standaard PCM\n"
 " of soort 3 floating point PCM zijn\n"
 
-#: oggenc/audio.c:467
-#, c-format
+#: oggenc/audio.c:455
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
-
-#: oggenc/audio.c:528
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
 "FOUT: WAV bestand heeft niet ondersteund subformaat (moet 16 bit PCM\n"
 "of floating point PCM zijn\n"
 
-#: oggenc/audio.c:604
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
+#: oggenc/audio.c:607
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "Programmeerfout: Nul monsters ontvangen van herbemonsteraar: uw bestand zal worden afgekapt. Rapporteer dit alstublieft.\n"
 
-#: oggenc/audio.c:624
-#, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:630
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:732
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"Programmeerfout: Nul monsters ontvangen van herbemonsteraar: uw bestand zal "
-"worden afgekapt. Rapporteer dit alstublieft.\n"
-
-#: oggenc/audio.c:750
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr "Kon herbemonsteraar niet initialiseren\n"
 
-#: oggenc/encode.c:64
+#: oggenc/encode.c:59
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Instellen geavanceerde codeeroptie \"%s\" op %s\n"
 
-#: oggenc/encode.c:101
+#: oggenc/encode.c:100
 #, 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:104
+#: oggenc/encode.c:103
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Niet herkende geavanceerde optie \"%s\"\n"
 
-#: oggenc/encode.c:111
-#, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
+#: oggenc/encode.c:133
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+msgstr "255 kanalen zouden voor iedereen genoeg moeten zijn. (Sorry, vorbis ondersteunt niet meer)\n"
 
-#: oggenc/encode.c:115 oggenc/encode.c:252
-#, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, fuzzy, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 kanalen zouden voor iedereen genoeg moeten zijn. (Sorry, vorbis "
-"ondersteunt niet meer)\n"
-
-#: oggenc/encode.c:182
-#, c-format
+#: oggenc/encode.c:141
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Een minimum of maximum bitrate verzoeken vereist --managed\n"
 
-#: oggenc/encode.c:200
-#, c-format
+#: oggenc/encode.c:159
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Initialiseren modus mislukt: onjuiste parameters voor kwaliteit\n"
 
-#: oggenc/encode.c:245
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:247
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:263
-#, c-format
+#: oggenc/encode.c:183
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "Initialiseren modus mislukt: onjuiste parameters voor bitrate\n"
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:237
 msgid "Failed writing header to output stream\n"
 msgstr "Schrijven kop naar uitvoerstroom mislukt\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:303
 msgid "Failed writing data to output stream\n"
 msgstr "Schrijven gegevens naar uitvoerstroom mislukt\n"
 
-#: oggenc/encode.c:472
-#, fuzzy, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
+#: oggenc/encode.c:349
+#, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 msgstr "\t[%5.1f%%] [%2dm%.2ds over] %c"
 
-#: oggenc/encode.c:482
-#, fuzzy, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+#: oggenc/encode.c:359
+#, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr "\tCoderen [%2dm%.2ds tot nu toe] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:377
 #, c-format
 msgid ""
 "\n"
@@ -1034,8 +700,7 @@
 "\n"
 "Coderen bestand voltooid \"%s\"\n"
 
-#: oggenc/encode.c:502
-#, c-format
+#: oggenc/encode.c:379
 msgid ""
 "\n"
 "\n"
@@ -1045,7 +710,7 @@
 "\n"
 "Coderen voltooid.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:383
 #, c-format
 msgid ""
 "\n"
@@ -1054,17 +719,17 @@
 "\n"
 "\tBestandslengte:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:387
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tTijd voorbij: %dm %04.1fs\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:390
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tRate:         %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:391
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1073,7 +738,7 @@
 "\tGemiddelde bitrate: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:428
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1084,17 +749,17 @@
 "        %s%s%s \n"
 "met gemiddelde bitrate %d kbps "
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
+#: oggenc/encode.c:452 oggenc/encode.c:458
 msgid "standard input"
 msgstr "standaard invoer"
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
+#: oggenc/encode.c:453 oggenc/encode.c:459
 msgid "standard output"
 msgstr "standaard uitvoer"
 
-#: oggenc/encode.c:559
+#: oggenc/encode.c:436
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1105,7 +770,7 @@
 "        %s%s%s \n"
 "bij geschatte bitrate %d kbps (met VBR codering)\n"
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:444
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1116,7 +781,7 @@
 "        %s%s%s \n"
 "met kwaliteitsniveau %2.2f met beperkte VBR "
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:451
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1127,7 +792,7 @@
 "        %s%s%s \n"
 "met kwaliteit %2.2f\n"
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:457
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1138,722 +803,396 @@
 "        %s%s%s \n"
 "met bitrate beheer "
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
+#: oggenc/oggenc.c:96
+#, c-format
+msgid ""
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 "%s%s\n"
 "FOUT: Geen invoerbestanden aangegeven. Gebruik -h voor hulp.\n"
 
-#: oggenc/oggenc.c:118
-#, c-format
+#: oggenc/oggenc.c:111
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "FOUT: Meerdere bestanden aangegeven bij gebruik stdin\n"
 
-#: oggenc/oggenc.c:125
-#, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"FOUT: Meerdere invoerbestanden met aangegeven uitvoer bestandsnaam: "
-"misschien -n gebruiken\n"
+#: oggenc/oggenc.c:118
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "FOUT: Meerdere invoerbestanden met aangegeven uitvoer bestandsnaam: misschien -n gebruiken\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:172
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "FOUT: Kan invoerbestand \"%s\" niet openen: %s\n"
 
-#: oggenc/oggenc.c:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "WAV bestandslezer"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:200
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Openen met %s module: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:209
 #, 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:280
-#, c-format
+#: oggenc/oggenc.c:259
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
-msgstr ""
-"WAARSCHUWING: Geen bestandsnaam, gebruik nu standaard \"default.ogg\"\n"
+msgstr "WAARSCHUWING: Geen bestandsnaam, gebruik nu standaard \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:267
 #, 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"
+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:295
-#, 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:306
+#: oggenc/oggenc.c:278
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "FOUT: Kan niet uitvoerbestand \"%s\" openen: %s\n"
 
-#: oggenc/oggenc.c:350
+#: oggenc/oggenc.c:308
 #, 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:357
-#, c-format
+#: oggenc/oggenc.c:315
 msgid "Downmixing stereo to mono\n"
 msgstr "Terugbrengen stereo naar mono\n"
 
-#: oggenc/oggenc.c:360
-#, fuzzy, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:318
+msgid "ERROR: Can't downmix except from stereo to mono\n"
 msgstr "FOUT: Kan alleen terugbrengen van stereo naar mono\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:365
 #, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 van %s %s\n"
-
-#: oggenc/oggenc.c:416
-#, c-format
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:417
-#, c-format
-msgid ""
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
+"                      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"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel. Using this will\n"
-"                      automatically enable managed bitrate mode (see\n"
-"                      --managed).\n"
+"                      encoding for a fixed-size channel.\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications. Using this will automatically\n"
-"                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
-" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
-"                      high), instead of specifying a particular bitrate.\n"
+"                      streaming applications.\n"
+" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
+"                      instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
+"                      Quality -1 is also possible, but may not be of\n"
+"                      acceptable quality.\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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
-" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
-"                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
-"                      used multiple times. The argument should be in the\n"
-"                      format \"tag=value\".\n"
+"                      used multiple times.\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\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 "
-"additional\n"
+" OggEnc input files must currently be 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"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
-" In this mode, output is to stdout unless an output filename is specified\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Gebruik: oggenc [opties] input.wav [...]\n"
+"\n"
+"OPTIES:\n"
+" Algemeen:\n"
+" -Q, --quiet          Geen uitvoer naar stderr sturen\n"
+" -h, --help           Deze help tekst weergeven\n"
+" -r, --raw            Ruwe modus. Invoer worden direct als PCM gegevens gelezen\n"
+" -B, --raw-bits=n     Voor ruwe invoer bits/monster instellen. Standaard is 16\n"
+" -C, --raw-chan=n     Aantal kanalen voor ruwe invoer instellen. Standaard is 2\n"
+" -R, --raw-rate=n     Voor ruwe invoer monsters/sec instellen. Standaard is 44100\n"
+" --raw-endianness     1 voor bigendian, 0 voor little (standaard is 0)\n"
+" -b, --bitrate        Een nominale bitrate aangeven om mee te coderen. Er wordt\n"
+"                      geprobeerd om met een bitrate te coderen waarvan het gemiddelde\n"
+"                      op de waarde ligt. Het argument is het aantal kbps. Dit gebruikt\n"
+"                      de bitrate-beheer engine, en wordt niet aangeraden voor de\n"
+"                      meeste gebruikers.\n"
+"                      Zie -q, --quality voor een beter alternatief.\n"
+" -m, --min-bitrate    Een minimale bitrate aangeven (in kbps). Nuttig voor coderen\n"
+"                      voor een kanaal met een vaste grootte.\n"
+" -M, --max-bitrate    Een maximale bitrate aangeven in kbps. Nuttig voor\n"
+"                      stroomtoepassingen.\n"
+" -q, --quality        Kwaliteit aangeven tussen 0 (laag) en 10 (hoog),\n"
+"                      in plaats van een bepaalde bitrate aangeven.\n"
+"                      Dit is de normale modus waarmee wordt gewerkt.\n"
+"                      Fracties zijn toegestaan (zoals 2.75)\n"
+"                      Kwaliteit -1 is ook mogelijk, maar geeft mogelijk geen\n"
+"                      acceptabele kwaliteit.\n"
+" --resample n         Opnieuw bemonsteren invoergegevens naar bemonster frequentie n (Hz)\n"
+" --downmix            Stereo terugbrengen tot mono. Alleen toegestaan bij stereo invoer.\n"
+" -s, --serial         Een serienummer aangeven voor de stroom. Bij het coderen van\n"
+"                      meerdere bestanden, zal dit bij elke stroom na de eerste verhoogd\n"
+"                      worden.\n"
+"\n"
+" Naamgeving:\n"
+" -o, --output=fn      Bestand schrijven naar fn (alleen geldig in enkel-bestandsmodus)\n"
+" -n, --names=string   Bestandsnamen maken zoals deze tekst, waarbij %%a, %%t, %%l,\n"
+"                      %%n, %%d wordt vervangen door artiest, titel, album, spoornummer,\n"
+"                      en datum, respectievelijk (hieronder staat hoe dit aangegeven wordt).\n"
+"                      %%%% geeft %%.\n"
+" -X, --name-remove=s  De aangegeven tekens verwijderen uit parameters die voorkomen in\n"
+"                      de tekst die meegegeven is aan de -n optie.\n"
+"                      Te gebruiken om toegestane bestandsnamen te garanderen.\n"
+" -P, --name-replace=s Tekens die verwijderd zijn door --name-remove vervangen met de\n"
+"                      aangegeven tekens. Als deze tekst korter is dan de lijst bij\n"
+"                      --name-remove, of deze tekst is niet aangegeven, worden extra\n"
+"                      tekens gewoon verwijderd.\n"
+"                      Standaardwaarden voor de twee hierboven genoemde argumenten zijn\n"
+"                      platform specifiek.\n"
+" -c, --comment=c      De gegeven string toevoegen als extra opmerking. Dit mag meerdere\n"
+"                      keren worden gebruikt.\n"
+" -d, --date           Datum voor spoor (normaal gesproken datum van opname)\n"
+" -N, --tracknum       Spoornummer voor dit spoor\n"
+" -t, --title          Titel voor dit spoor\n"
+" -l, --album          Naam van album\n"
+" -a, --artist         Naam van artiest\n"
+" -G, --genre          Genre van spoor\n"
+"                      Als er meerdere invoerbestanden zijn gegeven, zullen er meerdere\n"
+"                      instanties van de vorige vijf argumenten worden gebruikt,\n"
+"                      in de volgorde waarin ze zijn gegeven. Als er minder titels zijn\n"
+"                      aangegeven dan bestanden, geeft OggEnc een waarschuwing weer, en\n"
+"                      de laatste voor alle overblijvende bestanden gebruiken. Als er\n"
+"                      minder spoornummers zijn gegeven, zullen de overige bestanden niet\n"
+"                      worden genummerd. Voor de andere zal de laatste tag worden gebruikt\n"
+"                      voor alle andere, zonder waarschuwing (u kunt de datum dus één keer\n"
+"                      aangeven, bijvoorbeeld, en voor alle bestanden laten gebruiken)\n"
+"\n"
+"INVOERBESTANDEN:\n"
+" OggEnc invoerbestanden moeten op dit moment 16 of 8 bit PCM WAV, AIFF, AIFF/C\n"
+" of 32 bit IEEE floating point WAV bestanden zijn. Bestanden kunnen mono of stereo\n"
+" (of meer kanalen) zijn en mogen elke bemosteringsfrequentie hebben.\n"
+" Ook kan de --raw optie worden gebruikt om een ruw PCM gegevensbestand te gebruiken.\n"
+" Dat moet dan 16bit stereo little-endian PCM ('wav zonder kop', 'headerless wav') zijn,\n"
+" tenzij er meer parameters zijn aangegeven voor ruwe modus.\n"
+" U kunt aangeven dat het bestand van stdin moet worden genomen door - te gebruiken als\n"
+" invoer bestandsnaam. In deze modus wordt uitvoer naar stdout gestuurd, tenzij er een\n"
+" uitvoer bestandsnaam is aangegeven met -o\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:536
 #, 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"
+msgstr "WAARSCHUWING: Onjuist escape teken '%c' wordt genegeerd in naam formaat\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
-#, c-format
+#: oggenc/oggenc.c:562 oggenc/oggenc.c:670 oggenc/oggenc.c:683
 msgid "Enabling bitrate management engine\n"
 msgstr "De bitrate beheer-engine wordt aan gezet\n"
 
-#: oggenc/oggenc.c:661
-#, 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:571
+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:664
+#: oggenc/oggenc.c:574
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "WAARSCHUWING: Kon endianness argument \"%s\" niet lezen\n"
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:581
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "WAARSCHUWING: Kon herbemonster frequentie \"%s\" niet lezen\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:587
 #, 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"
+msgstr "Waarschuwing: Herbemonsterfrequentie aangegeven als %d Hz. Bedoelde u %d Hz?\n"
 
-#: oggenc/oggenc.c:687
-#, fuzzy, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Waarschuwing: Kon map %s niet lezen.\n"
-
-#: oggenc/oggenc.c:700
-#, c-format
+#: oggenc/oggenc.c:599
 msgid "No value for advanced encoder option found\n"
 msgstr "Geen waarde gevonden voor geavanceerde codeeroptie\n"
 
-#: oggenc/oggenc.c:718
-#, c-format
+#: oggenc/oggenc.c:610
 msgid "Internal error parsing command line options\n"
 msgstr "Interne fout bij inlezen opdrachtregel opties\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Waarschuwing: Onjuiste opmerking gebruikt (\"%s\"), genegeerd.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:656
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Waarschuwing: nominale bitrate \"%s\" wordt niet herkend\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:664
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Waarschuwing: minimale bitrate \"%s\" wordt niet herkend\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:677
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Waarschuwing: maximale bitrate \"%s\" wordt niet herkend\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:689
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Kwaliteitsoptie \"%s\" wordt niet herkend en genegeerd\n"
 
-#: oggenc/oggenc.c:807
-#, c-format
+#: oggenc/oggenc.c:697
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
-msgstr ""
-"WAARSCHUWING: kwaliteitsinstelling te hoog, maximale kwaliteit wordt "
-"gebruikt.\n"
+msgstr "WAARSCHUWING: kwaliteitsinstelling te hoog, maximale kwaliteit wordt gebruikt.\n"
 
-#: oggenc/oggenc.c:813
-#, c-format
+#: oggenc/oggenc.c:703
 msgid "WARNING: Multiple name formats specified, using final\n"
-msgstr ""
-"WAARSCHUWING: Meerdere naam formaten aangegeven, de laatste wordt gebruikt\n"
+msgstr "WAARSCHUWING: Meerdere naam formaten aangegeven, de laatste wordt gebruikt\n"
 
-#: oggenc/oggenc.c:822
-#, c-format
+#: oggenc/oggenc.c:712
 msgid "WARNING: Multiple name format filters specified, using final\n"
-msgstr ""
-"WAARSCHUWING: Meerdere naam formaat filters aangegeven, de laatste wordt "
-"gebruikt\n"
+msgstr "WAARSCHUWING: Meerdere naam formaat filters aangegeven, de laatste wordt gebruikt\n"
 
-#: oggenc/oggenc.c:831
-#, 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:721
+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:839
-#, c-format
+#: oggenc/oggenc.c:729
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
-msgstr ""
-"WAARSCHUWING: Meerdere uitvoerbestanden aangegeven, misschien is -n nodig?\n"
+msgstr "WAARSCHUWING: Meerdere uitvoerbestanden aangegeven, misschien is -n nodig?\n"
 
-#: oggenc/oggenc.c:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 van %s %s\n"
+#: oggenc/oggenc.c:748
+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"
 
-#: oggenc/oggenc.c:858
-#, 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"
-
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
-#, c-format
+#. Failed, so just set to 16
+#: oggenc/oggenc.c:753 oggenc/oggenc.c:757
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "WAARSCHUWING: Onjuiste bits/monster aangeven, 16 wordt gekozen.\n"
 
-#: oggenc/oggenc.c:874
-#, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"WAARSCHUWING: Ruw kanaal aantal aangegeven voor niet-ruwe gegevens. Er wordt "
-"aangenomen dat invoer ruw is.\n"
+#: oggenc/oggenc.c:764
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "WAARSCHUWING: Ruw kanaal aantal aangegeven voor niet-ruwe gegevens. Er wordt aangenomen dat invoer ruw is.\n"
 
-#: oggenc/oggenc.c:879
-#, c-format
+#. Failed, so just set to 2
+#: oggenc/oggenc.c:769
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "WAARSCHUWING: Onjuist kanaal aantal aangegeven, 2 wordt gekozen.\n"
 
-#: oggenc/oggenc.c:890
-#, 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"
+#: oggenc/oggenc.c:780
+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"
 
-#: oggenc/oggenc.c:895
-#, c-format
+#. Failed, so just set to 44100
+#: oggenc/oggenc.c:785
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
-msgstr ""
-"WAARSCHUWING: Onjuiste bemonsteringsfrequentie aangegeven, 44100 wordt "
-"gekozen.\n"
+msgstr "WAARSCHUWING: Onjuiste bemonsteringsfrequentie aangegeven, 44100 wordt gekozen.\n"
 
-#: oggenc/oggenc.c:902
-#, c-format
+#: oggenc/oggenc.c:789
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "WAARSCHUWING: Onbekende optie aangegeven, wordt genegeerd->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Kon opmerking niet converteren naar UTF-8, toevoegen onmogelijk\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
-#, c-format
+#: oggenc/oggenc.c:811
 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:954
-#, c-format
+#: oggenc/oggenc.c:830
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
-msgstr ""
-"WAARSCHUWING: Te weinig titels aangegeven, laatste titel wordt de "
-"standaard.\n"
+msgstr "WAARSCHUWING: Te weinig titels aangegeven, laatste titel wordt de standaard.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Kon map \"%s\" niet maken: %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Fout bij controleren op aanwezigheid van map %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:167
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Fout: pad deel \"%s\" is geen map\n"
 
-#: ogginfo/ogginfo2.c:212
-#, 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:220
+#: ogginfo/ogginfo2.c:156
 #, 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"
+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:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo2.c:164
 #, 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"
+msgid "Warning: Vorbis 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:266
+#: ogginfo/ogginfo2.c:168
 #, 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:342
-#, fuzzy, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Waarschuwing: Onjuiste UTF-8 codes in opmerking %d (stroom %d): onjuiste "
-"opvolging van codes\n"
-
-#: ogginfo/ogginfo2.c:356
-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:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Waarschuwing: EOS niet ingesteld voor stroom %d\n"
-
-#: ogginfo/ogginfo2.c:389
-#, 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:396
-#, 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:400
-#, 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:403
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Versie: %d\n"
-
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
-#, c-format
-msgid "Vendor: %s\n"
-msgstr "Maker: %s\n"
-
-#: ogginfo/ogginfo2.c:406
-#, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Versie: %d\n"
-
-#: ogginfo/ogginfo2.c:408
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:416
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:429
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:431
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:433
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:437
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:439
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:441
-#, fuzzy
-msgid "Colourspace unspecified\n"
-msgstr "geen actie aangegeven\n"
-
-#: ogginfo/ogginfo2.c:444
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:446
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:448
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:450
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:452
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr "Bovengrens bitrate: %f kb/s\n"
-
-#: ogginfo/ogginfo2.c:453
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
-msgid "User comments section follows...\n"
-msgstr "Gebruikersopmerkingen deel volgt...\n"
-
-#: ogginfo/ogginfo2.c:477
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Waarschuwing: EOS niet ingesteld voor stroom %d\n"
-
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Waarschuwing: granulepos in stroom %d neemt af van "
-
-#: ogginfo/ogginfo2.c:520
-msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-"Waarschuwing: Kon vorbis koppakket niet decoderen - onjuiste vorbis stroom (%"
-"d)\n"
-
-#: ogginfo/ogginfo2.c:565
-#, 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"
-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:569
-#, 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:572
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid "Version: %d\n"
 msgstr "Versie: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:175
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Maker: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:182
 #, c-format
+msgid "Vendor: %s\n"
+msgstr "Maker: %s\n"
+
+#: ogginfo/ogginfo2.c:183
+#, c-format
 msgid "Channels: %d\n"
 msgstr "Kanalen: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:184
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1862,199 +1201,120 @@
 "Frequentie: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:187
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Nominale bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:190
 msgid "Nominal bitrate not set\n"
 msgstr "Nominale bitrate niet ingesteld\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:193
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Bovengrens bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:196
 msgid "Upper bitrate not set\n"
 msgstr "Bovengrens bitrate niet ingesteld\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:199
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Ondergrens bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:202
 msgid "Lower bitrate not set\n"
 msgstr "Ondergrens bitrate niet ingesteld\n"
 
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo2.c:205
+msgid "User comments section follows...\n"
+msgstr "Gebruikersopmerkingen deel volgt...\n"
+
+#: ogginfo/ogginfo2.c:217
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
+msgid "Warning: Comment %d in stream %d is invalidly formatted, does not contain '=': \"%s\"\n"
+msgstr "Waarschuwing: Opmerking %d in stroom %d is niet juist opgemaakt, bevat geen '='; \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:651
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
+#: ogginfo/ogginfo2.c:226
+#, 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:692
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Waarschuwing: Kon vorbis koppakket niet decoderen - onjuiste vorbis stroom (%"
-"d)\n"
-
-#: ogginfo/ogginfo2.c:703
-#, fuzzy, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Waarschuwing: Kon vorbis koppakket niet decoderen - onjuiste vorbis stroom (%"
-"d)\n"
-
-#: ogginfo/ogginfo2.c:734
-#, fuzzy, c-format
-msgid ""
-"Warning: Kate 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:738
-#, fuzzy, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr "Vorbis koppen ingelezen voor stroom %d, informatie volgt...\n"
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Versie: %d\n"
-
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:257 ogginfo/ogginfo2.c:266
 #, c-format
-msgid "Language: %s\n"
-msgstr ""
+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:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Maker: %s\n"
-
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
-msgid "No category set\n"
-msgstr "Nominale bitrate niet ingesteld\n"
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:274
 #, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
+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:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
+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:783
-msgid "Unknown text directionality\n"
-msgstr ""
+#: ogginfo/ogginfo2.c:347
+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:795
-msgid "Invalid zero granulepos rate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:797
+#: ogginfo/ogginfo2.c:364
 #, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr ""
+msgid "Warning: granulepos in stream %d decreases from "
+msgstr "Waarschuwing: granulepos in stroom %d neemt af van "
 
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:365
+msgid " to "
+msgstr " tot "
+
+#: ogginfo/ogginfo2.c:365
 msgid "\n"
 msgstr "\n"
 
-#: ogginfo/ogginfo2.c:828
+#: ogginfo/ogginfo2.c:384
 #, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %ld bytes\n"
+"\tPlayback length: %ldm:%02lds\n"
+"\tAverage bitrate: %f kbps\n"
 msgstr ""
+"Vorbis stroom %d:\n"
+"\tTotale gegevenslengte: %ld bytes\n"
+"\tAfspeellengte: %ldm:%02lds\n"
+"\tGemiddelde bitrate: %f kbps\n"
 
-#: ogginfo/ogginfo2.c:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:418
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Waarschuwing: EOS niet ingesteld voor stroom %d\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:537
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Waarschuwing: Onjuiste koppagina, geen pakket gevonden\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:549
 #, 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"
+msgstr "Waarschuwing: Onjuiste koppagina in stroom %d, bevat meerdere pakketten\n"
 
-#: ogginfo/ogginfo2.c:1088
-#, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1105
-#, fuzzy
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
+#: ogginfo/ogginfo2.c:574
+msgid "Warning: Hole in data found at approximate offset "
 msgstr "Waarschuwing: Gat in gegevens gevonden op plaats (ongeveer) "
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:575
+msgid " bytes. Corrupted ogg.\n"
+msgstr " bytes. Slechte ogg.\n"
+
+#: ogginfo/ogginfo2.c:599
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Fout bij openen invoerbestand \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:604
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2063,88 +1323,66 @@
 "Verwerken bestand \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:613
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Kon geen verwerker vinden voor stroom, afsluiten\n"
 
-#: ogginfo/ogginfo2.c:1151
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1154
+#: ogginfo/ogginfo2.c:618
+#, c-format
 msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1158
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1161
-#, fuzzy, c-format
-msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
-"This indicates a corrupt ogg file: %s.\n"
+"This indicates a corrupt ogg file.\n"
 msgstr ""
 "Waarschuwing: onjuist geplaatste pagina(s) voor logische stroom %d\n"
 "Dit geeft een slecht ogg bestand aan.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:625
 #, 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:1176
+#: ogginfo/ogginfo2.c:628
 #, 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:1180
+#: ogginfo/ogginfo2.c:632
 #, 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:1185
+#: ogginfo/ogginfo2.c:637
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
-msgstr ""
-"Waarschuwing: gat gevonden in nummering fragmenten in stroom %d. Pagina %ld "
-"ontvangen, %ld verwacht. Geeft ontbrekende gegevens aan.\n"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "Waarschuwing: gat gevonden in nummering fragmenten in stroom %d. Pagina %ld ontvangen, %ld verwacht. Geeft ontbrekende gegevens aan.\n"
 
-#: ogginfo/ogginfo2.c:1200
+#: ogginfo/ogginfo2.c:652
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Logische stroom %d geëindigd\n"
 
-#: ogginfo/ogginfo2.c:1208
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:659
+#, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
+"Input probably not ogg.\n"
 msgstr ""
 "Fout: Geen ogg gegevens gevonden in bestand \"%s\".\n"
 "Invoer is waarschijnlijk geen ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 van %s %s\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:670
 msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
+"ogginfo 1.0\n"
+"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] files1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
 "\t-h Show this help message\n"
 "\t-q Make less verbose. Once will remove detailed informative\n"
 "\t   messages, two will remove warnings\n"
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
+"\n"
 msgstr ""
 "ogginfo 1.0\n"
 "(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
@@ -2152,26 +1390,17 @@
 "Gebruik: ogginfo [opties] bestanden1.ogg [bestand2.ogg ... bestandN.ogg]\n"
 "Ondersteunde opties:\n"
 "\t-h Deze hulp weergeven.\n"
-"\t-q Minder informatie weergeven. Als dit een keer wordt gebruikt, "
-"verdwijnt\n"
-"\t   de gedetailleerde, informatieve informatie. Bij twee keer, ook "
-"waarschuwingen.\n"
-"\t-v Meer informatie weergeven. Dit zet mogelijk gedetailleerdere controles "
-"aan\n"
+"\t-q Minder informatie weergeven. Als dit een keer wordt gebruikt, verdwijnt\n"
+"\t   de gedetailleerde, informatieve informatie. Bij twee keer, ook waarschuwingen.\n"
+"\t-v Meer informatie weergeven. Dit zet mogelijk gedetailleerdere controles aan\n"
 "\t   voor sommige soorten stromen.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1234
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:691
 msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
-"ogginfo is a tool for printing information about Ogg files\n"
+"Ogginfo is a tool for printing information about ogg files\n"
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
@@ -2181,8 +1410,7 @@
 "en helpt bij het vinden van problemen met die bestanden.\n"
 "Volledige hulp wordt weergegeven met \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
-#, c-format
+#: ogginfo/ogginfo2.c:720
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Geen invoerbestanden aangegeven. \"ogginfo -h\" voor hulp.\n"
 
@@ -2206,16 +1434,19 @@
 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"
@@ -2226,6 +1457,7 @@
 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"
@@ -2241,43 +1473,35 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `-W %s' heeft geen argumenten\n"
 
-#: vcut/vcut.c:149
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr "Pagina fout. Beschadigde invoer.\n"
 
-#: vcut/vcut.c:166
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr "Bitstroom fout, doorgaan\n"
 
-#: vcut/vcut.c:206
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr "EOS gevonden voor knippunt.\n"
 
-#: vcut/vcut.c:215
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr "EOS instellen: bijwerkingssynchronisatie gaf 0\n"
 
-#: vcut/vcut.c:225
-#, c-format
+#: vcut/vcut.c:192
 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:277
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Niet behandelde speciale situatie: eerste bestand te kort?\n"
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr "Knippunt niet binnen stroom. Tweede bestand zal leeg zijn\n"
-
-#: vcut/vcut.c:353
-#, c-format
+#. 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:284
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -2285,59 +1509,47 @@
 "FOUT: Eerste twee audio pakketjes pasten niet in één ogg\n"
 "      pagina. Mogelijk decodeert het bestand niet juist.\n"
 
-#: vcut/vcut.c:373
-#, c-format
-msgid "Update sync returned 0, setting eos\n"
-msgstr "Bijwerkingssynchronisatie gaf 0, EOS instellen\n"
-
-#: vcut/vcut.c:378
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr "Herstelbare bitstroom fout\n"
 
-#: vcut/vcut.c:387
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr "Bitstroom fout\n"
 
-#: vcut/vcut.c:449
-#, c-format
+#: vcut/vcut.c:330
+msgid "Update sync returned 0, setting eos\n"
+msgstr "Bijwerkingssynchronisatie gaf 0, EOS instellen\n"
+
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "Invoer niet ogg.\n"
 
-#: vcut/vcut.c:459
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Fout in eerste pagina\n"
 
-#: vcut/vcut.c:464
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "fout in eerste pakket\n"
 
-#: vcut/vcut.c:470
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Fout in eerste kop: niet vorbis?\n"
 
-#: vcut/vcut.c:490
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Tweede kop beschadigd\n"
 
-#: vcut/vcut.c:503
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "EOF in koppen\n"
 
-#: vcut/vcut.c:535
-#, fuzzy, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+#: vcut/vcut.c:456
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
 msgstr "Gebruik: vcut inbestand.ogg uitbestand1.ogg uitbestand2.ogg knippunt\n"
 
-#: vcut/vcut.c:539
-#, c-format
+#: vcut/vcut.c:460
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -2347,676 +1559,190 @@
 "Controleer uitvoerbestanden voordat u de bronbestanden verwijdert.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Kon %s niet openen om te lezen\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Kon %s niet openen om te schrijven\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Kon knippunt \"%s\" niet lezen\n"
 
-#: vcut/vcut.c:570
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+#: vcut/vcut.c:484
+#, c-format
+msgid "Processing: Cutting at %lld\n"
 msgstr "Verwerken: knippen bij %lld\n"
 
-#: vcut/vcut.c:572
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr "Verwerken: knippen bij %lld\n"
-
-#: vcut/vcut.c:582
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr "Verwerken mislukt\n"
 
-#: vcut/vcut.c:604
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr "Fout bij lezen koppen\n"
 
-#: vcut/vcut.c:627
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr "Fout bij schrijven eerste uitvoerbestand\n"
 
-#: vcut/vcut.c:635
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr "Fout bij schrijven tweede uitvoerbestand\n"
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:220
+msgid "Input truncated or empty."
+msgstr "Invoer afgekapt of leeg."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:222
+msgid "Input is not an Ogg bitstream."
+msgstr "Invoer is niet een Ogg bitstroom."
+
+#: vorbiscomment/vcedit.c:239
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Fout bij lezen eerste pagina van Ogg bitstroom."
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:245
 msgid "Error reading initial header packet."
 msgstr "Fout bij lezen eerste koppakket."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Invoer afgekapt of leeg."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "Invoer is niet een Ogg bitstroom."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:251
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Ogg bitstroom bevat geen vorbis gegevens."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "EOF voor einde van vorbis koppen."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg bitstroom bevat geen vorbis gegevens."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:274
 msgid "Corrupt secondary header."
 msgstr "Beschadigde tweede kop."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:295
 msgid "EOF before end of vorbis headers."
 msgstr "EOF voor einde van vorbis koppen."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:448
 msgid "Corrupt or missing data, continuing..."
 msgstr "Beschadigde of missende gegevens, doorgaan..."
 
-#: vorbiscomment/vcedit.c:875
-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/vcedit.c:487
+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:190 vorbiscomment/vcomment.c:216
+#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Openen bestand als vorbis mislukt: %s\n"
 
-#: vorbiscomment/vcomment.c:235
+#: vorbiscomment/vcomment.c:148
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Foute opmerking: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "foute opmerking: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:170
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Fout bij schrijven opmerkingen naar uitvoerbestand: %s\n"
 
-#: vorbiscomment/vcomment.c:274
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:187
 msgid "no action specified\n"
 msgstr "geen actie aangegeven\n"
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
-msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
+#: 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:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
+#: vorbiscomment/vcomment.c:287
 msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
+"   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 ""
+"Gebruik: \n"
+"  vorbiscomment [-l] bestand.ogg (om de opmerkingen op te sommen)\n"
+"  vorbiscomment -a in.ogg uit.ogg (om opmerkingen toe te voegen)\n"
+"  vorbiscomment -w in.ogg uit.ogg (om opmerkingen te wijzigen)\n"
+"\tbij schrijven, wordt een nieuwe verzameling opmerkingen verwacht in de\n"
+"\tvorm 'TAG=waarde' op stdin. Deze verzameling zal de bestaande verzameling\n"
+"\tvolledig vervangen.\n"
+"   Zowel -a als -w kan slechts één bestandsnaam aannemen,\n"
+"   waarbij een tijdelijk bestand wordt gebruikt.\n"
+"   -c kan worden gebruikt om opmerkingen uit een aangegeven bestand te halen\n"
+"   in plaats van stdin.\n"
+"   Voorbeeld: vorbiscomment -a in.ogg -c opmerkingen.txt\n"
+"   zal de opmerkingen uit opmerkingen.txt toevoegen aan in.ogg\n"
+"   Tot slot, kunt u elk aantal tags aangeven om toe te voegen via de\n"
+"   opdrachtregel door de -t optie te gebruiken. Bijvoorbeeld\n"
+"   vorbiscomment -a in.ogg -t \"ARTIST=Iemand\" -t \"TITLE=Een titel\"\n"
+"   (merk op dat als u dit gebruikt, het lezen van opmerkingen uit een\n"
+"   opmerkingen bestand of van stdin uit wordt gezet)\n"
+"   Ruwe modus (--raw, -R) zal opmerkingen lezen en schrijven in utf8,\n"
+"   in plaats van converteren van/naar tekenset van de gebruiker. Dit is nuttig\n"
+"   als vorbiscomment in scripts wordt gebruikt. Het is alleen niet genoeg\n"
+"   voor het rondsturen van opmerkingen in alle gevallen.\n"
 
-#: vorbiscomment/vcomment.c:391
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Onjuiste soort in optielijst"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
+#: vorbiscomment/vcomment.c:371
 msgid "Internal error parsing command options\n"
 msgstr "Interne fout bij lezen opdracht opties\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:456
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Fout bij openen invoerbestand '%s'.\n"
 
-#: vorbiscomment/vcomment.c:587
-#, c-format
+#: vorbiscomment/vcomment.c:465
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Invoerbestandsnaam mag niet hetzelfde zijn als uitvoerbestandsnaam\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:476
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Fout bij openen uitvoerbestand '%s'.\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:491
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Fout bij openen opmerkingen bestand '%s'.\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:508
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Fout bij openen opmerkingen bestand '%s'\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:536
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Fout bij verwijderen oude bestand %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:538
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Fout bij hernoemen %s naar %s\n"
-
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Fout bij verwijderen oude bestand %s\n"
-
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 van %s %s\n"
-#~ " van de Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Gebruik: ogg123 [<opties>] <invoerbestand> ...\n"
-#~ "\n"
-#~ "  -h, --help     deze hulp\n"
-#~ "  -V, --version  versie weergeven\n"
-#~ "  -d, --device=d gebruikt 'd' als uitvoerapparaat\n"
-#~ "      Mogelijke apparaten zijn ('*'=live, '@'=bestand):\n"
-#~ "        "
-
-#~ 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"
-#~ "  -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"
-#~ "\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"
-#~ msgstr ""
-#~ "  -f, --file=bestandsnaam    de bestandsnaam voor uitvoer instellen voor\n"
-#~ "      een eerder aangegeven bestandsapparaat (met -d).\n"
-#~ "  -k n, --skip n             eerste 'n' seconden overslaan\n"
-#~ "  -o, --device-option=k:v    speciale optie k met waarde v meegeven aan\n"
-#~ "      eerder aangegeven apparaat (met -d). Zie man pagina voor meer "
-#~ "info.\n"
-#~ "  -b n, --buffer n           een invoerbuffer van 'n' kilobytes "
-#~ "gebruiken\n"
-#~ "  -p n, --prebuffer n        n%% van invoerbuffer laden voor afspelen\n"
-#~ "  -v, --verbose              voortgang en andere status informatie "
-#~ "weergeven\n"
-#~ "  -q, --quiet                niets weergeven (geen titel)\n"
-#~ "  -x n, --nth                elk 'n'de blok afspelen\n"
-#~ "  -y n, --ntimes             elk afgespeeld blok 'n' keer herhalen\n"
-#~ "  -z, --shuffle              afspelen in willekeurige volgorde\n"
-#~ "\n"
-#~ "ogg123 zal het volgende liedje overslaan bij SIGINT (Ctrl-C); twee keer "
-#~ "SIGINTs\n"
-#~ "binnen s milliseconden breekt ogg123 af.\n"
-#~ "  -l, --delay=s              s instellen [milliseconden] (standaard "
-#~ "500).\n"
-
-#~ msgid "Track number:"
-#~ msgstr "Spoornummer:"
-
-#~ msgid "ReplayGain (Track):"
-#~ msgstr "AangepasteGeluidssterkte (ReplayGain) (Spoor):"
-
-#~ msgid "ReplayGain (Album):"
-#~ msgstr "HerspeelFactor (Album):"
-
-#~ msgid "ReplayGain (Track) Peak:"
-#~ msgstr "HerspeelFactor (Spoor) piek:"
-
-#~ msgid "ReplayGain (Album) Peak:"
-#~ msgstr "HerspeelFactor (Album) piek:"
-
-#~ msgid "Copyright"
-#~ msgstr "Auteursrecht"
-
-#~ msgid "Comment:"
-#~ msgstr "Opmerking:"
-
-#~ msgid "Version is %d"
-#~ msgstr "Versie is %d"
-
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " General:\n"
-#~ " -Q, --quiet          Produce no output to stderr\n"
-#~ " -h, --help           Print this help text\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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --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"
-#~ " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-#~ "                      encoding for a fixed-size channel.\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"
-#~ "                      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"
-#~ " --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"
-#~ "\n"
-#~ " Naming:\n"
-#~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times.\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 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"
-#~ " Alternatively, the --raw option may be used to use a raw PCM data file, "
-#~ "which\n"
-#~ " must be 16bit stereo little-endian PCM ('headerless wav'), unless "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an outfile filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Gebruik: oggenc [opties] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIES:\n"
-#~ " Algemeen:\n"
-#~ " -Q, --quiet          Geen uitvoer naar stderr sturen\n"
-#~ " -h, --help           Deze help tekst weergeven\n"
-#~ " -r, --raw            Ruwe modus. Invoer worden direct als PCM gegevens "
-#~ "gelezen\n"
-#~ " -B, --raw-bits=n     Voor ruwe invoer bits/monster instellen. Standaard "
-#~ "is 16\n"
-#~ " -C, --raw-chan=n     Aantal kanalen voor ruwe invoer instellen. "
-#~ "Standaard is 2\n"
-#~ " -R, --raw-rate=n     Voor ruwe invoer monsters/sec instellen. Standaard "
-#~ "is 44100\n"
-#~ " --raw-endianness     1 voor bigendian, 0 voor little (standaard is 0)\n"
-#~ " -b, --bitrate        Een nominale bitrate aangeven om mee te coderen. Er "
-#~ "wordt\n"
-#~ "                      geprobeerd om met een bitrate te coderen waarvan "
-#~ "het gemiddelde\n"
-#~ "                      op de waarde ligt. Het argument is het aantal kbps. "
-#~ "Dit gebruikt\n"
-#~ "                      de bitrate-beheer engine, en wordt niet aangeraden "
-#~ "voor de\n"
-#~ "                      meeste gebruikers.\n"
-#~ "                      Zie -q, --quality voor een beter alternatief.\n"
-#~ " -m, --min-bitrate    Een minimale bitrate aangeven (in kbps). Nuttig "
-#~ "voor coderen\n"
-#~ "                      voor een kanaal met een vaste grootte.\n"
-#~ " -M, --max-bitrate    Een maximale bitrate aangeven in kbps. Nuttig voor\n"
-#~ "                      stroomtoepassingen.\n"
-#~ " -q, --quality        Kwaliteit aangeven tussen 0 (laag) en 10 (hoog),\n"
-#~ "                      in plaats van een bepaalde bitrate aangeven.\n"
-#~ "                      Dit is de normale modus waarmee wordt gewerkt.\n"
-#~ "                      Fracties zijn toegestaan (zoals 2.75)\n"
-#~ "                      Kwaliteit -1 is ook mogelijk, maar geeft mogelijk "
-#~ "geen\n"
-#~ "                      acceptabele kwaliteit.\n"
-#~ " --resample n         Opnieuw bemonsteren invoergegevens naar bemonster "
-#~ "frequentie n (Hz)\n"
-#~ " --downmix            Stereo terugbrengen tot mono. Alleen toegestaan bij "
-#~ "stereo invoer.\n"
-#~ " -s, --serial         Een serienummer aangeven voor de stroom. Bij het "
-#~ "coderen van\n"
-#~ "                      meerdere bestanden, zal dit bij elke stroom na de "
-#~ "eerste verhoogd\n"
-#~ "                      worden.\n"
-#~ "\n"
-#~ " Naamgeving:\n"
-#~ " -o, --output=fn      Bestand schrijven naar fn (alleen geldig in enkel-"
-#~ "bestandsmodus)\n"
-#~ " -n, --names=string   Bestandsnamen maken zoals deze tekst, waarbij %%a, %"
-#~ "%t, %%l,\n"
-#~ "                      %%n, %%d wordt vervangen door artiest, titel, "
-#~ "album, spoornummer,\n"
-#~ "                      en datum, respectievelijk (hieronder staat hoe dit "
-#~ "aangegeven wordt).\n"
-#~ "                      %%%% geeft %%.\n"
-#~ " -X, --name-remove=s  De aangegeven tekens verwijderen uit parameters die "
-#~ "voorkomen in\n"
-#~ "                      de tekst die meegegeven is aan de -n optie.\n"
-#~ "                      Te gebruiken om toegestane bestandsnamen te "
-#~ "garanderen.\n"
-#~ " -P, --name-replace=s Tekens die verwijderd zijn door --name-remove "
-#~ "vervangen met de\n"
-#~ "                      aangegeven tekens. Als deze tekst korter is dan de "
-#~ "lijst bij\n"
-#~ "                      --name-remove, of deze tekst is niet aangegeven, "
-#~ "worden extra\n"
-#~ "                      tekens gewoon verwijderd.\n"
-#~ "                      Standaardwaarden voor de twee hierboven genoemde "
-#~ "argumenten zijn\n"
-#~ "                      platform specifiek.\n"
-#~ " -c, --comment=c      De gegeven string toevoegen als extra opmerking. "
-#~ "Dit mag meerdere\n"
-#~ "                      keren worden gebruikt.\n"
-#~ " -d, --date           Datum voor spoor (normaal gesproken datum van "
-#~ "opname)\n"
-#~ " -N, --tracknum       Spoornummer voor dit spoor\n"
-#~ " -t, --title          Titel voor dit spoor\n"
-#~ " -l, --album          Naam van album\n"
-#~ " -a, --artist         Naam van artiest\n"
-#~ " -G, --genre          Genre van spoor\n"
-#~ "                      Als er meerdere invoerbestanden zijn gegeven, "
-#~ "zullen er meerdere\n"
-#~ "                      instanties van de vorige vijf argumenten worden "
-#~ "gebruikt,\n"
-#~ "                      in de volgorde waarin ze zijn gegeven. Als er "
-#~ "minder titels zijn\n"
-#~ "                      aangegeven dan bestanden, geeft OggEnc een "
-#~ "waarschuwing weer, en\n"
-#~ "                      de laatste voor alle overblijvende bestanden "
-#~ "gebruiken. Als er\n"
-#~ "                      minder spoornummers zijn gegeven, zullen de overige "
-#~ "bestanden niet\n"
-#~ "                      worden genummerd. Voor de andere zal de laatste tag "
-#~ "worden gebruikt\n"
-#~ "                      voor alle andere, zonder waarschuwing (u kunt de "
-#~ "datum dus één keer\n"
-#~ "                      aangeven, bijvoorbeeld, en voor alle bestanden "
-#~ "laten gebruiken)\n"
-#~ "\n"
-#~ "INVOERBESTANDEN:\n"
-#~ " OggEnc invoerbestanden moeten op dit moment 16 of 8 bit PCM WAV, AIFF, "
-#~ "AIFF/C\n"
-#~ " of 32 bit IEEE floating point WAV bestanden zijn. Bestanden kunnen mono "
-#~ "of stereo\n"
-#~ " (of meer kanalen) zijn en mogen elke bemosteringsfrequentie hebben.\n"
-#~ " Ook kan de --raw optie worden gebruikt om een ruw PCM gegevensbestand te "
-#~ "gebruiken.\n"
-#~ " Dat moet dan 16bit stereo little-endian PCM ('wav zonder kop', "
-#~ "'headerless wav') zijn,\n"
-#~ " tenzij er meer parameters zijn aangegeven voor ruwe modus.\n"
-#~ " U kunt aangeven dat het bestand van stdin moet worden genomen door - te "
-#~ "gebruiken als\n"
-#~ " invoer bestandsnaam. In deze modus wordt uitvoer naar stdout gestuurd, "
-#~ "tenzij er een\n"
-#~ " uitvoer bestandsnaam is aangegeven met -o\n"
-#~ "\n"
-
-#~ msgid " to "
-#~ msgstr " tot "
-
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %ld bytes\n"
-#~ "\tPlayback length: %ldm:%02lds\n"
-#~ "\tAverage bitrate: %f kbps\n"
-#~ msgstr ""
-#~ "Vorbis stroom %d:\n"
-#~ "\tTotale gegevenslengte: %ld bytes\n"
-#~ "\tAfspeellengte: %ldm:%02lds\n"
-#~ "\tGemiddelde bitrate: %f kbps\n"
-
-#~ msgid " bytes. Corrupted ogg.\n"
-#~ msgstr " bytes. Slechte ogg.\n"
-
-#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
-#~ msgstr "Kon opmerking niet converteren naar UTF-8, toevoegen onmogelijk\n"
-
-#~ msgid ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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"
-#~ "   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 ""
-#~ "Gebruik: \n"
-#~ "  vorbiscomment [-l] bestand.ogg (om de opmerkingen op te sommen)\n"
-#~ "  vorbiscomment -a in.ogg uit.ogg (om opmerkingen toe te voegen)\n"
-#~ "  vorbiscomment -w in.ogg uit.ogg (om opmerkingen te wijzigen)\n"
-#~ "\tbij schrijven, wordt een nieuwe verzameling opmerkingen verwacht in de\n"
-#~ "\tvorm 'TAG=waarde' op stdin. Deze verzameling zal de bestaande "
-#~ "verzameling\n"
-#~ "\tvolledig vervangen.\n"
-#~ "   Zowel -a als -w kan slechts één bestandsnaam aannemen,\n"
-#~ "   waarbij een tijdelijk bestand wordt gebruikt.\n"
-#~ "   -c kan worden gebruikt om opmerkingen uit een aangegeven bestand te "
-#~ "halen\n"
-#~ "   in plaats van stdin.\n"
-#~ "   Voorbeeld: vorbiscomment -a in.ogg -c opmerkingen.txt\n"
-#~ "   zal de opmerkingen uit opmerkingen.txt toevoegen aan in.ogg\n"
-#~ "   Tot slot, kunt u elk aantal tags aangeven om toe te voegen via de\n"
-#~ "   opdrachtregel door de -t optie te gebruiken. Bijvoorbeeld\n"
-#~ "   vorbiscomment -a in.ogg -t \"ARTIST=Iemand\" -t \"TITLE=Een titel\"\n"
-#~ "   (merk op dat als u dit gebruikt, het lezen van opmerkingen uit een\n"
-#~ "   opmerkingen bestand of van stdin uit wordt gezet)\n"
-#~ "   Ruwe modus (--raw, -R) zal opmerkingen lezen en schrijven in utf8,\n"
-#~ "   in plaats van converteren van/naar tekenset van de gebruiker. Dit is "
-#~ "nuttig\n"
-#~ "   als vorbiscomment in scripts wordt gebruikt. Het is alleen niet "
-#~ "genoeg\n"
-#~ "   voor het rondsturen van opmerkingen in alle gevallen.\n"

Modified: trunk/vorbis-tools/po/pl.po
===================================================================
--- trunk/vorbis-tools/po/pl.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/pl.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.2.1\n"
 "Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2008-09-12 02:53+0100\n"
 "PO-Revision-Date: 2008-09-16 21:30+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh at pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl at lists.sourceforge.net>\n"
@@ -31,8 +31,7 @@
 #: ogg123/callbacks.c:78
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
-msgstr ""
-"Błąd: %s wymaga podania nazwy pliku wyjściowego przy użyciu opcji -f.\n"
+msgstr "Błąd: %s wymaga podania nazwy pliku wyjściowego przy użyciu opcji -f.\n"
 
 #: ogg123/callbacks.c:81
 #, c-format
@@ -155,9 +154,9 @@
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:571 oggenc/oggenc.c:576
+#: oggenc/oggenc.c:581 oggenc/oggenc.c:586 oggenc/oggenc.c:591
+#: oggenc/oggenc.c:596
 msgid "(none)"
 msgstr "(brak)"
 
@@ -263,12 +262,8 @@
 msgstr "--- Sterownik %s podany w pliku konfiguracyjnym jest błędny.\n"
 
 #: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Nie można wczytać domyślnego sterownika, a w pliku konfiguracyjnym nie "
-"określono sterownika. Zakończenie.\n"
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Nie można wczytać domyślnego sterownika, a w pliku konfiguracyjnym nie określono sterownika. Zakończenie.\n"
 
 #: ogg123/cmdline_options.c:292
 #, c-format
@@ -323,10 +318,8 @@
 
 #: ogg123/cmdline_options.c:311
 #, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-"  -d urz, --device urz    Użycie urządzenia wyjściowego \"urz\". Dostępne:\n"
+msgid "  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
+msgstr "  -d urz, --device urz    Użycie urządzenia wyjściowego \"urz\". Dostępne:\n"
 
 #: ogg123/cmdline_options.c:313
 #, c-format
@@ -350,8 +343,7 @@
 #: ogg123/cmdline_options.c:334
 #, c-format
 msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-"  --audio-buffer n        Użycie n-kilobajtowego bufora wyjścia dźwięku\n"
+msgstr "  --audio-buffer n        Użycie n-kilobajtowego bufora wyjścia dźwięku\n"
 
 #: ogg123/cmdline_options.c:335
 #, c-format
@@ -364,8 +356,7 @@
 "  -o k:w, --device-option k:w\n"
 "                          Przekazanie opcji specjalnej 'k' o wartości 'v'\n"
 "                          do urządzenia określonego przez --device.\n"
-"                          Dostępne opcje można znaleźć na stronie manuala "
-"do\n"
+"                          Dostępne opcje można znaleźć na stronie manuala do\n"
 "                          ogg123.\n"
 
 #: ogg123/cmdline_options.c:341
@@ -375,11 +366,8 @@
 
 #: ogg123/cmdline_options.c:342
 #, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-"  -@ plik, --list plik    Odczyt listy odtwarzania plików i URL-i z \"pliku"
-"\"\n"
+msgid "  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
+msgstr "  -@ plik, --list plik    Odczyt listy odtwarzania plików i URL-i z \"pliku\"\n"
 
 #: ogg123/cmdline_options.c:343
 #, c-format
@@ -394,8 +382,7 @@
 #: ogg123/cmdline_options.c:345
 #, c-format
 msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-"  -z, --shuffle           Przemieszanie listy plików przed odtwarzaniem\n"
+msgstr "  -z, --shuffle           Przemieszanie listy plików przed odtwarzaniem\n"
 
 #: ogg123/cmdline_options.c:346
 #, c-format
@@ -415,8 +402,7 @@
 #: ogg123/cmdline_options.c:351
 #, c-format
 msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-"  -p n, --prebuffer n     Wczytanie n%% bufora wejścia przed odtwarzaniem\n"
+msgstr "  -p n, --prebuffer n     Wczytanie n%% bufora wejścia przed odtwarzaniem\n"
 
 #: ogg123/cmdline_options.c:354
 #, c-format
@@ -425,10 +411,8 @@
 
 #: ogg123/cmdline_options.c:355
 #, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-"  -k n, --skip n          Pominięcie pierwszych n sekund (lub hh:mm:ss)\n"
+msgid "  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
+msgstr "  -k n, --skip n          Pominięcie pierwszych n sekund (lub hh:mm:ss)\n"
 
 #: ogg123/cmdline_options.c:356
 #, c-format
@@ -445,7 +429,7 @@
 msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
 msgstr "  -y n, --ntimes n        Powtarzanie każdego bloku n razy\n"
 
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
+#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:399
 #, c-format
 msgid "Miscellaneous options\n"
 msgstr "Opcje różne\n"
@@ -464,7 +448,7 @@
 "                          po odebraniu dwóch SIGINTów w ciągu określonego\n"
 "                          czasu 's' (domyślnie 500 ms).\n"
 
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
+#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:406
 #, c-format
 msgid "  -h, --help              Display this help\n"
 msgstr "  -h, --help              Wyświetlenie tego opisu\n"
@@ -476,10 +460,8 @@
 
 #: ogg123/cmdline_options.c:369
 #, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-"  -v, --verbose           Wyświetlanie informacji o postępie i stanie\n"
+msgid "  -v, --verbose           Display progress and other status information\n"
+msgstr "  -v, --verbose           Wyświetlanie informacji o postępie i stanie\n"
 
 #: ogg123/cmdline_options.c:370
 #, c-format
@@ -696,7 +678,7 @@
 msgid "oggdec from %s %s\n"
 msgstr "oggdec z pakietu %s %s\n"
 
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
+#: oggdec/oggdec.c:56 oggenc/oggenc.c:396 ogginfo/ogginfo2.c:1223
 #, c-format
 msgid ""
 " by the Xiph.Org Foundation (http://www.xiph.org/)\n"
@@ -773,131 +755,82 @@
 "                  tylko jeśli podano jeden plik wejściowy,\n"
 "                  z wyjÄ…tkiem trybu surowego.\n"
 
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "BŁĄD: nie można otworzyć pliku wejściowego \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "BŁĄD: nie udało się otworzyć pliku wyjściowego \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Nie udało się otworzyć pliku jako Vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "BÅ‚Ä…d usuwania starego pliku %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr "BŁĄD: nie podano plików wejściowych. Opcja -h wyświetla pomoc.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"BŁĄD: wiele plików wejściowych z określoną nazwą pliku wyjściowego: "
-"należałoby użyć -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:51
 msgid "WAV file reader"
 msgstr "Czytnik plików WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:52
 msgid "AIFF/AIFC file reader"
 msgstr "Czytnik plików AIFF/AIFC"
 
-#: oggenc/audio.c:53
+#: oggenc/audio.c:54
 msgid "FLAC file reader"
 msgstr "Czytnik plików FLAC"
 
-#: oggenc/audio.c:54
+#: oggenc/audio.c:55
 msgid "Ogg FLAC file reader"
 msgstr "Czytnik plików Ogg FLAC"
 
-#: oggenc/audio.c:131 oggenc/audio.c:425
+#: oggenc/audio.c:57
+msgid "AU file reader"
+msgstr "Czytnik plików AU"
+
+#: oggenc/audio.c:133
 #, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Uwaga: nieoczekiwany EOF podczas odczytu nagłówka WAV\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:144
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Pominięto fragment typu \"%s\" o długości %d\n"
 
-#: oggenc/audio.c:168
+#: oggenc/audio.c:170
 #, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Uwaga: nieoczekiwany EOF we fragmencie AIFF\n"
 
-#: oggenc/audio.c:254
+#: oggenc/audio.c:256
 #, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Uwaga: nie znaleziono ogólnego fragmentu w pliku AIFF\n"
 
-#: oggenc/audio.c:260
+#: oggenc/audio.c:262
 #, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Uwaga: skrócony ogólny fragment w nagłówku AIFF\n"
 
-#: oggenc/audio.c:268
+#: oggenc/audio.c:270
 #, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Uwaga: nieoczekiwany EOF podczas odczytu nagłówka AIFF\n"
 
-#: oggenc/audio.c:283
+#: oggenc/audio.c:285
 #, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Uwaga: skrócony nagłówek AIFF-C.\n"
 
-#: oggenc/audio.c:297
+#: oggenc/audio.c:299
 #, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Uwaga: nie można obsłużyć skompresowanego AIFF-C (%c%c%c%c)\n"
 
-#: oggenc/audio.c:304
+#: oggenc/audio.c:306
 #, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Uwaga: nie znaleziono fragmentu SSND w pliku AIFF\n"
 
-#: oggenc/audio.c:310
+#: oggenc/audio.c:312
 #, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Uwaga: uszkodzony fragment SSND w nagłówku AIFF\n"
 
-#: oggenc/audio.c:316
+#: oggenc/audio.c:318
 #, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Uwaga: nieoczekiwany EOF podczas odczytu nagłówka AIFF\n"
 
-#: oggenc/audio.c:353
+#: oggenc/audio.c:355
 #, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
@@ -906,30 +839,35 @@
 "Uwaga: OggEnc nie obsługuje tego rodzaju plików AIFF/AIFC\n"
 " Plik musi być 8- lub 16-bitowym PCM.\n"
 
-#: oggenc/audio.c:407
-#, fuzzy, c-format
-msgid "Warning: Unrecognised format chunk in WAV header\n"
+#: oggenc/audio.c:409
+#, c-format
+msgid "Warning: Unrecognised format chunk in Wave header\n"
 msgstr "Uwaga: nierozpoznany fragment formatu w nagłówku Wave\n"
 
-#: oggenc/audio.c:420
-#, fuzzy, c-format
+#: oggenc/audio.c:422
+#, c-format
 msgid ""
-"Warning: INVALID format chunk in wav header.\n"
+"Warning: INVALID format chunk in Wave header.\n"
 " Trying to read anyway (may not work)...\n"
 msgstr ""
 "Uwaga: NIEPRAWIDŁOWY fragment formatu w nagłówku Wave.\n"
 " Próba odczytu mimo to (może się nie udać)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: oggenc/audio.c:427
+#, c-format
+msgid "Warning: Unexpected EOF in reading Wave header\n"
+msgstr "Uwaga: nieoczekiwany EOF podczas odczytu nagłówka Wave\n"
+
+#: oggenc/audio.c:460
+#, c-format
 msgid ""
-"ERROR: Wav file is unsupported type (must be standard PCM\n"
+"ERROR: Wave file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM)\n"
 msgstr ""
 "BŁĄD: plik Wave nieobsługiwanego typu (musi być standardowym PCM\n"
 " lub zmiennoprzecinkowym PCM typu 3)\n"
 
-#: oggenc/audio.c:467
+#: oggenc/audio.c:469
 #, c-format
 msgid ""
 "Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
@@ -938,7 +876,7 @@
 "Uwaga: wartość 'block alignment' WAV jest niepoprawna, zignorowano.\n"
 "Program który utworzył ten plik jest niepoprawny.\n"
 
-#: oggenc/audio.c:528
+#: oggenc/audio.c:530
 #, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
@@ -947,36 +885,46 @@
 "BŁĄD: plik Wav jest w nieobsługiwanym podformacie (musi być 8-, 16-, 24-\n"
 "lub 32-bitowym PCM albo zmiennoprzecinkowym PCM)\n"
 
-#: oggenc/audio.c:604
+#: oggenc/audio.c:606
 #, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr "24-bitowe dane PCM big-endian nie są obecnie obsługiwane, przerwano.\n"
 
-#: oggenc/audio.c:624
+#: oggenc/audio.c:626
 #, c-format
 msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
 msgstr "32-bitowe dane PCM big-endian nie są obecnie obsługiwane, przerwano.\n"
 
-#: oggenc/audio.c:630
+#: oggenc/audio.c:632
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-"Błąd wewnętrzny: próba odczytu nieobsługiwanej rozdzielczości bitowej %d\n"
+msgstr "Błąd wewnętrzny: próba odczytu nieobsługiwanej rozdzielczości bitowej %d\n"
 
-#: oggenc/audio.c:732
+#: oggenc/audio.c:734
 #, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"BŁĄD: Otrzymano zero próbek z resamplera: plik może być ucięty. Proszę to "
-"zgłosić.\n"
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "BŁĄD: Otrzymano zero próbek z resamplera: plik może być ucięty. Proszę to zgłosić.\n"
 
-#: oggenc/audio.c:750
+#: oggenc/audio.c:752
 #, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Nie udało się zainicjować resamplera\n"
 
+#: oggenc/audio.c:882
+#, c-format
+msgid "Out of memory opening AU driver\n"
+msgstr "Brak pamięci podczas otwierania sterownika AU\n"
+
+#: oggenc/audio.c:889
+#, c-format
+msgid "At this moment, only linear 16 bit .au files are supported\n"
+msgstr "Aktualnie obsługiwane są tylko liniowe 16-bitowe pliki .au\n"
+
+#: oggenc/audio.c:941
+#, c-format
+msgid "Internal error! Please report this bug.\n"
+msgstr "Błąd wewnętrzny! Proszę zgłosić ten błąd.\n"
+
 #: oggenc/encode.c:64
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
@@ -995,25 +943,17 @@
 #: oggenc/encode.c:111
 #, c-format
 msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
-"Nie udało się ustawić zaawansowanych parametrów zarządzania prędkością\n"
+msgstr "Nie udało się ustawić zaawansowanych parametrów zarządzania prędkością\n"
 
 #: oggenc/encode.c:115 oggenc/encode.c:252
 #, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-"Ta wersja libvorbisenc nie potrafi ustawiać zaawansowanych parametrów "
-"zarządzania prędkością\n"
+msgid "This version of libvorbisenc cannot set advanced rate management parameters\n"
+msgstr "Ta wersja libvorbisenc nie potrafi ustawiać zaawansowanych parametrów zarządzania prędkością\n"
 
 #: oggenc/encode.c:174
 #, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 kanałów powinno wystarczyć każdemu (niestety Vorbis nie obsługuje "
-"więcej)\n"
+msgid "255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support more)\n"
+msgstr "255 kanałów powinno wystarczyć każdemu (niestety Vorbis nie obsługuje więcej)\n"
 
 #: oggenc/encode.c:182
 #, c-format
@@ -1033,8 +973,7 @@
 #: oggenc/encode.c:247
 #, c-format
 msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-"Nie udało się ustawić minimalnego/maksymalnego bitrate w trybie jakości\n"
+msgstr "Nie udało się ustawić minimalnego/maksymalnego bitrate w trybie jakości\n"
 
 #: oggenc/encode.c:263
 #, c-format
@@ -1174,93 +1113,86 @@
 "          %s%s%s \n"
 "przy użyciu zarządzania bitrate "
 
-#: oggenc/oggenc.c:103
+#: oggenc/oggenc.c:100
 #, c-format
 msgid "ERROR: No input files specified. Use -h for help.\n"
 msgstr "BŁĄD: nie podano plików wejściowych. Opcja -h wyświetla pomoc.\n"
 
-#: oggenc/oggenc.c:118
+#: oggenc/oggenc.c:115
 #, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "BŁĄD: podano wiele plików jednocześnie z użyciem stdin\n"
 
-#: oggenc/oggenc.c:125
+#: oggenc/oggenc.c:122
 #, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"BŁĄD: wiele plików wejściowych z określoną nazwą pliku wyjściowego: "
-"należałoby użyć -n\n"
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "BŁĄD: wiele plików wejściowych z określoną nazwą pliku wyjściowego: należałoby użyć -n\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:183
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "BŁĄD: nie można otworzyć pliku wejściowego \"%s\": %s\n"
 
-#: oggenc/oggenc.c:202
+#: oggenc/oggenc.c:199
 msgid "RAW file reader"
 msgstr "Czytnik plików RAW"
 
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:216
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Otwieranie przy użyciu modułu %s: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:225
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "BŁĄD: plik wejściowy \"%s\" nie jest w obsługiwanym formacie\n"
 
-#: oggenc/oggenc.c:280
+#: oggenc/oggenc.c:277
 #, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "UWAGA: brak nazwy pliku, przyjęcie domyślnej \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:285
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"BŁĄD: nie udało się utworzyć wymaganych podkatalogów dla pliku wyjściowego "
-"\"%s\"\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "BŁĄD: nie udało się utworzyć wymaganych podkatalogów dla pliku wyjściowego \"%s\"\n"
 
-#: oggenc/oggenc.c:295
+#: oggenc/oggenc.c:292
 #, c-format
 msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
 msgstr "BŁĄD: nazwa pliku wejściowego jest taka sama jak wyjściowego \"%s\"\n"
 
-#: oggenc/oggenc.c:306
+#: oggenc/oggenc.c:303
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "BŁĄD: nie udało się otworzyć pliku wyjściowego \"%s\": %s\n"
 
-#: oggenc/oggenc.c:350
+#: oggenc/oggenc.c:335
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Resamplowanie wejścia z %d Hz do %d Hz\n"
 
-#: oggenc/oggenc.c:357
+#: oggenc/oggenc.c:342
 #, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Miksowanie stereo do mono\n"
 
-#: oggenc/oggenc.c:360
+#: oggenc/oggenc.c:345
 #, c-format
 msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "UWAGA: nie można miksować inaczej niż ze stereo do mono\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:353
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr "Skalowanie wejścia do %f\n"
 
-#: oggenc/oggenc.c:414
+#: oggenc/oggenc.c:395
 #, c-format
 msgid "oggenc from %s %s"
 msgstr "oggenc z pakietu %s %s"
 
-#: oggenc/oggenc.c:416
+#: oggenc/oggenc.c:397
 #, c-format
 msgid ""
 "Usage: oggenc [options] inputfile [...]\n"
@@ -1269,7 +1201,7 @@
 "Składnia: oggenc [opcje] plik_wejściowy [...]\n"
 "\n"
 
-#: oggenc/oggenc.c:417
+#: oggenc/oggenc.c:398
 #, c-format
 msgid ""
 "OPTIONS:\n"
@@ -1284,7 +1216,7 @@
 " -h, --help           Wyświetlenie tego opisu\n"
 " -V, --version        Wypisanie numeru wersji\n"
 
-#: oggenc/oggenc.c:423
+#: oggenc/oggenc.c:404
 #, c-format
 msgid ""
 " -k, --skeleton       Adds an Ogg Skeleton bitstream\n"
@@ -1296,15 +1228,12 @@
 msgstr ""
 " -k, --skeleton       Dodanie strumienia bitowego Ogg Skeleton\n"
 " -r, --raw            Tryb surowy; pliki wejściowe są czytane jako dane PCM\n"
-" -B, --raw-bits=n     Ustawienie bitów/próbkę dla trybu surowego; domyślnie "
-"16\n"
-" -C, --raw-chan=n     Ustawienie liczby kanałów dla trybu surowego; "
-"domyślnie 2\n"
-" -R, --raw-rate=n     Ustawienie próbek/s dla trybu surowego; domyślnie "
-"44100\n"
+" -B, --raw-bits=n     Ustawienie bitów/próbkę dla trybu surowego; domyślnie 16\n"
+" -C, --raw-chan=n     Ustawienie liczby kanałów dla trybu surowego; domyślnie 2\n"
+" -R, --raw-rate=n     Ustawienie próbek/s dla trybu surowego; domyślnie 44100\n"
 " --raw-endianness     1 dla big-endian, 0 dla little (domyślnie 0)\n"
 
-#: oggenc/oggenc.c:430
+#: oggenc/oggenc.c:411
 #, c-format
 msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
@@ -1314,32 +1243,29 @@
 "                      See the --managed option to use a managed bitrate\n"
 "                      targetting the selected bitrate.\n"
 msgstr ""
-" -b, --bitrate        Wybór minimalnej średniej bitowej (bitrate) do "
-"kodowania.\n"
+" -b, --bitrate        Wybór minimalnej średniej bitowej (bitrate) do kodowania.\n"
 "                      Próba kodowania z taką średnią w kbps. Domyślnie\n"
 "                      wybierane jest kodowanie VBR, odpowiadające użyciu\n"
 "                      -q lub --quality. Do wyboru konkretnego bitrate\n"
 "                      służy opcja --managed.\n"
 
-#: oggenc/oggenc.c:437
+#: oggenc/oggenc.c:418
 #, c-format
 msgid ""
 " --managed            Enable the bitrate management engine. This will allow\n"
-"                      much greater control over the precise bitrate(s) "
-"used,\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"
 msgstr ""
 " --managed            WÅ‚Ä…czenie silnika zarzÄ…dzania bitrate. Pozwala on na\n"
-"                      znacznie większą kontrolę nad dokładnym użytym "
-"bitrate,\n"
+"                      znacznie większą kontrolę nad dokładnym użytym bitrate,\n"
 "                      ale kodowanie jest znacznie wolniejsze. Nie należy\n"
 "                      używać tej opcji, chyba że istnieje silna potrzeba\n"
 "                      szczegółowej kontroli nad bitrate, na przykład do\n"
 "                      przesyłania strumieni.\n"
 
-#: oggenc/oggenc.c:443
+#: oggenc/oggenc.c:424
 #, c-format
 msgid ""
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
@@ -1359,7 +1285,7 @@
 "                      automatycznie włączy tryb zarządzania bitrate\n"
 "                      (p. --managed).\n"
 
-#: oggenc/oggenc.c:451
+#: oggenc/oggenc.c:432
 #, c-format
 msgid ""
 " --advanced-encode-option option=value\n"
@@ -1370,14 +1296,13 @@
 "                      caution.\n"
 msgstr ""
 " --advanced-enable-option opcja=wartość\n"
-"                      Ustawienie zaawansowanej opcji kodera na podanÄ… "
-"wartość.\n"
+"                      Ustawienie zaawansowanej opcji kodera na podaną wartość.\n"
 "                      Poprawne opcje (i ich wartości) są opisane na stronie\n"
 "                      manuala dołączonej do tego programu. Są przeznaczone\n"
 "                      tylko dla zaawansowanych użytkowników i powinny być\n"
 "                      używane z rozwagą.\n"
 
-#: oggenc/oggenc.c:458
+#: oggenc/oggenc.c:439
 #, c-format
 msgid ""
 " -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
@@ -1386,14 +1311,13 @@
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
 "                      The default quality level is 3.\n"
 msgstr ""
-" -q, --quality        Określenie jakości od -1 (bardzo niskiej) do 10 "
-"(bardzo\n"
+" -q, --quality        Określenie jakości od -1 (bardzo niskiej) do 10 (bardzo\n"
 "                      wysokiej) zamiast określania konkretnego bitrate.\n"
 "                      Jest to zwykły tryb pracy.\n"
 "                      Dopuszczalne są jakości ułamkowe (np. 2.75).\n"
 "                      Domyślny poziom jakości to 3.\n"
 
-#: oggenc/oggenc.c:464
+#: oggenc/oggenc.c:445
 #, c-format
 msgid ""
 " --resample n         Resample input data to sampling rate n (Hz)\n"
@@ -1406,13 +1330,11 @@
 " --resample n         Przesamplowanie danych wejściowych do n Hz\n"
 " --downmix            Zmiksowanie stereo do mono. Dopuszczalne tylko dla\n"
 "                      wejścia stereo.\n"
-" -s, --serial         Określenie numeru seryjnego strumienia. Jeśli "
-"kodowane\n"
-"                      jest wiele plików, numer będzie zwiększany dla "
-"każdego\n"
+" -s, --serial         Określenie numeru seryjnego strumienia. Jeśli kodowane\n"
+"                      jest wiele plików, numer będzie zwiększany dla każdego\n"
 "                      kolejnego strumienia.\n"
 
-#: oggenc/oggenc.c:471
+#: oggenc/oggenc.c:452
 #, c-format
 msgid ""
 " --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
@@ -1421,85 +1343,65 @@
 "                      support for files > 4GB and STDIN data streams. \n"
 "\n"
 msgstr ""
-" --discard-comments   Wyłączenie kopiowania komentarzy z plików FLAC i Ogg "
-"FLAC\n"
+" --discard-comments   Wyłączenie kopiowania komentarzy z plików FLAC i Ogg FLAC\n"
 "                      do pliku wyjściowego Ogg Vorbis.\n"
 " --ignorelength       Ignorowanie nagłówków datalength w nagłówkach wav.\n"
-"                      Pozwala to na obsługę plików >4GB i strumieni danych "
-"ze\n"
+"                      Pozwala to na obsługę plików >4GB i strumieni danych ze\n"
 "                      standardowego wejścia.\n"
 
-#: oggenc/oggenc.c:477
+#: oggenc/oggenc.c:458
 #, c-format
 msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
 msgstr ""
 " Nazwy:\n"
-" -o, --output=nazwa   Zapis pliku pod nazwÄ… (poprawne tylko dla jednego "
-"pliku)\n"
-" -n, --names=łańcuch  Tworzenie nazw plików w oparciu o łańcuch, z %%a, %%t, "
-"%%l,\n"
+" -o, --output=nazwa   Zapis pliku pod nazwÄ… (poprawne tylko dla jednego pliku)\n"
+" -n, --names=łańcuch  Tworzenie nazw plików w oparciu o łańcuch, z %%a, %%t, %%l,\n"
 "                      %%n, %%d zastępowanym odpowiednio artystą, tytułem,\n"
-"                      albumem, numerem ścieżki i datą (poniżej ich "
-"określenie).\n"
+"                      albumem, numerem ścieżki i datą (poniżej ich określenie).\n"
 "                      %%%% daje znak %%.\n"
 
-#: oggenc/oggenc.c:484
+#: oggenc/oggenc.c:465
 #, c-format
 msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
 msgstr ""
 " -X, --name-remove=s  Usunięcie określonych znaków z parametrów łańcucha\n"
-"                      formatujÄ…cego -n. Przydatne do zapewnienia "
-"dopuszczalnych\n"
+"                      formatujÄ…cego -n. Przydatne do zapewnienia dopuszczalnych\n"
 "                      nazw plików.\n"
 " -P, --name-replace=s Zastąpienie znaków usuniętych przez --name-remove\n"
-"                      podanymi znakami. Jeśli łańcuch jest krótszy niż "
-"lista\n"
+"                      podanymi znakami. Jeśli łańcuch jest krótszy niż lista\n"
 "                      --name-remove lub go nie podano, dodatkowe znaki sÄ…\n"
 "                      po prostu usuwane.\n"
-"                      Domyślne ustawienia tych dwóch argumentów są zależne "
-"od\n"
+"                      Domyślne ustawienia tych dwóch argumentów są zależne od\n"
 "                      platformy.\n"
 
-#: oggenc/oggenc.c:493
-#, fuzzy, c-format
+#: oggenc/oggenc.c:474
+#, c-format
 msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
 "                      used multiple times. The argument should be in the\n"
 "                      format \"tag=value\".\n"
 " -d, --date           Date for track (usually date of performance)\n"
 msgstr ""
-" -c, --comment=kom    Dodanie określonego łańcucha jako dodatkowego "
-"komentarza.\n"
-"                      Opcja może być użyta wiele razy. Argument powinien "
-"być\n"
+" -c, --comment=kom    Dodanie określonego łańcucha jako dodatkowego komentarza.\n"
+"                      Opcja może być użyta wiele razy. Argument powinien być\n"
 "                      w postaci \"znacznik=wartość\".\n"
 " -d, --date           Data dla ścieżki (zwykle data wykonania)\n"
 
-#: oggenc/oggenc.c:501
+#: oggenc/oggenc.c:479
 #, c-format
 msgid ""
 " -N, --tracknum       Track number for this track\n"
@@ -1514,23 +1416,18 @@
 " -a, --artist         Nazwa artysty\n"
 " -G, --genre          Gatunek ścieżki\n"
 
-#: oggenc/oggenc.c:507
+#: oggenc/oggenc.c:485
 #, c-format
 msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
 msgstr ""
 "                      Jeśli podano wiele plików wejściowych, używane będą\n"
@@ -1538,425 +1435,367 @@
 "                      kolejności podania. Jeśli podano mniej tytułów niż\n"
 "                      plików, OggEnc wypisze ostrzeżenie i użyje ostatnich\n"
 "                      wartości dla pozostałych plików. Jeśli podano mniej\n"
-"                      numerów ścieżek, pozostałe pliki będą nie "
-"ponumerowane.\n"
-"                      Dla pozostałych opcji ostatnia wartość znacznika "
-"będzie\n"
+"                      numerów ścieżek, pozostałe pliki będą nie ponumerowane.\n"
+"                      Dla pozostałych opcji ostatnia wartość znacznika będzie\n"
 "                      używana dla pozostałych plików bez ostrzeżenia (można\n"
 "                      więc podać np. datę raz dla wszystkich plików)\n"
 "\n"
 
-#: oggenc/oggenc.c:518
-#, fuzzy, c-format
+#: oggenc/oggenc.c:496
+#, c-format
 msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\n"
-" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
-"Files\n"
+" OggEnc input files must currently be 24, 16, or 8 bit PCM Wave, 16 bit u-Law (.au), AIFF, or AIFF/C\n"
+" files, 32 bit IEEE floating point Wave, 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 "
-"additional\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 wave'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
 " In this mode, output is to stdout unless an output filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
 "PLIKI WEJÅšCIOWE:\n"
 " Pliki wejściowe dla programu OggEnc aktualnie muszą być 24-, 16- lub\n"
-" 8-bitowymi plikami PCM Wave, 16-bitowymi plikami u-Law (.au), AIFF lub AIFF-"
-"C,\n"
-" 32-bitowymi zmiennoprzecinkowymi IEEE plikami Wave i opcjonalnie plikami "
-"FLAC\n"
+" 8-bitowymi plikami PCM Wave, 16-bitowymi plikami u-Law (.au), AIFF lub AIFF-C,\n"
+" 32-bitowymi zmiennoprzecinkowymi IEEE plikami Wave i opcjonalnie plikami FLAC\n"
 " lub Ogg FLAC.\n"
-" Pliki mogą być mono lub stereo (lub o większej liczbie kanałów) i o "
-"dowolnej\n"
+" Pliki mogą być mono lub stereo (lub o większej liczbie kanałów) i o dowolnej\n"
 " częstotliwości próbkowania.\n"
 " Alternatywnie można użyć opcji --raw dla surowego pliku wejściowego PCM,\n"
 " który musi być 16-bitowym, stereofonicznym PCM little-endian (wave bez\n"
 " nagłówka), chyba że podano dodatkowe opcje dla trybu surowego.\n"
 " Można wymusić pobranie pliku ze standardowego wejścia przekazując opcję -\n"
 " jako nazwę pliku wejściowego.\n"
-" W tym trybie wyjściem jest standardowe wyjście, chyba że podano nazwę "
-"pliku\n"
+" W tym trybie wyjściem jest standardowe wyjście, chyba że podano nazwę pliku\n"
 " wyjściowego opcją -o.\n"
 "\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:601
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr "UWAGA: zignorowano niedozwolony znak specjalny '%c' w formacie nazwy\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
+#: oggenc/oggenc.c:630 oggenc/oggenc.c:755 oggenc/oggenc.c:768
 #, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "WÅ‚Ä…czono silnik zarzÄ…dzania bitrate\n"
 
-#: oggenc/oggenc.c:661
+#: oggenc/oggenc.c:639
 #, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"UWAGA: podano surową kolejność bajtów dla plików niesurowych; przyjęcie "
-"wejścia surowego.\n"
+msgid "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
+msgstr "UWAGA: podano surową kolejność bajtów dla plików niesurowych; przyjęcie wejścia surowego.\n"
 
-#: oggenc/oggenc.c:664
+#: oggenc/oggenc.c:642
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "UWAGA: nie udało się odczytać argumentu kolejności bajtów \"%s\"\n"
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:649
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "UWAGA: nie udało się odczytać częstotliwości resamplowania \"%s\"\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:655
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
-msgstr ""
-"Uwaga: częstotliwość resamplowania podano jako %d Hz. Nie miało być %d Hz?\n"
+msgstr "Uwaga: częstotliwość resamplowania podano jako %d Hz. Nie miało być %d Hz?\n"
 
-#: oggenc/oggenc.c:687
+#: oggenc/oggenc.c:665
 #, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Uwaga: nie udało się przeanalizować współczynnika skalowania \"%s\"\n"
 
-#: oggenc/oggenc.c:700
+#: oggenc/oggenc.c:675
 #, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Nie odnaleziono wartości zaawansowanej opcji kodera\n"
 
-#: oggenc/oggenc.c:718
+#: oggenc/oggenc.c:693
 #, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Błąd wewnętrzny podczas analizy opcji linii poleceń\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:704
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Uwaga: użyto niedozwolonego komentarza (\"%s\"), zignorowano.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:741
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Uwaga: nierozpoznane nominalne bitrate \"%s\"\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:749
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Uwaga: nierozpoznane minimalne bitrate \"%s\"\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:762
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Uwaga: nierozpoznane maksymalne bitrate \"%s\"\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:774
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Nierozpoznana opcja jakości \"%s\", zignorowano\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:782
 #, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr "UWAGA: ustawienie jakości zbyt wysokie, przyjęto maksymalną jakość.\n"
 
-#: oggenc/oggenc.c:813
+#: oggenc/oggenc.c:788
 #, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "UWAGA: podano wiele formatów nazw, użycie ostatniego\n"
 
-#: oggenc/oggenc.c:822
+#: oggenc/oggenc.c:797
 #, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr "UWAGA: podano wiele filtrów formatu nazw, użycie ostatniego\n"
 
-#: oggenc/oggenc.c:831
+#: oggenc/oggenc.c:806
 #, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
-msgstr ""
-"UWAGA: podano wiele zamienników filtrów formatu nazw, użycie ostatniego\n"
+msgid "WARNING: Multiple name format filter replacements specified, using final\n"
+msgstr "UWAGA: podano wiele zamienników filtrów formatu nazw, użycie ostatniego\n"
 
-#: oggenc/oggenc.c:839
+#: oggenc/oggenc.c:814
 #, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr "UWAGA: podano wiele nazw plików wyjściowych, należałoby użyć -n\n"
 
-#: oggenc/oggenc.c:851
+#: oggenc/oggenc.c:826
 #, c-format
 msgid "oggenc from %s %s\n"
 msgstr "oggenc z pakietu %s %s\n"
 
-#: oggenc/oggenc.c:858
+#: oggenc/oggenc.c:833
 #, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"UWAGA: podano surową liczbę bitów/próbkę dla danych niesurowych; przyjęcie "
-"wejścia surowego.\n"
+msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+msgstr "UWAGA: podano surową liczbę bitów/próbkę dla danych niesurowych; przyjęcie wejścia surowego.\n"
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
+#: oggenc/oggenc.c:838 oggenc/oggenc.c:842
 #, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "UWAGA: błędna liczba bitów/próbkę, przyjęcie 16.\n"
 
-#: oggenc/oggenc.c:874
+#: oggenc/oggenc.c:849
 #, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"UWAGA: podano surową liczbę kanałów dla danych niesurowych; przyjęcie "
-"wejścia surowego.\n"
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "UWAGA: podano surową liczbę kanałów dla danych niesurowych; przyjęcie wejścia surowego.\n"
 
-#: oggenc/oggenc.c:879
+#: oggenc/oggenc.c:854
 #, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "UWAGA: błędna liczba kanałów, przyjęcie 2.\n"
 
-#: oggenc/oggenc.c:890
+#: oggenc/oggenc.c:865
 #, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"UWAGA: podano surową częstotliwość próbkowania dla danych niesurowych; "
-"przyjęcie wejścia surowego.\n"
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+msgstr "UWAGA: podano surową częstotliwość próbkowania dla danych niesurowych; przyjęcie wejścia surowego.\n"
 
-#: oggenc/oggenc.c:895
+#: oggenc/oggenc.c:870
 #, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr "UWAGA: podano błędną częstotliwość próbkowania, przyjęcie 44100.\n"
 
-#: oggenc/oggenc.c:902
+#: oggenc/oggenc.c:877
 #, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "UWAGA: podano nieznanÄ… opcjÄ™, zignorowano\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr ""
-"Nie udało się przekonwertować komentarza do UTF-8, nie można go dodać\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
+#: oggenc/oggenc.c:899 vorbiscomment/vcomment.c:354
 #, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
-msgstr ""
-"Nie udało się przekonwertować komentarza do UTF-8, nie można go dodać\n"
+msgstr "Nie udało się przekonwertować komentarza do UTF-8, nie można go dodać\n"
 
-#: oggenc/oggenc.c:954
+#: oggenc/oggenc.c:918
 #, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
-msgstr ""
-"UWAGA: Podano za mało tytułów, przyjęcie ostatniego tytułu jako domyślnego.\n"
+msgstr "UWAGA: Podano za mało tytułów, przyjęcie ostatniego tytułu jako domyślnego.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:150
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Nie udało się utworzyć katalogu \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:157
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "BÅ‚Ä…d sprawdzania istnienia katalogu %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:170
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Błąd: element ścieżki \"%s\" nie jest katalogiem\n"
 
-#: ogginfo/ogginfo2.c:212
+#: ogginfo/ogginfo2.c:211
 #, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
-msgstr ""
-"Uwaga: komentarz %d w strumieniu %d ma błędny format, nie zawiera '=': \"%s"
-"\"\n"
+msgid "Warning: Comment %d in stream %d has invalid format, does not contain '=': \"%s\"\n"
+msgstr "Uwaga: komentarz %d w strumieniu %d ma błędny format, nie zawiera '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo2.c:219
 #, c-format
 msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
 msgstr "Uwaga: błędna nazwa pola w komentarzu %d (strumień %d): \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo2.c:250 ogginfo/ogginfo2.c:258
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
-msgstr ""
-"Uwaga: niedozwolona sekwencja UTF-8 w komentarzu %d (strumień %d): błędny "
-"znacznik długości\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
+msgstr "Uwaga: niedozwolona sekwencja UTF-8 w komentarzu %d (strumień %d): błędny znacznik długości\n"
 
-#: ogginfo/ogginfo2.c:266
+#: ogginfo/ogginfo2.c:265
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Uwaga: niedozwolona sekwencja UTF-8 w komentarzu %d (strumień %d): za mało "
-"bajtów\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr "Uwaga: niedozwolona sekwencja UTF-8 w komentarzu %d (strumień %d): za mało bajtów\n"
 
-#: ogginfo/ogginfo2.c:342
+#: ogginfo/ogginfo2.c:341
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Uwaga: niedozwolona sekwencja UTF-8 w komentarzu %d (strumień %d): błędna "
-"sekwencja \"%s\": %s\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence \"%s\": %s\n"
+msgstr "Uwaga: niedozwolona sekwencja UTF-8 w komentarzu %d (strumień %d): błędna sekwencja \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:356
+#: ogginfo/ogginfo2.c:355
 msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
 msgstr "Uwaga: usterka dekodera UTF-8. To nie powinno być możliwe.\n"
 
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
+#: ogginfo/ogginfo2.c:380 ogginfo/ogginfo2.c:547 ogginfo/ogginfo2.c:680
 #, c-format
 msgid "Warning: discontinuity in stream (%d)\n"
 msgstr "Uwaga: nieciągłość w strumieniu (%d)\n"
 
-#: ogginfo/ogginfo2.c:389
+#: ogginfo/ogginfo2.c:388
 #, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Uwaga: nie udało się zdekodować pakietu nagłówka Theora - błędny strumień "
-"Theora (%d)\n"
+msgid "Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr "Uwaga: nie udało się zdekodować pakietu nagłówka Theora - błędny strumień Theora (%d)\n"
 
-#: ogginfo/ogginfo2.c:396
+#: ogginfo/ogginfo2.c:395
 #, 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 ""
-"Uwaga: strumień Theora %d nie ma właściwych ramek nagłówków. Końcowa strona "
-"nagłówka zawiera dodatkowe pakiety lub ma niezerową granulepos\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 "Uwaga: strumień Theora %d nie ma właściwych ramek nagłówków. Końcowa strona nagłówka zawiera dodatkowe pakiety lub ma niezerową granulepos\n"
 
-#: ogginfo/ogginfo2.c:400
+#: ogginfo/ogginfo2.c:399
 #, c-format
 msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr ""
-"Przeanalizowano nagłówki Theora dla strumienia %d, informacje poniżej...\n"
+msgstr "Przeanalizowano nagłówki Theora dla strumienia %d, informacje poniżej...\n"
 
-#: ogginfo/ogginfo2.c:403
+#: ogginfo/ogginfo2.c:402
 #, c-format
 msgid "Version: %d.%d.%d\n"
 msgstr "Wersja: %d.%d>%d\n"
 
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:582 ogginfo/ogginfo2.c:742
 #, c-format
 msgid "Vendor: %s\n"
 msgstr "Producent: %s\n"
 
-#: ogginfo/ogginfo2.c:406
+#: ogginfo/ogginfo2.c:405
 #, c-format
 msgid "Width: %d\n"
 msgstr "Szerokość: %d\n"
 
-#: ogginfo/ogginfo2.c:407
+#: ogginfo/ogginfo2.c:406
 #, c-format
 msgid "Height: %d\n"
 msgstr "Wysokość: %d\n"
 
-#: ogginfo/ogginfo2.c:408
+#: ogginfo/ogginfo2.c:407
 #, c-format
 msgid "Total image: %d by %d, crop offset (%d, %d)\n"
 msgstr "Całkowity obraz: %d na %d, offset obcięcia (%d, %d)\n"
 
-#: ogginfo/ogginfo2.c:411
+#: ogginfo/ogginfo2.c:410
 msgid "Frame offset/size invalid: width incorrect\n"
 msgstr "Błędny offset/rozmiar ramki: niepoprawna szerokość\n"
 
-#: ogginfo/ogginfo2.c:413
+#: ogginfo/ogginfo2.c:412
 msgid "Frame offset/size invalid: height incorrect\n"
 msgstr "Błędny offset/rozmiar ramki: niepoprawna wysokość\n"
 
-#: ogginfo/ogginfo2.c:416
+#: ogginfo/ogginfo2.c:415
 msgid "Invalid zero framerate\n"
 msgstr "Błędna zerowa częstotliwość ramek\n"
 
-#: ogginfo/ogginfo2.c:418
+#: ogginfo/ogginfo2.c:417
 #, c-format
 msgid "Framerate %d/%d (%.02f fps)\n"
 msgstr "Częstotliwość ramek %d/%d (%.02f fps)\n"
 
-#: ogginfo/ogginfo2.c:422
+#: ogginfo/ogginfo2.c:421
 msgid "Aspect ratio undefined\n"
 msgstr "Nieokreślone proporcje\n"
 
-#: ogginfo/ogginfo2.c:427
+#: ogginfo/ogginfo2.c:426
 #, c-format
 msgid "Pixel aspect ratio %d:%d (%f:1)\n"
 msgstr "Proporcje pikseli %d:%d (%f:1)\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:428
 msgid "Frame aspect 4:3\n"
 msgstr "Proporcje klatki 4:3\n"
 
-#: ogginfo/ogginfo2.c:431
+#: ogginfo/ogginfo2.c:430
 msgid "Frame aspect 16:9\n"
 msgstr "Proporcje klatki 16:9\n"
 
-#: ogginfo/ogginfo2.c:433
+#: ogginfo/ogginfo2.c:432
 #, c-format
 msgid "Frame aspect %f:1\n"
 msgstr "Proporcje klatki %f:1\n"
 
-#: ogginfo/ogginfo2.c:437
+#: ogginfo/ogginfo2.c:436
 msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
 msgstr "Przestrzeń kolorów: Rec. ITU-R BT.470-6 system M (NTSC)\n"
 
-#: ogginfo/ogginfo2.c:439
+#: ogginfo/ogginfo2.c:438
 msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
 msgstr "Przestrzeń kolorów: Rec. ITU-R BT.470-6 systemy B i G (PAL)\n"
 
-#: ogginfo/ogginfo2.c:441
+#: ogginfo/ogginfo2.c:440
 msgid "Colourspace unspecified\n"
 msgstr "Przestrzeń kolorów nieokreślona\n"
 
-#: ogginfo/ogginfo2.c:444
+#: ogginfo/ogginfo2.c:443
 msgid "Pixel format 4:2:0\n"
 msgstr "Format piksela 4:2:0\n"
 
-#: ogginfo/ogginfo2.c:446
+#: ogginfo/ogginfo2.c:445
 msgid "Pixel format 4:2:2\n"
 msgstr "Format piksela 4:2:2\n"
 
-#: ogginfo/ogginfo2.c:448
+#: ogginfo/ogginfo2.c:447
 msgid "Pixel format 4:4:4\n"
 msgstr "Format piksela 4:4:4\n"
 
-#: ogginfo/ogginfo2.c:450
+#: ogginfo/ogginfo2.c:449
 msgid "Pixel format invalid\n"
 msgstr "Format piksela błędny\n"
 
-#: ogginfo/ogginfo2.c:452
+#: ogginfo/ogginfo2.c:451
 #, c-format
 msgid "Target bitrate: %d kbps\n"
 msgstr "Docelowe bitrate: %d kbps\n"
 
-#: ogginfo/ogginfo2.c:453
+#: ogginfo/ogginfo2.c:452
 #, c-format
 msgid "Nominal quality setting (0-63): %d\n"
 msgstr "Nominalne ustawienie jakości (0-63): %d\n"
 
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
+#: ogginfo/ogginfo2.c:455 ogginfo/ogginfo2.c:605 ogginfo/ogginfo2.c:801
 msgid "User comments section follows...\n"
 msgstr "Sekcja komentarzy użytkownika poniżej...\n"
 
-#: ogginfo/ogginfo2.c:477
+#: ogginfo/ogginfo2.c:476
 msgid "Warning: Expected frame %"
 msgstr "Uwaga: oczekiwano ramki %"
 
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
+#: ogginfo/ogginfo2.c:492 ogginfo/ogginfo2.c:620 ogginfo/ogginfo2.c:818
 msgid "Warning: granulepos in stream %d decreases from %"
 msgstr "Uwaga: granulepos w strumieniu %d zmniejsza siÄ™ z %"
 
-#: ogginfo/ogginfo2.c:520
+#: ogginfo/ogginfo2.c:519
 msgid ""
 "Theora stream %d:\n"
 "\tTotal data length: %"
@@ -1964,46 +1803,37 @@
 "Strumień Theora %d:\n"
 "\tCałkowita długość danych: %"
 
-#: ogginfo/ogginfo2.c:557
+#: ogginfo/ogginfo2.c:556
 #, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-"Uwaga: nie udało się zdekodować pakietu nagłówka Vorbis %d - błędny strumień "
-"Vorbis (%d)\n"
+msgid "Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%d)\n"
+msgstr "Uwaga: nie udało się zdekodować pakietu nagłówka Vorbis %d - błędny strumień Vorbis (%d)\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:564
 #, 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"
-msgstr ""
-"Uwaga: strumień Vorbis %d nie ma właściwych ramek nagłówków. Końcowa strona "
-"nagłówka zawiera dodatkowe pakiety lub ma niezerową granulepos\n"
+msgid "Warning: Vorbis stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n"
+msgstr "Uwaga: strumień Vorbis %d nie ma właściwych ramek nagłówków. Końcowa strona nagłówka zawiera dodatkowe pakiety lub ma niezerową granulepos\n"
 
-#: ogginfo/ogginfo2.c:569
+#: ogginfo/ogginfo2.c:568
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
-msgstr ""
-"Przeanalizowano nagłówki Vorbis dla strumienia %d, informacje poniżej...\n"
+msgstr "Przeanalizowano nagłówki Vorbis dla strumienia %d, informacje poniżej...\n"
 
-#: ogginfo/ogginfo2.c:572
+#: ogginfo/ogginfo2.c:571
 #, c-format
 msgid "Version: %d\n"
 msgstr "Wersja: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:575
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Producent: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:583
 #, c-format
 msgid "Channels: %d\n"
 msgstr "Kanały: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:584
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -2012,43 +1842,39 @@
 "Częstotliwość: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:587
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Nominalne bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:590
 msgid "Nominal bitrate not set\n"
 msgstr "Nominalne bitrate nie ustawione\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:593
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Wyższe bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:596
 msgid "Upper bitrate not set\n"
 msgstr "Wyższe bitrate nie ustawione\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:599
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Niższe bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:602
 msgid "Lower bitrate not set\n"
 msgstr "Niższe bitrate nie ustawione\n"
 
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo2.c:629
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
-"Ujemna lub zerowa granulepos (%lld) w strumieniu Vorbis poza nagłówkami. Ten "
-"plik został utworzony przez błędny koder\n"
+msgid "Negative or zero granulepos (%lld) on vorbis stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "Ujemna lub zerowa granulepos (%lld) w strumieniu Vorbis poza nagłówkami. Ten plik został utworzony przez błędny koder\n"
 
-#: ogginfo/ogginfo2.c:651
+#: ogginfo/ogginfo2.c:650
 msgid ""
 "Vorbis stream %d:\n"
 "\tTotal data length: %"
@@ -2056,121 +1882,106 @@
 "Strumień Vorbis %d:\n"
 "\tCałkowita długość danych: %"
 
-#: ogginfo/ogginfo2.c:692
+#: ogginfo/ogginfo2.c:691
 #, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Uwaga: nie udało się zdekodować pakietu nagłówka Kate %d - błędny strumień "
-"Kate (%d)\n"
+msgid "Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
+msgstr "Uwaga: nie udało się zdekodować pakietu nagłówka Kate %d - błędny strumień Kate (%d)\n"
 
-#: ogginfo/ogginfo2.c:703
+#: ogginfo/ogginfo2.c:702
 #, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Uwaga: pakiet %d nie wygląda na nagłówek Kate - błędny strumień Kate (%d)\n"
+msgid "Warning: packet %d does not seem to be a kate header - invalid kate stream (%d)\n"
+msgstr "Uwaga: pakiet %d nie wygląda na nagłówek Kate - błędny strumień Kate (%d)\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:733
 #, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
-"Uwaga: strumień Kate %d nie ma właściwych ramek nagłówków. Końcowa strona "
-"nagłówka zawiera dodatkowe pakiety lub ma niezerową granulepos\n"
+msgid "Warning: Kate stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n"
+msgstr "Uwaga: strumień Kate %d nie ma właściwych ramek nagłówków. Końcowa strona nagłówka zawiera dodatkowe pakiety lub ma niezerową granulepos\n"
 
-#: ogginfo/ogginfo2.c:738
+#: ogginfo/ogginfo2.c:737
 #, c-format
 msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr ""
-"Przeanalizowano nagłówki Kate dla strumienia %d, informacje poniżej...\n"
+msgstr "Przeanalizowano nagłówki Kate dla strumienia %d, informacje poniżej...\n"
 
-#: ogginfo/ogginfo2.c:741
+#: ogginfo/ogginfo2.c:740
 #, c-format
 msgid "Version: %d.%d\n"
 msgstr "Wersja: %d.%d\n"
 
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:746
 #, c-format
 msgid "Language: %s\n"
 msgstr "Język: %s\n"
 
-#: ogginfo/ogginfo2.c:750
+#: ogginfo/ogginfo2.c:749
 msgid "No language set\n"
 msgstr "Brak ustawionego języka\n"
 
-#: ogginfo/ogginfo2.c:753
+#: ogginfo/ogginfo2.c:752
 #, c-format
 msgid "Category: %s\n"
 msgstr "Kategoria: %s\n"
 
-#: ogginfo/ogginfo2.c:756
+#: ogginfo/ogginfo2.c:755
 msgid "No category set\n"
 msgstr "Brak ustawionej kategorii\n"
 
-#: ogginfo/ogginfo2.c:761
+#: ogginfo/ogginfo2.c:760
 msgid "utf-8"
 msgstr "utf-8"
 
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:764
 #, c-format
 msgid "Character encoding: %s\n"
 msgstr "Kodowanie znaków: %s\n"
 
-#: ogginfo/ogginfo2.c:768
+#: ogginfo/ogginfo2.c:767
 msgid "Unknown character encoding\n"
 msgstr "Nieznane kodowanie znaków\n"
 
-#: ogginfo/ogginfo2.c:773
+#: ogginfo/ogginfo2.c:772
 msgid "left to right, top to bottom"
 msgstr "od lewej do prawej, od góry do dołu"
 
-#: ogginfo/ogginfo2.c:774
+#: ogginfo/ogginfo2.c:773
 msgid "right to left, top to bottom"
 msgstr "od prawej do lewej, od góry do dołu"
 
-#: ogginfo/ogginfo2.c:775
+#: ogginfo/ogginfo2.c:774
 msgid "top to bottom, right to left"
 msgstr "od góry do dołu, od prawej do lewej"
 
-#: ogginfo/ogginfo2.c:776
+#: ogginfo/ogginfo2.c:775
 msgid "top to bottom, left to right"
 msgstr "od góry do dołu, od lewej do prawej"
 
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo2.c:779
 #, c-format
 msgid "Text directionality: %s\n"
 msgstr "Kierunek tekstu: %s\n"
 
-#: ogginfo/ogginfo2.c:783
+#: ogginfo/ogginfo2.c:782
 msgid "Unknown text directionality\n"
 msgstr "Nieznany kierunek tekstu\n"
 
-#: ogginfo/ogginfo2.c:795
+#: ogginfo/ogginfo2.c:794
 msgid "Invalid zero granulepos rate\n"
 msgstr "Błędna zerowa częstotliwość granulepos\n"
 
-#: ogginfo/ogginfo2.c:797
+#: ogginfo/ogginfo2.c:796
 #, c-format
 msgid "Granulepos rate %d/%d (%.02f gps)\n"
 msgstr "Częstotliwość granulepos %d/%d (%.02f gps)\n"
 
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:809
 msgid "\n"
 msgstr "\n"
 
-#: ogginfo/ogginfo2.c:828
+#: ogginfo/ogginfo2.c:827
 #, c-format
-msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-"Ujemna granulepos (%lld) w strumieniu Kate poza nagłówkami. Ten plik został "
-"utworzony przez błędny koder\n"
+msgid "Negative granulepos (%lld) on kate stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "Ujemna granulepos (%lld) w strumieniu Kate poza nagłówkami. Ten plik został utworzony przez błędny koder\n"
 
-#: ogginfo/ogginfo2.c:853
+#: ogginfo/ogginfo2.c:852
 msgid ""
 "Kate stream %d:\n"
 "\tTotal data length: %"
@@ -2178,40 +1989,35 @@
 "Strumień Kate %d:\n"
 "\tCałkowita długość danych: %"
 
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:892
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Uwaga: nie ustawiono EOS w strumieniu %d\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:1047
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Uwaga: błędna strona nagłówka, nie znaleziono pakietu\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:1073
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-"Uwaga: błędna strona nagłówka w strumieniu %d, zawiera wiele pakietów\n"
+msgstr "Uwaga: błędna strona nagłówka w strumieniu %d, zawiera wiele pakietów\n"
 
-#: ogginfo/ogginfo2.c:1088
+#: ogginfo/ogginfo2.c:1087
 #, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-"Uwaga: strumień %d ma numer seryjny %d, który jest dopuszczalny, ale może "
-"powodować problemy z niektórymi narzędziami.\n"
+msgid "Note: Stream %d has serial number %d, which is legal but may cause problems with some tools.\n"
+msgstr "Uwaga: strumień %d ma numer seryjny %d, który jest dopuszczalny, ale może powodować problemy z niektórymi narzędziami.\n"
 
-#: ogginfo/ogginfo2.c:1105
+#: ogginfo/ogginfo2.c:1104
 msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
 msgstr "Uwaga: dziura w danych (%d bajtów) pod przybliżonym offsetem %"
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:1128
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Błąd otwierania pliku wejściowego \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:1133
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2220,27 +2026,23 @@
 "Przetwarzanie pliku \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:1142
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Nie udało się odnaleźć procesora dla strumienia, zakończenie\n"
 
-#: ogginfo/ogginfo2.c:1151
+#: ogginfo/ogginfo2.c:1150
 msgid "Page found for stream after EOS flag"
 msgstr "Napotkano stronÄ™ w strumieniu po fladze EOS"
 
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-"Naruszone ograniczenia przeplotu Ogg, nowy strumień przed EOS wszystkich "
-"poprzednich strumieni"
+#: ogginfo/ogginfo2.c:1153
+msgid "Ogg muxing constraints violated, new stream before EOS of all previous streams"
+msgstr "Naruszone ograniczenia przeplotu Ogg, nowy strumień przed EOS wszystkich poprzednich strumieni"
 
-#: ogginfo/ogginfo2.c:1158
+#: ogginfo/ogginfo2.c:1157
 msgid "Error unknown."
 msgstr "Nieznany błąd."
 
-#: ogginfo/ogginfo2.c:1161
+#: ogginfo/ogginfo2.c:1160
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -2249,37 +2051,32 @@
 "Uwaga: niedopuszczalnie umieszczone strony dla strumienia logicznego %d\n"
 "Oznacza to uszkodzony plik Ogg: %s.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:1172
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Nowy strumień logiczny (#%d, numer seryjny %08x): typ %s\n"
 
-#: ogginfo/ogginfo2.c:1176
+#: ogginfo/ogginfo2.c:1175
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
-msgstr ""
-"Uwaga: flaga poczÄ…tku strumienia nie jest ustawiona dla strumienia %d\n"
+msgstr "Uwaga: flaga poczÄ…tku strumienia nie jest ustawiona dla strumienia %d\n"
 
-#: ogginfo/ogginfo2.c:1180
+#: ogginfo/ogginfo2.c:1179
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "Uwaga: napotkano flagę początku strumienia w środku strumienia %d\n"
 
-#: ogginfo/ogginfo2.c:1185
+#: ogginfo/ogginfo2.c:1184
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
-msgstr ""
-"Uwaga: luka w numerach sekwencji w strumieniu %d. Otrzymano stronÄ™ %ld kiedy "
-"oczekiwano strony %ld. Oznacza to brakujÄ…ce dane.\n"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "Uwaga: luka w numerach sekwencji w strumieniu %d. Otrzymano stronÄ™ %ld kiedy oczekiwano strony %ld. Oznacza to brakujÄ…ce dane.\n"
 
-#: ogginfo/ogginfo2.c:1200
+#: ogginfo/ogginfo2.c:1199
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Strumień logiczny %d zakończony\n"
 
-#: ogginfo/ogginfo2.c:1208
+#: ogginfo/ogginfo2.c:1207
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -2288,12 +2085,12 @@
 "BÅ‚Ä…d: nie znaleziono danych Ogg w pliku \"%s\".\n"
 "Wejście prawdopodobnie nie jest typu Ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
+#: ogginfo/ogginfo2.c:1218
 #, c-format
 msgid "ogginfo from %s %s\n"
 msgstr "ogginfo z pakietu %s %s\n"
 
-#: ogginfo/ogginfo2.c:1225
+#: ogginfo/ogginfo2.c:1224
 #, c-format
 msgid ""
 "(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
@@ -2316,12 +2113,12 @@
 "\t-v Bardziej szczegółowe wyjście. Włącza bardziej dokładne\n"
 "\t   sprawdzanie niektórych rodzajów strumieni.\n"
 
-#: ogginfo/ogginfo2.c:1234
+#: ogginfo/ogginfo2.c:1233
 #, c-format
 msgid "\t-V Output version information and exit\n"
 msgstr "\t-V Wypisanie informacji o wersji i zakończenie\n"
 
-#: ogginfo/ogginfo2.c:1246
+#: ogginfo/ogginfo2.c:1245
 #, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
@@ -2336,7 +2133,7 @@
 "i diagnozowania problemów z nimi.\n"
 "Pełny opis można uzyskać poprzez \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
+#: ogginfo/ogginfo2.c:1279
 #, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Nie podano plików wejściowych. \"ogginfo -h\" pokaże pomoc\n"
@@ -2487,11 +2284,8 @@
 
 #: vcut/vcut.c:535
 #, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
-msgstr ""
-"Składnia: vcut plik_wej.ogg plik_wyj1.ogg plik_wyj2.ogg [punkt_cięcia | "
-"+punkt_cięcia]\n"
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+msgstr "Składnia: vcut plik_wej.ogg plik_wyj1.ogg plik_wyj2.ogg [punkt_cięcia | +punkt_cięcia]\n"
 
 #: vcut/vcut.c:539
 #, c-format
@@ -2563,9 +2357,7 @@
 
 #: vorbiscomment/vcedit.c:238
 msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-"Nie udało się przydzielić pamięci do zarejestrowania numeru seryjnego nowego "
-"strumienia."
+msgstr "Nie udało się przydzielić pamięci do zarejestrowania numeru seryjnego nowego strumienia."
 
 #: vorbiscomment/vcedit.c:506
 msgid "Input truncated or empty."
@@ -2600,8 +2392,7 @@
 msgstr "Uszkodzone lub brakujÄ…ce dane, kontynuacja..."
 
 #: vorbiscomment/vcedit.c:875
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+msgid "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr "Błąd zapisu strumienia wyjściowego. Może być uszkodzony lub ucięty."
 
 #: vorbiscomment/vcomment.c:190 vorbiscomment/vcomment.c:216
@@ -2629,7 +2420,7 @@
 msgid "no action specified\n"
 msgstr "Nie określono akcji\n"
 
-#: vorbiscomment/vcomment.c:379
+#: vorbiscomment/vcomment.c:376
 #, c-format
 msgid ""
 "vorbiscomment from %s %s\n"
@@ -2640,12 +2431,12 @@
 " autorstwa Xiph.Org Foundation (http://www.xiph.org/)\n"
 "\n"
 
-#: vorbiscomment/vcomment.c:382
+#: vorbiscomment/vcomment.c:379
 #, c-format
 msgid "List or edit comments in Ogg Vorbis files.\n"
 msgstr "Wypisanie i modyfikacja komentarzy w plikach Ogg Vorbis.\n"
 
-#: vorbiscomment/vcomment.c:385
+#: vorbiscomment/vcomment.c:382
 #, c-format
 msgid ""
 "Usage: \n"
@@ -2658,31 +2449,27 @@
 "  vorbiscomment [-lR] plik\n"
 "  vorbiscomment [-R] [-c plik] [-t znacznik] <-a|-w> plik_wej [plik_wyj]\n"
 
-#: vorbiscomment/vcomment.c:391
+#: vorbiscomment/vcomment.c:388
 #, c-format
 msgid "Listing options\n"
 msgstr "Opcje wypisywania\n"
 
-#: vorbiscomment/vcomment.c:392
+#: vorbiscomment/vcomment.c:389
 #, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-"  -l, --list              Wypisanie komentarzy (domyślne jeśli nie podano "
-"opcji)\n"
+msgid "  -l, --list              List the comments (default if no options are given)\n"
+msgstr "  -l, --list              Wypisanie komentarzy (domyślne jeśli nie podano opcji)\n"
 
-#: vorbiscomment/vcomment.c:395
+#: vorbiscomment/vcomment.c:392
 #, c-format
 msgid "Editing options\n"
 msgstr "Opcje modyfikacji\n"
 
-#: vorbiscomment/vcomment.c:396
+#: vorbiscomment/vcomment.c:393
 #, c-format
 msgid "  -a, --append            Append comments\n"
 msgstr "  -a, --append            Dołączenie komentarzy\n"
 
-#: vorbiscomment/vcomment.c:397
+#: vorbiscomment/vcomment.c:394
 #, c-format
 msgid ""
 "  -t \"name=value\", --tag \"name=value\"\n"
@@ -2691,72 +2478,59 @@
 "  -t \"nazwa=wartość\", --tag \"nazwa=wartość\"\n"
 "                          Przekazanie znacznika komentarza z linii poleceń\n"
 
-#: vorbiscomment/vcomment.c:399
+#: vorbiscomment/vcomment.c:396
 #, c-format
 msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-"  -w, --write             Zapisanie komentarzy z zastÄ…pieniem istniejÄ…cych\n"
+msgstr "  -w, --write             Zapisanie komentarzy z zastÄ…pieniem istniejÄ…cych\n"
 
-#: vorbiscomment/vcomment.c:403
+#: vorbiscomment/vcomment.c:400
 #, c-format
 msgid ""
 "  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
+"                          When listing, write comments to the specified file.\n"
+"                          When editing, read comments from the specified file.\n"
 msgstr ""
 "  -c plik, --commentfile plik\n"
-"                          Przy wypisywaniu zapis komentarzy do podanego "
-"pliku.\n"
-"                          Przy modyfikacji odczyt komentarzy z podanego "
-"pliku.\n"
+"                          Przy wypisywaniu zapis komentarzy do podanego pliku.\n"
+"                          Przy modyfikacji odczyt komentarzy z podanego pliku.\n"
 
-#: vorbiscomment/vcomment.c:406
+#: vorbiscomment/vcomment.c:403
 #, c-format
 msgid "  -R, --raw               Read and write comments in UTF-8\n"
 msgstr "  -R, --raw               Odczyt i zapis komentarzy w UTF-8\n"
 
-#: vorbiscomment/vcomment.c:410
+#: vorbiscomment/vcomment.c:407
 #, c-format
 msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-"  -V, --version           Wypisanie informacji o wersji i zakończenie\n"
+msgstr "  -V, --version           Wypisanie informacji o wersji i zakończenie\n"
 
-#: vorbiscomment/vcomment.c:413
+#: vorbiscomment/vcomment.c:410
 #, c-format
 msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
+"If no output file is specified, vorbiscomment will modify the input file. This\n"
+"is handled via temporary file, such that the input file is not modified if any\n"
 "errors are encountered during processing.\n"
 msgstr ""
-"Jeśli nie podano pliku wyjściowego, vorbiscomment zmodyfikuje plik "
-"wejściowy.\n"
+"Jeśli nie podano pliku wyjściowego, vorbiscomment zmodyfikuje plik wejściowy.\n"
 "Jest to obsługiwane przez plik tymczasowy, więc plik wejściowy nie zostanie\n"
 "zmodyfikowany jeśli wystąpią błędy w czasie przetwarzania.\n"
 
-#: vorbiscomment/vcomment.c:418
+#: vorbiscomment/vcomment.c:415
 #, c-format
 msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
+"vorbiscomment handles comments in the format \"name=value\", one per line. By\n"
+"default, comments are written to stdout when listing, and read from stdin when\n"
 "editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
+"can be given on the commandline with -t \"name=value\". Use of either -c or -t\n"
 "disables reading from stdin.\n"
 msgstr ""
 "vorbiscomment obsługuje komentarze w formacie \"nazwa=wartość\", po jednym\n"
 "w każdej linii. Domyślnie komentarze są wypisywane na standardowe wyjście,\n"
-"a w trybie modyfikacji czytane ze standardowego wejścia. Alternatywnie "
-"można\n"
+"a w trybie modyfikacji czytane ze standardowego wejścia. Alternatywnie można\n"
 "podać plik za pomocą opcji -c lub znaczniki poprzez -t \"nazwa=wartość\".\n"
 "Użycie -c lub -t wyłącza czytanie ze standardowego wejścia.\n"
 
-#: vorbiscomment/vcomment.c:425
+#: vorbiscomment/vcomment.c:422
 #, c-format
 msgid ""
 "Examples:\n"
@@ -2767,13 +2541,11 @@
 "  vorbiscomment -a wej.ogg -c komentarze.txt\n"
 "  vorbiscomment -a wej.ogg -t \"ARTIST=Jakiś facet\" -t \"TITLE=Tytuł\"\n"
 
-#: vorbiscomment/vcomment.c:430
+#: vorbiscomment/vcomment.c:427
 #, c-format
 msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
+"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather than\n"
+"converting to the user's character set, which is useful in scripts. However,\n"
 "this is not sufficient for general round-tripping of comments in all cases.\n"
 msgstr ""
 "UWAGA: W trybie surowym (--raw, -R) komentarze sÄ… czytane i zapisywane\n"
@@ -2781,63 +2553,47 @@
 "w skryptach. Jednak nie jest ot wystarczajÄ…ce przy przekazywaniu komentarzy\n"
 "we wszystkich przypadkach.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:489
 #, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Błąd wewnętrzny analizy opcji polecenia\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:575
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Błąd otwierania pliku wejściowego '%s'.\n"
 
-#: vorbiscomment/vcomment.c:587
+#: vorbiscomment/vcomment.c:584
 #, c-format
 msgid "Input filename may not be the same as output filename\n"
-msgstr ""
-"Nazwa pliku wejściowego nie może być taka sama, jak pliku wyjściowego\n"
+msgstr "Nazwa pliku wejściowego nie może być taka sama, jak pliku wyjściowego\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:595
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Błąd otwierania pliku wyjściowego '%s'.\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:610
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Błąd otwierania pliku wyjściowego '%s'.\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:627
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "BÅ‚Ä…d otwierania pliku komentarzy '%s'\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:661
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "BÅ‚Ä…d usuwania starego pliku %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:663
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "BÅ‚Ä…d zmiany nazwy z %s na %s\n"
 
-#: vorbiscomment/vcomment.c:676
+#: vorbiscomment/vcomment.c:673
 #, c-format
 msgid "Error removing erroneous temporary file %s\n"
 msgstr "Błąd usuwania błędnego pliku tymczasowego %s\n"
-
-#~ msgid "AU file reader"
-#~ msgstr "Czytnik plików AU"
-
-#~ msgid "Warning: Unexpected EOF in reading Wave header\n"
-#~ msgstr "Uwaga: nieoczekiwany EOF podczas odczytu nagłówka Wave\n"
-
-#~ msgid "Out of memory opening AU driver\n"
-#~ msgstr "Brak pamięci podczas otwierania sterownika AU\n"
-
-#~ msgid "At this moment, only linear 16 bit .au files are supported\n"
-#~ msgstr "Aktualnie obsługiwane są tylko liniowe 16-bitowe pliki .au\n"
-
-#~ msgid "Internal error! Please report this bug.\n"
-#~ msgstr "Błąd wewnętrzny! Proszę zgłosić ten błąd.\n"

Modified: trunk/vorbis-tools/po/ro.po
===================================================================
--- trunk/vorbis-tools/po/ro.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/ro.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -5,8 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.0\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2002-07-19 22:30+1000\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,186 +13,185 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ogg123/buffer.c:117
-#, c-format
+#: ogg123/buffer.c:111
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Eroare: memorie plinã în malloc_action().\n"
 
-#: ogg123/buffer.c:360
-#, c-format
+#: ogg123/buffer.c:344
 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:75
+#: ogg123/buffer.c:363
+msgid "malloc"
+msgstr "malloc"
+
+#: ogg123/callbacks.c:70
 msgid "Error: Device not available.\n"
 msgstr "Eroare: Dispozitiv(device) indisponibil.\n"
 
-#: ogg123/callbacks.c:78
+#: ogg123/callbacks.c:73
 #, 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:81
+#: ogg123/callbacks.c:76
 #, 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:85
+#: ogg123/callbacks.c:80
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Eroare: nu am putut deschide dispozitivul %s\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:84
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Eroare: Probleme dispozitiv %s.\n"
 
-#: ogg123/callbacks.c:92
+#: ogg123/callbacks.c:87
 #, 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:95
+#: ogg123/callbacks.c:90
 #, 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:99
+#: ogg123/callbacks.c:94
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Eroare: Fiºierul %s existã deja.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:97
 #, 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:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:120 ogg123/callbacks.c:125
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Eroare: Memorie plinã în new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:174
+#: ogg123/callbacks.c:169
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Eroare: Memorie plinã în new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:233
+#: ogg123/callbacks.c:228
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Eroare: Memorie plinã în new_status_message_arg.\n"
 
-#: ogg123/callbacks.c:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: ogg123/callbacks.c:274 ogg123/callbacks.c:293 ogg123/callbacks.c:330
+#: ogg123/callbacks.c:349
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Eroare: Memorie plinã în decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Eroare sistem"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Eroare de analizã: %s în linia %d din %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Nume"
 
-#: ogg123/cfgfile_options.c:137
+#. Description
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Descriere"
 
-#: ogg123/cfgfile_options.c:140
+#. Type
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Tip"
 
-#: ogg123/cfgfile_options.c:143
+#. Default
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Implicit"
 
-#: ogg123/cfgfile_options.c:169
-#, c-format
+#: ogg123/cfgfile_options.c:165
 msgid "none"
 msgstr "nimic"
 
-#: ogg123/cfgfile_options.c:172
-#, c-format
+#: ogg123/cfgfile_options.c:168
 msgid "bool"
 msgstr "bool"
 
-#: ogg123/cfgfile_options.c:175
-#, c-format
+#: ogg123/cfgfile_options.c:171
 msgid "char"
 msgstr "char"
 
-#: ogg123/cfgfile_options.c:178
-#, c-format
+#: ogg123/cfgfile_options.c:174
 msgid "string"
 msgstr "ºir"
 
-#: ogg123/cfgfile_options.c:181
-#, c-format
+#: ogg123/cfgfile_options.c:177
 msgid "int"
 msgstr "int"
 
-#: ogg123/cfgfile_options.c:184
-#, c-format
+#: ogg123/cfgfile_options.c:180
 msgid "float"
 msgstr "float"
 
-#: ogg123/cfgfile_options.c:187
-#, c-format
+#: ogg123/cfgfile_options.c:183
 msgid "double"
 msgstr "double"
 
-#: ogg123/cfgfile_options.c:190
-#, c-format
+#: ogg123/cfgfile_options.c:186
 msgid "other"
 msgstr "altul"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:506 oggenc/oggenc.c:511
+#: oggenc/oggenc.c:516 oggenc/oggenc.c:521 oggenc/oggenc.c:526
+#: oggenc/oggenc.c:531
 msgid "(none)"
 msgstr "(nimic)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Succes"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Key negãsit"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Nici un key"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Valoare greºitã"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Tip greºit in listã opþiuni"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Eroare necunoscutã"
 
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:74
 msgid "Internal error parsing command line options.\n"
 msgstr "Eroare internã in analizã opþiuni linie comandã.\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:81
 #, 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:102
+#: ogg123/cmdline_options.c:93
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -202,45 +200,44 @@
 "=== Eroare \"%s\" în analizã opþiuni configurare linie comandã.\n"
 "=== Opþiunea a fost: %s\n"
 
-#: ogg123/cmdline_options.c:109
-#, c-format
+#. not using the status interface here
+#: ogg123/cmdline_options.c:100
 msgid "Available options:\n"
 msgstr "Opþiuni disponibile:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:109
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Nu existã device-ul %s.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:129
 #, 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:143
+#: ogg123/cmdline_options.c:134
 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"
+msgstr "=== Nu se poate specifica fiºier de output fãrã specificare de driver.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:149
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Format opþiune incorect: %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:164
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Valoare prebuffer invalidã. Intervalul este 0-100.\n"
 
-#: ogg123/cmdline_options.c:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:179
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 de la %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:186
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Nu se poate cânta fiecare 0 fiºier!\n"
 
-#: ogg123/cmdline_options.c:216
+#: ogg123/cmdline_options.c:194
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -248,252 +245,112 @@
 "--- 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:232
+#: ogg123/cmdline_options.c:206
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Nu se poate deschide playlistul %s.  Omis.\n"
 
-#: ogg123/cmdline_options.c:248
-msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:227
 #, 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:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== 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:237
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== 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:292
+#: ogg123/cmdline_options.c:258
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 de la %s %s\n"
+" de Fundaþia Xiph.org (http://www.xiph.org/)\n"
+"\n"
+"Folosire: ogg123 [<opþiuni>] <fiºiere intrare> ...\n"
+"\n"
+"  -h, --help     acest mesaj\n"
+"  -V, --version  afiºare versiune Ogg123\n"
+"  -d, --device=d foloseºte 'd' ca device de ieºire\n"
+"      Device-uri posibile sunt ('*'=live, '@'=fiºier):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Opþiuni disponibile:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:279
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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"
+"  -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"
 "\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"
 msgstr ""
+"  -f, --file=nume fiºier  Setare nume fiºier ieºire pentru un fiºier\n"
+"      device specificat anterior  (cu -d).\n"
+"  -k n, --skip n  Omitere primele 'n' secunde\n"
+"  -o, --device-option=k:v trimitere opþiune specialã k cu valoare\n"
+"      v spre device specificat anterior (cu -d).  Vezi\n"
+"      pagina de manual pentru informaþii.\n"
+"  -b n, --buffer n  foloseºte un buffer de intrare de 'n' kiloocteþi\n"
+"  -p n, --prebuffer n  încarcã n%% din bufferul de intrare înainte de a începe\n"
+"  -v, --verbose  afiºeazã progres ºi alte informaþii de stare\n"
+"  -q, --quiet    nu afiºa nimic (fãrã titlu)\n"
+"  -x n, --nth    cântã fiecare 'n' bucatã'\n"
+"  -y n, --ntimes repetã fiecare bucatã de 'n' ori\n"
+"  -z, --shuffle  amestecare cântece\n"
+"\n"
+"ogg123 va sãri la urmatorul cântec la SIGINT (Ctrl-C);2 SIGINTuri în\n"
+"s milisecunde va opri ogg123.\n"
+"  -l, --delay=s  setare întârziere s [milisecunde] (implicit 500).\n"
 
-#: ogg123/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Fiºier: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Opþiuni disponibile:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "Intrare non ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Descriere"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Opþiuni disponibile:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:203
+#: ogg123/oggvorbis_format.c:106 ogg123/oggvorbis_format.c:321
+#: ogg123/oggvorbis_format.c:336 ogg123/oggvorbis_format.c:354
 msgid "Error: Out of memory.\n"
 msgstr "Eroare: memorie plinã.\n"
 
-#: ogg123/format.c:82
-#, c-format
+#: ogg123/format.c:59
 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:145
+#: ogg123/http_transport.c:137
 msgid "Error: Could not set signal mask."
 msgstr "Eroare: Nu s-a putut seta mask semnal."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:191
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Eroare: Nu s-a putut crea buffer de intrare.\n"
 
-#: ogg123/ogg123.c:82
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "device de ieºire implicit"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "playlist amestecat"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Nu s-au putut omite %f secunde de audio."
-
-#: ogg123/ogg123.c:378
+#: ogg123/ogg123.c:261
 #, c-format
 msgid ""
 "\n"
@@ -502,372 +359,241 @@
 "\n"
 "Dispozitiv Audio:   %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:262
 #, c-format
 msgid "Author:   %s"
 msgstr "Autor:   %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:263
 #, c-format
 msgid "Comments: %s"
 msgstr "Comentarii: %s"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
+#: ogg123/ogg123.c:307 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:460
+#: ogg123/ogg123.c:341
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Eroare: Nu s-a putut crea bufferul audio.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:429
 #, 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:561
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Nu s-a putut deschide %s.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:440
 #, 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:577
+#: ogg123/ogg123.c:450
 #, 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"
+msgstr "Eroare la deschiderea %s utilizând modulul %s.  Fiºierul poate sã fie corupt.\n"
 
-#: ogg123/ogg123.c:596
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
 msgstr "În rulare: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:474
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Nu s-au putut omite %f secunde de audio."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
 msgstr "Eroare: Decodare eºuatã.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Eroare: Probleme dispozitiv %s.\n"
-
-#: ogg123/ogg123.c:743
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:585
 msgid "Done."
 msgstr "Finalizat."
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:51
+msgid "Track number:"
+msgstr "Numar pistã(track):"
+
+#: ogg123/oggvorbis_format.c:52
+msgid "ReplayGain (Track):"
+msgstr "ReplayGain (Pistã):"
+
+#: ogg123/oggvorbis_format.c:53
+msgid "ReplayGain (Album):"
+msgstr "ReplayGain (Album):"
+
+#: ogg123/oggvorbis_format.c:54
+msgid "ReplayGain (Track) Peak:"
+msgstr "ReplayGain (Pistã) Vârf:"
+
+#: ogg123/oggvorbis_format.c:55
+msgid "ReplayGain (Album) Peak:"
+msgstr "ReplayGain (Album) Vârf:"
+
+#: ogg123/oggvorbis_format.c:56
+msgid "Copyright"
+msgstr "Copyright"
+
+#: ogg123/oggvorbis_format.c:57 ogg123/oggvorbis_format.c:58
+msgid "Comment:"
+msgstr "Comentariu:"
+
+#: ogg123/oggvorbis_format.c:167
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Pauzã în stream; probabil nedãunãtoare\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:173
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Biblioteca Vorbis a raportat o eroare de stream.\n"
 
-#: ogg123/oggvorbis_format.c:310
-#, fuzzy, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr "Bitstreamul este canal %d, %ldHz"
-
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:402
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr ""
+msgid "Version is %d"
+msgstr "Versiunea: %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:406
 #, 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:327
+#: ogg123/oggvorbis_format.c:414
 #, c-format
+msgid "Bitstream is %d channel, %ldHz"
+msgstr "Bitstreamul este canal %d, %ldHz"
+
+#: ogg123/oggvorbis_format.c:419
+#, c-format
 msgid "Encoded by: %s"
 msgstr "Encodat de: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, c-format
+#: ogg123/playlist.c:41 ogg123/playlist.c:52
 msgid "Error: Out of memory in create_playlist_member().\n"
 msgstr "Eroare: Memorie plinã în create_playlist_member().\n"
 
-#: ogg123/playlist.c:222
+#: ogg123/playlist.c:214
 #, c-format
 msgid "Warning from playlist %s: Could not read directory %s.\n"
 msgstr "Avertisment din playlistul %s: Nu se poate citi directorul %s.\n"
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
-#, c-format
+#: ogg123/playlist.c:259 ogg123/playlist.c:271
 msgid "Error: Out of memory in playlist_to_array().\n"
 msgstr "Eroare: Memorie plinã în playlist_to_array().\n"
 
-#: ogg123/status.c:60
+#: ogg123/status.c:47
 #, c-format
 msgid "%sPrebuf to %.1f%%"
 msgstr "%sPrebuf cãtre %.1f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sÎn pauzã"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr "%sEOS"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
-#, c-format
+#: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
+#: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Eroare alocare memorie in stats_init()\n"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Fiºier: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Duratã: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "din %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Bitrate mediu: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr "Buffer intrare %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr "Buffer ieºire %5.1f%%"
 
-#: ogg123/transport.c:71
-#, c-format
+#: ogg123/transport.c:67
 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"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 de la %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, fuzzy, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr ""
-"Folosire: vcut fiºierintrare.ogg fiºierieºire1.ogg fiºierieºire2.ogg "
-"punct_secþiune\n"
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "EROARE: nu s-a putut deschide fiºierul \"%s\":%s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "EROARE: Nu s-a putut scrie fiºierul de ieºire \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Nu s-a putut deschide fiºierul ca vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Eroare in ºtergerea fiºierului vechi %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"EROARE: Nici un fiºier de intrare specificat. Folosiþi -h pentru help.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"EROARE: Fiºiere intrare multiple cu fiºier ieºire specificat: sugerãm "
-"folosirea lui -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:39
 msgid "WAV file reader"
 msgstr "cititor fiºiere WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
 msgstr "cititor fiºiere AIFF/AIFC"
 
-#: oggenc/audio.c:53
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "cititor fiºiere WAV"
-
-#: oggenc/audio.c:54
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "cititor fiºiere WAV"
-
-#: oggenc/audio.c:131 oggenc/audio.c:425
-#, c-format
+#: oggenc/audio.c:117 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Avertisment: EOF neaºteptat în citirea headerului WAV\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:128
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Omitere bucatã tip \"%s\", lungime %d\n"
 
-#: oggenc/audio.c:168
-#, c-format
+#: oggenc/audio.c:146
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Avertisment: EOF neaºteptat în bucatã AIFF\n"
 
-#: oggenc/audio.c:254
-#, c-format
+#: oggenc/audio.c:231
 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:260
-#, c-format
+#: oggenc/audio.c:237
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Avertisment: Bucatã obiºnuitã trunchiatã în header AIFF\n"
 
-#: oggenc/audio.c:268
-#, c-format
+#: oggenc/audio.c:245
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Avertismnet: EOF neaºteptat în citirea headerului AIFF\n"
 
-#: oggenc/audio.c:283
-#, c-format
+#: oggenc/audio.c:258
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Avertisment: Header AIFF-C trunchiat.\n"
 
-#: oggenc/audio.c:297
-#, fuzzy, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
+#: oggenc/audio.c:263
+msgid "Warning: Can't handle compressed AIFF-C\n"
 msgstr "Avertisment: Nu se poate manipula AIFF-C compresat.\n"
 
-#: oggenc/audio.c:304
-#, c-format
+#: oggenc/audio.c:270
 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:310
-#, c-format
+#: oggenc/audio.c:276
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Avertisment: Bucatã SSND coruptã în header AIFF\n"
 
-#: oggenc/audio.c:316
-#, c-format
+#: oggenc/audio.c:282
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Avertisment: EOF neaºteptat în citirea headerului AIFF\n"
 
-#: oggenc/audio.c:353
-#, c-format
+#: oggenc/audio.c:314
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
 " Must be 8 or 16 bit PCM.\n"
@@ -875,13 +601,11 @@
 "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:407
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Avertisment: Format bucata nerecunoscut în header WAV\n"
 
-#: oggenc/audio.c:420
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -889,139 +613,80 @@
 "Avertisment: format bucatã INVALID în header wav.\n"
 " Se încearcã oricum citirea (s-ar putea sã nu meargã)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: oggenc/audio.c:406
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
-" or type 3 floating point PCM)\n"
+" or type 3 floating point PCM\n"
 msgstr ""
 "EROARE: Fiºier wav în format nesuportat (trebuie sã fie standard PCM)\n"
 " sau tip 3 floating point PCM\n"
 
-#: oggenc/audio.c:467
-#, c-format
+#: oggenc/audio.c:455
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
-
-#: oggenc/audio.c:528
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
 "EROARE: Fiºier wav în format nesuportat (trebuie sã fie 16 biþi PCM)\n"
 "sau floating point PCM\n"
 
-#: oggenc/audio.c:604
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
+#: oggenc/audio.c:607
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "BUG: S-au primit exemple zero din resampler: fiºierul va fi trunchiat. Vã rugãm raportaþi asta.\n"
 
-#: oggenc/audio.c:624
-#, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:630
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:732
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"BUG: S-au primit exemple zero din resampler: fiºierul va fi trunchiat. Vã "
-"rugãm raportaþi asta.\n"
-
-#: oggenc/audio.c:750
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr "Nu s-a putut iniþializa resampler\n"
 
-#: oggenc/encode.c:64
+#: oggenc/encode.c:59
 #, 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:101
+#: oggenc/encode.c:100
 #, 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:104
+#: oggenc/encode.c:103
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Opþiune avansatã nerecunoscutã \"%s\"\n"
 
-#: oggenc/encode.c:111
-#, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
+#: oggenc/encode.c:133
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+msgstr "255 de canale ar trebui  sã ajungã la oricine. (Ne pare rãu, vorbis nu permite mai mult)\n"
 
-#: oggenc/encode.c:115 oggenc/encode.c:252
-#, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, fuzzy, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 de canale ar trebui  sã ajungã la oricine. (Ne pare rãu, vorbis nu "
-"permite mai mult)\n"
-
-#: oggenc/encode.c:182
-#, c-format
+#: oggenc/encode.c:141
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Cererea de bitrate minim sau maxim necesitã --managed\n"
 
-#: oggenc/encode.c:200
-#, c-format
+#: oggenc/encode.c:159
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Iniþializare mod eºuatã: parametri invalizi pentru calitate\n"
 
-#: oggenc/encode.c:245
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:247
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:263
-#, c-format
+#: oggenc/encode.c:183
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "Iniþializare mod eºuatã: parametri invalizi pentru bitrate\n"
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:237
 msgid "Failed writing header to output stream\n"
 msgstr "Nu s-a putut scrie headerul spre streamul de ieºire\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:303
 msgid "Failed writing data to output stream\n"
 msgstr "Nu s-au putut scrie date spre streamul de ieºire\n"
 
-#: oggenc/encode.c:472
-#, fuzzy, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
+#: oggenc/encode.c:349
+#, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 msgstr "\t[%5.1f%%] [%2dm%.2ds rãmase] %c"
 
-#: oggenc/encode.c:482
-#, fuzzy, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+#: oggenc/encode.c:359
+#, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr "\tEncodare [%2dm%.2ds pânã acum] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:377
 #, c-format
 msgid ""
 "\n"
@@ -1032,8 +697,7 @@
 "\n"
 "Encodare fiºier finalizatã \"%s\"\n"
 
-#: oggenc/encode.c:502
-#, c-format
+#: oggenc/encode.c:379
 msgid ""
 "\n"
 "\n"
@@ -1043,7 +707,7 @@
 "\n"
 "Encodare finalizatã.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:383
 #, c-format
 msgid ""
 "\n"
@@ -1052,17 +716,17 @@
 "\n"
 "\tDuratã fiºier:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:387
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tTimp trecut: %dm %04.1fs\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:390
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tRatã:         %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:391
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1071,7 +735,7 @@
 "\tBitrate mediu: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:428
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1082,17 +746,17 @@
 "         %s%s%s \n"
 "la bitrate mediu de %d kbps "
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:430 oggenc/encode.c:437 oggenc/encode.c:445
+#: oggenc/encode.c:452 oggenc/encode.c:458
 msgid "standard input"
 msgstr "intrare standard"
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:431 oggenc/encode.c:438 oggenc/encode.c:446
+#: oggenc/encode.c:453 oggenc/encode.c:459
 msgid "standard output"
 msgstr "ieºire standard"
 
-#: oggenc/encode.c:559
+#: oggenc/encode.c:436
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1103,7 +767,7 @@
 "         %s%s%s \n"
 "la bitrate de aproximativ %d kbps (encodare VBR activatã)\n"
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:444
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1114,7 +778,7 @@
 "         %s%s%s \n"
 "la nivel de calitate %2.2f  utilizând VBR constrâns"
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:451
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1125,7 +789,7 @@
 "         %s%s%s \n"
 "la calitate %2.2f\n"
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:457
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1136,723 +800,395 @@
 "         %s%s%s \n"
 "folosind management de bitrate"
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
+#: oggenc/oggenc.c:96
+#, c-format
+msgid ""
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 "%s%s\n"
 "EROARE: Nici un fiºier de intrare specificat. Folosiþi -h pentru help.\n"
 
-#: oggenc/oggenc.c:118
-#, c-format
+#: oggenc/oggenc.c:111
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "EROARE: Fiºiere multiple specificate pentru utilizare stdin\n"
 
-#: oggenc/oggenc.c:125
-#, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"EROARE: Fiºiere intrare multiple cu fiºier ieºire specificat: sugerãm "
-"folosirea lui -n\n"
+#: oggenc/oggenc.c:118
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "EROARE: Fiºiere intrare multiple cu fiºier ieºire specificat: sugerãm folosirea lui -n\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:172
 #, 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:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "cititor fiºiere WAV"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:200
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Deschidere cu modulul %s: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:209
 #, 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:280
-#, c-format
+#: oggenc/oggenc.c:259
 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:288
+#: oggenc/oggenc.c:267
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"EROARE: Nu s-au putut crea subdirectoarele necesare pentru nume fiºier "
-"ieºire \"%s\"\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "EROARE: Nu s-au putut crea subdirectoarele necesare pentru nume fiºier ieºire \"%s\"\n"
 
-#: oggenc/oggenc.c:295
-#, 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:306
+#: oggenc/oggenc.c:278
 #, 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:350
+#: oggenc/oggenc.c:308
 #, 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:357
-#, c-format
+#: oggenc/oggenc.c:315
 msgid "Downmixing stereo to mono\n"
 msgstr "Demixare stereo în mono\n"
 
-#: oggenc/oggenc.c:360
-#, fuzzy, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
+#: oggenc/oggenc.c:318
+msgid "ERROR: Can't downmix except from stereo to mono\n"
 msgstr "EROARE: Nu se poate demixa exceptând stereo în mono\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:365
 #, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 de la %s %s\n"
-
-#: oggenc/oggenc.c:416
-#, c-format
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:417
-#, c-format
-msgid ""
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
+"                      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"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel. Using this will\n"
-"                      automatically enable managed bitrate mode (see\n"
-"                      --managed).\n"
+"                      encoding for a fixed-size channel.\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications. Using this will automatically\n"
-"                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
-" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
-"                      high), instead of specifying a particular bitrate.\n"
+"                      streaming applications.\n"
+" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
+"                      instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
+"                      Quality -1 is also possible, but may not be of\n"
+"                      acceptable quality.\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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
-" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
-"                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
-"                      used multiple times. The argument should be in the\n"
-"                      format \"tag=value\".\n"
+"                      used multiple times.\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\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 "
-"additional\n"
+" OggEnc input files must currently be 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"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
-" In this mode, output is to stdout unless an output filename is specified\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Folosire: oggenc [opþiuni] intrare.wav [...]\n"
+"\n"
+"OPÞIUNI:\n"
+" Generale:\n"
+" -Q, --quiet          Nu produce output la stderr\n"
+" -h, --help           Tipãreºte acest text de ajutor.\n"
+" -r, --raw            Mod brut. Fiºierele intrare sunt citite direct ca date PCM\n"
+" -B, --raw-bits=n     Setare biþi/exemplu(sample) pentru intrare brutã. Implicit este 16\n"
+" -C, --raw-chan=n     Setare numãr canale pentru intrare brutã. Implicit este 2\n"
+" -R, --raw-rate=n     Setare exemple(samples)/sec pentru intrare brutã. Implicit este 44100\n"
+" --raw-endianness     1 pentru bigendian, 0 pentru puþin (little) - (implicit 0)\n"
+" -b, --bitrate        Alegere nominalã a bitrate-ului pentru encodare. Încercare\n"
+"                      de encodare la acest bitrate aproximând aceasta. Necesitã un\n"
+"                      parametru în kbps. Foloseºte motorul de management\n"
+"                      de bitrate, ºi nu este recomandat pentru mulþi utilizatori.\n"
+"                      Vedeþi -q, --quality pentru o mai bunã alternativã.\n"
+" -m, --min-bitrate    Specificare bitrate minim (în kbps). Folositor\n"
+"                      pentru encodare a unui canal cu dimensiune fixã.\n"
+" -M, --max-bitrate    Specificare bitrate maxim în kbps. Folositor\n"
+"                      pentru aplicaþii de streaming.\n"
+" -q, --quality        Specificare calitate între 0 (slabã) and 10 (superioarã),\n"
+"                      în loc de specifica un anumit bitrate .\n"
+"                      Acesta este modul normal de operare.\n"
+"                      Calitãþi fracþionale (ex. 2.75) sunt permise.\n"
+"                      E posibilã ºi calitatea -1, dar s-ar putea sa nu fie\n"
+"                      de o calitate acceptabilã.\n"
+" --resample n         Remixare date intrare în ratã sampling de n (Hz)\n"
+" --downmix            Demixare stereo în mono.Permisã doar la intrare\n"
+"                      stereo.\n"
+" -s, --serial         Specificare numãr serial pentru stream. Dacã se vor\n"
+"                      encoda fiºiere multiple, acesta va fi incrementat la\n"
+"                      fiecare stream dupã primul.\n"
+"\n"
+" De nume:\n"
+" -o, --output=fn      Scrie fiºier în fn (valid doar în mod single-file)\n"
+" -n, --names=ºir   Produce nume fiºiere ca acest ºir cu %%a, %%p, %%l,\n"
+"                      %%n, %%d înlocuite de artist, titlu, album, pistã numãr,\n"
+"                      ºi datã, respectiv (vedeþi mai jos pentru specificarea acestora).\n"
+"                      %%%% oferã cu exactitate %%.\n"
+" -X, --name-remove=s  ªterge caracterele specificate în parametri pentru \n"
+"                      formatul ºirului -n. Folositor pentru nume fiºiere corecte.\n"
+" -P, --name-replace=s Înlocuieºte caracterele eliminate de --name-remove cu\n"
+"                      caracterele specificate. Dacã acest ºir e mai scurt decât\n"
+"                      --name-remove list sau nu e specificat, caracterele\n"
+"                      în plus sunt pur ºi simplu ºterse.\n"
+"                      Setãrile implicite pentru cele douã argumente de mai sus sunt specifice\n"
+"                      de la o platformã la alta.\n"
+" -c, --comment=c      Adãugare ºir dat ca ºi comentariu. Poate fi folosit\n"
+"                      de mai multe ori.\n"
+" -d, --date           Data pistei (de obicei data când a fost fãcut cântecul)\n"
+" -N, --tracknum       Numãr pistã pentru aceastã pistã\n"
+" -t, --title          Titlu pentru aceastã pistã\n"
+" -l, --album          Nume album\n"
+" -a, --artist         Nume artist\n"
+" -G, --genre          Gen muzical pistã\n"
+"                      Dacã se dau mai multe fiºiere de intrare\n"
+"                      vor fi folosite instanþe ale anterioarelor cinciargumente,\n"
+"                      în oridnea datã. Dacã sunt specificate mai \n"
+"                      puþine titluri decât fiºiere, OggEnc va tipãri un avertisment, ºi\n"
+"                      va utiliza ultimul titlu pentru restul de fiºiere Dacã e\n"
+"                      dat un numãr mai mic de piste, fiºierele rãmase nu vor fi\n"
+"                      numerotate. Pentru celelalte ultima etichetã (tag) va fi refolositã\n"
+"                      pentru toate celelalte fãrã avertisment (pentru a putea specifica o datã\n"
+"                      undeva, de exemplu, ºi a fi folositã pentru toate fiºierele)\n"
+"\n"
+"FIªIERE DE INTRARE::\n"
+" Fiºierele de intrare OggEnc trebuie sã fie fiºiere de 16 sau 8 biþi PCM WAV, AIFF, sau AIFF/C\n"
+" sau WAV 32 biþi IEEE în virgulã mobilã. Fiºierele pot fi mono sau stereo\n"
+" (sau mai multe canale) ºi la orice ratã de sample.\n"
+" Alternativ, opþiunea --raw poate fi folositã pentru a utiliza un fiºier de date PCM brut , care\n"
+" trebuie sã fie 16biþi stereo little-endian PCM ('headerless wav'), dacã nu sunt specificaþi\n"
+" parametri suplimentari pentru modul brut.\n"
+" Puteþi specifica luarea fiºierului din stdin folosind - ca nume fiºier deintrare.\n"
+" În acest mod, ieºirea e la stdout dacã nu este specificat nume fiºier de ieºire\n"
+" cu -o\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:536
 #, 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"
+msgstr "AVERTISMENT: Se ignorã caracterul ilegal de escape '%c' în formatul de nume\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
-#, c-format
+#: oggenc/oggenc.c:562 oggenc/oggenc.c:670 oggenc/oggenc.c:683
 msgid "Enabling bitrate management engine\n"
 msgstr "Activare motor management bitrate\n"
 
-#: oggenc/oggenc.c:661
-#, 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:571
+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:664
+#: oggenc/oggenc.c:574
 #, 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:671
+#: oggenc/oggenc.c:581
 #, 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"
+msgstr "AVERTISMENT: nu s-a putut citi frecvenþa de remixare (resampling) \"%s\"\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:587
 #, 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"
+msgstr "Avertisment: Ratã remixare (resample) specificatã la %d Hz. Doriþi cumva %d Hz?\n"
 
-#: oggenc/oggenc.c:687
-#, 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:700
-#, c-format
+#: oggenc/oggenc.c:599
 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:718
-#, c-format
+#: oggenc/oggenc.c:610
 msgid "Internal error parsing command line options\n"
 msgstr "Eroare internã la analiza opþiunilor din linia de comandã\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Avertisment: Comentariu invalid utilizat (\"%s\"), ignorat.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:656
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Avertisment: bitrate nominal \"%s\" nerecunoscut\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:664
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Avertisment: bitrate minim \"%s\" nerecunoscut.\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:677
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Avertisment: bitrate maxim \"%s\" nerecunoscut\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:689
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Opþiune de calitate \"%s\" nerecunoscuta, ignoratã\n"
 
-#: oggenc/oggenc.c:807
-#, c-format
+#: oggenc/oggenc.c:697
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
-msgstr ""
-"AVERTISMENT: setare de calitate prea mare, se seteazã la calitate maximã.\n"
+msgstr "AVERTISMENT: setare de calitate prea mare, se seteazã la calitate maximã.\n"
 
-#: oggenc/oggenc.c:813
-#, c-format
+#: oggenc/oggenc.c:703
 msgid "WARNING: Multiple name formats specified, using final\n"
-msgstr ""
-"AVERTISMENT: Nume formaturi multiple specificate, se foloseºte cel final\n"
+msgstr "AVERTISMENT: Nume formaturi multiple specificate, se foloseºte cel final\n"
 
-#: oggenc/oggenc.c:822
-#, c-format
+#: oggenc/oggenc.c:712
 msgid "WARNING: Multiple name format filters specified, using final\n"
-msgstr ""
-"AVERTISMENT: Nume multiple formate filtre specificate, se utilizeazã cel "
-"final\n"
+msgstr "AVERTISMENT: Nume multiple formate filtre specificate, se utilizeazã cel final\n"
 
-#: oggenc/oggenc.c:831
-#, 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:721
+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:839
-#, c-format
+#: oggenc/oggenc.c:729
 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"
+msgstr "AVERTISMENT: Fiºiere de ieºire multiple specificate, sugerãm sa folosiþi -n\n"
 
-#: oggenc/oggenc.c:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 de la %s %s\n"
+#: oggenc/oggenc.c:748
+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"
 
-#: oggenc/oggenc.c:858
-#, 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"
-
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
-#, c-format
+#. Failed, so just set to 16
+#: oggenc/oggenc.c:753 oggenc/oggenc.c:757
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "AVERTISMENT: Numãr biþi/sample invalid, se presupune 16.\n"
 
-#: oggenc/oggenc.c:874
-#, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"AVERTISMENT: Numãrare canal brutã specificatã pentru date non-brute. Se "
-"presupune intrare brutã.\n"
+#: oggenc/oggenc.c:764
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "AVERTISMENT: Numãrare canal brutã specificatã pentru date non-brute. Se presupune intrare brutã.\n"
 
-#: oggenc/oggenc.c:879
-#, c-format
+#. Failed, so just set to 2
+#: oggenc/oggenc.c:769
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "AVERTISMENT: Numãrare canal specificatã invalidã, se presupune 2.\n"
 
-#: oggenc/oggenc.c:890
-#, 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"
+#: oggenc/oggenc.c:780
+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"
 
-#: oggenc/oggenc.c:895
-#, c-format
+#. Failed, so just set to 44100
+#: oggenc/oggenc.c:785
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr "AVERTISMENT: Ratã sample specificatã invalidã, se presupune 44100.\n"
 
-#: oggenc/oggenc.c:902
-#, c-format
+#: oggenc/oggenc.c:789
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "AVERTISMENT: Opþiune necunoscutã specificatã, se ignorã->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Nu se poate converti comentariu înb UTF-8, nu se poate adãuga\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
-#, c-format
+#: oggenc/oggenc.c:811
 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:954
-#, c-format
+#: oggenc/oggenc.c:830
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
-msgstr ""
-"AVERTISMENT: Titluri insuficiente specificate, implicit se ia titlul final.\n"
+msgstr "AVERTISMENT: Titluri insuficiente specificate, implicit se ia titlul final.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Nu s-a putut crea directorul \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Eroare în verificarea existenþei directorului %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:167
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Eroare: calea segmentului \"%s\" nu este director\n"
 
-#: ogginfo/ogginfo2.c:212
-#, 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:220
+#: ogginfo/ogginfo2.c:156
 #, 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"
+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:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo2.c:164
 #, 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"
+msgid "Warning: Vorbis 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:266
+#: ogginfo/ogginfo2.c:168
 #, 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:342
-#, fuzzy, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Avertisment: Secvenþã UTF-8 invalidã în comentariul %d (stream %d): secvenþã "
-"invalidã\n"
-
-#: ogginfo/ogginfo2.c:356
-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:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Avertisment: EOS nesetat în streamul %d\n"
-
-#: ogginfo/ogginfo2.c:389
-#, 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:396
-#, 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:400
-#, 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:403
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Versiune: %d\n"
-
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
-#, c-format
-msgid "Vendor: %s\n"
-msgstr "Vânzãtor: %s\n"
-
-#: ogginfo/ogginfo2.c:406
-#, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Versiune: %d\n"
-
-#: ogginfo/ogginfo2.c:408
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:416
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:429
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:431
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:433
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:437
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:439
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:441
-#, fuzzy
-msgid "Colourspace unspecified\n"
-msgstr "nici o acþiune specificatã\n"
-
-#: ogginfo/ogginfo2.c:444
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:446
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:448
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:450
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:452
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr "Bitrate superior: %f kb/s\n"
-
-#: ogginfo/ogginfo2.c:453
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
-msgid "User comments section follows...\n"
-msgstr "Urmeaza secþiunea comentariilor utilizator..\n"
-
-#: ogginfo/ogginfo2.c:477
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Avertisment: EOS nesetat în streamul %d\n"
-
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Avertisment: granulele (granulepos) în streamul %d scad din "
-
-#: ogginfo/ogginfo2.c:520
-msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-"Avertisment: Nu s-a putut decoda header-ul packetului vorbis -- stream "
-"vorbis invalid (%d)\n"
-
-#: ogginfo/ogginfo2.c:565
-#, 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"
-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:569
-#, 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:572
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid "Version: %d\n"
 msgstr "Versiune: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:175
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Vânzãtor: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:182
 #, c-format
+msgid "Vendor: %s\n"
+msgstr "Vânzãtor: %s\n"
+
+#: ogginfo/ogginfo2.c:183
+#, c-format
 msgid "Channels: %d\n"
 msgstr "Canale: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:184
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1861,199 +1197,120 @@
 "Ratã: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:187
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Bitrate nominal: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:190
 msgid "Nominal bitrate not set\n"
 msgstr "Bitrate nominal nesetat\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:193
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Bitrate superior: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:196
 msgid "Upper bitrate not set\n"
 msgstr "Bitrate superior nesetat\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:199
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Bitrate inferior: %fkb/s\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:202
 msgid "Lower bitrate not set\n"
 msgstr "Bitrate inferior nesetat\n"
 
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo2.c:205
+msgid "User comments section follows...\n"
+msgstr "Urmeaza secþiunea comentariilor utilizator..\n"
+
+#: ogginfo/ogginfo2.c:217
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
+msgid "Warning: Comment %d in stream %d is invalidly formatted, does not contain '=': \"%s\"\n"
+msgstr "Avertisment: Comentariul %d în streamul %d este formatat invalid, nu conþine '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:651
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
+#: ogginfo/ogginfo2.c:226
+#, 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:692
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Avertisment: Nu s-a putut decoda header-ul packetului vorbis -- stream "
-"vorbis invalid (%d)\n"
-
-#: ogginfo/ogginfo2.c:703
-#, fuzzy, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Avertisment: Nu s-a putut decoda header-ul packetului vorbis -- stream "
-"vorbis invalid (%d)\n"
-
-#: ogginfo/ogginfo2.c:734
-#, fuzzy, c-format
-msgid ""
-"Warning: Kate 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:738
-#, fuzzy, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr "Headerele vorbis analizate pentru streamul %d, urmeazã informaþie...\n"
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Versiune: %d\n"
-
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:257 ogginfo/ogginfo2.c:266
 #, c-format
-msgid "Language: %s\n"
-msgstr ""
+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:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Vânzãtor: %s\n"
-
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
-msgid "No category set\n"
-msgstr "Bitrate nominal nesetat\n"
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:274
 #, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
+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:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
+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:783
-msgid "Unknown text directionality\n"
-msgstr ""
+#: ogginfo/ogginfo2.c:347
+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:795
-msgid "Invalid zero granulepos rate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:797
+#: ogginfo/ogginfo2.c:364
 #, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr ""
+msgid "Warning: granulepos in stream %d decreases from "
+msgstr "Avertisment: granulele (granulepos) în streamul %d scad din "
 
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:365
+msgid " to "
+msgstr " spre "
+
+#: ogginfo/ogginfo2.c:365
 msgid "\n"
 msgstr "\n"
 
-#: ogginfo/ogginfo2.c:828
+#: ogginfo/ogginfo2.c:384
 #, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %ld bytes\n"
+"\tPlayback length: %ldm:%02lds\n"
+"\tAverage bitrate: %f kbps\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:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:418
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Avertisment: EOS nesetat în streamul %d\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:537
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Avertisment: Paginã header invalid, nici un pachet gasit\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:549
 #, 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"
+msgstr "Avertisment: Paginã header invalid în streamul %d, conþine pachete multiple\n"
 
-#: ogginfo/ogginfo2.c:1088
-#, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1105
-#, fuzzy
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
+#: ogginfo/ogginfo2.c:574
+msgid "Warning: Hole in data found at approximate offset "
 msgstr "Avertisment: Lipsã de date la offsetul aproximativ"
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:575
+msgid " bytes. Corrupted ogg.\n"
+msgstr " octeþi. Ogg corupt.\n"
+
+#: ogginfo/ogginfo2.c:599
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Eroare în deschiderea fiºierului de intrare \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:604
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2062,90 +1319,66 @@
 "Procesare fiºier \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:613
 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:1151
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1154
+#: ogginfo/ogginfo2.c:618
+#, c-format
 msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1158
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1161
-#, fuzzy, c-format
-msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
-"This indicates a corrupt ogg file: %s.\n"
+"This indicates a corrupt ogg file.\n"
 msgstr ""
 "Avertisment: paginã(i) plasate invalid pentru streamul logic %d\n"
 "Aceasta indicã un fiºier ogg corupt.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:625
 #, 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:1176
+#: ogginfo/ogginfo2.c:628
 #, 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:1180
+#: ogginfo/ogginfo2.c:632
 #, 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"
+msgstr "Avertisment: Marcajul(flag) de început al stream-ului %d gãsit la mijlocul stream-ului\n"
 
-#: ogginfo/ogginfo2.c:1185
+#: ogginfo/ogginfo2.c:637
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
-msgstr ""
-"Avertisment: pauzã numãr secvenþã în stream-ul %d. S-a gãsit pagina %ld în "
-"loc de pagina % ld. Indicã date lipsã.\n"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "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:1200
+#: ogginfo/ogginfo2.c:652
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Stream logic %d terminat.\n"
 
-#: ogginfo/ogginfo2.c:1208
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:659
+#, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
+"Input probably not ogg.\n"
 msgstr ""
 "Eroare: Nu s-au gasit date ogg în fiºierul \"%s\".\n"
 "Intrare probabil non-ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 de la %s %s\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:670
 msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
+"ogginfo 1.0\n"
+"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] files1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
 "\t-h Show this help message\n"
 "\t-q Make less verbose. Once will remove detailed informative\n"
 "\t   messages, two will remove warnings\n"
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
+"\n"
 msgstr ""
 "ogginfo 1.0\n"
 "(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
@@ -2159,17 +1392,11 @@
 "\t   detaliate pentru mai multe tipuri de stream-uri.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1234
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:691
 msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
-"ogginfo is a tool for printing information about Ogg files\n"
+"Ogginfo is a tool for printing information about ogg files\n"
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
@@ -2179,8 +1406,7 @@
 "fiºierele ogg ºi pentru diagnozarea problemelor acestora.\n"
 "Helpul întreg se afiºeazã cu \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
-#, c-format
+#: ogginfo/ogginfo2.c:720
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Nici un fiºier de intrare specificat. \"ogginfo -h\" pentru ajutor\n"
 
@@ -2204,16 +1430,19 @@
 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"
@@ -2224,6 +1453,7 @@
 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"
@@ -2239,45 +1469,35 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: opþiunea `-W %s' nu permite parametri\n"
 
-#: vcut/vcut.c:149
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr "Eroare paginã. Intrare coruptã.\n"
 
-#: vcut/vcut.c:166
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr "Eroare bitstream, se continuã\n"
 
-#: vcut/vcut.c:206
-#, c-format
+#: vcut/vcut.c:173
 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:215
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Setare eos: update-sync a returnat valoarea 0.\n"
 
-#: vcut/vcut.c:225
-#, c-format
+#: vcut/vcut.c:192
 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"
+msgstr "Punctul de secþiune(cutpoint) nu este în stream. Al doilea fiºier va fi gol\n"
 
-#: vcut/vcut.c:277
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Caz special: primul fiºier prea scurt?\n"
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. 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:353
-#, c-format
+#. 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:284
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
@@ -2285,734 +1505,241 @@
 "EROARE: Primele 2 pachete audio nu s-au potrivit într-o\n"
 "      paginã ogg. Fiºierul s-ar putea sã nu se decodeze corect.\n"
 
-#: vcut/vcut.c:373
-#, c-format
-msgid "Update sync returned 0, setting eos\n"
-msgstr "Update sync a returnat 0, setând eos\n"
-
-#: vcut/vcut.c:378
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr "Eroare bitstream recuperabilã\n"
 
-#: vcut/vcut.c:387
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr "Eroare bitstream\n"
 
-#: vcut/vcut.c:449
-#, c-format
+#: vcut/vcut.c:330
+msgid "Update sync returned 0, setting eos\n"
+msgstr "Update sync a returnat 0, setând eos\n"
+
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "Intrare non ogg.\n"
 
-#: vcut/vcut.c:459
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Eroare în prima paginã\n"
 
-#: vcut/vcut.c:464
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "eroare în primul pachet\n"
 
-#: vcut/vcut.c:470
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Eroare în headerul primar: non vorbis?\n"
 
-#: vcut/vcut.c:490
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Header secundar corupt\n"
 
-#: vcut/vcut.c:503
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "EOF în headere\n"
 
-#: vcut/vcut.c:535
-#, fuzzy, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
-msgstr ""
-"Folosire: vcut fiºierintrare.ogg fiºierieºire1.ogg fiºierieºire2.ogg "
-"punct_secþiune\n"
+#: vcut/vcut.c:456
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
+msgstr "Folosire: vcut fiºierintrare.ogg fiºierieºire1.ogg fiºierieºire2.ogg punct_secþiune\n"
 
-#: vcut/vcut.c:539
-#, c-format
+#: vcut/vcut.c:460
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
 "\n"
 msgstr ""
 "AVERTISMENT: vcut este încã în cod experimental.\n"
-"Verificaþi dacã fiºierele de ieºire sunt corecte înainte de a ºterge "
-"sursele.\n"
+"Verificaþi dacã fiºierele de ieºire sunt corecte înainte de a ºterge sursele.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Nu s-a putut deschide %s pentru citire\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Nu s-a putut deschide %s pentru scriere\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Nu s-a putut analiza punctul de secþiune \"%s\"\n"
 
-#: vcut/vcut.c:570
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+#: vcut/vcut.c:484
+#, c-format
+msgid "Processing: Cutting at %lld\n"
 msgstr "Procesare: Secþionare la %lld\n"
 
-#: vcut/vcut.c:572
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr "Procesare: Secþionare la %lld\n"
-
-#: vcut/vcut.c:582
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr "Procesare eºuatã\n"
 
-#: vcut/vcut.c:604
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr "Eroare în citirea headerelor\n"
 
-#: vcut/vcut.c:627
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr "Eroare în scrierea primului fiºier de ieºire\n"
 
-#: vcut/vcut.c:635
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr "Eroare în scrierea celui de-al doilea fiºier de ieºire\n"
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:220
+msgid "Input truncated or empty."
+msgstr "Intrare coruptã sau vidã."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:222
+msgid "Input is not an Ogg bitstream."
+msgstr "Intrarea(input) nu este un bitstream Ogg."
+
+#: vorbiscomment/vcedit.c:239
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Eroare în citirea primei pagini a bitstreamului Ogg."
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:245
 msgid "Error reading initial header packet."
 msgstr "Eroare în citirea pachetului iniþial de header."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Intrare coruptã sau vidã."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "Intrarea(input) nu este un bitstream Ogg."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:251
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Bitstreamul Ogg nu conþine date vorbis."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "EOF înainte de headerele vorbis."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Bitstreamul Ogg nu conþine date vorbis."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:274
 msgid "Corrupt secondary header."
 msgstr "Header secundar corupt."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:295
 msgid "EOF before end of vorbis headers."
 msgstr "EOF înainte de headerele vorbis."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:448
 msgid "Corrupt or missing data, continuing..."
 msgstr "Date corupte sau lipsã, se continuã..."
 
-#: vorbiscomment/vcedit.c:875
-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/vcedit.c:487
+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:190 vorbiscomment/vcomment.c:216
+#: vorbiscomment/vcomment.c:103 vorbiscomment/vcomment.c:129
 #, 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:235
+#: vorbiscomment/vcomment.c:148
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Comentariu greºit: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "comentariu greºit: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:170
 #, 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"
 
-#: vorbiscomment/vcomment.c:274
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:187
 msgid "no action specified\n"
 msgstr "nici o acþiune specificatã\n"
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
-msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
+#: 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:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
+#: vorbiscomment/vcomment.c:287
 msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
+"   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 ""
+"Folosire: \n"
+"  vorbiscomment [-l] fiºier.ogg (pentru listã comentarii)\n"
+"  vorbiscomment -a in.ogg out.ogg (pentru adãugare comentarii)\n"
+"  vorbiscomment -w in.ogg out.ogg (pentru modificare comentarii)\n"
+"\tîn caz de scriere, un set nou de comentarii de forma\n"
+"\t'ETICHETÃ=valoare' se aºteaptã la stdin. Acest set va\n"
+"\tînlocui complet setul existent.\n"
+"   Cu oricare din -a ºi -w putem lua un singur nume fiºier,\n"
+"   caz în care se va folosi un fiºier temporar.\n"
+"   -c poate fi folosit pentru extragere comentarii din fiºier \n"
+"   specificat în loc de stdin.\n"
+"   Exemplu: vorbiscomment -a in.ogg -c comments.txt\n"
+"   va adãuga comentariile din comments.txt în in.ogg\n"
+"   În final, puteþi specifica orice numar de tag-uri pentru \n"
+"   linia comandã folosind opþiunea -t option. ex.\n"
+"   vorbiscomment -a in.ogg -t \"ARTIST=Un tip\" -t \"TITLE=Un titlu\"\n"
+"   (notãm ca atunci când se foloseºte aceasta, cititrea comentariilor din\n"
+"   fiºiere sau de la stdin este dezactivatã)\n"
+"   Modul brut (--raw, -R) va citi ºi scrie comentarii în utf8 mai degrabã,\n"
+"   decât sã converteascã în setul de caractere al utilizatorului. Este\n"
+"   folositor pentru utilizarea vorbiscomment în scripturi. Oricum aceasta nu\n"
+"   este suficientã pentru acoperirea întregului interval de comentarii în toate\n"
+"   cazurile.\n"
 
-#: vorbiscomment/vcomment.c:391
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Tip greºit in listã opþiuni"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
+#: vorbiscomment/vcomment.c:371
 msgid "Internal error parsing command options\n"
 msgstr "Eroare internã în analiza opþiunilor din linia comandã\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:456
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Eroare în deschiderea fiºierului '%s'.\n"
 
-#: vorbiscomment/vcomment.c:587
-#, c-format
+#: vorbiscomment/vcomment.c:465
 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"
+msgstr "Numele fiºierului de intrare poate sã nu fie acelaºi cu al celui de ieºire\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:476
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Eroare în deschiderea fiºierului de ieºire '%s'.\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:491
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Eroare în deschiderea fiºierului de comentarii '%s'.\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:508
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Eroare în deschiderea fiºierului de comentarii '%s'\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:536
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Eroare in ºtergerea fiºierului vechi %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:538
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Eroare în redenumirea %s în %s\n"
-
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Eroare in ºtergerea fiºierului vechi %s\n"
-
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 de la %s %s\n"
-#~ " de Fundaþia Xiph.org (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Folosire: ogg123 [<opþiuni>] <fiºiere intrare> ...\n"
-#~ "\n"
-#~ "  -h, --help     acest mesaj\n"
-#~ "  -V, --version  afiºare versiune Ogg123\n"
-#~ "  -d, --device=d foloseºte 'd' ca device de ieºire\n"
-#~ "      Device-uri posibile sunt ('*'=live, '@'=fiºier):\n"
-#~ "        "
-
-#~ 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"
-#~ "  -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"
-#~ "\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"
-#~ msgstr ""
-#~ "  -f, --file=nume fiºier  Setare nume fiºier ieºire pentru un fiºier\n"
-#~ "      device specificat anterior  (cu -d).\n"
-#~ "  -k n, --skip n  Omitere primele 'n' secunde\n"
-#~ "  -o, --device-option=k:v trimitere opþiune specialã k cu valoare\n"
-#~ "      v spre device specificat anterior (cu -d).  Vezi\n"
-#~ "      pagina de manual pentru informaþii.\n"
-#~ "  -b n, --buffer n  foloseºte un buffer de intrare de 'n' kiloocteþi\n"
-#~ "  -p n, --prebuffer n  încarcã n%% din bufferul de intrare înainte de a "
-#~ "începe\n"
-#~ "  -v, --verbose  afiºeazã progres ºi alte informaþii de stare\n"
-#~ "  -q, --quiet    nu afiºa nimic (fãrã titlu)\n"
-#~ "  -x n, --nth    cântã fiecare 'n' bucatã'\n"
-#~ "  -y n, --ntimes repetã fiecare bucatã de 'n' ori\n"
-#~ "  -z, --shuffle  amestecare cântece\n"
-#~ "\n"
-#~ "ogg123 va sãri la urmatorul cântec la SIGINT (Ctrl-C);2 SIGINTuri în\n"
-#~ "s milisecunde va opri ogg123.\n"
-#~ "  -l, --delay=s  setare întârziere s [milisecunde] (implicit 500).\n"
-
-#~ msgid "Track number:"
-#~ msgstr "Numar pistã(track):"
-
-#~ msgid "ReplayGain (Track):"
-#~ msgstr "ReplayGain (Pistã):"
-
-#~ msgid "ReplayGain (Album):"
-#~ msgstr "ReplayGain (Album):"
-
-#~ msgid "ReplayGain (Track) Peak:"
-#~ msgstr "ReplayGain (Pistã) Vârf:"
-
-#~ msgid "ReplayGain (Album) Peak:"
-#~ msgstr "ReplayGain (Album) Vârf:"
-
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
-#~ msgid "Comment:"
-#~ msgstr "Comentariu:"
-
-#~ msgid "Version is %d"
-#~ msgstr "Versiunea: %d"
-
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " General:\n"
-#~ " -Q, --quiet          Produce no output to stderr\n"
-#~ " -h, --help           Print this help text\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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --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"
-#~ " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-#~ "                      encoding for a fixed-size channel.\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"
-#~ "                      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"
-#~ " --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"
-#~ "\n"
-#~ " Naming:\n"
-#~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times.\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 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"
-#~ " Alternatively, the --raw option may be used to use a raw PCM data file, "
-#~ "which\n"
-#~ " must be 16bit stereo little-endian PCM ('headerless wav'), unless "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an outfile filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Folosire: oggenc [opþiuni] intrare.wav [...]\n"
-#~ "\n"
-#~ "OPÞIUNI:\n"
-#~ " Generale:\n"
-#~ " -Q, --quiet          Nu produce output la stderr\n"
-#~ " -h, --help           Tipãreºte acest text de ajutor.\n"
-#~ " -r, --raw            Mod brut. Fiºierele intrare sunt citite direct ca "
-#~ "date PCM\n"
-#~ " -B, --raw-bits=n     Setare biþi/exemplu(sample) pentru intrare brutã. "
-#~ "Implicit este 16\n"
-#~ " -C, --raw-chan=n     Setare numãr canale pentru intrare brutã. Implicit "
-#~ "este 2\n"
-#~ " -R, --raw-rate=n     Setare exemple(samples)/sec pentru intrare brutã. "
-#~ "Implicit este 44100\n"
-#~ " --raw-endianness     1 pentru bigendian, 0 pentru puþin (little) - "
-#~ "(implicit 0)\n"
-#~ " -b, --bitrate        Alegere nominalã a bitrate-ului pentru encodare. "
-#~ "Încercare\n"
-#~ "                      de encodare la acest bitrate aproximând aceasta. "
-#~ "Necesitã un\n"
-#~ "                      parametru în kbps. Foloseºte motorul de management\n"
-#~ "                      de bitrate, ºi nu este recomandat pentru mulþi "
-#~ "utilizatori.\n"
-#~ "                      Vedeþi -q, --quality pentru o mai bunã "
-#~ "alternativã.\n"
-#~ " -m, --min-bitrate    Specificare bitrate minim (în kbps). Folositor\n"
-#~ "                      pentru encodare a unui canal cu dimensiune fixã.\n"
-#~ " -M, --max-bitrate    Specificare bitrate maxim în kbps. Folositor\n"
-#~ "                      pentru aplicaþii de streaming.\n"
-#~ " -q, --quality        Specificare calitate între 0 (slabã) and 10 "
-#~ "(superioarã),\n"
-#~ "                      în loc de specifica un anumit bitrate .\n"
-#~ "                      Acesta este modul normal de operare.\n"
-#~ "                      Calitãþi fracþionale (ex. 2.75) sunt permise.\n"
-#~ "                      E posibilã ºi calitatea -1, dar s-ar putea sa nu "
-#~ "fie\n"
-#~ "                      de o calitate acceptabilã.\n"
-#~ " --resample n         Remixare date intrare în ratã sampling de n (Hz)\n"
-#~ " --downmix            Demixare stereo în mono.Permisã doar la intrare\n"
-#~ "                      stereo.\n"
-#~ " -s, --serial         Specificare numãr serial pentru stream. Dacã se "
-#~ "vor\n"
-#~ "                      encoda fiºiere multiple, acesta va fi incrementat "
-#~ "la\n"
-#~ "                      fiecare stream dupã primul.\n"
-#~ "\n"
-#~ " De nume:\n"
-#~ " -o, --output=fn      Scrie fiºier în fn (valid doar în mod single-file)\n"
-#~ " -n, --names=ºir   Produce nume fiºiere ca acest ºir cu %%a, %%p, %%l,\n"
-#~ "                      %%n, %%d înlocuite de artist, titlu, album, pistã "
-#~ "numãr,\n"
-#~ "                      ºi datã, respectiv (vedeþi mai jos pentru "
-#~ "specificarea acestora).\n"
-#~ "                      %%%% oferã cu exactitate %%.\n"
-#~ " -X, --name-remove=s  ªterge caracterele specificate în parametri "
-#~ "pentru \n"
-#~ "                      formatul ºirului -n. Folositor pentru nume fiºiere "
-#~ "corecte.\n"
-#~ " -P, --name-replace=s Înlocuieºte caracterele eliminate de --name-remove "
-#~ "cu\n"
-#~ "                      caracterele specificate. Dacã acest ºir e mai scurt "
-#~ "decât\n"
-#~ "                      --name-remove list sau nu e specificat, "
-#~ "caracterele\n"
-#~ "                      în plus sunt pur ºi simplu ºterse.\n"
-#~ "                      Setãrile implicite pentru cele douã argumente de "
-#~ "mai sus sunt specifice\n"
-#~ "                      de la o platformã la alta.\n"
-#~ " -c, --comment=c      Adãugare ºir dat ca ºi comentariu. Poate fi "
-#~ "folosit\n"
-#~ "                      de mai multe ori.\n"
-#~ " -d, --date           Data pistei (de obicei data când a fost fãcut "
-#~ "cântecul)\n"
-#~ " -N, --tracknum       Numãr pistã pentru aceastã pistã\n"
-#~ " -t, --title          Titlu pentru aceastã pistã\n"
-#~ " -l, --album          Nume album\n"
-#~ " -a, --artist         Nume artist\n"
-#~ " -G, --genre          Gen muzical pistã\n"
-#~ "                      Dacã se dau mai multe fiºiere de intrare\n"
-#~ "                      vor fi folosite instanþe ale anterioarelor "
-#~ "cinciargumente,\n"
-#~ "                      în oridnea datã. Dacã sunt specificate mai \n"
-#~ "                      puþine titluri decât fiºiere, OggEnc va tipãri un "
-#~ "avertisment, ºi\n"
-#~ "                      va utiliza ultimul titlu pentru restul de fiºiere "
-#~ "Dacã e\n"
-#~ "                      dat un numãr mai mic de piste, fiºierele rãmase nu "
-#~ "vor fi\n"
-#~ "                      numerotate. Pentru celelalte ultima etichetã (tag) "
-#~ "va fi refolositã\n"
-#~ "                      pentru toate celelalte fãrã avertisment (pentru a "
-#~ "putea specifica o datã\n"
-#~ "                      undeva, de exemplu, ºi a fi folositã pentru toate "
-#~ "fiºierele)\n"
-#~ "\n"
-#~ "FIªIERE DE INTRARE::\n"
-#~ " Fiºierele de intrare OggEnc trebuie sã fie fiºiere de 16 sau 8 biþi PCM "
-#~ "WAV, AIFF, sau AIFF/C\n"
-#~ " sau WAV 32 biþi IEEE în virgulã mobilã. Fiºierele pot fi mono sau "
-#~ "stereo\n"
-#~ " (sau mai multe canale) ºi la orice ratã de sample.\n"
-#~ " Alternativ, opþiunea --raw poate fi folositã pentru a utiliza un fiºier "
-#~ "de date PCM brut , care\n"
-#~ " trebuie sã fie 16biþi stereo little-endian PCM ('headerless wav'), dacã "
-#~ "nu sunt specificaþi\n"
-#~ " parametri suplimentari pentru modul brut.\n"
-#~ " Puteþi specifica luarea fiºierului din stdin folosind - ca nume fiºier "
-#~ "deintrare.\n"
-#~ " În acest mod, ieºirea e la stdout dacã nu este specificat nume fiºier de "
-#~ "ieºire\n"
-#~ " cu -o\n"
-#~ "\n"
-
-#~ msgid " to "
-#~ msgstr " spre "
-
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %ld bytes\n"
-#~ "\tPlayback length: %ldm:%02lds\n"
-#~ "\tAverage bitrate: %f kbps\n"
-#~ msgstr ""
-#~ "Stream Vorbis %d:\n"
-#~ "\tLungime totalã date: %ld octeþi\n"
-#~ "\tLungime playback: %ldm:%02lds\n"
-#~ "\tBitrate mediu: %f kbps\n"
-
-#~ msgid " bytes. Corrupted ogg.\n"
-#~ msgstr " octeþi. Ogg corupt.\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 ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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"
-#~ "   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 ""
-#~ "Folosire: \n"
-#~ "  vorbiscomment [-l] fiºier.ogg (pentru listã comentarii)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (pentru adãugare comentarii)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (pentru modificare comentarii)\n"
-#~ "\tîn caz de scriere, un set nou de comentarii de forma\n"
-#~ "\t'ETICHETÃ=valoare' se aºteaptã la stdin. Acest set va\n"
-#~ "\tînlocui complet setul existent.\n"
-#~ "   Cu oricare din -a ºi -w putem lua un singur nume fiºier,\n"
-#~ "   caz în care se va folosi un fiºier temporar.\n"
-#~ "   -c poate fi folosit pentru extragere comentarii din fiºier \n"
-#~ "   specificat în loc de stdin.\n"
-#~ "   Exemplu: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   va adãuga comentariile din comments.txt în in.ogg\n"
-#~ "   În final, puteþi specifica orice numar de tag-uri pentru \n"
-#~ "   linia comandã folosind opþiunea -t option. ex.\n"
-#~ "   vorbiscomment -a in.ogg -t \"ARTIST=Un tip\" -t \"TITLE=Un titlu\"\n"
-#~ "   (notãm ca atunci când se foloseºte aceasta, cititrea comentariilor "
-#~ "din\n"
-#~ "   fiºiere sau de la stdin este dezactivatã)\n"
-#~ "   Modul brut (--raw, -R) va citi ºi scrie comentarii în utf8 mai "
-#~ "degrabã,\n"
-#~ "   decât sã converteascã în setul de caractere al utilizatorului. Este\n"
-#~ "   folositor pentru utilizarea vorbiscomment în scripturi. Oricum aceasta "
-#~ "nu\n"
-#~ "   este suficientã pentru acoperirea întregului interval de comentarii în "
-#~ "toate\n"
-#~ "   cazurile.\n"

Modified: trunk/vorbis-tools/po/ru.po
===================================================================
--- trunk/vorbis-tools/po/ru.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/ru.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.1.1\n"
 "Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2005-06-27 11:34+0200\n"
 "PO-Revision-Date: 2007-07-26 15:01+0300\n"
 "Last-Translator: Dmitry D. Stasyuk <stdms at mail.ru>\n"
 "Language-Team: Russian <gnu at mx.ru>\n"
@@ -14,494 +14,352 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ogg123/buffer.c:117
+#: ogg123/buffer.c:114
 #, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Ошибка: Не достаточно памяти при выполнении malloc_action().\n"
 
-#: ogg123/buffer.c:360
+#: ogg123/buffer.c:347
 #, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
-msgstr ""
-"Ошибка: Не возможно выделить память при выполнении malloc_buffer_stats()\n"
+msgstr "Ошибка: Не возможно выделить память при выполнении malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:75
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Ошибка: Устройство не доступно.\n"
 
-#: ogg123/callbacks.c:78
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
-msgstr ""
-"Ошибка: для %s необходимо указание имени выходного файла в параметре -f.\n"
+msgstr "Ошибка: для %s необходимо указание имени выходного файла в параметре -f.\n"
 
-#: ogg123/callbacks.c:81
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Ошибка: Не поддерживаемое значение параметра для устройства %s.\n"
 
-#: ogg123/callbacks.c:85
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Ошибка: Невозможно открыть устройство %s.\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Ошибка: Сбой устройства %s.\n"
 
-#: ogg123/callbacks.c:92
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Ошибка: Для устройства %s не может быть задан выходной файл.\n"
 
-#: ogg123/callbacks.c:95
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Ошибка: Невозможно открыть файл %s для записи.\n"
 
-#: ogg123/callbacks.c:99
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Ошибка: Файл %s уже существует.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Ошибка: Эта ошибка никогда не должна была произойти (%d). Паника!\n"
 
-#: ogg123/callbacks.c:125 ogg123/callbacks.c:130
+#: 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:174
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
-msgstr ""
-"Ошибка: Не достаточно памяти при выполнении new_print_statistics_arg().\n"
+msgstr "Ошибка: Не достаточно памяти при выполнении new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:233
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
-msgstr ""
-"Ошибка: Не достаточно памяти при выполнении new_status_message_arg().\n"
+msgstr "Ошибка: Не достаточно памяти при выполнении new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: 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"
+msgstr "Ошибка: Не достаточно памяти при выполнении decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Системная ошибка"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Ошибка разбора: %s в строке %d из %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Имя"
 
-#: ogg123/cfgfile_options.c:137
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Описание"
 
-#: ogg123/cfgfile_options.c:140
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Тип"
 
-#: ogg123/cfgfile_options.c:143
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ogg123/cfgfile_options.c:169
+#: ogg123/cfgfile_options.c:165
 #, c-format
 msgid "none"
 msgstr "не указан"
 
-#: ogg123/cfgfile_options.c:172
+#: ogg123/cfgfile_options.c:168
 #, c-format
 msgid "bool"
 msgstr "булев"
 
-#: ogg123/cfgfile_options.c:175
+#: ogg123/cfgfile_options.c:171
 #, c-format
 msgid "char"
 msgstr "символ"
 
-#: ogg123/cfgfile_options.c:178
+#: ogg123/cfgfile_options.c:174
 #, c-format
 msgid "string"
 msgstr "строка"
 
-#: ogg123/cfgfile_options.c:181
+#: ogg123/cfgfile_options.c:177
 #, c-format
 msgid "int"
 msgstr "целый"
 
-#: ogg123/cfgfile_options.c:184
+#: ogg123/cfgfile_options.c:180
 #, c-format
 msgid "float"
 msgstr "с пл.точкой"
 
-#: ogg123/cfgfile_options.c:187
+#: ogg123/cfgfile_options.c:183
 #, c-format
 msgid "double"
 msgstr "дв.точн."
 
-#: ogg123/cfgfile_options.c:190
+#: ogg123/cfgfile_options.c:186
 #, c-format
 msgid "other"
 msgstr "другой"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: 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 "(не указан)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Успешное завершение"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Ключ не найден"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Нет ключа"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Некорректное значение"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Некорректный тип в списке параметров"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "Внутренняя ошибка разбора параметров командной строки.\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Размер входного буфера меньше минимального - %dКб."
 
-#: ogg123/cmdline_options.c:102
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
 "=== Option was: %s\n"
 msgstr ""
-"=== Ошибка \"%s\" во время разбора параметров конфигурации из командной "
-"строки.\n"
+"=== Ошибка \"%s\" во время разбора параметров конфигурации из командной строки.\n"
 "=== Ошибку вызвал параметр: %s\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:115
 #, c-format
 msgid "Available options:\n"
 msgstr "Доступные параметры:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Устройство %s не существует.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Драйвер %s не является драйвером выходного файла.\n"
 
-#: ogg123/cmdline_options.c:143
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "=== Невозможно указать выходной файл, не указав драйвер.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Некорректный формат параметра: %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Неправильное значение размера пре-буфера. Диапазон 0-100.\n"
 
-#: ogg123/cmdline_options.c:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:198
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 из %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Воспроизвести каждый 0-й фрагмент невозможно!\n"
 
-#: ogg123/cmdline_options.c:216
+#: 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 ""
 "--- Невозможно воспроизвести фрагмент 0 раз.\n"
-"--- Для проведения тестового декодирования используйте выходной драйвер "
-"null.\n"
+"--- Для проведения тестового декодирования используйте выходной драйвер null.\n"
 
-#: ogg123/cmdline_options.c:232
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Невозможно открыть файл списка воспроизведения %s.  Пропущен.\n"
 
-#: ogg123/cmdline_options.c:248
+#: ogg123/cmdline_options.c:241
 msgid "=== Option conflict: End time is before start time.\n"
 msgstr "=== Конфликт параметров: Время окончания раньше времени старта.\n"
 
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Указанный в файле конфигурации драйвер %s неправилен.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Невозможно загрузить драйвер по умолчанию, а в файле конфигурации "
-"никакой драйвер не указан. Завершение работы.\n"
+#: ogg123/cmdline_options.c:264
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Невозможно загрузить драйвер по умолчанию, а в файле конфигурации никакой драйвер не указан. Завершение работы.\n"
 
-#: ogg123/cmdline_options.c:292
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 из %s %s\n"
+"Xiph.org Foundation (http://www.xiph.org/)\n"
+"\n"
+"Вызов: ogg123 [<опции>] <входной файл> ...\n"
+"\n"
+"  -h, --help     эта справка\n"
+"  -V, --version  показать версию Ogg123\n"
+"  -d, --device=d использовать в качестве устройства вывода 'd'\n"
+"      Допустимые устройства ('*'=живое, '@'=файл):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Доступные параметры:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:306
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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 (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"
+"  -@, --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"
 msgstr ""
+"  -f, --file=имя_файла  Установить имя выходного файла для ранее указанного\n"
+"      файла устройства (с опцией -d).\n"
+"  -k n, --skip n  Пропустить первые 'n' секунд (или в формате чч:мм:сс)\n"
+"  -o, --device-option=k:v передать специальный параметр k со значением\n"
+"      v ранее указанному устройству (с опцией -d).  Смотри\n"
+"      man для дополнительной информации.\n"
+"  -@, --list=имя_файла  Прочитать список воспроизведения файлов и URL из файла \"имя_файла\"\n"
+"  -b n, --buffer n  Использовать входной буфер размером 'n' Кб\n"
+"  -p n, --prebuffer n  загрузить n%% из входного буфера перед воспроизведением\n"
+"  -v, --verbose  показать прогресс и другую информацию о состоянии\n"
+"  -q, --quiet    не показывать ничего (без заголовка)\n"
+"  -x n, --nth    воспроизводить каждый 'n'-й блок\n"
+"  -y n, --ntimes повторить каждый воспроизводимый блок 'n' раз\n"
+"  -z, --shuffle  случайное воспроизведение\n"
+"\n"
+"При получении SIGINT (Ctrl-C) ogg123 пропустит следующую песню; два сигнала SIGINT\n"
+"в течение s миллисекунд завершают работу ogg123.\n"
+"  -l, --delay=s  устанавливает значение s [в миллисекундах] (по умолчанию 500).\n"
 
-#: ogg123/cmdline_options.c:310
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
 #, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Файл: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Доступные параметры:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "Входные данные не в формате ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Описание"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Доступные параметры:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Ошибка: Не достаточно памяти.\n"
 
-#: ogg123/format.c:82
+#: ogg123/format.c:81
 #, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
-msgstr ""
-"Ошибка: Невозможно выделить память при выполнении malloc_decoder_stats()\n"
+msgstr "Ошибка: Невозможно выделить память при выполнении malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:145
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Ошибка: Невозможно установить маску сигнала."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Ошибка: Невозможно создать входной буфер.\n"
 
-#: ogg123/ogg123.c:82
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "устройство вывода по умолчанию"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "перемешать список воспроизведения"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Невозможно пропустить %f секунд звука."
-
-#: ogg123/ogg123.c:378
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -510,370 +368,234 @@
 "\n"
 "Звуковое Устройство:   %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Автор:    %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "Комментарии: %s"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Внимание: Невозможно прочитать каталог %s.\n"
 
-#: ogg123/ogg123.c:460
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Ошибка: Невозможно создать буфер для звука.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Не найдены модули для чтения из файла %s.\n"
 
-#: ogg123/ogg123.c:561
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Невозможно открыть %s.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Формат файла %s не поддерживается.\n"
 
-#: ogg123/ogg123.c:577
+#: 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:596
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Воспроизведение: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Невозможно пропустить %f секунд звука."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Ошибка: Декодирование не удалось.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Ошибка: Сбой устройства %s.\n"
-
-#: ogg123/ogg123.c:743
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Завершено."
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- В потоке пусто; возможно, ничего страшного\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Библиотека Vorbis сообщила об ошибке потока.\n"
 
-#: ogg123/oggvorbis_format.c:310
+#: ogg123/oggvorbis_format.c:303
 #, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Поток Ogg Vorbis: %d канал, %ld Гц"
 
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr "Формат Vorbis: Версия %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: 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:327
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Кодирование: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
+#: 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"
+msgstr "Ошибка: Не достаточно памяти при выполнении create_playlist_member().\n"
 
-#: ogg123/playlist.c:222
+#: ogg123/playlist.c:214
 #, c-format
 msgid "Warning from playlist %s: Could not read directory %s.\n"
-msgstr ""
-"Предупреждение из списка воспроизведения %s: Невозможно прочитать каталог %"
-"s.\n"
+msgstr "Предупреждение из списка воспроизведения %s: Невозможно прочитать каталог %s.\n"
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
+#: 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"
 
-#: ogg123/status.c:60
+#: ogg123/status.c:47
 #, c-format
 msgid "%sPrebuf to %.1f%%"
 msgstr "%sПред-чтение до %.1f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sПауза"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr "%sEOS"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
+#: 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"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Время: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "из %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Срд битрейт: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr " Входной Буфер %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr " Выходной Буфер %5.1f%%"
 
-#: ogg123/transport.c:71
+#: ogg123/transport.c:70
 #, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
-msgstr ""
-"Ошибка: Невозможно выделить память при выполнении malloc_data_source_stats"
-"()\n"
+msgstr "Ошибка: Невозможно выделить память при выполнении malloc_data_source_stats()\n"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 из %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "ОШИБКА: Невозможно открыть входной файл \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "ОШИБКА: Невозможно открыть выходной файл \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Ошибка открытия файла как файла vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Ошибка удаления старого файла %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"ОШИБКА: Не указаны входные файлы. Для получения справки -h.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"ОШИБКА: Несколько входных файлов при указанном имени выходного файла: "
-"предполагается использование - n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "Чтение файлов WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "Чтение файлов AIFF/AIFC"
 
-#: oggenc/audio.c:53
+#: oggenc/audio.c:51
 msgid "FLAC file reader"
 msgstr "Чтение файлов FLAC"
 
-#: oggenc/audio.c:54
+#: oggenc/audio.c:52
 msgid "Ogg FLAC file reader"
 msgstr "Чтение файлов Ogg FLAC"
 
-#: oggenc/audio.c:131 oggenc/audio.c:425
+#: 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:142
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Пропускаем фрагмент типа \"%s\", длина %d\n"
 
-#: oggenc/audio.c:168
+#: oggenc/audio.c:158
 #, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Внимание: Неожиданный конец файла во фрагменте AIFF\n"
 
-#: oggenc/audio.c:254
+#: oggenc/audio.c:243
 #, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Внимание: В файле AIFF не найден общий фрагмент\n"
 
-#: oggenc/audio.c:260
+#: oggenc/audio.c:249
 #, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Внимание: Обрезанный общий фрагмент в заголовке AIFF\n"
 
-#: oggenc/audio.c:268
+#: oggenc/audio.c:257
 #, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Внимание: Неожиданный конец файла при чтении заголовка AIFF\n"
 
-#: oggenc/audio.c:283
+#: oggenc/audio.c:272
 #, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Внимание: Заголовок AIFF-C обрезан.\n"
 
-#: oggenc/audio.c:297
+#: oggenc/audio.c:286
 #, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Внимание: Невозможно обработать сжатый AIFF-C (%c%c%c%c)\n"
 
-#: oggenc/audio.c:304
+#: oggenc/audio.c:293
 #, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Внимание: В файле AIFF не найден SSND-фрагмент\n"
 
-#: oggenc/audio.c:310
+#: oggenc/audio.c:299
 #, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Внимание: В заголовке AIFF повреждён SSND-фрагмент\n"
 
-#: oggenc/audio.c:316
+#: oggenc/audio.c:305
 #, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Внимание: Неожиданный конец файла при чтении заголовка AIFF\n"
 
-#: oggenc/audio.c:353
+#: oggenc/audio.c:336
 #, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
@@ -882,12 +604,12 @@
 "Внимание: OggEnc не поддерживает этот тип AIFF/AIFC файла\n"
 " Должен быть 8- или 16- битный PCM.\n"
 
-#: oggenc/audio.c:407
+#: oggenc/audio.c:379
 #, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Внимание: Формат фрагмента в заголовке WAV не распознан\n"
 
-#: oggenc/audio.c:420
+#: oggenc/audio.c:391
 #, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
@@ -896,147 +618,108 @@
 "Внимание: НЕКОРРЕКТНЫЙ формат фрагмента в заголовке wav.\n"
 "Тем не менее, пытаемся прочитать (может не сработать)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: 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"
+" or type 3 floating point PCM\n"
 msgstr ""
 "ОШИБКА: Файл wav не поддерживаемого типа (должен быть стандартный PCM\n"
 " или тип 3 PCM с плавающей точкой)\n"
 
-#: oggenc/audio.c:467
+#: oggenc/audio.c:480
 #, c-format
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
-
-#: oggenc/audio.c:528
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
-"ОШИБКА: Файл wav не поддерживаемого под-формата (должен быть 8, 16 или 24-"
-"битный PCM\n"
+"ОШИБКА: Файл wav не поддерживаемого под-формата (должен быть 8, 16 или 24-битный PCM\n"
 "или PCM с плавающей точкой)\n"
 
-#: oggenc/audio.c:604
+#: oggenc/audio.c:555
 #, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"24-битные данные PCM в режиме BIG-ENDIAN не поддерживаются. Действие "
-"прервано.\n"
+msgstr "24-битные данные PCM в режиме BIG-ENDIAN не поддерживаются. Действие прервано.\n"
 
-#: oggenc/audio.c:624
-#, fuzzy, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"24-битные данные PCM в режиме BIG-ENDIAN не поддерживаются. Действие "
-"прервано.\n"
-
-#: oggenc/audio.c:630
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-"Внутренняя ошибка: попытка прочитать не поддерживаемую разрядность в %d бит\n"
+msgstr "Внутренняя ошибка: попытка прочитать не поддерживаемую разрядность в %d бит\n"
 
-#: oggenc/audio.c:732
+#: oggenc/audio.c:658
 #, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"ГЛЮК: От ресэмплера получено нулевое число кадров: ваш файл будет обрезан. "
-"Пожалуйста, сообщите об этом автору.\n"
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "ГЛЮК: От ресэмплера получено нулевое число кадров: ваш файл будет обрезан. Пожалуйста, сообщите об этом автору.\n"
 
-#: oggenc/audio.c:750
+#: oggenc/audio.c:676
 #, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Не возможно инициализировать ресэмплер\n"
 
-#: oggenc/encode.c:64
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Установка дополнительного параметра кодировщика \"%s\" в %s\n"
 
-#: oggenc/encode.c:101
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Изменение нижней границы частоты с %f до %f кГц\n"
 
-#: oggenc/encode.c:104
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Не распознаваемый дополнительный параметр \"%s\"\n"
 
-#: oggenc/encode.c:111
+#: oggenc/encode.c:129
 #, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+msgstr "255 каналов должно быть достаточно для всех. (Извините, но vorbis не поддерживает больше)\n"
 
-#: oggenc/encode.c:115 oggenc/encode.c:252
+#: oggenc/encode.c:137
 #, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, fuzzy, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 каналов должно быть достаточно для всех. (Извините, но vorbis не "
-"поддерживает больше)\n"
-
-#: oggenc/encode.c:182
-#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
-msgstr ""
-"Для запроса минимального или максимального битрейта требуется --managed\n"
+msgstr "Для запроса минимального или максимального битрейта требуется --managed\n"
 
-#: oggenc/encode.c:200
+#: oggenc/encode.c:155
 #, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Сбой режима инициализации: некорректные параметры для качества\n"
 
-#: oggenc/encode.c:245
+#: oggenc/encode.c:198
 #, c-format
 msgid "Set optional hard quality restrictions\n"
 msgstr "Установлены необязательные жёсткие ограничения качества\n"
 
-#: oggenc/encode.c:247
+#: oggenc/encode.c:200
 #, c-format
 msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-"Сбой при установке мин/макс значения битрейта в режиме установки качества\n"
+msgstr "Сбой при установке мин/макс значения битрейта в режиме установки качества\n"
 
-#: oggenc/encode.c:263
+#: oggenc/encode.c:212
 #, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "Сбой режима инициализации: некорректные параметры для битрейта\n"
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Сбой при записи заголовка в выходной поток\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Сбой при записи данных в выходной поток\n"
 
-#: oggenc/encode.c:472
+#: oggenc/encode.c:381
 #, c-format
 msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [осталось %2dм%.2dс] %c "
 
-#: oggenc/encode.c:482
+#: oggenc/encode.c:391
 #, c-format
 msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tКодирование [готово %2dм%.2dс] %c "
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -1047,7 +730,7 @@
 "\n"
 "Кодирование файла \"%s\" завершено\n"
 
-#: oggenc/encode.c:502
+#: oggenc/encode.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1058,7 +741,7 @@
 "\n"
 "Кодирование завершено.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -1067,17 +750,17 @@
 "\n"
 "\tДлина файла:  %dм %04.1fс\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tОставшееся время: %dм %04.1fс\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tВыборка:      %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1086,7 +769,7 @@
 "\tСредний битрейт: %.1f Кб/с\n"
 "\n"
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1097,17 +780,17 @@
 "         %s%s%s \n"
 "со средним битрейтом %d Кб/с "
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: 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:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: 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:559
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1118,7 +801,7 @@
 "         %s%s%s \n"
 "с приблизительным битрейтом %d Кб/сек (включено кодирование с VBR)\n"
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1129,7 +812,7 @@
 "         %s%s%s \n"
 "с уровнем качества %2.2f с использованием ограниченного VBR "
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1140,7 +823,7 @@
 "         %s%s%s \n"
 "с качеством %2.2f\n"
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1151,148 +834,107 @@
 "         %s%s%s \n"
 "с использованием управления битрейтом "
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
+#: oggenc/oggenc.c:98
+#, c-format
+msgid ""
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 "%s%s\n"
 "ОШИБКА: Не указаны входные файлы. Для получения справки -h.\n"
 
-#: oggenc/oggenc.c:118
+#: oggenc/oggenc.c:113
 #, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "ОШИБКА: Указано несколько файлов, в то время как используется stdin\n"
 
-#: oggenc/oggenc.c:125
+#: oggenc/oggenc.c:120
 #, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"ОШИБКА: Несколько входных файлов при указанном имени выходного файла: "
-"предполагается использование - n\n"
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "ОШИБКА: Несколько входных файлов при указанном имени выходного файла: предполагается использование - n\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ОШИБКА: Невозможно открыть входной файл \"%s\": %s\n"
 
-#: oggenc/oggenc.c:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "Чтение файлов WAV"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Открытие с модулем %s: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "ОШИБКА: Входной файл \"%s\" в не поддерживаемом формате\n"
 
-#: oggenc/oggenc.c:280
+#: oggenc/oggenc.c:263
 #, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "ВНИМАНИЕ: Не указано имя файла, используется \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:271
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"ОШИБКА: Невозможно создать необходимые подкаталоги для выходного файла \"%s"
-"\"\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "ОШИБКА: Невозможно создать необходимые подкаталоги для выходного файла \"%s\"\n"
 
-#: oggenc/oggenc.c:295
+#: oggenc/oggenc.c:278
 #, c-format
 msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
 msgstr "Имя входного файла совпадает с именем выходного файла \"%s\"\n"
 
-#: oggenc/oggenc.c:306
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ОШИБКА: Невозможно открыть выходной файл \"%s\": %s\n"
 
-#: oggenc/oggenc.c:350
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Изменение частоты выборки входных файлов с %d до %d Гц\n"
 
-#: oggenc/oggenc.c:357
+#: oggenc/oggenc.c:326
 #, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Смешение стерео в моно\n"
 
-#: oggenc/oggenc.c:360
+#: oggenc/oggenc.c:329
 #, c-format
 msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "ВНИМАНИЕ: Смешение сигналов возможно только из стерео в моно\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr "Умножение входного сигнала на %f\n"
 
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 из %s %s\n"
-
-#: oggenc/oggenc.c:416
+#: oggenc/oggenc.c:381
 #, c-format
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:417
-#, c-format
-msgid ""
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
 " --managed            Enable the bitrate management engine. This will allow\n"
-"                      much greater control over the precise bitrate(s) "
-"used,\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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
 "                      encoding for a fixed-size channel. Using this will\n"
 "                      automatically enable managed bitrate mode (see\n"
@@ -1300,574 +942,539 @@
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
 "                      streaming applications. Using this will automatically\n"
 "                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
 " --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
 " -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"
 "                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
 " --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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
 " --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
 "                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
 "                      used multiple times. The argument should be in the\n"
 "                      format \"tag=value\".\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\n"
-" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
-"Files\n"
+" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or AIFF/C\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 "
-"additional\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 additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
 " In this mode, output is to stdout unless an output filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Вызов: oggenc [опции] input.wav [...]\n"
+"\n"
+"ПАРАМЕТРЫ:\n"
+" Основные:\n"
+" -Q, --quiet          Не выводить в поток ошибок\n"
+" -h, --help           Вывести этот справочный текст\n"
+" -v, --version        Напечатать номер версии\n"
+" -r, --raw            Сырой режим. Входные файлы читаются непосредственно как данные PCM\n"
+" -B, --raw-bits=n     Установить число бит/сэмпл для сырого ввода. По умолчанию 16\n"
+" -C, --raw-chan=n     Установить число каналов для сырого ввода. По умолчанию 2\n"
+" -R, --raw-rate=n     Установить число сэмплов/сек для сырого ввода. По умолчанию 44100\n"
+" --raw-endianness     1 для bigendian, 0 для little (по умолчанию 0)\n"
+" -b, --bitrate        Выбрать номинальный битрейт для кодирования. Попытка\n"
+"                      кодировать со средним битрейтом равным указанному. Используется\n"
+"                      1 аргумент в kbps. По умолчанию, используется VBR кодирование,\n"
+"                      эквивалентное использованию параметра -q или --quality.\n"
+"                      Используйте описание параметра --managed для указания\n"
+"                      выбранного битрейта.\n"
+" --managed            Включить движок управления битрейтом. Предоставляет возможность\n"
+"                      намного лучшего управления над точной установкой используемого битрейта.\n"
+"                      Однако, кодирование будет значительно медленнее. Не используйте это\n"
+"                      если у Вас нет острой необходимости в детальном управлении битрейтом,\n"
+"                      например, для потоковых передач.\n"
+" -m, --min-bitrate    Указать минимальный битрейт (в kbps). Полезно при кодировании\n"
+"                      для канала постоянного размера. Использование этого параметра\n"
+"                      автоматически включит режим управляемого битрейта (смотрите\n"
+"                      --managed).\n"
+" -M, --max-bitrate    Указать максимальный битрейт в kbps. Полезно для потоковых\n"
+"                      приложений. Использование этого параметра автоматически включит\n"
+"                      режим управляемого битрейта (смотрите --managed).\n"
+" --advanced-encode-option параметр=значение\n"
+"                      Установить заданное значение дополнительного параметра кодировщика.\n"
+"                      Допустимые параметры (и их значения) описаны на странице руководства,\n"
+"                      поставляемого с данной программой. Они предназначены только для\n"
+"                      продвинутых пользователей и должны быть использованы осторожно.\n"
+" -q, --quality        Указать качество от -1 (очень низкое) до 10 (очень высокое),\n"
+"                      вместо указания конкретного битрейта.\n"
+"                      Это нормальный режим работы.\n"
+"                      Допустимо дробное значение качества (например, 2.75).\n"
+"                      По-умолчанию, уровень качества равен 3.\n"
+" --resample n         Изменить частоту выборки входных данных до значения n (Гц)\n"
+" --downmix            Перемикшировать стерео сигнал в моно. Доступно только для стерео\n"
+"                      входного сигнала.\n"
+" -s, --serial         Указать серийный номер для потока. Если кодируется несколько\n"
+"                      файлов, это значение будет автоматически увеличиваться на 1\n"
+"                      для каждого следующего потока.\n"
+" --discard-comments   Предотвращает копирование комментариев из файлов FLAC и Ogg FLAC\n"
+"                      в выходной файл Ogg Vorbis.\n"
+"\n"
+" Присвоение имён:\n"
+" -o, --output=fn      Записать файл в fn (корректно только для работы с одним файлом)\n"
+" -n, --names=string   Создать имена файлов по образцу в строке string, заменяя %%a, %%t, %%l,\n"
+"                      %%n, %%d на имя артиста, название, альбом, номер дорожки,\n"
+"                      и дату, соответственно (ниже смотрите как это указать).\n"
+"                      %%%% даёт символ %%.\n"
+" -X, --name-remove=s  Удалить указанные символы из параметров строки формата -n.\n"
+"                      Полезно для создания корректных имён фалов.\n"
+" -P, --name-replace=s Заменить символы, удалённые --name-remove, на указанные\n"
+"                      символы. Если эта строка короче, чем список\n"
+"                      --name-remove или не указана, символы просто удаляются.\n"
+"                      Значения по умолчанию для указанных выше двух аргументов\n"
+"                      зависят от платформы.\n"
+" -c, --comment=c      Добавить указанную строку в качестве дополнительного\n"
+"                      комментария. Может быть использовано несколько раз. Аргумент\n"
+"                      должен быть в формате \"тэг=значение\".\n"
+" -d, --date           Дата дорожки (обычно дата исполнения)\n"
+" -N, --tracknum       Номер этой дорожки\n"
+" -t, --title          Заголовок этой дорожки\n"
+" -l, --album          Название альбома\n"
+" -a, --artist         Имя артиста\n"
+" -G, --genre          Жанр дорожки\n"
+"                      Если задано несколько входных файлов, то несколько\n"
+"                      экземпляров предыдущих пяти аргументов будут \n"
+"                      использованы, в том порядке, в котором они заданы. \n"
+"                      Если заголовков указано меньше чем\n"
+"                      файлов, OggEnc выдаст предупреждение, и\n"
+"                      будет использовать последнее указанное значение для\n"
+"                      оставшихся файлов. Если указано не достаточно номеров\n"
+"                      дорожек, оставшиеся файлы будут не нумерованными.\n"
+"                      Для всех остальных будет использовано последнее \n"
+"                      значение тэга без предупреждений (таким образом, \n"
+"                      например, можно один раз указать дату и затем \n"
+"                      использовать её для всех файлов)\n"
+"\n"
+"ВХОДНЫЕ ФАЙЛЫ:\n"
+" Входными файлами для OggEnc в настоящее время должны быть 24-, 16- или 8-битные\n"
+" файлы PCM WAV, AIFF, или AIFF/C, или 32-битный с плавающей точкой IEEE WAV, и,\n"
+" опционально, FLAC или Ogg FLAC. Файлы могут быть моно или стерео\n"
+" (или с большим числом каналов) и любым значением частоты выборки.\n"
+" В качестве альтернативы может использоваться опция --raw для чтения сырых файлов\n"
+" с данными PCM, которые должны быть 16 битными стерео little-endian PCM ('wav\n"
+" без заголовков'), в противном случае указываются дополнительные параметры для\n"
+" сырого режима.\n"
+" Вы можете указать считывание файла из stdin используя - в качестве имени\n"
+" входного файла. В этом случае вывод направляется в stdout если не указано имя\n"
+" выходного файла опцией -o\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
-msgstr ""
-"ВНИМАНИЕ: Некорректный управляющий символ '%c' в формате имени, "
-"игнорируется\n"
+msgstr "ВНИМАНИЕ: Некорректный управляющий символ '%c' в формате имени, игнорируется\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
+#: 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:661
+#: oggenc/oggenc.c:605
 #, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"ВНИМАНИЕ: Указан порядок байт сырых данных для не-сырых данных. "
-"Подразумеваем сырые данные.\n"
+msgid "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
+msgstr "ВНИМАНИЕ: Указан порядок байт сырых данных для не-сырых данных. Подразумеваем сырые данные.\n"
 
-#: oggenc/oggenc.c:664
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
-msgstr ""
-"ВНИМАНИЕ: Невозможно прочитать аргумент \"%s\" в порядке следования байт\n"
+msgstr "ВНИМАНИЕ: Невозможно прочитать аргумент \"%s\" в порядке следования байт\n"
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "ВНИМАНИЕ: Невозможно прочитать изменение частоты \"%s\"\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
-msgstr ""
-"Внимание: Указано изменение частоты выборки %d Гц. Вы имели в виду %d Гц?\n"
+msgstr "Внимание: Указано изменение частоты выборки %d Гц. Вы имели в виду %d Гц?\n"
 
-#: oggenc/oggenc.c:687
+#: oggenc/oggenc.c:631
 #, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Внимание: Невозможно обработать коэффициент умножения \"%s\".\n"
 
-#: oggenc/oggenc.c:700
+#: oggenc/oggenc.c:641
 #, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Не найдено значение дополнительного параметра кодировщика\n"
 
-#: oggenc/oggenc.c:718
+#: oggenc/oggenc.c:656
 #, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Внутренняя ошибка разбора параметров командной строки\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
-msgstr ""
-"Внимание: Использован некорректный комментарий (\"%s\"), игнорируется.\n"
+msgstr "Внимание: Использован некорректный комментарий (\"%s\"), игнорируется.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Внимание: номинальный битрейт \"%s\" не опознан\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Внимание: минимальный битрейт \"%s\" не опознан\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Внимание: максимальный битрейт \"%s\" не опознан\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Опция качества \"%s\" не опознана, игнорируется\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:743
 #, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
-msgstr ""
-"ВНИМАНИЕ: установлено слишком высокое качество, ограничено до максимального\n"
+msgstr "ВНИМАНИЕ: установлено слишком высокое качество, ограничено до максимального\n"
 
-#: oggenc/oggenc.c:813
+#: oggenc/oggenc.c:749
 #, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "ВНИМАНИЕ: Указано несколько форматов имени, используется последний\n"
 
-#: oggenc/oggenc.c:822
+#: oggenc/oggenc.c:758
 #, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
-msgstr ""
-"ВНИМАНИЕ: Указано несколько фильтров форматов имени, используется последний\n"
+msgstr "ВНИМАНИЕ: Указано несколько фильтров форматов имени, используется последний\n"
 
-#: oggenc/oggenc.c:831
+#: oggenc/oggenc.c:767
 #, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
-msgstr ""
-"ВНИМАНИЕ: Указано несколько замен фильтров форматов имени, используется "
-"последняя\n"
+msgid "WARNING: Multiple name format filter replacements specified, using final\n"
+msgstr "ВНИМАНИЕ: Указано несколько замен фильтров форматов имени, используется последняя\n"
 
-#: oggenc/oggenc.c:839
+#: oggenc/oggenc.c:775
 #, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
-msgstr ""
-"ВНИМАНИЕ: Указано несколько выходных файлов, предполагается использование "
-"параметра -n\n"
+msgstr "ВНИМАНИЕ: Указано несколько выходных файлов, предполагается использование параметра -n\n"
 
-#: oggenc/oggenc.c:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 из %s %s\n"
-
-#: oggenc/oggenc.c:858
+#: oggenc/oggenc.c:794
 #, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"ВНИМАНИЕ: Указано значение сырых бит/кадр для не-сырых данных. "
-"Предполагается сырой ввод.\n"
+msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+msgstr "ВНИМАНИЕ: Указано значение сырых бит/кадр для не-сырых данных. Предполагается сырой ввод.\n"
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
+#: 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:874
+#: oggenc/oggenc.c:810
 #, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"ВНИМАНИЕ: Указано число сырых каналов для не-сырых данных. Предполагается "
-"сырой ввод.\n"
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "ВНИМАНИЕ: Указано число сырых каналов для не-сырых данных. Предполагается сырой ввод.\n"
 
-#: oggenc/oggenc.c:879
+#: oggenc/oggenc.c:815
 #, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "ВНИМАНИЕ: Указано неверное число каналов, предполагается 2.\n"
 
-#: oggenc/oggenc.c:890
+#: oggenc/oggenc.c:826
 #, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"ВНИМАНИЕ: Указана сырая частота выборки для не-сырых данных. Предполагается "
-"сырой ввод.\n"
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+msgstr "ВНИМАНИЕ: Указана сырая частота выборки для не-сырых данных. Предполагается сырой ввод.\n"
 
-#: oggenc/oggenc.c:895
+#: oggenc/oggenc.c:831
 #, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
-msgstr ""
-"ВНИМАНИЕ: Указано некорректное значение частоты выборки, предполагается "
-"44100.\n"
+msgstr "ВНИМАНИЕ: Указано некорректное значение частоты выборки, предполагается 44100.\n"
 
-#: oggenc/oggenc.c:902
+#: oggenc/oggenc.c:835
 #, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "ВНИМАНИЕ: Указан неизвестный параметр, игнорируется->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Невозможно преобразовать комментарий в UTF-8, добавлять нельзя\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
+#: 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:954
+#: oggenc/oggenc.c:876
 #, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
-msgstr ""
-"ВНИМАНИЕ: Указано недостаточное количество заголовков, установлены последние "
-"значения.\n"
+msgstr "ВНИМАНИЕ: Указано недостаточное количество заголовков, установлены последние значения.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Невозможно создать каталог \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Ошибка проверки существования каталога %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:167
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Ошибка: сегмент пути \"%s\" не является каталогом\n"
 
-#: ogginfo/ogginfo2.c:212
+#: ogginfo/ogginfo2.c:171
 #, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
-msgstr ""
-"Внимание: Комментарий %d в потоке %d имеет недопустимый формат. Он не "
-"содержит '=': \"%s\"\n"
+msgid "Warning: Comment %d in stream %d has invalid format, does not contain '=': \"%s\"\n"
+msgstr "Внимание: Комментарий %d в потоке %d имеет недопустимый формат. Он не содержит '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo2.c:179
 #, c-format
 msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Внимание: Некорректное имя поля комментария в комментарии %d (поток %d): \"%s"
-"\"\n"
+msgstr "Внимание: Некорректное имя поля комментария в комментарии %d (поток %d): \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: 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"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
+msgstr "Внимание: Некорректная последовательность UTF-8 в комментарии %d (поток %d): неправильный маркер длины\n"
 
-#: ogginfo/ogginfo2.c:266
+#: 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"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr "Внимание: Некорректная последовательность UTF-8 в комментарии %d (поток %d): слишком мало байт\n"
 
-#: ogginfo/ogginfo2.c:342
-#, fuzzy, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\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:356
+#: ogginfo/ogginfo2.c:295
 msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
 msgstr "Внимание: Сбой в декодере utf8. Вообще-то это должно быть невозможно\n"
 
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Внимание: для потока %d не установлен маркер его конца\n"
-
-#: ogginfo/ogginfo2.c:389
+#: ogginfo/ogginfo2.c:318
 #, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Внимание: Невозможно декодировать пакет заголовка theora - некорректный "
-"поток theora (%d)\n"
+msgid "Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr "Внимание: Невозможно декодировать пакет заголовка theora - некорректный поток theora (%d)\n"
 
-#: ogginfo/ogginfo2.c:396
+#: 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 ""
-"Внимание: Заголовки в потоке Theora %d разделены некорректно. Последняя "
-"страница заголовка содержит дополнительные пакеты или имеет не-нулевой "
-"granulepos\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 "Внимание: Заголовки в потоке Theora %d разделены некорректно. Последняя страница заголовка содержит дополнительные пакеты или имеет не-нулевой granulepos\n"
 
-#: ogginfo/ogginfo2.c:400
+#: ogginfo/ogginfo2.c:329
 #, c-format
 msgid "Theora headers parsed for stream %d, information follows...\n"
 msgstr "Заголовки theora обработаны для потока %d, далее информация...\n"
 
-#: ogginfo/ogginfo2.c:403
+#: ogginfo/ogginfo2.c:332
 #, c-format
 msgid "Version: %d.%d.%d\n"
 msgstr "Версия: %d.%d.%d\n"
 
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
 #, c-format
 msgid "Vendor: %s\n"
 msgstr "Поставщик: %s\n"
 
-#: ogginfo/ogginfo2.c:406
+#: ogginfo/ogginfo2.c:335
 #, c-format
 msgid "Width: %d\n"
 msgstr "Ширина: %d\n"
 
-#: ogginfo/ogginfo2.c:407
+#: ogginfo/ogginfo2.c:336
 #, c-format
 msgid "Height: %d\n"
 msgstr "Высота: %d\n"
 
-#: ogginfo/ogginfo2.c:408
+#: ogginfo/ogginfo2.c:337
 #, c-format
 msgid "Total image: %d by %d, crop offset (%d, %d)\n"
 msgstr "Полное изображение: %d на %d, сдвиг обрезки (%d, %d)\n"
 
-#: ogginfo/ogginfo2.c:411
+#: ogginfo/ogginfo2.c:340
 msgid "Frame offset/size invalid: width incorrect\n"
 msgstr "Недопустимое смещение/размер кадра: неправильная ширина\n"
 
-#: ogginfo/ogginfo2.c:413
+#: ogginfo/ogginfo2.c:342
 msgid "Frame offset/size invalid: height incorrect\n"
 msgstr "Недопустимое смещение/размер кадра: неправильная высота\n"
 
-#: ogginfo/ogginfo2.c:416
+#: ogginfo/ogginfo2.c:345
 msgid "Invalid zero framerate\n"
 msgstr "Недопустимая нулевая частота кадров\n"
 
-#: ogginfo/ogginfo2.c:418
+#: ogginfo/ogginfo2.c:347
 #, c-format
 msgid "Framerate %d/%d (%.02f fps)\n"
 msgstr "Частота кадров %d/%d (%.02f кадр/с)\n"
 
-#: ogginfo/ogginfo2.c:422
+#: ogginfo/ogginfo2.c:351
 msgid "Aspect ratio undefined\n"
 msgstr "Соотношение размеров не указано\n"
 
-#: ogginfo/ogginfo2.c:427
-#, fuzzy, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
 msgstr "Соотношение размеров пикселя %d:%d (1:%f)\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:358
 msgid "Frame aspect 4:3\n"
 msgstr "Соотношение размеров кадра 4:3\n"
 
-#: ogginfo/ogginfo2.c:431
+#: ogginfo/ogginfo2.c:360
 msgid "Frame aspect 16:9\n"
 msgstr "Соотношение размеров кадра 16:9\n"
 
-#: ogginfo/ogginfo2.c:433
-#, fuzzy, c-format
-msgid "Frame aspect %f:1\n"
-msgstr "Соотношение размеров кадра 4:3\n"
+#: ogginfo/ogginfo2.c:362
+#, c-format
+msgid "Frame aspect 1:%d\n"
+msgstr "Соотношение размеров кадра 1:%d\n"
 
-#: ogginfo/ogginfo2.c:437
+#: ogginfo/ogginfo2.c:366
 msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
 msgstr "Цветовое пространство: Rec. ITU-R BT.470-6 Система M (NTSC)\n"
 
-#: ogginfo/ogginfo2.c:439
+#: ogginfo/ogginfo2.c:368
 msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
 msgstr "Цветовое пространство: Rec. ITU-R BT.470-6 Системы B и G (PAL)\n"
 
-#: ogginfo/ogginfo2.c:441
+#: ogginfo/ogginfo2.c:370
 msgid "Colourspace unspecified\n"
 msgstr "Цветовое пространство не указано\n"
 
-#: ogginfo/ogginfo2.c:444
+#: ogginfo/ogginfo2.c:373
 msgid "Pixel format 4:2:0\n"
 msgstr "Формат пикселя 4:2:0\n"
 
-#: ogginfo/ogginfo2.c:446
+#: ogginfo/ogginfo2.c:375
 msgid "Pixel format 4:2:2\n"
 msgstr "Формат пикселя 4:4:2\n"
 
-#: ogginfo/ogginfo2.c:448
+#: ogginfo/ogginfo2.c:377
 msgid "Pixel format 4:4:4\n"
 msgstr "Формат пикселя 4:4:4\n"
 
-#: ogginfo/ogginfo2.c:450
+#: ogginfo/ogginfo2.c:379
 msgid "Pixel format invalid\n"
 msgstr "Неправильный формат пикселя\n"
 
-#: ogginfo/ogginfo2.c:452
+#: ogginfo/ogginfo2.c:381
 #, c-format
 msgid "Target bitrate: %d kbps\n"
 msgstr "Целевой битрейт: %d Кб/с\n"
 
-#: ogginfo/ogginfo2.c:453
+#: ogginfo/ogginfo2.c:382
 #, c-format
 msgid "Nominal quality setting (0-63): %d\n"
 msgstr "Значение номинального качества (0-63): %d\n"
 
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
 msgid "User comments section follows...\n"
 msgstr "Секция пользовательских комментариев следует за...\n"
 
-#: ogginfo/ogginfo2.c:477
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Внимание: для потока %d не установлен маркер его конца\n"
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "Внимание: granulepos в потоке %d уменьшилось с %I64d до %I64d"
 
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
 msgstr "Внимание: granulepos в потоке %d уменьшилось с %lld до %lld"
 
-#: ogginfo/ogginfo2.c:520
+#: ogginfo/ogginfo2.c:432
 msgid ""
 "Theora stream %d:\n"
-"\tTotal data length: %"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
+"Поток theora %d:\n"
+"\tОбщая длина данных: %I64d байт\n"
+"\tВремя воспроизведения: %ldм:%02ld.%03ldс\n"
+"\tСредний битрейт: %f Кбит/с\n"
 
-#: ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:438
+#, c-format
 msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Внимание: Невозможно декодировать пакет заголовка vorbis - некорректный "
-"поток vorbis (%d)\n"
+"Поток theora %d:\n"
+"\tОбщая длина данных: %lld байт\n"
+"\tВремя воспроизведения: %ldм:%02ld.%03ldс\n"
+"\tСредний битрейт: %f Кбит/с\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:466
 #, 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"
-msgstr ""
-"Внимание: Заголовки в потоке Vorbis %d разделены некорректно. Последняя "
-"страница заголовка содержит дополнительные пакеты или имеет не-нулевой "
-"granulepos\n"
+msgid "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
+msgstr "Внимание: Невозможно декодировать пакет заголовка vorbis - некорректный поток vorbis (%d)\n"
 
-#: ogginfo/ogginfo2.c:569
+#: ogginfo/ogginfo2.c:473
 #, 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"
+msgstr "Внимание: Заголовки в потоке Vorbis %d разделены некорректно. Последняя страница заголовка содержит дополнительные пакеты или имеет не-нулевой granulepos\n"
+
+#: ogginfo/ogginfo2.c:477
+#, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Заголовки vorbis обработаны для потока %d, далее информация...\n"
 
-#: ogginfo/ogginfo2.c:572
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Версия: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Поставщик: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:492
 #, c-format
 msgid "Channels: %d\n"
 msgstr "Каналы: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1876,209 +1483,96 @@
 "Битрейт: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Номинальный битрейт: %f Кб/с\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Номинальный битрейт не установлен\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Максимальный битрейт: %f Кб/с\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Максимальный битрейт не установлен\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Минимальный битрейт: %f Кб/с\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Минимальный битрейт не установлен\n"
 
-#: ogginfo/ogginfo2.c:630
-#, fuzzy, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
-"Отрицательное значение granulepos в потоке vorbis за пределами заголовков. "
-"Этот файл был создан \"кривым\" кодировщиком\n"
+#: ogginfo/ogginfo2.c:539
+msgid "Negative granulepos on vorbis stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "Отрицательное значение granulepos в потоке vorbis за пределами заголовков. Этот файл был создан \"кривым\" кодировщиком\n"
 
-#: ogginfo/ogginfo2.c:651
+#: ogginfo/ogginfo2.c:561
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
+"Поток vorbis %d:\n"
+"\tОбщая длина данных: %I64d байт\n"
+"\tВремя воспроизведения: %ldм:%02ld.%03ldс\n"
+"\tСредний битрейт: %f Кбит/с\n"
 
-#: ogginfo/ogginfo2.c:692
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Внимание: Невозможно декодировать пакет заголовка theora - некорректный "
-"поток theora (%d)\n"
-
-#: ogginfo/ogginfo2.c:703
-#, fuzzy, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Внимание: Невозможно декодировать пакет заголовка theora - некорректный "
-"поток theora (%d)\n"
-
-#: ogginfo/ogginfo2.c:734
-#, fuzzy, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
-"Внимание: Заголовки в потоке Theora %d разделены некорректно. Последняя "
-"страница заголовка содержит дополнительные пакеты или имеет не-нулевой "
-"granulepos\n"
-
-#: ogginfo/ogginfo2.c:738
-#, fuzzy, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr "Заголовки theora обработаны для потока %d, далее информация...\n"
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Версия: %d.%d.%d\n"
-
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:567
 #, c-format
-msgid "Language: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Поставщик: %s\n"
-
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
-msgid "No category set\n"
-msgstr "Номинальный битрейт не установлен\n"
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
-#, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
-#, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:783
-msgid "Unknown text directionality\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:795
-#, fuzzy
-msgid "Invalid zero granulepos rate\n"
-msgstr "Недопустимая нулевая частота кадров\n"
-
-#: ogginfo/ogginfo2.c:797
-#, fuzzy, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr "Частота кадров %d/%d (%.02f кадр/с)\n"
-
-#: ogginfo/ogginfo2.c:810
-msgid "\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:828
-#, fuzzy, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Отрицательное значение granulepos в потоке vorbis за пределами заголовков. "
-"Этот файл был создан \"кривым\" кодировщиком\n"
+"Поток vorbis %d:\n"
+"\tОбщая длина данных: %lld байт\n"
+"\tВремя воспроизведения: %ldм:%02ld.%03ldс\n"
+"\tСредний битрейт: %f Кбит/с\n"
 
-#: ogginfo/ogginfo2.c:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Внимание: для потока %d не установлен маркер его конца\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Внимание: Неправильная страница заголовка, не найден пакет\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-"Внимание: Неправильная страница заголовка в потоке %d, содержит множество "
-"пакетов\n"
+msgstr "Внимание: Неправильная страница заголовка в потоке %d, содержит множество пакетов\n"
 
-#: ogginfo/ogginfo2.c:1088
+#: ogginfo/ogginfo2.c:770
 #, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-"Примечание: Поток %d имеет серийный номер %d, что допустимо, но может "
-"вызвать проблемы в работе некоторых инструментов.\n"
+msgid "Note: Stream %d has serial number %d, which is legal but may cause problems with some tools.\n"
+msgstr "Примечание: Поток %d имеет серийный номер %d, что допустимо, но может вызвать проблемы в работе некоторых инструментов.\n"
 
-#: ogginfo/ogginfo2.c:1105
-#, fuzzy
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-"Внимание: Обнаружена дыра в данных со смещением приблизительно %lld байт. "
-"Испорченный ogg.\n"
+#: ogginfo/ogginfo2.c:788
+msgid "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted ogg.\n"
+msgstr "Внимание: Обнаружена дыра в данных со смещением приблизительно %I64d байт. Испорченный ogg.\n"
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:790
 #, c-format
+msgid "Warning: Hole in data found at approximate offset %lld bytes. Corrupted ogg.\n"
+msgstr "Внимание: Обнаружена дыра в данных со смещением приблизительно %lld байт. Испорченный ogg.\n"
+
+#: ogginfo/ogginfo2.c:815
+#, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Ошибка открытия входного файла \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2087,27 +1581,23 @@
 "Обработка файла \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Невозможно найти обработчик для потока. Задание отложено\n"
 
-#: ogginfo/ogginfo2.c:1151
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr "Найдена страница для потока после получения маркера его конца"
 
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-"Нарушены ограничения мультиплексирования Ogg. Найден новый поток до "
-"получения маркеров конца всех предыдущих потоков"
+#: ogginfo/ogginfo2.c:840
+msgid "Ogg muxing constraints violated, new stream before EOS of all previous streams"
+msgstr "Нарушены ограничения мультиплексирования Ogg. Найден новый поток до получения маркеров конца всех предыдущих потоков"
 
-#: ogginfo/ogginfo2.c:1158
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr "Неизвестная ошибка."
 
-#: ogginfo/ogginfo2.c:1161
+#: ogginfo/ogginfo2.c:847
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -2116,61 +1606,54 @@
 "Внимание: неправильно расположены страницы для логического потока %d\n"
 "Это сигнализирует о повреждении файла ogg: %s.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Новый логический поток (#%d, серийный номер: %08x): тип %s\n"
 
-#: ogginfo/ogginfo2.c:1176
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Внимание: для потока %d не установлен флаг его начала\n"
 
-#: ogginfo/ogginfo2.c:1180
+#: 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:1185
+#: 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 ""
-"Внимание: пропущен порядковый номер в потоке %d. Получена страница %ld когда "
-"ожидалась %ld. Свидетельствует о пропуске данных.\n"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "Внимание: пропущен порядковый номер в потоке %d. Получена страница %ld когда ожидалась %ld. Свидетельствует о пропуске данных.\n"
 
-#: ogginfo/ogginfo2.c:1200
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Логический поток %d завершён\n"
 
-#: ogginfo/ogginfo2.c:1208
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:894
+#, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
+"Input probably not ogg.\n"
 msgstr ""
 "Ошибка: Данные ogg не найдены в файле \"%s\".\n"
 "Входные данные, вероятно, не в формате ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 из %s %s\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:905
+#, c-format
 msgid ""
+"ogginfo 1.1.0\n"
 "(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
 "\t-h Show this help message\n"
 "\t-q Make less verbose. Once will remove detailed informative\n"
 "\t   messages, two will remove warnings\n"
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
+"\n"
 msgstr ""
 "ogginfo 1.1.0\n"
 "(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
@@ -2184,17 +1667,12 @@
 "\t   доступными более детальные проверки для некоторых типов потоков.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1234
+#: ogginfo/ogginfo2.c:926
 #, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, fuzzy, c-format
 msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
-"ogginfo is a tool for printing information about Ogg files\n"
+"Ogginfo is a tool for printing information about ogg files\n"
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
@@ -2204,11 +1682,10 @@
 "и для диагностики проблем с ними.\n"
 "Полная справка отображается по команде \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
+#: ogginfo/ogginfo2.c:955
 #, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
-msgstr ""
-"Не указаны входные файлы. Для получения справки используйте \"ogginfo -h\"\n"
+msgstr "Не указаны входные файлы. Для получения справки используйте \"ogginfo -h\"\n"
 
 #: share/getopt.c:673
 #, c-format
@@ -2265,42 +1742,37 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: для параметра `-W %s' не допустимы аргументы\n"
 
-#: vcut/vcut.c:149
+#: vcut/vcut.c:133
 #, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Ошибка страницы. Входные данные повреждены.\n"
 
-#: vcut/vcut.c:166
+#: vcut/vcut.c:150
 #, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Ошибка битового потока, продолжение работы\n"
 
-#: vcut/vcut.c:206
+#: vcut/vcut.c:175
 #, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "Конец потока найден до точки отреза.\n"
 
-#: vcut/vcut.c:215
+#: vcut/vcut.c:184
 #, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Установка флага конца потока: 0 код возврата попытки обновления\n"
 
-#: vcut/vcut.c:225
+#: vcut/vcut.c:194
 #, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Точка отреза не внутри потока. Второй файл будет пустой\n"
 
-#: vcut/vcut.c:277
+#: vcut/vcut.c:227
 #, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Необработанный особый случай: первый файл слишком короткий?\n"
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr "Точка отреза не внутри потока. Второй файл будет пустой\n"
-
-#: vcut/vcut.c:353
+#: vcut/vcut.c:286
 #, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
@@ -2309,60 +1781,57 @@
 "ОШИБКА: Первые два звуковых пакета не укладываются в одну\n"
 "        страницу ogg. Файл не может быть корректно декодирован.\n"
 
-#: vcut/vcut.c:373
+#: vcut/vcut.c:299
 #, c-format
-msgid "Update sync returned 0, setting eos\n"
-msgstr "Попытка обновления вернула 0, установка eos\n"
-
-#: vcut/vcut.c:378
-#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Исправляемая ошибка битового потока\n"
 
-#: vcut/vcut.c:387
+#: vcut/vcut.c:309
 #, c-format
 msgid "Bitstream error\n"
 msgstr "Ошибка битового потока\n"
 
-#: vcut/vcut.c:449
+#: 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:459
+#: vcut/vcut.c:391
 #, c-format
 msgid "Error in first page\n"
 msgstr "Ошибка на первой странице\n"
 
-#: vcut/vcut.c:464
+#: vcut/vcut.c:396
 #, c-format
 msgid "error in first packet\n"
 msgstr "ошибка в первом пакете\n"
 
-#: vcut/vcut.c:470
+#: vcut/vcut.c:402
 #, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Ошибка в основном заголовке: не vorbis?\n"
 
-#: vcut/vcut.c:490
+#: vcut/vcut.c:422
 #, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Вторичный заголовок повреждён\n"
 
-#: vcut/vcut.c:503
+#: vcut/vcut.c:435
 #, c-format
 msgid "EOF in headers\n"
 msgstr "В заголовках обнаружен конец файла\n"
 
-#: vcut/vcut.c:535
+#: vcut/vcut.c:468
 #, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
-msgstr ""
-"Вызов: vcut вх_файл.ogg вых_файл1.ogg вых_файл2.ogg [точка_отреза | "
-"+точка_отреза]\n"
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+msgstr "Вызов: vcut вх_файл.ogg вых_файл1.ogg вых_файл2.ogg [точка_отреза | +точка_отреза]\n"
 
-#: vcut/vcut.c:539
+#: vcut/vcut.c:472
 #, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
@@ -2373,746 +1842,198 @@
 "Проверьте корректность выходных файлов перед удалением исходных.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:477
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Невозможно открыть %s для чтения\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:482 vcut/vcut.c:487
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Невозможно открыть %s для записи\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:493 vcut/vcut.c:498
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Невозможно обработать точку отреза \"%s\"\n"
 
-#: vcut/vcut.c:570
+#: vcut/vcut.c:503
 #, c-format
 msgid "Processing: Cutting at %lld seconds\n"
 msgstr "Обработка: Вырезание в позиции %lld секунд\n"
 
-#: vcut/vcut.c:572
+#: vcut/vcut.c:505
 #, c-format
 msgid "Processing: Cutting at %lld samples\n"
 msgstr "Обработка: Вырезание в позиции %lld кадров\n"
 
-#: vcut/vcut.c:582
+#: vcut/vcut.c:515
 #, c-format
 msgid "Processing failed\n"
 msgstr "Обработка не удалась\n"
 
-#: vcut/vcut.c:604
+#: vcut/vcut.c:537
 #, c-format
 msgid "Error reading headers\n"
 msgstr "Ошибка чтения заголовков\n"
 
-#: vcut/vcut.c:627
+#: vcut/vcut.c:560
 #, c-format
 msgid "Error writing first output file\n"
 msgstr "Ошибка записи первого выходного файла\n"
 
-#: vcut/vcut.c:635
+#: vcut/vcut.c:568
 #, c-format
 msgid "Error writing second output file\n"
 msgstr "Ошибка записи второго выходного файла\n"
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:229
+msgid "Input truncated or empty."
+msgstr "Входные данные обрезаны или пусты."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:231
+msgid "Input is not an Ogg bitstream."
+msgstr "Входные данные не являются битовым потоком Ogg."
+
+#: vorbiscomment/vcedit.c:249
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Ошибка чтения первой страницы битового потока Ogg."
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:255
 msgid "Error reading initial header packet."
 msgstr "Ошибка чтения начального заголовка пакета."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Входные данные обрезаны или пусты."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "Входные данные не являются битовым потоком Ogg."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:261
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Битовый поток Ogg не содержит данных vorbis."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "Конец файла обнаружен до окончания заголовков vorbis."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Битовый поток Ogg не содержит данных vorbis."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:284
 msgid "Corrupt secondary header."
 msgstr "Повреждён вторичный заголовок."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:305
 msgid "EOF before end of vorbis headers."
 msgstr "Конец файла обнаружен до окончания заголовков vorbis."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:458
 msgid "Corrupt or missing data, continuing..."
 msgstr "Повреждены или отсутствуют данные, продолжение работы..."
 
-#: vorbiscomment/vcedit.c:875
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
-"Ошибка записи выходного потока. Выходной поток может быть повреждён или "
-"обрезан."
+#: vorbiscomment/vcedit.c:498
+msgid "Error writing stream to output. Output stream may be corrupted or truncated."
+msgstr "Ошибка записи выходного потока. Выходной поток может быть повреждён или обрезан."
 
-#: vorbiscomment/vcomment.c:190 vorbiscomment/vcomment.c:216
+#: 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:235
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Неправильный комментарий: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "неправильный комментарий: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Ошибка при записи комментариев в выходной файл: %s\n"
 
-#: vorbiscomment/vcomment.c:274
+#: vorbiscomment/vcomment.c:192
 #, c-format
 msgid "no action specified\n"
 msgstr "действие не указано\n"
 
-#: vorbiscomment/vcomment.c:379
+#: vorbiscomment/vcomment.c:292
 #, c-format
 msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
-msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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 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 ""
+"Использование: \n"
+"  vorbiscomment [-l] file.ogg (просмотреть комментарии)\n"
+"  vorbiscomment -a in.ogg out.ogg (добавить комментарии)\n"
+"  vorbiscomment -w in.ogg out.ogg (изменить комментарии)\n"
+"\tв случае записи, на stdin ожидается новый набор\n"
+"\tкомментариев в форме 'ТЭГ=значение'. Этот набор будет\n"
+"\tполностью заменять уже существующий набор.\n"
+"   Параметры -a и -w также могут использовать только одно имя файла.\n"
+"   В этом случае будет использоваться временный файл.\n"
+"   Параметр -c может быть использован для того, чтобы брать комментарии\n"
+"   из указанного файла вместо stdin.\n"
+"   Пример: vorbiscomment -a in.ogg -c comments.txt\n"
+"   добавит комментарии из файла comments.txt в in.ogg\n"
+"   Наконец, Вы можете указать любое количество тэгов для добавления в\n"
+"   командной строке используя опцию -t.\n"
+"   Пример: vorbiscomment -a in.ogg -t \"ARTIST=Некий артист\" -t \"TITLE=Название\"\n"
+"   (заметьте, что когда используется такой способ, чтение комментариев из файла с\n"
+"   комментариями или из stdin отключено)\n"
+"   Сырой режим (--raw, -R) будет читать и записывать комментарии в UTF-8,\n"
+"   вместо того, чтобы конвертировать в пользовательский набор символов. Это полезно\n"
+"   при использовании vorbiscomment в сценариях. Однако, этого не достаточно\n"
+"   для основной обработки комментариев во всех случаях.\n"
 
-#: vorbiscomment/vcomment.c:391
+#: vorbiscomment/vcomment.c:376
 #, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Некорректный тип в списке параметров"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Внутренняя ошибка разбора параметров командной строки\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Ошибка открытия входного файла '%s'.\n"
 
-#: vorbiscomment/vcomment.c:587
+#: vorbiscomment/vcomment.c:471
 #, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Имя входного файла не может совпадать с именем выходного файла\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Ошибка открытия выходного файла '%s'.\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Ошибка открытия файла комментариев '%s'.\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Ошибка открытия файла комментариев '%s'\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Ошибка удаления старого файла %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Ошибка переименования %s в %s\n"
-
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Ошибка удаления старого файла %s\n"
-
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 из %s %s\n"
-#~ "Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Вызов: ogg123 [<опции>] <входной файл> ...\n"
-#~ "\n"
-#~ "  -h, --help     эта справка\n"
-#~ "  -V, --version  показать версию Ogg123\n"
-#~ "  -d, --device=d использовать в качестве устройства вывода 'd'\n"
-#~ "      Допустимые устройства ('*'=живое, '@'=файл):\n"
-#~ "        "
-
-#~ 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 (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"
-#~ "  -@, --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"
-#~ msgstr ""
-#~ "  -f, --file=имя_файла  Установить имя выходного файла для ранее "
-#~ "указанного\n"
-#~ "      файла устройства (с опцией -d).\n"
-#~ "  -k n, --skip n  Пропустить первые 'n' секунд (или в формате чч:мм:сс)\n"
-#~ "  -o, --device-option=k:v передать специальный параметр k со значением\n"
-#~ "      v ранее указанному устройству (с опцией -d).  Смотри\n"
-#~ "      man для дополнительной информации.\n"
-#~ "  -@, --list=имя_файла  Прочитать список воспроизведения файлов и URL из "
-#~ "файла \"имя_файла\"\n"
-#~ "  -b n, --buffer n  Использовать входной буфер размером 'n' Кб\n"
-#~ "  -p n, --prebuffer n  загрузить n%% из входного буфера перед "
-#~ "воспроизведением\n"
-#~ "  -v, --verbose  показать прогресс и другую информацию о состоянии\n"
-#~ "  -q, --quiet    не показывать ничего (без заголовка)\n"
-#~ "  -x n, --nth    воспроизводить каждый 'n'-й блок\n"
-#~ "  -y n, --ntimes повторить каждый воспроизводимый блок 'n' раз\n"
-#~ "  -z, --shuffle  случайное воспроизведение\n"
-#~ "\n"
-#~ "При получении SIGINT (Ctrl-C) ogg123 пропустит следующую песню; два "
-#~ "сигнала SIGINT\n"
-#~ "в течение s миллисекунд завершают работу ogg123.\n"
-#~ "  -l, --delay=s  устанавливает значение s [в миллисекундах] (по умолчанию "
-#~ "500).\n"
-
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " 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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --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. 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. 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. 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"
-#~ "                      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"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times. The argument should be in the\n"
-#~ "                      format \"tag=value\".\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-#~ "AIFF/C\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 "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an output filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Вызов: oggenc [опции] input.wav [...]\n"
-#~ "\n"
-#~ "ПАРАМЕТРЫ:\n"
-#~ " Основные:\n"
-#~ " -Q, --quiet          Не выводить в поток ошибок\n"
-#~ " -h, --help           Вывести этот справочный текст\n"
-#~ " -v, --version        Напечатать номер версии\n"
-#~ " -r, --raw            Сырой режим. Входные файлы читаются непосредственно "
-#~ "как данные PCM\n"
-#~ " -B, --raw-bits=n     Установить число бит/сэмпл для сырого ввода. По "
-#~ "умолчанию 16\n"
-#~ " -C, --raw-chan=n     Установить число каналов для сырого ввода. По "
-#~ "умолчанию 2\n"
-#~ " -R, --raw-rate=n     Установить число сэмплов/сек для сырого ввода. По "
-#~ "умолчанию 44100\n"
-#~ " --raw-endianness     1 для bigendian, 0 для little (по умолчанию 0)\n"
-#~ " -b, --bitrate        Выбрать номинальный битрейт для кодирования. "
-#~ "Попытка\n"
-#~ "                      кодировать со средним битрейтом равным указанному. "
-#~ "Используется\n"
-#~ "                      1 аргумент в kbps. По умолчанию, используется VBR "
-#~ "кодирование,\n"
-#~ "                      эквивалентное использованию параметра -q или --"
-#~ "quality.\n"
-#~ "                      Используйте описание параметра --managed для "
-#~ "указания\n"
-#~ "                      выбранного битрейта.\n"
-#~ " --managed            Включить движок управления битрейтом. Предоставляет "
-#~ "возможность\n"
-#~ "                      намного лучшего управления над точной установкой "
-#~ "используемого битрейта.\n"
-#~ "                      Однако, кодирование будет значительно медленнее. Не "
-#~ "используйте это\n"
-#~ "                      если у Вас нет острой необходимости в детальном "
-#~ "управлении битрейтом,\n"
-#~ "                      например, для потоковых передач.\n"
-#~ " -m, --min-bitrate    Указать минимальный битрейт (в kbps). Полезно при "
-#~ "кодировании\n"
-#~ "                      для канала постоянного размера. Использование этого "
-#~ "параметра\n"
-#~ "                      автоматически включит режим управляемого битрейта "
-#~ "(смотрите\n"
-#~ "                      --managed).\n"
-#~ " -M, --max-bitrate    Указать максимальный битрейт в kbps. Полезно для "
-#~ "потоковых\n"
-#~ "                      приложений. Использование этого параметра "
-#~ "автоматически включит\n"
-#~ "                      режим управляемого битрейта (смотрите --managed).\n"
-#~ " --advanced-encode-option параметр=значение\n"
-#~ "                      Установить заданное значение дополнительного "
-#~ "параметра кодировщика.\n"
-#~ "                      Допустимые параметры (и их значения) описаны на "
-#~ "странице руководства,\n"
-#~ "                      поставляемого с данной программой. Они "
-#~ "предназначены только для\n"
-#~ "                      продвинутых пользователей и должны быть "
-#~ "использованы осторожно.\n"
-#~ " -q, --quality        Указать качество от -1 (очень низкое) до 10 (очень "
-#~ "высокое),\n"
-#~ "                      вместо указания конкретного битрейта.\n"
-#~ "                      Это нормальный режим работы.\n"
-#~ "                      Допустимо дробное значение качества (например, "
-#~ "2.75).\n"
-#~ "                      По-умолчанию, уровень качества равен 3.\n"
-#~ " --resample n         Изменить частоту выборки входных данных до значения "
-#~ "n (Гц)\n"
-#~ " --downmix            Перемикшировать стерео сигнал в моно. Доступно "
-#~ "только для стерео\n"
-#~ "                      входного сигнала.\n"
-#~ " -s, --serial         Указать серийный номер для потока. Если кодируется "
-#~ "несколько\n"
-#~ "                      файлов, это значение будет автоматически "
-#~ "увеличиваться на 1\n"
-#~ "                      для каждого следующего потока.\n"
-#~ " --discard-comments   Предотвращает копирование комментариев из файлов "
-#~ "FLAC и Ogg FLAC\n"
-#~ "                      в выходной файл Ogg Vorbis.\n"
-#~ "\n"
-#~ " Присвоение имён:\n"
-#~ " -o, --output=fn      Записать файл в fn (корректно только для работы с "
-#~ "одним файлом)\n"
-#~ " -n, --names=string   Создать имена файлов по образцу в строке string, "
-#~ "заменяя %%a, %%t, %%l,\n"
-#~ "                      %%n, %%d на имя артиста, название, альбом, номер "
-#~ "дорожки,\n"
-#~ "                      и дату, соответственно (ниже смотрите как это "
-#~ "указать).\n"
-#~ "                      %%%% даёт символ %%.\n"
-#~ " -X, --name-remove=s  Удалить указанные символы из параметров строки "
-#~ "формата -n.\n"
-#~ "                      Полезно для создания корректных имён фалов.\n"
-#~ " -P, --name-replace=s Заменить символы, удалённые --name-remove, на "
-#~ "указанные\n"
-#~ "                      символы. Если эта строка короче, чем список\n"
-#~ "                      --name-remove или не указана, символы просто "
-#~ "удаляются.\n"
-#~ "                      Значения по умолчанию для указанных выше двух "
-#~ "аргументов\n"
-#~ "                      зависят от платформы.\n"
-#~ " -c, --comment=c      Добавить указанную строку в качестве "
-#~ "дополнительного\n"
-#~ "                      комментария. Может быть использовано несколько раз. "
-#~ "Аргумент\n"
-#~ "                      должен быть в формате \"тэг=значение\".\n"
-#~ " -d, --date           Дата дорожки (обычно дата исполнения)\n"
-#~ " -N, --tracknum       Номер этой дорожки\n"
-#~ " -t, --title          Заголовок этой дорожки\n"
-#~ " -l, --album          Название альбома\n"
-#~ " -a, --artist         Имя артиста\n"
-#~ " -G, --genre          Жанр дорожки\n"
-#~ "                      Если задано несколько входных файлов, то несколько\n"
-#~ "                      экземпляров предыдущих пяти аргументов будут \n"
-#~ "                      использованы, в том порядке, в котором они "
-#~ "заданы. \n"
-#~ "                      Если заголовков указано меньше чем\n"
-#~ "                      файлов, OggEnc выдаст предупреждение, и\n"
-#~ "                      будет использовать последнее указанное значение "
-#~ "для\n"
-#~ "                      оставшихся файлов. Если указано не достаточно "
-#~ "номеров\n"
-#~ "                      дорожек, оставшиеся файлы будут не нумерованными.\n"
-#~ "                      Для всех остальных будет использовано последнее \n"
-#~ "                      значение тэга без предупреждений (таким образом, \n"
-#~ "                      например, можно один раз указать дату и затем \n"
-#~ "                      использовать её для всех файлов)\n"
-#~ "\n"
-#~ "ВХОДНЫЕ ФАЙЛЫ:\n"
-#~ " Входными файлами для OggEnc в настоящее время должны быть 24-, 16- или 8-"
-#~ "битные\n"
-#~ " файлы PCM WAV, AIFF, или AIFF/C, или 32-битный с плавающей точкой IEEE "
-#~ "WAV, и,\n"
-#~ " опционально, FLAC или Ogg FLAC. Файлы могут быть моно или стерео\n"
-#~ " (или с большим числом каналов) и любым значением частоты выборки.\n"
-#~ " В качестве альтернативы может использоваться опция --raw для чтения "
-#~ "сырых файлов\n"
-#~ " с данными PCM, которые должны быть 16 битными стерео little-endian PCM "
-#~ "('wav\n"
-#~ " без заголовков'), в противном случае указываются дополнительные "
-#~ "параметры для\n"
-#~ " сырого режима.\n"
-#~ " Вы можете указать считывание файла из stdin используя - в качестве "
-#~ "имени\n"
-#~ " входного файла. В этом случае вывод направляется в stdout если не "
-#~ "указано имя\n"
-#~ " выходного файла опцией -o\n"
-
-#~ msgid "Frame aspect 1:%d\n"
-#~ msgstr "Соотношение размеров кадра 1:%d\n"
-
-#~ msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-#~ msgstr "Внимание: granulepos в потоке %d уменьшилось с %I64d до %I64d"
-
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Поток theora %d:\n"
-#~ "\tОбщая длина данных: %I64d байт\n"
-#~ "\tВремя воспроизведения: %ldм:%02ld.%03ldс\n"
-#~ "\tСредний битрейт: %f Кбит/с\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 ""
-#~ "Поток theora %d:\n"
-#~ "\tОбщая длина данных: %lld байт\n"
-#~ "\tВремя воспроизведения: %ldм:%02ld.%03ldс\n"
-#~ "\tСредний битрейт: %f Кбит/с\n"
-
-#~ msgid ""
-#~ "Vorbis 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Общая длина данных: %I64d байт\n"
-#~ "\tВремя воспроизведения: %ldм:%02ld.%03ldс\n"
-#~ "\tСредний битрейт: %f Кбит/с\n"
-
-#~ msgid ""
-#~ "Vorbis 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Общая длина данных: %lld байт\n"
-#~ "\tВремя воспроизведения: %ldм:%02ld.%03ldс\n"
-#~ "\tСредний битрейт: %f Кбит/с\n"
-
-#~ msgid ""
-#~ "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
-#~ "ogg.\n"
-#~ msgstr ""
-#~ "Внимание: Обнаружена дыра в данных со смещением приблизительно %I64d "
-#~ "байт. Испорченный ogg.\n"
-
-#~ msgid ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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 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 ""
-#~ "Использование: \n"
-#~ "  vorbiscomment [-l] file.ogg (просмотреть комментарии)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (добавить комментарии)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (изменить комментарии)\n"
-#~ "\tв случае записи, на stdin ожидается новый набор\n"
-#~ "\tкомментариев в форме 'ТЭГ=значение'. Этот набор будет\n"
-#~ "\tполностью заменять уже существующий набор.\n"
-#~ "   Параметры -a и -w также могут использовать только одно имя файла.\n"
-#~ "   В этом случае будет использоваться временный файл.\n"
-#~ "   Параметр -c может быть использован для того, чтобы брать комментарии\n"
-#~ "   из указанного файла вместо stdin.\n"
-#~ "   Пример: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   добавит комментарии из файла comments.txt в in.ogg\n"
-#~ "   Наконец, Вы можете указать любое количество тэгов для добавления в\n"
-#~ "   командной строке используя опцию -t.\n"
-#~ "   Пример: vorbiscomment -a in.ogg -t \"ARTIST=Некий артист\" -t "
-#~ "\"TITLE=Название\"\n"
-#~ "   (заметьте, что когда используется такой способ, чтение комментариев из "
-#~ "файла с\n"
-#~ "   комментариями или из stdin отключено)\n"
-#~ "   Сырой режим (--raw, -R) будет читать и записывать комментарии в UTF-"
-#~ "8,\n"
-#~ "   вместо того, чтобы конвертировать в пользовательский набор символов. "
-#~ "Это полезно\n"
-#~ "   при использовании vorbiscomment в сценариях. Однако, этого не "
-#~ "достаточно\n"
-#~ "   для основной обработки комментариев во всех случаях.\n"

Modified: trunk/vorbis-tools/po/sk.po
===================================================================
--- trunk/vorbis-tools/po/sk.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/sk.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.1.1\n"
 "Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2005-06-27 11:34+0200\n"
 "PO-Revision-Date: 2008-03-20 20:15+0100\n"
 "Last-Translator: Peter Tuhársky <tuharsky at misbb.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -20,488 +20,351 @@
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-Country: SLOVAKIA\n"
 
-#: ogg123/buffer.c:117
+#: ogg123/buffer.c:114
 #, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Chyba: Nedostatok pamäte v malloc_action().\n"
 
-#: ogg123/buffer.c:360
+#: ogg123/buffer.c:347
 #, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Chyba: Nepodarilo sa alokovať pamäť v malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:75
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Chyba: Zariadenie nie je dostupné.\n"
 
-#: ogg123/callbacks.c:78
+#: ogg123/callbacks.c:74
 #, c-format
 msgid "Error: %s requires an output filename to be specified with -f.\n"
 msgstr "Chyba: %s vyžaduje zadanie názvu výstupného súboru pomocou -f.\n"
 
-#: ogg123/callbacks.c:81
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Chyba: Nepodporovaná hodnota prepínača zariadenia %s.\n"
 
-#: ogg123/callbacks.c:85
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Chyba: Nedá sa otvoriť zariadenie %s.\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Chyba: Zariadenie %s zlyhalo.\n"
 
-#: ogg123/callbacks.c:92
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Chyba: Výstupný súbor pre zariadenie %s sa nedá zadať.\n"
 
-#: ogg123/callbacks.c:95
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Chyba: Nedá sa otvoriť súbor %s na zápis.\n"
 
-#: ogg123/callbacks.c:99
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Chyba: Súbor %s už existuje.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Chyba: Táto chyba by sa vôbec nemala stať (%d). Panika!\n"
 
-#: ogg123/callbacks.c:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:121 ogg123/callbacks.c:126
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
 msgstr "Chyba: Nedostatok pamäti v new_audio_reopen_arg().\n"
 
-#: ogg123/callbacks.c:174
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
 msgstr "Chyba: Nedostatok pamäti v new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:233
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Chyba: Nedostatok pamäti v new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: 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: Nedostatok pamäti v decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Systémová chyba"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Chyba v spracovaní: %s na riadku %d súboru %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Názov"
 
-#: ogg123/cfgfile_options.c:137
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Popis"
 
-#: ogg123/cfgfile_options.c:140
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Typ"
 
-#: ogg123/cfgfile_options.c:143
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Predvolené"
 
-#: ogg123/cfgfile_options.c:169
+#: ogg123/cfgfile_options.c:165
 #, c-format
 msgid "none"
 msgstr "žiadny"
 
-#: ogg123/cfgfile_options.c:172
+#: ogg123/cfgfile_options.c:168
 #, c-format
 msgid "bool"
 msgstr "bool"
 
-#: ogg123/cfgfile_options.c:175
+#: ogg123/cfgfile_options.c:171
 #, c-format
 msgid "char"
 msgstr "char"
 
-#: ogg123/cfgfile_options.c:178
+#: ogg123/cfgfile_options.c:174
 #, c-format
 msgid "string"
 msgstr "string"
 
-#: ogg123/cfgfile_options.c:181
+#: ogg123/cfgfile_options.c:177
 #, c-format
 msgid "int"
 msgstr "int"
 
-#: ogg123/cfgfile_options.c:184
+#: ogg123/cfgfile_options.c:180
 #, c-format
 msgid "float"
 msgstr "float"
 
-#: ogg123/cfgfile_options.c:187
+#: ogg123/cfgfile_options.c:183
 #, c-format
 msgid "double"
 msgstr "double"
 
-#: ogg123/cfgfile_options.c:190
+#: ogg123/cfgfile_options.c:186
 #, c-format
 msgid "other"
 msgstr "iný"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: 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 "(žiadny)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Úspech"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Kľúč sa nenašiel"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Žiadny kľúč"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Chybná hodnota"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Chybný typ v zozname prepínačov"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "Interná chyba pri spracúvaní prepínačov na príkazovom riadku.\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
-msgstr ""
-"Veľkosť vstupnej vyrovnávacej pamäte je menšia než minimálna veľkosť %d kB."
+msgstr "Veľkosť vstupnej vyrovnávacej pamäte je menšia než minimálna veľkosť %d kB."
 
-#: ogg123/cmdline_options.c:102
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
 "=== Option was: %s\n"
 msgstr ""
-"=== Chyba \"%s\" pri spracúvaní prepínača konfigurácie z príkazového "
-"riadku.\n"
+"=== Chyba \"%s\" pri spracúvaní prepínača konfigurácie z príkazového riadku.\n"
 "=== Prepínač bol: %s\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:115
 #, c-format
 msgid "Available options:\n"
 msgstr "Dostupné prepínače:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Také zariadenie %s neexistuje.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Ovládač %s nie je ovládač výstupu do súboru.\n"
 
-#: ogg123/cmdline_options.c:143
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "=== Nedá sa určiť výstupný súbor bez určenia ovládača.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Nesprávny formát prepínača: %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: 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:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:198
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 z %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Nedá sa prehrávať každý nultý úsek!\n"
 
-#: ogg123/cmdline_options.c:216
+#: 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 ""
 "--- Nedá sa každý úsek prehrávať nulakrát.\n"
-"--- Na vykonanie testovacieho dekódovania prosím použite výstupný ovládač "
-"null.\n"
+"--- Na vykonanie testovacieho dekódovania prosím použite výstupný ovládač null.\n"
 
-#: ogg123/cmdline_options.c:232
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Nedá sa otvoriť súbor zoznamu skladieb %s. Preskakujem.\n"
 
-#: ogg123/cmdline_options.c:248
+#: ogg123/cmdline_options.c:241
 msgid "=== Option conflict: End time is before start time.\n"
 msgstr "=== Konflikt predvolieb: Koncový čas je pred začiatočným.\n"
 
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Ovládač %s zadaný v konfiguračnom súbore je neplatný.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Nedá sa načítať implicitný ovládač a v konfiguračnom súbore nie je "
-"zadaný žiadny ovládač. Končím.\n"
+#: ogg123/cmdline_options.c:264
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Nedá sa načítať implicitný ovládač a v konfiguračnom súbore nie je zadaný žiadny ovládač. Končím.\n"
 
-#: ogg123/cmdline_options.c:292
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 z %s %s\n"
+" od Xiph.org Foundation (http://www.xiph.org/)\n"
+"\n"
+"Použitie: ogg123 [<prepínače>] <vstupný súbor> ...\n"
+"\n"
+"  -h, --help     tento pomocný text\n"
+"  -V, --version  zobraziť verziu Ogg123\n"
+"  -d, --device=d používa 'd' ako výstupné zariadenie\n"
+"      Možné zariadenia sú ('*'=živo, '@'=súbor):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Dostupné prepínače:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:306
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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 (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"
+"  -@, --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"
 msgstr ""
+"  -f, --file=názov súboru  Nastaviť názov súboru výstupu pre zariadenie\n"
+"      súboru určené predtým (pomocou -d).\n"
+"  -k n, --skip n  Preskočiť prvých 'n' sekúnd\n"
+"  -o, --device-option=k:v odovzdáva špeciálny prepínač k s hodnotou\n"
+"      v zariadeniu určenému predtým (pomocou -d). Ak chcete viac informácií\n"
+"      viz manuálovú stránku.\n"
+"  -b n, --buffer n  používať vstupnú vyrovnávaciu pamäť 'n' kilobajtov\n"
+"  -p n, --prebuffer n  načítať n%% vstupné vyrovnávacie pamäte pred prehrávaním\n"
+"  -v, --verbose  zobrazovať priebeh a iné stavové informácie\n"
+"  -q, --quiet    nezobrazovať nič (žiadny názov)\n"
+"  -x n, --nth    prehrávať každý 'n'tý blok\n"
+"  -y n, --ntimes zopakovať každý prehrávaný blok 'n'-krát\n"
+"  -z, --shuffle  pomiešať poradie prehrávania\n"
+"\n"
+"ogg123 preskočí na ďalšiu pieseň pri SIGINT (Ctrl-C); dva SIGINTy v rámci\n"
+"s milisekúnd spôsobí ukončenie ogg123.\n"
+"  -l, --delay=s  nastaviť s [milisekúnd] (implicitne 500).\n"
 
-#: ogg123/cmdline_options.c:310
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
 #, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Soubor: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Dostupné prepínače:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "Vstup není ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Popis"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Dostupné prepínače:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Chyba: Nedostatok pamäte.\n"
 
-#: ogg123/format.c:82
+#: ogg123/format.c:81
 #, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Chyba: Nepodarilo sa alokovať pamäť v malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:145
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Chyba: Nepodarilo sa nastaviť masku signálov."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Chyba: Nepodarilo sa vytvoriť vstupnú vyrovnávaciu pamäť.\n"
 
-#: ogg123/ogg123.c:82
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "implicitné výstupné zariadenie"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "pomiešať zoznam skladieb"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Nemohu přeskočit %f vteřin zvuku."
-
-#: ogg123/ogg123.c:378
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -510,365 +373,234 @@
 "\n"
 "Zvukové zariadenie: %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Autor:    %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "Poznámky: %s"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Varovanie: Nepodarilo sa prečítať adresár %s.\n"
 
-#: ogg123/ogg123.c:460
+#: 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:556
+#: 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:561
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Nemohu otevřít %s.\n"
 
-#: ogg123/ogg123.c:567
+#: 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:577
+#: 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:596
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Přehrávám: %s"
 
-#: ogg123/ogg123.c:607
+#: 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:662
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Chyba: Selhání dekódování.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Chyba: Zariadenie %s zlyhalo.\n"
-
-#: ogg123/ogg123.c:743
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Hotovo."
 
-#: ogg123/oggvorbis_format.c:157
+#: 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:163
+#: 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:310
+#: ogg123/oggvorbis_format.c:303
 #, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Prúd údajov Ogg Vorbis: %d kanál, %ld Hz"
 
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr "Vorbis formát: Verzia %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: 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:327
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Kódováno s: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
+#: 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"
 
-#: ogg123/playlist.c:222
+#: ogg123/playlist.c:214
 #, c-format
 msgid "Warning from playlist %s: Could not read directory %s.\n"
 msgstr "Varování ze seznamu skladeb %s: Nemohu číst adresář %s.\n"
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
+#: 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"
 
-#: ogg123/status.c:60
+#: ogg123/status.c:47
 #, c-format
 msgid "%sPrebuf to %.1f%%"
 msgstr "%sPrebuf na %.1f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sPozastaveno"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr "%sEOS"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
+#: 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"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Soubor: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "ÄŒas: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "z %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Prům bitrate: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr " Vstupní vyrovnávací paměť %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr " Výstupní vyrovnávací paměť %5.1f%%"
 
-#: ogg123/transport.c:71
+#: 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"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 z %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "CHYBA: Nemohu otevřít vstupní soubor \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "CHYBA: Nemohu otevřít výstupní soubor \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Nemohu otevřít soubor jako vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Chyba při odstraňování starého souboru %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"CHYBA: Neurčeny vstupní soubory. Použijte -h pro nápovědu.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"CHYBA: Více vstupních souborů s určeným názvem souboru výstupu: doporučuji "
-"použít -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "Čteč souborů WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "Čteč souborů AIFF/AIFC"
 
-#: oggenc/audio.c:53
+#: oggenc/audio.c:51
 msgid "FLAC file reader"
 msgstr "Čítač súborov FLAC"
 
-#: oggenc/audio.c:54
+#: oggenc/audio.c:52
 msgid "Ogg FLAC file reader"
 msgstr "Ogg čítač súborov FLAC"
 
-#: oggenc/audio.c:131 oggenc/audio.c:425
+#: 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:142
+#: 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:168
+#: 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:254
+#: 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:260
+#: 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:268
+#: 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:283
+#: 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:297
+#: oggenc/audio.c:286
 #, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Varovanie: Nedokážem spracovať komprimované AIFF-C (%c%c%c%c)\n"
 
-#: oggenc/audio.c:304
+#: 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:310
+#: 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:316
+#: 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:353
+#: oggenc/audio.c:336
 #, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
@@ -877,12 +609,12 @@
 "Varovanie: OggEnc nepodporuje tento typ súboru AIFF/AIFC\n"
 " Musí to byť 8- alebo 16-bit PCM.\n"
 
-#: oggenc/audio.c:407
+#: 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:420
+#: oggenc/audio.c:391
 #, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
@@ -891,139 +623,108 @@
 "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:458
-#, fuzzy, c-format
+#: 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"
+" or type 3 floating point PCM\n"
 msgstr ""
 "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:467
+#: oggenc/audio.c:480
 #, c-format
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
-
-#: oggenc/audio.c:528
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
-"CHYBA: Súbor wav je nepodporovaným podformátom (musí to byť 8-, 16-, alebo "
-"24-bit PCM\n"
+"CHYBA: Súbor wav je nepodporovaným podformátom (musí to byť 8-, 16-, alebo 24-bit PCM\n"
 "alebo PCM s pohyblivou desatinnou čiarkou\n"
 
-#: oggenc/audio.c:604
+#: oggenc/audio.c:555
 #, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
 msgstr "Údaje big endian 24-bit PCM v súčasnosti nie sú podporované, končím.\n"
 
-#: oggenc/audio.c:624
-#, fuzzy, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr "Údaje big endian 24-bit PCM v súčasnosti nie sú podporované, končím.\n"
-
-#: oggenc/audio.c:630
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr "Vnútorná chyba: pokus o čítanie nepodporovanej bitovej hĺbky %d\n"
 
-#: oggenc/audio.c:732
+#: oggenc/audio.c:658
 #, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"CHYBA: Dostal jsem nula vzorků z převzorkovávače: váš soubor bude useknut. "
-"Nahlaste toto prosím.\n"
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "CHYBA: Dostal jsem nula vzorků z převzorkovávače: váš soubor bude useknut. Nahlaste toto prosím.\n"
 
-#: oggenc/audio.c:750
+#: oggenc/audio.c:676
 #, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Nemohu inicializovat převzorkovávač\n"
 
-#: oggenc/encode.c:64
+#: 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:101
+#: 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:104
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Nerozpoznaný pokročilý přepínač \"%s\"\n"
 
-#: oggenc/encode.c:111
+#: oggenc/encode.c:129
 #, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
+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:115 oggenc/encode.c:252
+#: oggenc/encode.c:137
 #, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, fuzzy, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but 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:182
-#, 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:200
+#: 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:245
+#: oggenc/encode.c:198
 #, c-format
 msgid "Set optional hard quality restrictions\n"
 msgstr "Nastaviť voliteľné tvrdé obmedzenia kvality\n"
 
-#: oggenc/encode.c:247
+#: oggenc/encode.c:200
 #, c-format
 msgid "Failed to set bitrate min/max in quality mode\n"
 msgstr "Nepodarilo sa nastaviť min/max bitovú rýchlosť v režime kvality\n"
 
-#: oggenc/encode.c:263
+#: 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:330 oggenc/encode.c:352
+#: 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:426
+#: 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:472
+#: oggenc/encode.c:381
 #, c-format
 msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [zostáva %2dm%.2ds] %c"
 
-#: oggenc/encode.c:482
+#: oggenc/encode.c:391
 #, c-format
 msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tKódujem [zatiaľ %2dm%.2ds] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -1034,7 +735,7 @@
 "\n"
 "Kódování souboru \"%s\" hotovo\n"
 
-#: oggenc/encode.c:502
+#: oggenc/encode.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1045,7 +746,7 @@
 "\n"
 "Kódování hotovo.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -1054,17 +755,17 @@
 "\n"
 "\tDélka souboru:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tStrávený čas: %dm %04.1fs\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tPoměr:        %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1073,7 +774,7 @@
 "\tPrůměr bitrate:  %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1084,17 +785,17 @@
 "         %s%s%s \n"
 "při průměrné bitrate %d kb/s "
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: 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:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: 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:559
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1105,7 +806,7 @@
 "       %s%s%s \n"
 "při průměrné bitrate %d kb/s (VBR kódování povoleno)\n"
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1116,7 +817,7 @@
 "       %s%s%s \n"
 "při úrovni kvality %2.2f s použitím omezeného VBR "
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1127,7 +828,7 @@
 "       %s%s%s \n"
 "při kvalitě %2.2f\n"
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1138,148 +839,107 @@
 "       %s%s%s \n"
 "s použitím správy bitrate "
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
+#: oggenc/oggenc.c:98
+#, c-format
+msgid ""
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 "%s%s\n"
 "CHYBA: Neurčeny vstupní soubory. Použijte -h pro nápovědu.\n"
 
-#: oggenc/oggenc.c:118
+#: 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:125
+#: oggenc/oggenc.c:120
 #, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"CHYBA: Více vstupních souborů s určeným názvem souboru výstupu: doporučuji "
-"použít -n\n"
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "CHYBA: Více vstupních souborů s určeným názvem souboru výstupu: doporučuji použít -n\n"
 
-#: oggenc/oggenc.c:186
+#: 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:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "Čteč souborů WAV"
-
-#: oggenc/oggenc.c:219
+#: 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:228
+#: 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:280
+#: 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:288
+#: oggenc/oggenc.c:271
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"CHYBA: Nemohu vytvořit požadované podadresáře pro jméno souboru výstupu \"%s"
-"\"\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "CHYBA: Nemohu vytvořit požadované podadresáře pro jméno souboru výstupu \"%s\"\n"
 
-#: oggenc/oggenc.c:295
+#: oggenc/oggenc.c:278
 #, c-format
 msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
 msgstr "CHYBA: Názov vstupného súboru je rovnaký ako výstupného \"%s\"\n"
 
-#: oggenc/oggenc.c:306
+#: 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:350
+#: 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:357
+#: oggenc/oggenc.c:326
 #, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Mixuji stereo na mono\n"
 
-#: oggenc/oggenc.c:360
+#: oggenc/oggenc.c:329
 #, c-format
 msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "VAROVANIE: Neviem mixovať, iba stereo do mono\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr "Prispôsobujem vstup na %f\n"
 
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 z %s %s\n"
-
-#: oggenc/oggenc.c:416
+#: oggenc/oggenc.c:381
 #, c-format
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:417
-#, c-format
-msgid ""
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
 " --managed            Enable the bitrate management engine. This will allow\n"
-"                      much greater control over the precise bitrate(s) "
-"used,\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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
 "                      encoding for a fixed-size channel. Using this will\n"
 "                      automatically enable managed bitrate mode (see\n"
@@ -1287,560 +947,537 @@
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
 "                      streaming applications. Using this will automatically\n"
 "                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
 " --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
 " -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"
 "                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
 " --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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
 " --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
 "                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
 "                      used multiple times. The argument should be in the\n"
 "                      format \"tag=value\".\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\n"
-" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
-"Files\n"
+" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or AIFF/C\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 "
-"additional\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 additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
 " In this mode, output is to stdout unless an output filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Použitie: oggenc [možnosti] vstup.wav [...]\n"
+"\n"
+"MOŽNOSTI:\n"
+" Všeobecné:\n"
+" -Q, --quiet          Neposielať žiadny výstup na stderr\n"
+" -h, --help           Vypísať tento pomocný text\n"
+" -r, --raw            Surový režim. Vstupné súbory sa čítajú priamo ako PCM údaje\n"
+" -B, --raw-bits=n     Nastaviť bity/vzorka pre surový vstup. Predvolene je 16\n"
+" -C, --raw-chan=n     Nastaviť počet kanálov pre surový vstup. Predvolene je 2\n"
+" -R, --raw-rate=n     Nastaviť vzorky/s pre surový vstup. Predvolene je 44100\n"
+" --raw-endianness     1 pre big endian, 0 pre little (predvolene je 0)\n"
+" -b, --bitrate        Výber cieľovej nominálnej bitovej rýchlosti.\n"
+"                      Pokúsi sa kódovať priemerne do tejto bitovej rýchlosti.\n"
+"                      Berie parameter v kb/s. Zvyčajne je výsledkom VBR.\n"
+"                      Inou možnosťou je použiť -q, --quality.\n"
+"                      Pozrite tiež možnosť --managed.\n"
+"--managed     Zapne systém správy bitovej rýchlosti. Umožňuje\n"
+"                      väčšiu presnosť dodržania želanej bitovej rýchlosti.\n"
+"                      Kódovanie však bude omnoho pomalšie.\n"
+"                      Ak nepotrebujete úplnú kontrolu nad bitovou rýchlosťou,\n"
+"                      napríklad pri streamingu, tak to nepoužívajte.\n"
+" -m, --min-bitrate    Zadanie minimálnej bitovej rýchlosti (v kb/s).\n"
+"                      Užitočné pre kódovanie pre kanál fixnej priepustnosti.\n"
+"                      Automaticky zapína voľbu --managed.\n"
+" -M, --max-bitrate    Zadanie maximálnej bitovej rýchlosti (v kb/s).\n"
+"                      Užitočné pre streaming.\n"
+"                      Automaticky zapína voľbu --managed.\n"
+" --advanced-encode-option option=hodnota\n"
+"                      Nastavuje pokročilú možnosť enkodéra na zadanú hodnotu.\n"
+"                      Platné možnosti (a ich hodnoty) sú zdokumentované\n"
+"                      v man stránkach tohto programu. Sú určené len pre\n"
+"                     skúsených používateľov a používajú sa opatrne.\n"
+" -q, --quality        Zadanie kvality medzi -1 (najnižšia) a 10 (najvyššia),\n"
+"                      namiesto zadávania konkrétnej bitovej rýchlosti.\n"
+"                      Toto je normálny režim práce.\n"
+"                      Možné sú aj hodnoty s desatinnou presnosťou\n"
+"                      (napr. 2.75). Predvolená hodnota je 3.\n"
+" --resample n         Prevzorkovať vstupné údaje na frekvenciu n (Hz)\n"
+" --downmix            Zmiešať stereo na mono. Povolené len pre\n"
+"                      stereo vstup.\n"
+" -s, --serial         Zadanie sériového čísla prúdu údajov.\n"
+"                   Keď se kóduje viacero súborov, zvýši sa pre každý\n"
+"                      prúd po tom prvom.\n"
+" --discard-comments    Zabráni preneseniu poznámok z FLAC\n"
+"                      a Ogg FLAC do výstupného súboru Ogg Vorbis.\n"
+" Pomenovanie:\n"
+" -o, --output=nz      Zapísať súbor do nz (platné len v režime jedného súboru)\n"
+" -n, --names=reťazec  Tvoriť názvy súborov ako tento reťazec,\n"
+"                      s %%a, %%t, %%l, kde %%n, %%d sa nahradí\n"
+"                      umelcom, resp. názvom, albumom, číslom stopy\n"
+"                      a dátumom (viz nižšie pre ich zadanie).\n"
+"                      %%%% dáva doslovné %%.\n"
+" -X, --name-remove=s  Odstrániť určené znaky z parametrov\n"
+"                     reťazca formátu -n. Vhodné pre zabezpečenie\n"
+"                    platných názvov súborov.\n"
+" -P, --name-replace=s Nahradiť znaky, ktoré odstránilo --name-remove\n"
+"                    pomocou zadaných znakov. Ak je tento reťazec kratší\n"
+"                    než zoznam --name-remove alebo nie je zadaný,\n"
+"                    prebytočné znaky sa jednoducho odstránia.\n"
+"                    Predvolené nastavenie pre obidva parametre závisia\n"
+"                    na jednotlivej platforme.\n"
+" -c, --comment=c      Pridať daný reťazec ako ďalšiu poznámku.\n"
+"                      Dá sa použiť viackrát. Parameter musí byť v tvare\n"
+"                      \"značka=hodnota\".\n"
+" -d, --date           Dátum pré túto stopu (zvyčajne dátum výkonu)\n"
+" -N, --tracknum       Číslo pre túto stopu\n"
+" -t, --title          Názov pre túto stopu\n"
+" -l, --album          Názov albumu\n"
+" -a, --artist         Meno umelca\n"
+" -G, --genre          Žáner stopy\n"
+"                      Ak sú zadané viaceré vstupné súbory, použije sa\n"
+"                      viacero inštancií predchádzajúcich 5 parametrov,\n"
+"                      v poradí ako boli zadané. Ak je zadaných menej\n"
+"                      názvov než súborov, OggEnc zobrazí varovanie\n"
+"                      a znovu použije posledný pre všetky zostávajúce\n"
+"                      súbory. Ak je zadaných menej čísel stopy, zvyšné\n"
+"                      súbory sa neočíslujú. Pre ostatné sa použije\n"
+"                      posledná zadaná značka, bez varovania (takže\n"
+"                      môžete napríklad zadať dátum, ktorý sa použije\n"
+"                      pre všetky súbory).\n"
+"\n"
+"VSTUPNÉ SÚBORY:\n"
+" Vstupné súbory OggEnc musia byť v súčasnosti 24-, 16- alebo\n"
+" 8-bitové PCM WAV, AIFF alebo AIFF/C, 32-bitové IEEE WAV\n"
+" s pohyblivou desatinnou čiarkou, alebo FLAC alebo Ogg FLAC.\n"
+" Súbory môžu byť mono alebo stereo (alebo viackanálové)\n"
+" s ľubovoľnou vzorkovacou frekvenciou. Dá sa tiež použiť prepínač\n"
+" --raw pre použitie surového súboru PCM údajov, ktorý musí byť\n"
+" 16-bitový stereo little edian PCM ('bezhlavičkový wav'),\n"
+" ak nie sú zadané ďalšie parametre pre surový režim.\n"
+" Ak zadáte - ako názov vstupného súboru, bude sa čítať zo stdin.\n"
+" V tomto režime ide výstup na stdout, ale môže ísť aj do súboru,\n"
+" ak zadáte normálny názov výstupného súboru pomocou -o\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: 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:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
+#: 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:661
+#: 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"
+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:664
+#: 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:671
+#: 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:677
+#: 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"
+msgstr "Varování: Frekvence převzorkování zadána jako %d Hz. Mysleli jste %d Hz?\n"
 
-#: oggenc/oggenc.c:687
+#: oggenc/oggenc.c:631
 #, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Varovanie: Neviem spracovať škálovací faktor \"%s\"\n"
 
-#: oggenc/oggenc.c:700
+#: 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:718
+#: 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:729
+#: 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:766
+#: 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:774
+#: 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:787
+#: 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:799
+#: 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:807
+#: 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"
+msgstr "VAROVÁNÍ: nastavení kvality příliš vysoké, nastavuji na maximální kvalitu.\n"
 
-#: oggenc/oggenc.c:813
+#: 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:822
+#: 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:831
+#: oggenc/oggenc.c:767
 #, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
+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:839
+#: 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:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 z %s %s\n"
-
-#: oggenc/oggenc.c:858
+#: 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"
+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"
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
+#: 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:874
+#: oggenc/oggenc.c:810
 #, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"VAROVÁNÍ: Přímý počet kanálů zadán po nepřímá data. Předpokládám, že vstup "
-"je přím.\n"
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "VAROVÁNÍ: Přímý počet kanálů zadán po nepřímá data. Předpokládám, že vstup je přím.\n"
 
-#: oggenc/oggenc.c:879
+#: 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:890
+#: 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"
+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"
 
-#: oggenc/oggenc.c:895
+#: 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:902
+#: 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:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Nemohu převést poznámku do UTF-8, nemohu ji přidat\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
+#: 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:954
+#: 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"
+msgstr "VAROVÁNÍ: Zadáno nedostatečně názvů, implicitně používám poslední název.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Nemohu vytvořit adresář \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Chyba při kontrole existence adresáře %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:167
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Chyba: segment cesty \"%s\" není adresář\n"
 
-#: ogginfo/ogginfo2.c:212
+#: ogginfo/ogginfo2.c:171
 #, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
-msgstr ""
-"Varovanie: Poznámka %d v prúde údajov %d má neplatný formát, neobsahuje '=': "
-"\"%s\"\n"
+msgid "Warning: Comment %d in stream %d has invalid format, does not contain '=': \"%s\"\n"
+msgstr "Varovanie: Poznámka %d v prúde údajov %d má neplatný formát, neobsahuje '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:220
+#: 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"
+msgstr "Varování: Neplatný název pole poznámky v poznámce %d (proud %d): \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: 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"
+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:266
+#: 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"
+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:342
-#, fuzzy, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Varování: Neplatná sekvence UTF-8 v poznámce %d (proud %d): neplatná "
-"sekvence\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:356
+#: 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:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Varování: EOS nenastaveno v proudu %d\n"
-
-#: ogginfo/ogginfo2.c:389
+#: ogginfo/ogginfo2.c:318
 #, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Varovanie: Nepodarilo sa dekódovať hlavičkový paket theora -  neplatný prúd "
-"údajov theora (%d)\n"
+msgid "Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr "Varovanie: Nepodarilo sa dekódovať hlavičkový paket theora -  neplatný prúd údajov theora (%d)\n"
 
-#: ogginfo/ogginfo2.c:396
+#: 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 ""
-"Varovanie: Prúd údajov theora %d nemá hlavičky správne rámcované. Posledná "
-"strana hlavičky obsahuje nadbytočné pakety alebo má nenulovú granulepos\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 "Varovanie: Prúd údajov theora %d nemá hlavičky správne rámcované. Posledná strana hlavičky obsahuje nadbytočné pakety alebo má nenulovú granulepos\n"
 
-#: ogginfo/ogginfo2.c:400
+#: ogginfo/ogginfo2.c:329
 #, c-format
 msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr ""
-"Hlavičky theora spracované pre prúd údajov %d, nasledujú informácie...\n"
+msgstr "Hlavičky theora spracované pre prúd údajov %d, nasledujú informácie...\n"
 
-#: ogginfo/ogginfo2.c:403
+#: ogginfo/ogginfo2.c:332
 #, c-format
 msgid "Version: %d.%d.%d\n"
 msgstr "Verzia:  %d.%d.%d\n"
 
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
 #, c-format
 msgid "Vendor: %s\n"
 msgstr "Dodavatel: %s\n"
 
-#: ogginfo/ogginfo2.c:406
+#: ogginfo/ogginfo2.c:335
 #, c-format
 msgid "Width: %d\n"
 msgstr "Šírka: %d\n"
 
-#: ogginfo/ogginfo2.c:407
+#: ogginfo/ogginfo2.c:336
 #, c-format
 msgid "Height: %d\n"
 msgstr "Výška: %d\n"
 
-#: ogginfo/ogginfo2.c:408
+#: ogginfo/ogginfo2.c:337
 #, c-format
 msgid "Total image: %d by %d, crop offset (%d, %d)\n"
 msgstr "Celkový obraz: %d o %d, orezať posun (%d, %d)\n"
 
-#: ogginfo/ogginfo2.c:411
+#: ogginfo/ogginfo2.c:340
 msgid "Frame offset/size invalid: width incorrect\n"
 msgstr "Neplatný posun/veľkosť rámca: nesprávna šírka\n"
 
-#: ogginfo/ogginfo2.c:413
+#: ogginfo/ogginfo2.c:342
 msgid "Frame offset/size invalid: height incorrect\n"
 msgstr "Neplatný posun/veľkosť rámca: nesprávna výška\n"
 
-#: ogginfo/ogginfo2.c:416
+#: ogginfo/ogginfo2.c:345
 msgid "Invalid zero framerate\n"
 msgstr "Neplatná nulová rýchlosť rámcov\n"
 
-#: ogginfo/ogginfo2.c:418
+#: ogginfo/ogginfo2.c:347
 #, c-format
 msgid "Framerate %d/%d (%.02f fps)\n"
 msgstr "Rýchlosť rámcov %d/%d (%.02f fps)\n"
 
-#: ogginfo/ogginfo2.c:422
+#: ogginfo/ogginfo2.c:351
 msgid "Aspect ratio undefined\n"
 msgstr "Pomer strán nebol definovaný\n"
 
-#: ogginfo/ogginfo2.c:427
+#: ogginfo/ogginfo2.c:356
 #, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:358
 msgid "Frame aspect 4:3\n"
 msgstr "Pomer strán 4:3\n"
 
-#: ogginfo/ogginfo2.c:431
+#: ogginfo/ogginfo2.c:360
 msgid "Frame aspect 16:9\n"
 msgstr "Pomer strán 16:9\n"
 
-#: ogginfo/ogginfo2.c:433
-#, fuzzy, c-format
-msgid "Frame aspect %f:1\n"
-msgstr "Pomer strán 4:3\n"
+#: ogginfo/ogginfo2.c:362
+#, c-format
+msgid "Frame aspect 1:%d\n"
+msgstr "Pomer strán 1:%d\n"
 
-#: ogginfo/ogginfo2.c:437
+#: ogginfo/ogginfo2.c:366
 msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
 msgstr "Farebný priestor: Rec. ITU-R BT.470-6 Systém M (NTSC)\n"
 
-#: ogginfo/ogginfo2.c:439
+#: ogginfo/ogginfo2.c:368
 msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
 msgstr "Farebný priestor: Rec. ITU-R BT.470-6 Systémy B a G (PAL)\n"
 
-#: ogginfo/ogginfo2.c:441
+#: ogginfo/ogginfo2.c:370
 msgid "Colourspace unspecified\n"
 msgstr "Nebol zadaný farebný priestor\n"
 
-#: ogginfo/ogginfo2.c:444
+#: ogginfo/ogginfo2.c:373
 msgid "Pixel format 4:2:0\n"
 msgstr "Formát pixelov 4:2:0\n"
 
-#: ogginfo/ogginfo2.c:446
+#: ogginfo/ogginfo2.c:375
 msgid "Pixel format 4:2:2\n"
 msgstr "Formát pixelov 4:2:2\n"
 
-#: ogginfo/ogginfo2.c:448
+#: ogginfo/ogginfo2.c:377
 msgid "Pixel format 4:4:4\n"
 msgstr "Formát pixelov 4:4:4\n"
 
-#: ogginfo/ogginfo2.c:450
+#: ogginfo/ogginfo2.c:379
 msgid "Pixel format invalid\n"
 msgstr "Neplatný formát pixelov\n"
 
-#: ogginfo/ogginfo2.c:452
+#: ogginfo/ogginfo2.c:381
 #, c-format
 msgid "Target bitrate: %d kbps\n"
 msgstr "Cieľová bitová rýchlosť: %d kb/s\n"
 
-#: ogginfo/ogginfo2.c:453
+#: ogginfo/ogginfo2.c:382
 #, c-format
 msgid "Nominal quality setting (0-63): %d\n"
 msgstr "Číselné nastavenie kvality (0-63): %d\n"
 
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
+#: 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:477
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Varování: EOS nenastaveno v proudu %d\n"
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "Varovanie: granulepos v prúde údajov %d sa znižuje z %I64d na %I64d"
 
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
 msgstr "Varovanie: granulepos v prúde údajov %d sa znižuje z %lld na %lld"
 
-#: ogginfo/ogginfo2.c:520
+#: ogginfo/ogginfo2.c:432
 msgid ""
 "Theora stream %d:\n"
-"\tTotal data length: %"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
+"Prúd údajov theora %d:\n"
+"\tCelková dĺžka údajov: %I64d bajtov\n"
+"\tPrehrávací čas: %ldm:%02ld.%03lds\n"
+"\tPriemerná bitová rýchlosť: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:438
+#, c-format
 msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Varování: Nemohu dekódovat paket hlavičky vorbis - neplatný proud vorbis (%"
-"d)\n"
+"Prúd údajov theora %d:\n"
+"\tCelková dĺžka údajov: %lld bajtov\n"
+"\tPrehrávací čas: %ldm:%02ld.%03lds\n"
+"\tPriemerná bitová rýchlosť: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:466
 #, 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"
-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"
+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:569
+#: ogginfo/ogginfo2.c:473
 #, 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"
+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: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:572
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Verze: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Dodavatel: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:492
 #, c-format
 msgid "Channels: %d\n"
 msgstr "Kanálů: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1849,207 +1486,96 @@
 "Frekvence: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Nominální bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Nominální bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Vyšší bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Vyšší bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Nižší bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Nižší bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:630
-#, fuzzy, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
-"Záporné granulepos na prúde údajov vorbis mimo hlavičiek. Tento súbor bol "
-"vytvorený chybným enkodérom\n"
+#: ogginfo/ogginfo2.c:539
+msgid "Negative granulepos on vorbis stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "Záporné granulepos na prúde údajov vorbis mimo hlavičiek. Tento súbor bol vytvorený chybným enkodérom\n"
 
-#: ogginfo/ogginfo2.c:651
+#: ogginfo/ogginfo2.c:561
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
+"Prúd údajov vorbis %d:\n"
+"\tCelková dĺžka údajov: %I64d bajtov\n"
+"\tPrehrávací čas: %ldm:%02ld.%03lds\n"
+"\tPriemerná bitová rýchlosť: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:692
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Varovanie: Nepodarilo sa dekódovať hlavičkový paket theora -  neplatný prúd "
-"údajov theora (%d)\n"
-
-#: ogginfo/ogginfo2.c:703
-#, fuzzy, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Varovanie: Nepodarilo sa dekódovať hlavičkový paket theora -  neplatný prúd "
-"údajov theora (%d)\n"
-
-#: ogginfo/ogginfo2.c:734
-#, fuzzy, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
-"Varovanie: Prúd údajov theora %d nemá hlavičky správne rámcované. Posledná "
-"strana hlavičky obsahuje nadbytočné pakety alebo má nenulovú granulepos\n"
-
-#: ogginfo/ogginfo2.c:738
-#, fuzzy, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr ""
-"Hlavičky theora spracované pre prúd údajov %d, nasledujú informácie...\n"
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Verzia:  %d.%d.%d\n"
-
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:567
 #, c-format
-msgid "Language: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Dodavatel: %s\n"
-
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
-msgid "No category set\n"
-msgstr "Nominální bitrate nenastavena\n"
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
-#, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
-#, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:783
-msgid "Unknown text directionality\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:795
-#, fuzzy
-msgid "Invalid zero granulepos rate\n"
-msgstr "Neplatná nulová rýchlosť rámcov\n"
-
-#: ogginfo/ogginfo2.c:797
-#, fuzzy, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr "Rýchlosť rámcov %d/%d (%.02f fps)\n"
-
-#: ogginfo/ogginfo2.c:810
-msgid "\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:828
-#, fuzzy, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Záporné granulepos na prúde údajov vorbis mimo hlavičiek. Tento súbor bol "
-"vytvorený chybným enkodérom\n"
+"Prúd údajov vorbis %d:\n"
+"\tCelková dĺžka údajov: %lld bajtov\n"
+"\tPrehrávací čas: %ldm:%02ld.%03lds\n"
+"\tPriemerná bitová rýchlosť: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
+#: 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:1048
+#: 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:1074
+#: 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:1088
+#: ogginfo/ogginfo2.c:770
 #, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-"Upozornenie: Prúd údajov %d má sériové číslo %d, čo je síce prípustné, ale "
-"môže spôsobiť problémy niektorým nástrojom,\n"
+msgid "Note: Stream %d has serial number %d, which is legal but may cause problems with some tools.\n"
+msgstr "Upozornenie: Prúd údajov %d má sériové číslo %d, čo je síce prípustné, ale môže spôsobiť problémy niektorým nástrojom,\n"
 
-#: ogginfo/ogginfo2.c:1105
-#, fuzzy
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-"Varovanie: V údajoch sa našla diera približne na pozícii %lld bajtov. "
-"Poškodený ogg.\n"
+#: ogginfo/ogginfo2.c:788
+msgid "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted ogg.\n"
+msgstr "Varovanie: V údajoch sa našla diera, približne na pozícii %l64d bajtov. Poškodený ogg.\n"
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:790
 #, c-format
+msgid "Warning: Hole in data found at approximate offset %lld bytes. Corrupted ogg.\n"
+msgstr "Varovanie: V údajoch sa našla diera približne na pozícii %lld bajtov. Poškodený ogg.\n"
+
+#: ogginfo/ogginfo2.c:815
+#, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Chyba pri otváraní vstupného súboru \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2058,27 +1584,23 @@
 "Spracúvam súbor \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Nepodarilo sa nájsť obsluhu pre prúd údajov, vzdávam sa\n"
 
-#: ogginfo/ogginfo2.c:1151
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr "Našla sa stránka pre prúd údajov po značke EOS"
 
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-"Obmedzenia pre Ogg muxing boli porušené, nový prúd údajov pred EOS všetkých "
-"predchádzajúcich prúdoch"
+#: ogginfo/ogginfo2.c:840
+msgid "Ogg muxing constraints violated, new stream before EOS of all previous streams"
+msgstr "Obmedzenia pre Ogg muxing boli porušené, nový prúd údajov pred EOS všetkých predchádzajúcich prúdoch"
 
-#: ogginfo/ogginfo2.c:1158
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr "Neznáma chyba."
 
-#: ogginfo/ogginfo2.c:1161
+#: ogginfo/ogginfo2.c:847
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -2087,64 +1609,55 @@
 "Varovanie: neplatné umiestnenie stránky v logickom prúde %d\n"
 "Vyzerá to na poškodený súbor ogg: %s.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Nový logický prúd údajov (#%d, sériové: %08x): typ %s\n"
 
-#: ogginfo/ogginfo2.c:1176
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
-msgstr ""
-"Varovanie: príznak začiatku prúdu údajov nebol nastavený na prúde údajov %d\n"
+msgstr "Varovanie: príznak začiatku prúdu údajov nebol nastavený na prúde údajov %d\n"
 
-#: ogginfo/ogginfo2.c:1180
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
-msgstr ""
-"Varovanie: príznak začiatku prúdu údajov sa našiel vnútri prúdu údajov %d\n"
+msgstr "Varovanie: príznak začiatku prúdu údajov sa našiel vnútri prúdu údajov %d\n"
 
-#: ogginfo/ogginfo2.c:1185
+#: 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 ""
-"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"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "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:1200
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Logický proud %d skončil\n"
 
-#: ogginfo/ogginfo2.c:1208
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:894
+#, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
+"Input probably not ogg.\n"
 msgstr ""
 "Chyba: V souboru \"%s\" nenalezena data ogg\n"
 "Vstup pravděpodobně není ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 z %s %s\n"
-
 # FIXME: s/files1/file1/
-#: ogginfo/ogginfo2.c:1225
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:905
+#, c-format
 msgid ""
+"ogginfo 1.1.0\n"
 "(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
 "\t-h Show this help message\n"
 "\t-q Make less verbose. Once will remove detailed informative\n"
 "\t   messages, two will remove warnings\n"
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
+"\n"
 msgstr ""
 "ogginfo 1.1.0\n"
 "(c) 2002-2005 Michael Smith <msmith at xiph.org>\n"
@@ -2158,17 +1671,12 @@
 "\t   pre niektoré typy prúdov údajov.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1234
+#: ogginfo/ogginfo2.c:926
 #, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, fuzzy, c-format
 msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
-"ogginfo is a tool for printing information about Ogg files\n"
+"Ogginfo is a tool for printing information about ogg files\n"
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
@@ -2178,7 +1686,7 @@
 "a pro diagnostiku problémů s nimi.\n"
 "Úplná nápověda je zobrazena pomocí \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
+#: 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"
@@ -2238,42 +1746,37 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: přepínač `-W %s' musí být zadán bez argumentu\n"
 
-#: vcut/vcut.c:149
+#: vcut/vcut.c:133
 #, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Chyba strany. Poškozený vstup.\n"
 
-#: vcut/vcut.c:166
+#: vcut/vcut.c:150
 #, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Chyba bitového proudu, pokračuji\n"
 
-#: vcut/vcut.c:206
+#: 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:215
+#: 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:225
+#: 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:277
+#: 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"
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr "Místo řezu není uvnitř proudu. Druhý soubor bude prázdný\n"
-
-#: vcut/vcut.c:353
+#: vcut/vcut.c:286
 #, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
@@ -2282,58 +1785,57 @@
 "CHYBA: První dva pakety zvuku se nevešly do jedné\n"
 "       strany ogg. Soubor se možná nebude dekódovat správně.\n"
 
-#: vcut/vcut.c:373
+#: vcut/vcut.c:299
 #, c-format
-msgid "Update sync returned 0, setting eos\n"
-msgstr "Aktualizace synchronizace vrátila 0, nastavuji eos\n"
-
-#: vcut/vcut.c:378
-#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Zotavitelná chyba bitového proudu\n"
 
-#: vcut/vcut.c:387
+#: vcut/vcut.c:309
 #, c-format
 msgid "Bitstream error\n"
 msgstr "Chyba bitového proudu\n"
 
-#: vcut/vcut.c:449
+#: 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:459
+#: vcut/vcut.c:391
 #, c-format
 msgid "Error in first page\n"
 msgstr "Chyba v první straně\n"
 
-#: vcut/vcut.c:464
+#: vcut/vcut.c:396
 #, c-format
 msgid "error in first packet\n"
 msgstr "chyba v prvním paketu\n"
 
-#: vcut/vcut.c:470
+#: 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:490
+#: vcut/vcut.c:422
 #, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Sekundární hlavička poškozena\n"
 
-#: vcut/vcut.c:503
+#: vcut/vcut.c:435
 #, c-format
 msgid "EOF in headers\n"
 msgstr "EOF v hlavičkách\n"
 
-#: vcut/vcut.c:535
+#: vcut/vcut.c:468
 #, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
 msgstr "Použitie: vcut vstup.ogg výstup1.ogg výstup2.ogg [ +bodrezu]\n"
 
-#: vcut/vcut.c:539
+#: vcut/vcut.c:472
 #, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
@@ -2344,704 +1846,201 @@
 "Zkontrolujte, že výstupní soubory jsou správné, před odstraněním zdrojů.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:477
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Nemohu otevřít %s pro čtení\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:482 vcut/vcut.c:487
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Nemohu otevřít %s pro zápis\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:493 vcut/vcut.c:498
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Nemohu zpracovat bod řezu \"%s\"\n"
 
-#: vcut/vcut.c:570
+#: vcut/vcut.c:503
 #, c-format
 msgid "Processing: Cutting at %lld seconds\n"
 msgstr "Spracúvam: Strihám %lld sekunde\n"
 
-#: vcut/vcut.c:572
+#: vcut/vcut.c:505
 #, c-format
 msgid "Processing: Cutting at %lld samples\n"
 msgstr "Spracúvam: Strihám na %lld vzorkách\n"
 
-#: vcut/vcut.c:582
+#: vcut/vcut.c:515
 #, c-format
 msgid "Processing failed\n"
 msgstr "Zpracování selhalo\n"
 
-#: vcut/vcut.c:604
+#: vcut/vcut.c:537
 #, c-format
 msgid "Error reading headers\n"
 msgstr "Chyba při čtení hlaviček\n"
 
-#: vcut/vcut.c:627
+#: 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:635
+#: 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"
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:229
+msgid "Input truncated or empty."
+msgstr "Vstup useknut nebo prázdný."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:231
+msgid "Input is not an Ogg bitstream."
+msgstr "Vstup není bitový proud Ogg."
+
+#: vorbiscomment/vcedit.c:249
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Chyba při čtení první strany bitového proudu Ogg."
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:255
 msgid "Error reading initial header packet."
 msgstr "Chyba při čtení prvního paketu hlavičky."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Vstup useknut nebo prázdný."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "Vstup není bitový proud Ogg."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:261
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Bitový proud ogg neobsahuje data vorbis."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "EOF před koncem hlaviček vorbis."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Bitový proud ogg neobsahuje data vorbis."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:284
 msgid "Corrupt secondary header."
 msgstr "Poškozená sekundární hlavička."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:305
 msgid "EOF before end of vorbis headers."
 msgstr "EOF před koncem hlaviček vorbis."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:458
 msgid "Corrupt or missing data, continuing..."
 msgstr "Poškozená nebo chybějící data, pokračuji..."
 
-#: vorbiscomment/vcedit.c:875
-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/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:190 vorbiscomment/vcomment.c:216
+#: 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:235
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Špatná poznámka: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "špatná poznámka: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:257
+#: 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"
 
-#: vorbiscomment/vcomment.c:274
+#: vorbiscomment/vcomment.c:192
 #, c-format
 msgid "no action specified\n"
 msgstr "neurčena žádná akce\n"
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
+#: vorbiscomment/vcomment.c:292
+#, fuzzy, c-format
 msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
-msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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 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 ""
+"Použití: \n"
+"  vorbiscomment [-l] soubor.ogg (pro vypsání poznámek)\n"
+"  vorbiscomment -a vstup.ogg výstup.ogg (pro připojení poznámek)\n"
+"  vorbiscomment -w vstup.ogg výstup.ogg (pro změnu poznámek)\n"
+"\tv případě zápisu je na stdin očekávána sada poznámek\n"
+"\tve tvaru 'ZNAČKA=hodnota'. Tato sada úplně nahradí\n"
+"\texistující sadu.\n"
+"   Jak -a, tak -w mohou dostat jen jeden název souboru,\n"
+"   v tom případě bude použit dočasný soubor.\n"
+"   -c může být použito pro vytvoření poznámek z určeného souboru\n"
+"   místo stdin.\n"
+"   Příklad: vorbiscomment -a vstup.ogg -c poznámky.txt\n"
+"   připojí poznámky v poznámky.txt do vstup.ogg\n"
+"   Konečně, můžete zadat jakýkoli počet značek, které přidat,\n"
+"   na příkazové řádce pomocí přepínače -t. Např.\n"
+"   vorbiscomment -a vstup.ogg -t \"ARTIST=Nějaký Chlapík\" -t \"TITLE=Název\"\n"
+"   (všimněte si, že při použití tohoto je čtení poznámek ze souboru\n"
+"   poznámek nebo stdin zakázáno)\n"
+"   Přímý režim (--raw, -R) bude číst a zapisovat poznámky v utf8,\n"
+"   místo jejich konverze do znakové sady uživatele. To je\n"
+"   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:391
+#: vorbiscomment/vcomment.c:376
 #, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Chybný typ v zozname prepínačov"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, 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:578
+#: 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:587
+#: 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"
+msgstr "Název vstupního souboru nemůže být stejný jako název výstupního souboru\n"
 
-#: vorbiscomment/vcomment.c:598
+#: 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:613
+#: 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:630
+#: 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:664
+#: 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:666
+#: 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"
 
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Chyba při odstraňování starého souboru %s\n"
-
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 z %s %s\n"
-#~ " od Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Použitie: ogg123 [<prepínače>] <vstupný súbor> ...\n"
-#~ "\n"
-#~ "  -h, --help     tento pomocný text\n"
-#~ "  -V, --version  zobraziť verziu Ogg123\n"
-#~ "  -d, --device=d používa 'd' ako výstupné zariadenie\n"
-#~ "      Možné zariadenia sú ('*'=živo, '@'=súbor):\n"
-#~ "        "
-
-#~ 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 (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"
-#~ "  -@, --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"
-#~ msgstr ""
-#~ "  -f, --file=názov súboru  Nastaviť názov súboru výstupu pre zariadenie\n"
-#~ "      súboru určené predtým (pomocou -d).\n"
-#~ "  -k n, --skip n  Preskočiť prvých 'n' sekúnd\n"
-#~ "  -o, --device-option=k:v odovzdáva špeciálny prepínač k s hodnotou\n"
-#~ "      v zariadeniu určenému predtým (pomocou -d). Ak chcete viac "
-#~ "informácií\n"
-#~ "      viz manuálovú stránku.\n"
-#~ "  -b n, --buffer n  používať vstupnú vyrovnávaciu pamäť 'n' kilobajtov\n"
-#~ "  -p n, --prebuffer n  načítať n%% vstupné vyrovnávacie pamäte pred "
-#~ "prehrávaním\n"
-#~ "  -v, --verbose  zobrazovať priebeh a iné stavové informácie\n"
-#~ "  -q, --quiet    nezobrazovať nič (žiadny názov)\n"
-#~ "  -x n, --nth    prehrávať každý 'n'tý blok\n"
-#~ "  -y n, --ntimes zopakovať každý prehrávaný blok 'n'-krát\n"
-#~ "  -z, --shuffle  pomiešať poradie prehrávania\n"
-#~ "\n"
-#~ "ogg123 preskočí na ďalšiu pieseň pri SIGINT (Ctrl-C); dva SIGINTy v "
-#~ "rámci\n"
-#~ "s milisekúnd spôsobí ukončenie ogg123.\n"
-#~ "  -l, --delay=s  nastaviť s [milisekúnd] (implicitne 500).\n"
-
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " 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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --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. 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. 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. 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"
-#~ "                      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"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times. The argument should be in the\n"
-#~ "                      format \"tag=value\".\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-#~ "AIFF/C\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 "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an output filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Použitie: oggenc [možnosti] vstup.wav [...]\n"
-#~ "\n"
-#~ "MOŽNOSTI:\n"
-#~ " Všeobecné:\n"
-#~ " -Q, --quiet          Neposielať žiadny výstup na stderr\n"
-#~ " -h, --help           Vypísať tento pomocný text\n"
-#~ " -r, --raw            Surový režim. Vstupné súbory sa čítajú priamo ako "
-#~ "PCM údaje\n"
-#~ " -B, --raw-bits=n     Nastaviť bity/vzorka pre surový vstup. Predvolene "
-#~ "je 16\n"
-#~ " -C, --raw-chan=n     Nastaviť počet kanálov pre surový vstup. Predvolene "
-#~ "je 2\n"
-#~ " -R, --raw-rate=n     Nastaviť vzorky/s pre surový vstup. Predvolene je "
-#~ "44100\n"
-#~ " --raw-endianness     1 pre big endian, 0 pre little (predvolene je 0)\n"
-#~ " -b, --bitrate        Výber cieľovej nominálnej bitovej rýchlosti.\n"
-#~ "                      Pokúsi sa kódovať priemerne do tejto bitovej "
-#~ "rýchlosti.\n"
-#~ "                      Berie parameter v kb/s. Zvyčajne je výsledkom VBR.\n"
-#~ "                      Inou možnosťou je použiť -q, --quality.\n"
-#~ "                      Pozrite tiež možnosť --managed.\n"
-#~ "--managed     Zapne systém správy bitovej rýchlosti. Umožňuje\n"
-#~ "                      väčšiu presnosť dodržania želanej bitovej "
-#~ "rýchlosti.\n"
-#~ "                      Kódovanie však bude omnoho pomalšie.\n"
-#~ "                      Ak nepotrebujete úplnú kontrolu nad bitovou "
-#~ "rýchlosťou,\n"
-#~ "                      napríklad pri streamingu, tak to nepoužívajte.\n"
-#~ " -m, --min-bitrate    Zadanie minimálnej bitovej rýchlosti (v kb/s).\n"
-#~ "                      Užitočné pre kódovanie pre kanál fixnej "
-#~ "priepustnosti.\n"
-#~ "                      Automaticky zapína voľbu --managed.\n"
-#~ " -M, --max-bitrate    Zadanie maximálnej bitovej rýchlosti (v kb/s).\n"
-#~ "                      Užitočné pre streaming.\n"
-#~ "                      Automaticky zapína voľbu --managed.\n"
-#~ " --advanced-encode-option option=hodnota\n"
-#~ "                      Nastavuje pokročilú možnosť enkodéra na zadanú "
-#~ "hodnotu.\n"
-#~ "                      Platné možnosti (a ich hodnoty) sú zdokumentované\n"
-#~ "                      v man stránkach tohto programu. Sú určené len pre\n"
-#~ "                     skúsených používateľov a používajú sa opatrne.\n"
-#~ " -q, --quality        Zadanie kvality medzi -1 (najnižšia) a 10 "
-#~ "(najvyššia),\n"
-#~ "                      namiesto zadávania konkrétnej bitovej rýchlosti.\n"
-#~ "                      Toto je normálny režim práce.\n"
-#~ "                      Možné sú aj hodnoty s desatinnou presnosťou\n"
-#~ "                      (napr. 2.75). Predvolená hodnota je 3.\n"
-#~ " --resample n         Prevzorkovať vstupné údaje na frekvenciu n (Hz)\n"
-#~ " --downmix            Zmiešať stereo na mono. Povolené len pre\n"
-#~ "                      stereo vstup.\n"
-#~ " -s, --serial         Zadanie sériového čísla prúdu údajov.\n"
-#~ "                   Keď se kóduje viacero súborov, zvýši sa pre každý\n"
-#~ "                      prúd po tom prvom.\n"
-#~ " --discard-comments    Zabráni preneseniu poznámok z FLAC\n"
-#~ "                      a Ogg FLAC do výstupného súboru Ogg Vorbis.\n"
-#~ " Pomenovanie:\n"
-#~ " -o, --output=nz      Zapísať súbor do nz (platné len v režime jedného "
-#~ "súboru)\n"
-#~ " -n, --names=reťazec  Tvoriť názvy súborov ako tento reťazec,\n"
-#~ "                      s %%a, %%t, %%l, kde %%n, %%d sa nahradí\n"
-#~ "                      umelcom, resp. názvom, albumom, číslom stopy\n"
-#~ "                      a dátumom (viz nižšie pre ich zadanie).\n"
-#~ "                      %%%% dáva doslovné %%.\n"
-#~ " -X, --name-remove=s  Odstrániť určené znaky z parametrov\n"
-#~ "                     reťazca formátu -n. Vhodné pre zabezpečenie\n"
-#~ "                    platných názvov súborov.\n"
-#~ " -P, --name-replace=s Nahradiť znaky, ktoré odstránilo --name-remove\n"
-#~ "                    pomocou zadaných znakov. Ak je tento reťazec kratší\n"
-#~ "                    než zoznam --name-remove alebo nie je zadaný,\n"
-#~ "                    prebytočné znaky sa jednoducho odstránia.\n"
-#~ "                    Predvolené nastavenie pre obidva parametre závisia\n"
-#~ "                    na jednotlivej platforme.\n"
-#~ " -c, --comment=c      Pridať daný reťazec ako ďalšiu poznámku.\n"
-#~ "                      Dá sa použiť viackrát. Parameter musí byť v tvare\n"
-#~ "                      \"značka=hodnota\".\n"
-#~ " -d, --date           Dátum pré túto stopu (zvyčajne dátum výkonu)\n"
-#~ " -N, --tracknum       Číslo pre túto stopu\n"
-#~ " -t, --title          Názov pre túto stopu\n"
-#~ " -l, --album          Názov albumu\n"
-#~ " -a, --artist         Meno umelca\n"
-#~ " -G, --genre          Žáner stopy\n"
-#~ "                      Ak sú zadané viaceré vstupné súbory, použije sa\n"
-#~ "                      viacero inštancií predchádzajúcich 5 parametrov,\n"
-#~ "                      v poradí ako boli zadané. Ak je zadaných menej\n"
-#~ "                      názvov než súborov, OggEnc zobrazí varovanie\n"
-#~ "                      a znovu použije posledný pre všetky zostávajúce\n"
-#~ "                      súbory. Ak je zadaných menej čísel stopy, zvyšné\n"
-#~ "                      súbory sa neočíslujú. Pre ostatné sa použije\n"
-#~ "                      posledná zadaná značka, bez varovania (takže\n"
-#~ "                      môžete napríklad zadať dátum, ktorý sa použije\n"
-#~ "                      pre všetky súbory).\n"
-#~ "\n"
-#~ "VSTUPNÉ SÚBORY:\n"
-#~ " Vstupné súbory OggEnc musia byť v súčasnosti 24-, 16- alebo\n"
-#~ " 8-bitové PCM WAV, AIFF alebo AIFF/C, 32-bitové IEEE WAV\n"
-#~ " s pohyblivou desatinnou čiarkou, alebo FLAC alebo Ogg FLAC.\n"
-#~ " Súbory môžu byť mono alebo stereo (alebo viackanálové)\n"
-#~ " s ľubovoľnou vzorkovacou frekvenciou. Dá sa tiež použiť prepínač\n"
-#~ " --raw pre použitie surového súboru PCM údajov, ktorý musí byť\n"
-#~ " 16-bitový stereo little edian PCM ('bezhlavičkový wav'),\n"
-#~ " ak nie sú zadané ďalšie parametre pre surový režim.\n"
-#~ " Ak zadáte - ako názov vstupného súboru, bude sa čítať zo stdin.\n"
-#~ " V tomto režime ide výstup na stdout, ale môže ísť aj do súboru,\n"
-#~ " ak zadáte normálny názov výstupného súboru pomocou -o\n"
-#~ "\n"
-
-#~ msgid "Frame aspect 1:%d\n"
-#~ msgstr "Pomer strán 1:%d\n"
-
-#~ msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-#~ msgstr "Varovanie: granulepos v prúde údajov %d sa znižuje z %I64d na %I64d"
-
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Prúd údajov theora %d:\n"
-#~ "\tCelková dĺžka údajov: %I64d bajtov\n"
-#~ "\tPrehrávací čas: %ldm:%02ld.%03lds\n"
-#~ "\tPriemerná bitová rýchlosť: %f kb/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 ""
-#~ "Prúd údajov theora %d:\n"
-#~ "\tCelková dĺžka údajov: %lld bajtov\n"
-#~ "\tPrehrávací čas: %ldm:%02ld.%03lds\n"
-#~ "\tPriemerná bitová rýchlosť: %f kb/s\n"
-
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Prúd údajov vorbis %d:\n"
-#~ "\tCelková dĺžka údajov: %I64d bajtov\n"
-#~ "\tPrehrávací čas: %ldm:%02ld.%03lds\n"
-#~ "\tPriemerná bitová rýchlosť: %f kb/s\n"
-
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %lld bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Prúd údajov vorbis %d:\n"
-#~ "\tCelková dĺžka údajov: %lld bajtov\n"
-#~ "\tPrehrávací čas: %ldm:%02ld.%03lds\n"
-#~ "\tPriemerná bitová rýchlosť: %f kb/s\n"
-
-#~ msgid ""
-#~ "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
-#~ "ogg.\n"
-#~ msgstr ""
-#~ "Varovanie: V údajoch sa našla diera, približne na pozícii %l64d bajtov. "
-#~ "Poškodený ogg.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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 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 ""
-#~ "Použití: \n"
-#~ "  vorbiscomment [-l] soubor.ogg (pro vypsání poznámek)\n"
-#~ "  vorbiscomment -a vstup.ogg výstup.ogg (pro připojení poznámek)\n"
-#~ "  vorbiscomment -w vstup.ogg výstup.ogg (pro změnu poznámek)\n"
-#~ "\tv případě zápisu je na stdin očekávána sada poznámek\n"
-#~ "\tve tvaru 'ZNAČKA=hodnota'. Tato sada úplně nahradí\n"
-#~ "\texistující sadu.\n"
-#~ "   Jak -a, tak -w mohou dostat jen jeden název souboru,\n"
-#~ "   v tom případě bude použit dočasný soubor.\n"
-#~ "   -c může být použito pro vytvoření poznámek z určeného souboru\n"
-#~ "   místo stdin.\n"
-#~ "   Příklad: vorbiscomment -a vstup.ogg -c poznámky.txt\n"
-#~ "   připojí poznámky v poznámky.txt do vstup.ogg\n"
-#~ "   Konečně, můžete zadat jakýkoli počet značek, které přidat,\n"
-#~ "   na příkazové řádce pomocí přepínače -t. Např.\n"
-#~ "   vorbiscomment -a vstup.ogg -t \"ARTIST=Nějaký Chlapík\" -t "
-#~ "\"TITLE=Název\"\n"
-#~ "   (všimněte si, že při použití tohoto je čtení poznámek ze souboru\n"
-#~ "   poznámek nebo stdin zakázáno)\n"
-#~ "   Přímý režim (--raw, -R) bude číst a zapisovat poznámky v utf8,\n"
-#~ "   místo jejich konverze do znakové sady uživatele. To je\n"
-#~ "   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"
-
 #~ msgid "Couldn't convert comment to UTF8, cannot add\n"
 #~ msgstr "Nemohu převést poznámku do UTF8, nemohu ji přidat\n"

Modified: trunk/vorbis-tools/po/sv.po
===================================================================
--- trunk/vorbis-tools/po/sv.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/sv.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -5,8 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vorbis-tools 0.99.1.3.1\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2002-02-05 10:31+0100\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,16 +13,18 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ogg123/buffer.c:117
-#, c-format
+#: ogg123/buffer.c:107
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Fel: Slut på minne i malloc_action().\n"
 
-#: ogg123/buffer.c:360
-#, c-format
+#: ogg123/buffer.c:338
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Fel: Kunde inte reservera minne i malloc_buffer_stats()\n"
 
+#: ogg123/buffer.c:357
+msgid "malloc"
+msgstr ""
+
 #: ogg123/callbacks.c:75
 msgid "Error: Device not available.\n"
 msgstr "Fel: Enhet inte tillgänglig.\n"
@@ -68,133 +69,129 @@
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Fel: Detta fel skall aldrig inträffa (%d). Panik!\n"
 
-#: ogg123/callbacks.c:125 ogg123/callbacks.c:130
+#: ogg123/callbacks.c:127 ogg123/callbacks.c:132
 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:174
+#: ogg123/callbacks.c:175
 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:233
+#: ogg123/callbacks.c:234
 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:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: ogg123/callbacks.c:280 ogg123/callbacks.c:299 ogg123/callbacks.c:336
+#: ogg123/callbacks.c:355
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
 msgstr "Fel: Slut på minne i decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Systemfel"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Tolkningsfel: %s på rad %d i %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Namn"
 
-#: ogg123/cfgfile_options.c:137
+#. Description
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ogg123/cfgfile_options.c:140
+#. Type
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Typ"
 
-#: ogg123/cfgfile_options.c:143
+#. Default
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Standardvärde"
 
-#: ogg123/cfgfile_options.c:169
-#, c-format
+#: ogg123/cfgfile_options.c:165
 msgid "none"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:172
-#, c-format
+#: ogg123/cfgfile_options.c:168
 msgid "bool"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:175
-#, c-format
+#: ogg123/cfgfile_options.c:171
 msgid "char"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:178
-#, c-format
+#: ogg123/cfgfile_options.c:174
 msgid "string"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:181
-#, c-format
+#: ogg123/cfgfile_options.c:177
 msgid "int"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:184
-#, c-format
+#: ogg123/cfgfile_options.c:180
 msgid "float"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:187
-#, c-format
+#: ogg123/cfgfile_options.c:183
 msgid "double"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:190
-#, c-format
+#: ogg123/cfgfile_options.c:186
 msgid "other"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:465 oggenc/oggenc.c:470
+#: oggenc/oggenc.c:475 oggenc/oggenc.c:480 oggenc/oggenc.c:485
+#: oggenc/oggenc.c:490
 msgid "(none)"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Lyckades"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Nyckel hittades inte"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Ingen nyckel"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Felaktigt värde"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Felaktig typ i argumentlista"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: ogg123/cmdline_options.c:83
-#, fuzzy
-msgid "Internal error parsing command line options.\n"
-msgstr "Internt fel vid tolkning av kommandoflaggor\n"
+#: ogg123/cmdline_options.c:69
+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"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:75
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "In-buffertens storlek mindre än minimistorkeken %dkB."
 
-#: ogg123/cmdline_options.c:102
+#: ogg123/cmdline_options.c:87
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
@@ -203,44 +200,44 @@
 "=== Fel \"%s\" under tolkning av konfigurationsflaggor från kommandoraden.\n"
 "=== Flaggan var: %s\n"
 
-#: ogg123/cmdline_options.c:109
-#, c-format
+#. not using the status interface here
+#: ogg123/cmdline_options.c:94
 msgid "Available options:\n"
 msgstr "Tillgängliga flaggor:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:103
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Ingen enhet %s.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:123
 #, 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:143
+#: ogg123/cmdline_options.c:128
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "== Kan inte ange utfil utan att ange drivrutin.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:143
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Felaktigt format på argument: %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:158
 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:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:173
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 från %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:180
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Kan inte spela var 0:te block!\n"
 
-#: ogg123/cmdline_options.c:216
+#: ogg123/cmdline_options.c:188
 msgid ""
 "--- Cannot play every chunk 0 times.\n"
 "--- To do a test decode, use the null output driver.\n"
@@ -248,636 +245,385 @@
 "--- 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:232
-#, fuzzy, c-format
-msgid "--- Cannot open playlist file %s.  Skipped.\n"
-msgstr "FEL: Kan inte öppna infil \"%s\": %s\n"
-
-#: ogg123/cmdline_options.c:248
-msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:215
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Drivrutin %s angiven i konfigurationsfil ogiltig.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Kunde inte ladda standard-drivrutin, och ingen är specificerad i "
-"konfigurationsfilen. Avslutar.\n"
+#: ogg123/cmdline_options.c:225
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Kunde inte ladda standard-drivrutin, och ingen är specificerad i konfigurationsfilen. Avslutar.\n"
 
-#: ogg123/cmdline_options.c:292
+#: ogg123/cmdline_options.c:246
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiphophorus Team (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 från %s %s\n"
+" av Xiphophorusgruppen (http://www.xiph.org/)\n"
+"\n"
+"Användning: ogg123 [<flaggor>] <infil> ...\n"
+"\n"
+"  -h, --help     den här hjälptexten\n"
+"  -V, --version  visa Ogg123:s version\n"
+"  -d, --device=d använd 'd' som ut-enhet\n"
+"      Möjliga enheter är ('*'=direkt, '@'=fil):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Tillgängliga flaggor:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:267
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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"
+"  -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"
 "\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"
 msgstr ""
+"  -f, --file=filename  Ange utfilens namn för tidigar vald \n"
+"        filenhet (med -d).\n"
+"  -k n, --skip n  Hoppa över de första n sekunderna\n"
+"  -o, --device-option=k:v vidarebefordra särskild\n"
+"        flagga k med värde v till tidigare vald enhet (med -d).\n"
+"        Se manualen för mer information.\n"
+"  -b n, --buffer n  använd en in-buffer på n kilobyte\n"
+"  -p n, --prebuffer n  ladda n%% av in-buffern innan uppspelning\n"
+"  -v, --verbose  visa framåtskridande och annan statusinformation\n"
+"  -q, --quiet    visa ingenting (ingen titel)\n"
+"  -x n, --nth    spela var n:te block\n"
+"  -y n, --ntimes upprepa varje spelat block n gånger\n"
+"  -z, --shuffle  spela i slumpvis ordning\n"
+"\n"
+"ogg123 hoppar till nästa spår om den får en SIGINT (Ctrl-C); två SIGINT\n"
+"inom s millisekunder gör att ogg123 avslutas.\n"
+"  -l, --delay=s  sätt s [millisekunder] (standard 500).\n"
 
-#: ogg123/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Fil: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Tillgängliga flaggor:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "Indata inte ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Beskrivning"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Tillgängliga flaggor:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:207
+#: ogg123/oggvorbis_format.c:109
 msgid "Error: Out of memory.\n"
 msgstr "Fel: Slut på minne.\n"
 
-#: ogg123/format.c:82
-#, c-format
+#: ogg123/format.c:59
 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:145
+#: ogg123/http_transport.c:119
+msgid "Error: Out of memory in new_curl_thread_arg().\n"
+msgstr "Fel: Slut på minne i new_curl_thread_arg().\n"
+
+#: ogg123/http_transport.c:144
 msgid "Error: Could not set signal mask."
 msgstr "Fel: Kunde inte sätta signalmask."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:196
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Fel: Kan inte skapa in-buffer\n"
 
-#: ogg123/ogg123.c:82
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:72
 msgid "default output device"
 msgstr "förvald utenhet"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:74
 msgid "shuffle playlist"
 msgstr "blanda spellistan"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
+#: ogg123/ogg123.c:255
+#, c-format
+msgid "\nDevice:   %s"
+msgstr "\nEnhet:    %s"
 
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Misslyckades med att hoppa över %f sekunder ljud."
-
-#: ogg123/ogg123.c:378
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Audio Device:   %s"
-msgstr ""
-"\n"
-"Enhet:    %s"
-
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:256
 #, c-format
 msgid "Author:   %s"
 msgstr "Författare:   %s"
 
-#: ogg123/ogg123.c:380
-#, fuzzy, c-format
-msgid "Comments: %s"
+#: ogg123/ogg123.c:257
+#, c-format
+msgid "Comments: %s\n"
 msgstr "Kommentarer: %s\n"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
-#, fuzzy, c-format
-msgid "Warning: Could not read directory %s.\n"
-msgstr "Kunde inte skapa katalog \"%s\": %s\n"
-
-#: ogg123/ogg123.c:460
+#: ogg123/ogg123.c:313
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Fel: Kan inte skapa ljudbuffer.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:387
 #, 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:561
+#: ogg123/ogg123.c:392
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Kan inte öppna %s.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:398
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Filformatet på %s stöds inte.\n"
 
-#: ogg123/ogg123.c:577
+#: ogg123/ogg123.c:405
 #, 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:596
+#: ogg123/ogg123.c:430
 #, c-format
 msgid "Playing: %s"
 msgstr "Spelar: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:435
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Misslyckades med att hoppa över %f sekunder ljud."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:473
 msgid "Error: Decoding failure.\n"
 msgstr "Fel: Avkodning misslyckades.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Fel: Fel på enhet %s.\n"
-
-#: ogg123/ogg123.c:743
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:546
 msgid "Done."
 msgstr "Klar."
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:50
+#, c-format
+msgid "Artist: %s"
+msgstr "Artist: %s"
+
+#: ogg123/oggvorbis_format.c:51
+#, c-format
+msgid "Album: %s"
+msgstr "Album: %s"
+
+#: ogg123/oggvorbis_format.c:52
+#, c-format
+msgid "Title: %s"
+msgstr "Titel: %s"
+
+#: ogg123/oggvorbis_format.c:53
+#, c-format
+msgid "Version: %s"
+msgstr "Version: %s"
+
+#: ogg123/oggvorbis_format.c:54
+#, c-format
+msgid "Track number: %s"
+msgstr "Spår: %s"
+
+#: ogg123/oggvorbis_format.c:55
+#, c-format
+msgid "Organization: %s"
+msgstr "Organisation: %s"
+
+#: ogg123/oggvorbis_format.c:56
+#, c-format
+msgid "Genre: %s"
+msgstr "Genre: %s"
+
+#: ogg123/oggvorbis_format.c:57
+#, c-format
+msgid "Description: %s"
+msgstr "Beskrivning: %s"
+
+#: ogg123/oggvorbis_format.c:58
+#, c-format
+msgid "Date: %s"
+msgstr "Datum: %s"
+
+#: ogg123/oggvorbis_format.c:59
+#, c-format
+msgid "Location: %s"
+msgstr "Plats: %s"
+
+#: ogg123/oggvorbis_format.c:60
+#, c-format
+msgid "Copyright %s"
+msgstr "Copyright %s"
+
+#: ogg123/oggvorbis_format.c:61
+#, c-format
+msgid "Comment: %s"
+msgstr "Kommentar: %s"
+
+#: ogg123/oggvorbis_format.c:170
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Hål i strömmen; antagligen ofarligt\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:176
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Vorbis-biblioteket rapporterade ett fel i strömmen.\n"
 
-#: ogg123/oggvorbis_format.c:310
-#, fuzzy, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr "Bitströmmen har %d kanal(er), %ldHz"
-
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:370
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr ""
+msgid "Version is %d"
+msgstr "Version %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:374
 #, 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"
+msgstr "Förslag för bithastigheter: övre=%ld nominell=%ld undre=%ld fönster=%ld"
 
-#: ogg123/oggvorbis_format.c:327
+#: ogg123/oggvorbis_format.c:382
 #, c-format
+msgid "Bitstream is %d channel, %ldHz"
+msgstr "Bitströmmen har %d kanal(er), %ldHz"
+
+#: ogg123/oggvorbis_format.c:387
+#, c-format
 msgid "Encoded by: %s"
 msgstr "Kodad av: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, fuzzy, c-format
-msgid "Error: Out of memory in create_playlist_member().\n"
-msgstr "Fel: Slut på minne i new_status_message_arg().\n"
-
-#: ogg123/playlist.c:222
+#: ogg123/status.c:47
 #, c-format
-msgid "Warning from playlist %s: Could not read directory %s.\n"
-msgstr ""
-
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
-#, fuzzy, c-format
-msgid "Error: Out of memory in playlist_to_array().\n"
-msgstr "Fel: Slut på minne i malloc_action().\n"
-
-#: ogg123/status.c:60
-#, fuzzy, c-format
-msgid "%sPrebuf to %.1f%%"
+msgid "%sPrebuf to %1.f%%"
 msgstr "%sFörbuffra %1.f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sPausad"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr ""
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
-#, c-format
+#: ogg123/status.c:191 ogg123/status.c:209 ogg123/status.c:223
+#: ogg123/status.c:237 ogg123/status.c:269 ogg123/status.c:288
 msgid "Memory allocation error in stats_init()\n"
 msgstr "Minnestilldelningsfel i stats_init()\n"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Tid: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "av %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Genomsnittlig bithastighet: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr " Inbuffer %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr " Utbuffer %5.1f%%"
 
-#: ogg123/transport.c:71
-#, c-format
+#: ogg123/transport.c:59
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr "Fel: Kunde inte reservera minne i malloc_data_source_stats()\n"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 från %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, fuzzy, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr "Användning: vcut infil.ogg utfil1.ogg utfil2.ogg skärpunkt\n"
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "FEL: Kan inte öppna infil \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "FEL: Kan inte öppna utfil \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Misslyckades att öppna fil som vorbis-typ: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Misslyckades att öppna infil \"%s\".\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"FEL: Ingen infil angiven. Använd -h för hjälp.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"FEL: Flera infiler med angivet utfilnamn: rekommenderar att använda -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:38
 msgid "WAV file reader"
 msgstr "WAV-filläsare"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:39
 msgid "AIFF/AIFC file reader"
 msgstr "AIFF/AIFC-filläsare"
 
-#: oggenc/audio.c:53
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "WAV-filläsare"
-
-#: oggenc/audio.c:54
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "WAV-filläsare"
-
-#: oggenc/audio.c:131 oggenc/audio.c:425
-#, c-format
+#: oggenc/audio.c:112 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Varning: Oväntad EOF under läsning av WAV-huvud\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:123
 #, 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:168
-#, c-format
+#: oggenc/audio.c:141
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Varning: Oväntad EOF i AIFF-block\n"
 
-#: oggenc/audio.c:254
-#, c-format
+#: oggenc/audio.c:226
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Varning: Ingen gemensamt block i AIFF-fil\n"
 
-#: oggenc/audio.c:260
-#, c-format
+#: oggenc/audio.c:232
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Varning: Stympat gemensamt block i AIFF-huvud\n"
 
-#: oggenc/audio.c:268
-#, c-format
+#: oggenc/audio.c:240
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Varning: Oväntad EOF under läsning av AIFF-huvud\n"
 
-#: oggenc/audio.c:283
-#, c-format
+#: oggenc/audio.c:253
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Varning: AIFF-C-huvud stympat.\n"
 
-#: oggenc/audio.c:297
-#, fuzzy, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
+#: oggenc/audio.c:258
+msgid "Warning: Can't handle compressed AIFF-C\n"
 msgstr "Varning: Kan inte hantera komprimerad AIFF-C\n"
 
-#: oggenc/audio.c:304
-#, c-format
+#: oggenc/audio.c:265
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Varning: Hittar inget SSND-block i AIFF-fil\n"
 
-#: oggenc/audio.c:310
-#, c-format
+#: oggenc/audio.c:271
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Varning: Felaktigt SSND-block i AIFF-huvud\n"
 
-#: oggenc/audio.c:316
-#, c-format
+#: oggenc/audio.c:277
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Varinig: Oväntad EOF under läsning av AIFF-huvud\n"
 
-#: oggenc/audio.c:353
+#: oggenc/audio.c:290 oggenc/audio.c:417
 #, c-format
 msgid ""
+"Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
+" At other than 44.1/48 kHz quality will be degraded.\n"
+msgstr ""
+"Varning: Vorbis är för närvarande inte justerad för denna\n"
+"samplingsfrekvens på in-data (%.3f kHz).  Kvaliteten blir försämrad\n"
+"vid annan frekvens än 44.1/48 kHz.\n"
+
+#: oggenc/audio.c:314
+msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\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:407
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Varning: okänt format på block i Wav-huvud\n"
 
-#: oggenc/audio.c:420
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -885,1218 +631,536 @@
 "Varning: OGILTIGT format på block i wav-huvud.\n"
 " Försöker läsa i alla fall (kanske inte fungerar)...\n"
 
-#: oggenc/audio.c:458
-#, c-format
+#: oggenc/audio.c:406
 msgid ""
 "ERROR: Wav file is unsupported type (must be standard PCM\n"
-" or type 3 floating point PCM)\n"
+" or type 3 floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:467
-#, c-format
+#: oggenc/audio.c:460
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 16 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
 
-#: oggenc/audio.c:528
+#: oggenc/audio.c:558
 #, c-format
 msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
+"Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
+" At other than 44.1/48 kHz quality will be significantly degraded.\n"
 msgstr ""
+"Varning: Vorbis är för närvarande inte justerad för denna\n"
+" samplingsfrekvens (%.3f kHz). Vid andra än 44.1 eller 48 kHz blir\n"
+" kvaliteten påtagligt försämrad.\n"
 
-#: oggenc/audio.c:604
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:624
-#, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:630
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:732
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-
-#: oggenc/audio.c:750
-#, c-format
-msgid "Couldn't initialise resampler\n"
-msgstr ""
-
-#: oggenc/encode.c:64
-#, c-format
-msgid "Setting advanced encoder option \"%s\" to %s\n"
-msgstr ""
-
-#: oggenc/encode.c:101
-#, c-format
-msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
-msgstr ""
-
-#: oggenc/encode.c:104
-#, fuzzy, c-format
-msgid "Unrecognised advanced option \"%s\"\n"
-msgstr "%s: okänd flagga \"--%s\"\n"
-
-#: oggenc/encode.c:111
-#, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:115 oggenc/encode.c:252
-#, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-
-#: oggenc/encode.c:182
-#, c-format
-msgid "Requesting a minimum or maximum bitrate requires --managed\n"
-msgstr ""
-
-#: oggenc/encode.c:200
-#, c-format
+#: oggenc/encode.c:59
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 
-#: oggenc/encode.c:245
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:247
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:263
-#, c-format
+#: oggenc/encode.c:71
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:110
 msgid "Failed writing header to output stream\n"
 msgstr "Mislyckades att skriva huvud till utströmmen\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:178
 msgid "Failed writing data to output stream\n"
 msgstr "Misslyckades att skriva data till utströmmen\n"
 
-#: oggenc/encode.c:472
-#, fuzzy, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
+#: oggenc/encode.c:224
+#, c-format
+msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c"
 msgstr "\t[%5.1f%%] [%2dm%.2ds återstår] %c"
 
-#: oggenc/encode.c:482
-#, fuzzy, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+#: oggenc/encode.c:234
+#, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr "\tKodar [%2dm%.2ds hittills] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:252
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Done encoding file \"%s\"\n"
-msgstr ""
-"\n"
-"\n"
-"Kodning av \"%s\" klar\n"
+msgid "\n\nDone encoding file \"%s\"\n"
+msgstr "\n\nKodning av \"%s\" klar\n"
 
-#: oggenc/encode.c:502
-#, c-format
-msgid ""
-"\n"
-"\n"
-"Done encoding.\n"
-msgstr ""
-"\n"
-"\n"
-"Kodning klar.\n"
+#: oggenc/encode.c:254
+msgid "\n\nDone encoding.\n"
+msgstr "\n\nKodning klar.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:258
 #, c-format
-msgid ""
-"\n"
-"\tFile length:  %dm %04.1fs\n"
-msgstr ""
-"\n"
-"\tFillängd:  %dm %04.1fs\n"
+msgid "\n\tFile length:  %dm %04.1fs\n"
+msgstr "\n\tFillängd:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:262
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tFörlupen tid: %dm %04.1fs\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:265
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tFörhålland:         %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:266
 #, c-format
-msgid ""
-"\tAverage bitrate: %.1f kb/s\n"
-"\n"
-msgstr ""
-"\tGenomsnittlig bithastighet: %.1f kb/s\n"
-"\n"
+msgid "\tAverage bitrate: %.1f kb/s\n\n"
+msgstr "\tGenomsnittlig bithastighet: %.1f kb/s\n\n"
 
-#: oggenc/encode.c:551
-#, fuzzy, c-format
+#: oggenc/encode.c:290
+#, c-format
 msgid ""
 "Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at average bitrate %d kbps "
+"         %s%s%s at quality %2.2f\n"
 msgstr ""
 "Kodar %s%s%s till \n"
 "         %s%s%s med kvalitet %2.2f\n"
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:291 oggenc/encode.c:298
 msgid "standard input"
 msgstr "standard in"
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:292 oggenc/encode.c:299
 msgid "standard output"
 msgstr "standard ut"
 
-#: oggenc/encode.c:559
-#, fuzzy, c-format
+#: oggenc/encode.c:295
+#, c-format
 msgid ""
 "Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at approximate bitrate %d kbps (VBR encoding enabled)\n"
+"         %s%s%s at bitrate %d kbps,\n"
+"using full bitrate management engine\n"
 msgstr ""
 "Kodar %s%s%s till\n"
 "         %s%s%s med bithastighet %d kbps,\n"
 "med komplett bithastighethanteringsmotor\n"
 
-#: oggenc/encode.c:567
-#, fuzzy, c-format
+#: oggenc/oggenc.c:90
+#, c-format
 msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at quality level %2.2f using constrained VBR "
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
-"Kodar %s%s%s till \n"
-"         %s%s%s med kvalitet %2.2f\n"
-
-#: oggenc/encode.c:574
-#, fuzzy, c-format
-msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at quality %2.2f\n"
-msgstr ""
-"Kodar %s%s%s till \n"
-"         %s%s%s med kvalitet %2.2f\n"
-
-#: oggenc/encode.c:580
-#, fuzzy, c-format
-msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"using bitrate management "
-msgstr ""
-"Kodar %s%s%s till\n"
-"         %s%s%s med bithastighet %d kbps,\n"
-"med komplett bithastighethanteringsmotor\n"
-
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
-msgstr ""
 "%s%s\n"
 "FEL: Ingen infil angiven. Använd -h för hjälp.\n"
 
-#: oggenc/oggenc.c:118
-#, c-format
+#: oggenc/oggenc.c:105
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "FEL: Flera filer angivna med stdin\n"
 
-#: oggenc/oggenc.c:125
-#, 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:112
+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:186
+#: oggenc/oggenc.c:166
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "FEL: Kan inte öppna infil \"%s\": %s\n"
 
-#: oggenc/oggenc.c:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "WAV-filläsare"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:193
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Öppnar med %s-modul: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:202
 #, 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:280
-#, c-format
+#: oggenc/oggenc.c:249
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "VARNING: Inget filnamn, använder förvalt namn \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:257
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+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:295
-#, 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:306
+#: oggenc/oggenc.c:268
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "FEL: Kan inte öppna utfil \"%s\": %s\n"
 
-#: oggenc/oggenc.c:350
-#, c-format
-msgid "Resampling input from %d Hz to %d Hz\n"
-msgstr ""
-
-#: oggenc/oggenc.c:357
-#, c-format
-msgid "Downmixing stereo to mono\n"
-msgstr ""
-
-#: oggenc/oggenc.c:360
-#, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
-msgstr ""
-
-#: oggenc/oggenc.c:368
-#, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 från %s %s\n"
-
-#: oggenc/oggenc.c:416
-#, c-format
+#: oggenc/oggenc.c:316
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"WARNING: Usage of the bitrate options (-b, -m, -M) has been deprecated\n"
+"To use these, you must specify that you wish to use managed mode, using\n"
+"the --managed option.\n"
+"This will cause oggenc to enable the full bitrate management engine.\n"
+"You should do this ONLY if bitrate management is critical to your usage\n"
+"(for example, certain audio streaming applications).\n"
+"Usage of the bitrate management engine will generally decrease quality,\n"
+"using the normal fully VBR modes (quality specified using -q) is\n"
+"very highly recommended for most users.\n"
+"Usage of the -managed option will become MANDATORY in the next release.\n"
 "\n"
 msgstr ""
 
-#: oggenc/oggenc.c:417
+#: oggenc/oggenc.c:331
 #, c-format
 msgid ""
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
+"\n"
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\n"
-" --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
+" -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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\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. 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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
+"                      argument in kbps.\n"
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-"                      encoding for a fixed-size channel. Using this will\n"
-"                      automatically enable managed bitrate mode (see\n"
-"                      --managed).\n"
+"                      encoding for a fixed-size channel.\n"
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
-"                      streaming applications. Using this will automatically\n"
-"                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
-" -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
-"                      high), instead of specifying a particular bitrate.\n"
+"                      streaming applications.\n"
+" -q, --quality        Specify quality between 0 (low) and 10 (high),\n"
+"                      instead of specifying a particular bitrate.\n"
 "                      This is the normal mode of operation.\n"
 "                      Fractional qualities (e.g. 2.75) are permitted\n"
-"                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
-" --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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
-" --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
-"                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
-"                      used multiple times. The argument should be in the\n"
-"                      format \"tag=value\".\n"
+"                      used multiple times.\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\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 "
-"additional\n"
+" OggEnc input files must currently be 16 or 8 bit PCM WAV, AIFF, or AIFF/C\n"
+" files. Files may be mono or stereo (or more channels) and any sample rate.\n"
+" However, the encoder is only tuned for rates of 44.1 and 48 kHz and while\n"
+" other rates will be accepted quality will be significantly degraded.\n"
+" Alternatively, the --raw option may be used to use a raw PCM data file, which\n"
+" must be 16bit stereo little-endian PCM ('headerless wav'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
-" In this mode, output is to stdout unless an output filename is specified\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
+" In this mode, output is to stdout unless an outfile filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Användning: oggenc [flaggor] infil.wav [...]\n"
+"\n"
+"FLAGGOR:\n"
+" Allmänna:\n"
+" -Q, --quiet          Skriv inte på stderr\n"
+" -h, --help           Visa denna hjälptext\n"
+" -r, --raw            Rå-läge. Infiler läses direkt som PCM-data\n"
+" -B, --raw-bits=n     Välj bitar/sample för rå-indata. Standardväre är 16\n"
+" -C, --raw-chan=n     Välj antal kanaler för rå-indata. Standardväre är 2\n"
+" -R, --raw-rate=n     Välj samples/sekund för rå-indata. Standardväre är 44100\n"
+" -b, --bitrate        Välj en nominell bithastighet att koda\n"
+"                      i. Försöker koda med en bithastighet som i\n"
+"                      genomsnitt blir denna. Tar ett argument i kbps.\n"
+" -m, --min-bitrate    Ange minimal bithastighet (i kbps). Användbart\n"
+"                      för att koda för en kanal med bestämd storlek.\n"
+" -M, --max-bitrate    Ange maximal bithastighet (i kbps).  Andvändbart\n"
+"                      för strömmande applikationer.\n"
+" -q, --quality        Ange kvalitet mellan 0 (låg) och 10 (hög),\n"
+"                      istället för att ange särskilda bithastigheter.\n"
+"                      Detta är det normala arbetssättet. Kvalitet i\n"
+"                      bråkdelar (t.ex. 2.75) går bra.\n"
+" -s, --serial         Ange ett serienummer för strömmen. Om flera\n"
+"                      filer kodas kommer detta att ökas för varje\n"
+"                      ström efter den första.\n"
+"\n"
+" Namngivning:\n"
+" -o, --output=fn      Skriv till fil fn (endast giltig för enstaka fil)\n"
+" -n, --names=sträng   Skapa filer med namn enligt sträng, med  %%a, %%t, %%l,\n"
+"                      %%n, %%d ersatta med artist, titel, album, spår\n"
+"                      respektive datum (se nedan för att ange\n"
+"                      dessa). %%%% ger ett bokstavligt %%.\n"
+" -X, --name-remove=s  Ta bort angivna tecken från parametrarna till\n"
+"                      formatsträngen för -n. Bra för att försäkra sig\n"
+"                      om giltiga filnamn.\n"
+" -P, --name-replace=s Ersätt tecken borttagna av --name-remove med\n"
+"                      angivet tecken.  Om denna sträng är kortare än\n"
+"                      listan till --name-remove, eller utelämnad, tas\n"
+"                      extra tecken bort.\n"
+"                      Förvalda värden för de två ovanstående\n"
+"                      argumenten beror på plattformen.\n"
+" -c, --comment=c      Lägg till argumentsträngen som en extra\n"
+"                      kommentar.  Kan användas flrea gånger.\n"
+" -d, --date           Datum för spåret (vanligtvis datum för framträdande)\n"
+" -N, --tracknum       Spårnummer för detta spår\n"
+" -t, --title          Titel för detta spår\n"
+" -l, --album          Namn på albumet\n"
+" -a, --artist         Namn på artisten\n"
+" -G, --genre          Spårets genre\n"
+"                      Om flera infiler anges kommer flera fall av de\n"
+"                      fem föregående flaggorna användas i given\n"
+"                      orgdning. Om antalet titlar är färre än antalet\n"
+"                      infiler visar OggEnc en varning och återanvänder\n"
+"                      det sista argumentet. Om antalet spårnummer är\n"
+"                      färre blir de resterande filerna onumrerade. För\n"
+"                      övriga flaggor återanvänds den sista taggen utan\n"
+"                      varning (så att du t.ex. kan ange datum en gång\n"
+"                      och använda det för alla filer).\n"
+"\n"
+"INFILER:\n"
+" Infiler till OggEnc måste för närvarande vara 16 eller 8 bitar RCM\n"
+" WAV, AIFF eller AIFF/C.  De kan vara mono eller stereo (eller fler\n"
+" kanaler) med godtycklig samplingshastighet.  Dock är kodaren bara\n"
+" justerad för 44.1 och 48 kHz samplingshastighet, och även om andra\n"
+" hastigheter accepteras blir kvaliteten påtagligt\n"
+" försämrad. Alternativt kan flaggan --raw användas för att använda en\n"
+" file med rå PCM-data, vilken måste vara 16 bitar stereo little-endian\n"
+" PCM ('headerless wav') om inte ytterligare flaggor för rå-läge\n"
+" används.\n"
+" Du kan läsa från stdin genom att ange - som namn för infilen. I detta\n"
+" läge går utdata till stdout om inget filnamn anges med -o\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:495
 #, 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:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
-#, c-format
+#: oggenc/oggenc.c:518
 msgid "Enabling bitrate management engine\n"
 msgstr ""
 
-#: oggenc/oggenc.c:661
-#, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:664
-#, c-format
-msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:671
-#, c-format
-msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:677
-#, c-format
-msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
-msgstr ""
-
-#: oggenc/oggenc.c:687
-#, fuzzy, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Kunde inte tolka skärpunkt \"%s\"\n"
-
-#: oggenc/oggenc.c:700
-#, c-format
-msgid "No value for advanced encoder option found\n"
-msgstr ""
-
-#: oggenc/oggenc.c:718
-#, c-format
+#: oggenc/oggenc.c:522
 msgid "Internal error parsing command line options\n"
 msgstr ""
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:569
 #, c-format
-msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:766
-#, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:582
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:594
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:600
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr ""
 
-#: oggenc/oggenc.c:807
-#, c-format
+#: oggenc/oggenc.c:607
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:813
-#, c-format
+#: oggenc/oggenc.c:612
+msgid "WARNING: negative quality specified, setting to minimum.\n"
+msgstr ""
+
+#: oggenc/oggenc.c:618
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:822
-#, c-format
+#: oggenc/oggenc.c:627
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:831
-#, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
+#: oggenc/oggenc.c:636
+msgid "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:839
-#, c-format
+#: oggenc/oggenc.c:644
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 från %s %s\n"
-
-#: oggenc/oggenc.c:858
-#, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:663
+msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
-#, c-format
+#. Failed, so just set to 16
+#: oggenc/oggenc.c:668 oggenc/oggenc.c:672
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:874
-#, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
+#: oggenc/oggenc.c:679
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:879
-#, c-format
+#. Failed, so just set to 2
+#: oggenc/oggenc.c:684
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:890
-#, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+#: oggenc/oggenc.c:695
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:895
-#, c-format
+#. Failed, so just set to 44100
+#: oggenc/oggenc.c:700
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:902
-#, c-format
+#: oggenc/oggenc.c:704
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr ""
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr ""
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
-#, c-format
+#: oggenc/oggenc.c:726
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:954
-#, c-format
+#: oggenc/oggenc.c:745
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:139
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Kunde inte skapa katalog \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:146
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr ""
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:157
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:212
+#: ogginfo/ogginfo.c:33
 #, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
-msgstr ""
+msgid "Usage: %s [filename1.ogg] ... [filenameN.ogg]\n"
+msgstr "Användning: %s [filenamn1.ogg] ... [filenamnN.ogg]\n"
 
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo.c:38
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
+msgid "filename=%s\n"
+msgstr "filenamn=%s\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo.c:68
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:266
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:342
-#, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:356
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:389
-#, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:396
-#, 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:400
-#, c-format
-msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:403
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Version: %s"
-
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
-#, fuzzy, c-format
-msgid "Vendor: %s\n"
+msgid "vendor=%s\n"
 msgstr "säljare=%s\n"
 
-#: ogginfo/ogginfo2.c:406
+#: ogginfo/ogginfo.c:70
 #, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, c-format
-msgid "Height: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:408
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:416
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:429
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:431
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:433
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:437
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:439
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:441
-msgid "Colourspace unspecified\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:444
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:446
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:448
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:450
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:452
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr ""
-"\tGenomsnittlig bithastighet: %.1f kb/s\n"
-"\n"
-
-#: ogginfo/ogginfo2.c:453
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
-msgid "User comments section follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:477
-msgid "Warning: Expected frame %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:520
 msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
+"version=%d\n"
+"channels=%d\n"
+"rate=%ld\n"
 msgstr ""
+"version=%d\n"
+"kanaler=%d\n"
+"hastighet=%ld\n"
 
-#: ogginfo/ogginfo2.c:557
-#, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
+#: ogginfo/ogginfo.c:75
+msgid "bitrate_upper="
 msgstr ""
 
-#: ogginfo/ogginfo2.c:565
-#, 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"
+#: ogginfo/ogginfo.c:77 ogginfo/ogginfo.c:83 ogginfo/ogginfo.c:89
+msgid "none\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:569
-#, c-format
-msgid "Vorbis headers parsed for stream %d, information follows...\n"
-msgstr ""
+#: ogginfo/ogginfo.c:81
+msgid "bitrate_nominal="
+msgstr "nominell bithastighet="
 
-#: ogginfo/ogginfo2.c:572
-#, fuzzy, c-format
-msgid "Version: %d\n"
-msgstr "Version: %s"
+#: ogginfo/ogginfo.c:87
+msgid "bitrate_lower="
+msgstr "undre bithastighet="
 
-#: ogginfo/ogginfo2.c:576
-#, fuzzy, c-format
-msgid "Vendor: %s (%s)\n"
-msgstr "säljare=%s\n"
-
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo.c:91
 #, c-format
-msgid "Channels: %d\n"
+msgid "%ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:585
-#, fuzzy, c-format
-msgid ""
-"Rate: %ld\n"
-"\n"
-msgstr "Datum: %s"
-
-#: ogginfo/ogginfo2.c:588
-#, fuzzy, c-format
-msgid "Nominal bitrate: %f kb/s\n"
-msgstr ""
-"\tGenomsnittlig bithastighet: %.1f kb/s\n"
-"\n"
-
-#: ogginfo/ogginfo2.c:591
-msgid "Nominal bitrate not set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:594
-#, fuzzy, c-format
-msgid "Upper bitrate: %f kb/s\n"
-msgstr ""
-"\tGenomsnittlig bithastighet: %.1f kb/s\n"
-"\n"
-
-#: ogginfo/ogginfo2.c:597
-msgid "Upper bitrate not set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:600
-#, fuzzy, c-format
-msgid "Lower bitrate: %f kb/s\n"
-msgstr ""
-"\tGenomsnittlig bithastighet: %.1f kb/s\n"
-"\n"
-
-#: ogginfo/ogginfo2.c:603
-msgid "Lower bitrate not set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo.c:100
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
+msgid "bitrate_average=%ld\n"
+msgstr "genomsnittlig bithastighet=%ld\n"
 
-#: ogginfo/ogginfo2.c:651
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:692
+#: ogginfo/ogginfo.c:101
 #, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
+msgid "length=%f\n"
+msgstr "längd=%f\n"
 
-#: ogginfo/ogginfo2.c:703
+#: ogginfo/ogginfo.c:102
 #, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
+msgid "playtime=%ld:%02ld\n"
+msgstr "speltid=%ld:%02ld\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo.c:300
 #, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
+msgid "Unable to open \"%s\": %s\n"
+msgstr "Kan inte öppna \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:738
+#: ogginfo/ogginfo.c:319
 #, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
+msgid "\nserial=%ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Version: %s"
-
-#: ogginfo/ogginfo2.c:747
-#, c-format
-msgid "Language: %s\n"
+#: ogginfo/ogginfo.c:320
+msgid "header_integrity=pass\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:750
-msgid "No language set\n"
+#: ogginfo/ogginfo.c:323
+msgid "header_integrity=fail\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Datum: %s"
-
-#: ogginfo/ogginfo2.c:756
-msgid "No category set\n"
+#: ogginfo/ogginfo.c:328
+msgid "stream_integrity=pass\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
+#: ogginfo/ogginfo.c:331
+msgid "stream_integrity=fail\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:765
-#, c-format
-msgid "Character encoding: %s\n"
+#: ogginfo/ogginfo.c:334
+msgid "stream_truncated=false\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:768
-msgid "Unknown character encoding\n"
+#: ogginfo/ogginfo.c:336
+msgid "stream_truncated=true\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo.c:344
 #, c-format
-msgid "Text directionality: %s\n"
+msgid "\ntotal_length=%f\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:783
-msgid "Unknown text directionality\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:795
-msgid "Invalid zero granulepos rate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:797
+#: ogginfo/ogginfo.c:345
 #, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
+msgid "total_playtime=%ld:%02ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:810
-msgid "\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:828
-#, c-format
-msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
-#, c-format
-msgid "Warning: EOS not set on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1048
-msgid "Warning: Invalid header page, no packet found\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1074
-#, c-format
-msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1088
-#, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1105
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1129
-#, fuzzy, c-format
-msgid "Error opening input file \"%s\": %s\n"
-msgstr "Misslyckades att öppna infil \"%s\".\n"
-
-#: ogginfo/ogginfo2.c:1134
-#, fuzzy, c-format
-msgid ""
-"Processing file \"%s\"...\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"Kodning av \"%s\" klar\n"
-
-#: ogginfo/ogginfo2.c:1143
-#, 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:1151
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1158
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1161
-#, 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:1173
-#, c-format
-msgid "New logical stream (#%d, serial: %08x): type %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1176
-#, c-format
-msgid "Warning: stream start flag not set on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1180
-#, c-format
-msgid "Warning: stream start flag found in mid-stream on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1185
-#, 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:1200
-#, c-format
-msgid "Logical stream %d ended\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1208
-#, c-format
-msgid ""
-"Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 från %s %s\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, c-format
-msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
-"\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
-"Flags supported:\n"
-"\t-h Show this help message\n"
-"\t-q Make less verbose. Once will remove detailed informative\n"
-"\t   messages, two will remove warnings\n"
-"\t-v Make more verbose. This may enable more detailed checks\n"
-"\t   for some stream types.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1234
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, c-format
-msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
-"\n"
-"ogginfo is a tool for printing information about Ogg files\n"
-"and for diagnosing problems with them.\n"
-"Full help shown with \"ogginfo -h\".\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1280
-#, fuzzy, c-format
-msgid "No input files specified. \"ogginfo -h\" for help\n"
-msgstr ""
-"%s%s\n"
-"FEL: Ingen infil angiven. Använd -h för hjälp.\n"
-
 #: share/getopt.c:673
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -2117,16 +1181,19 @@
 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"
@@ -2137,6 +1204,7 @@
 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"
@@ -2152,101 +1220,81 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: flaggan `-W %s' tar inget argument\n"
 
-#: vcut/vcut.c:149
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr ""
 
-#: vcut/vcut.c:166
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr ""
 
-#: vcut/vcut.c:206
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr ""
 
-#: vcut/vcut.c:215
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr ""
 
-#: vcut/vcut.c:225
-#, c-format
+#: vcut/vcut.c:192
 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:277
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr ""
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr "Skärpunkt utanför strömmen.  Andra filen kommer att vara tom\n"
-
-#: vcut/vcut.c:353
-#, c-format
+#. 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:284
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
 "       ogg page. File may not decode correctly.\n"
 msgstr ""
 
-#: vcut/vcut.c:373
-#, c-format
-msgid "Update sync returned 0, setting eos\n"
-msgstr ""
-
-#: vcut/vcut.c:378
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr ""
 
-#: vcut/vcut.c:387
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr ""
 
-#: vcut/vcut.c:449
-#, c-format
+#: vcut/vcut.c:330
+msgid "Update sync returned 0, setting eos\n"
+msgstr ""
+
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "Indata inte ogg.\n"
 
-#: vcut/vcut.c:459
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Fel på första sidan\n"
 
-#: vcut/vcut.c:464
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "fel i första paketet\n"
 
-#: vcut/vcut.c:470
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Fel i primärt huvud: inte vorbis?\n"
 
-#: vcut/vcut.c:490
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Sekundärt huvud felaktigt\n"
 
-#: vcut/vcut.c:503
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "EOF i huvud\n"
 
-#: vcut/vcut.c:535
-#, fuzzy, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+#: vcut/vcut.c:456
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg cutpoint\n"
 msgstr "Användning: vcut infil.ogg utfil1.ogg utfil2.ogg skärpunkt\n"
 
-#: vcut/vcut.c:539
-#, c-format
+#: vcut/vcut.c:460
 msgid ""
 "WARNING: vcut is still experimental code.\n"
 "Check that the output files are correct before deleting sources.\n"
@@ -2256,654 +1304,166 @@
 "Undersök resultatet innan källorna raderas.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Kunde inte öppna %s för att läsa\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Kunde inte öppna %s för att skriva\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Kunde inte tolka skärpunkt \"%s\"\n"
 
-#: vcut/vcut.c:570
+#: vcut/vcut.c:484
 #, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+msgid "Processing: Cutting at %lld\n"
 msgstr ""
 
-#: vcut/vcut.c:572
-#, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr ""
-
-#: vcut/vcut.c:582
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr ""
 
-#: vcut/vcut.c:604
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr ""
 
-#: vcut/vcut.c:627
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr ""
 
-#: vcut/vcut.c:635
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr ""
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:214
+msgid "Input truncated or empty."
+msgstr "Indata stympat eller tomt."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:216
+msgid "Input is not an Ogg bitstream."
+msgstr "Indata är inte en Ogg-bitström."
+
+#: vorbiscomment/vcedit.c:232
 msgid "Error reading first page of Ogg bitstream."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:238
 msgid "Error reading initial header packet."
 msgstr "Error reading initial header packet."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Indata stympat eller tomt."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "Indata är inte en Ogg-bitström."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:244
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Ogg-bitström inehåller inte vorbisdata."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "EOF innan slutet på vorbis-huvudet."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Ogg-bitström inehåller inte vorbisdata."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:267
 msgid "Corrupt secondary header."
 msgstr "Felaktigt sekundär-huvud."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:288
 msgid "EOF before end of vorbis headers."
 msgstr "EOF innan slutet på vorbis-huvudet."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:444
 msgid "Corrupt or missing data, continuing..."
 msgstr "Data felaktigt eller saknas, fortsätter..."
 
-#: vorbiscomment/vcedit.c:875
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+#: vorbiscomment/vcedit.c:479
+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:190 vorbiscomment/vcomment.c:216
+#: vorbiscomment/vcomment.c:100 vorbiscomment/vcomment.c:122
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr "Misslyckades att öppna fil som vorbis-typ: %s\n"
 
-#: vorbiscomment/vcomment.c:235
+#: vorbiscomment/vcomment.c:138
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Felaktig kommentar: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:150
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "felaktig kommentar: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Misslyckades att skriva kommentar till utfil: %s\n"
 
-#: vorbiscomment/vcomment.c:274
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:173
 msgid "no action specified\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:379
-#, c-format
-msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
+#: vorbiscomment/vcomment.c:250
+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:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
+#: vorbiscomment/vcomment.c:268
 msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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"
 msgstr ""
+"Användning:\n"
+"  vorbiscomment [-l] fil.ogg (listar kommentarer)\n"
+"  vorbiscomment -a in.ogg ut.ogg (lägger till kommentarer)\n"
+"  vorbiscomment -w in.ogg out.ogg (ändrar kommentarer)\n"
+"\tför skrivning förväntas nya kommentarer på formen 'TAG=värde'\n"
+"\tpå stdin.  Dessa ersätter helt de gamla.\n"
+"   Både -a och -w accepterar ett filnamn, i vilket fall en temporär\n"
+"   fil används.\n"
+"   -c kan användas för att läsa kommentarer från en fil istället för\n"
+"   stdin.\n"
+"   Exempel: vorbiscomment -a in.ogg -c kommentarer.txt\n"
+"   lägger till kommentarerna i kommentarer.txt till in.ogg\n"
+"   Till slut kan du ange taggar att lägga till på kommandoraden med\n"
+"   flaggan -t.  T.ex.\n"
+"   vorbiscomment -a in.ogg -t \"ARTIST=Någon Artist\" -t \"TITLE=En titel\"\n"
+"   (när du använder den här flaggan är läsning från kommentarfil eller\n"
+"   stdin avslaget)\n"
 
-#: vorbiscomment/vcomment.c:391
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Felaktig typ i argumentlista"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
+#: vorbiscomment/vcomment.c:339
 msgid "Internal error parsing command options\n"
 msgstr "Internt fel vid tolkning av kommandoflaggor\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:422
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Misslyckades att öppna infil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:587
+#: vorbiscomment/vcomment.c:438
 #, c-format
-msgid "Input filename may not be the same as output filename\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:598
-#, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Misslyckades att öppna utfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:453
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Misslyckades att öppna kommentarfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:470
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Misslyckades att öppna kommentarfil \"%s\"\n"
-
-#: vorbiscomment/vcomment.c:664
-#, fuzzy, c-format
-msgid "Error removing old file %s\n"
-msgstr "Misslyckades att öppna utfil \"%s\".\n"
-
-#: vorbiscomment/vcomment.c:666
-#, fuzzy, c-format
-msgid "Error renaming %s to %s\n"
-msgstr "Misslyckades att öppna infil \"%s\".\n"
-
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Misslyckades att öppna utfil \"%s\".\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"
-
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiphophorus Team (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 från %s %s\n"
-#~ " av Xiphophorusgruppen (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Användning: ogg123 [<flaggor>] <infil> ...\n"
-#~ "\n"
-#~ "  -h, --help     den här hjälptexten\n"
-#~ "  -V, --version  visa Ogg123:s version\n"
-#~ "  -d, --device=d använd 'd' som ut-enhet\n"
-#~ "      Möjliga enheter är ('*'=direkt, '@'=fil):\n"
-#~ "        "
-
-#~ 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"
-#~ "  -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"
-#~ "\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"
-#~ msgstr ""
-#~ "  -f, --file=filename  Ange utfilens namn för tidigar vald \n"
-#~ "        filenhet (med -d).\n"
-#~ "  -k n, --skip n  Hoppa över de första n sekunderna\n"
-#~ "  -o, --device-option=k:v vidarebefordra särskild\n"
-#~ "        flagga k med värde v till tidigare vald enhet (med -d).\n"
-#~ "        Se manualen för mer information.\n"
-#~ "  -b n, --buffer n  använd en in-buffer på n kilobyte\n"
-#~ "  -p n, --prebuffer n  ladda n%% av in-buffern innan uppspelning\n"
-#~ "  -v, --verbose  visa framåtskridande och annan statusinformation\n"
-#~ "  -q, --quiet    visa ingenting (ingen titel)\n"
-#~ "  -x n, --nth    spela var n:te block\n"
-#~ "  -y n, --ntimes upprepa varje spelat block n gånger\n"
-#~ "  -z, --shuffle  spela i slumpvis ordning\n"
-#~ "\n"
-#~ "ogg123 hoppar till nästa spår om den får en SIGINT (Ctrl-C); två SIGINT\n"
-#~ "inom s millisekunder gör att ogg123 avslutas.\n"
-#~ "  -l, --delay=s  sätt s [millisekunder] (standard 500).\n"
-
-#~ msgid "Error: Out of memory in new_curl_thread_arg().\n"
-#~ msgstr "Fel: Slut på minne i new_curl_thread_arg().\n"
-
-#~ msgid "Artist: %s"
-#~ msgstr "Artist: %s"
-
-#~ msgid "Album: %s"
-#~ msgstr "Album: %s"
-
-#~ msgid "Title: %s"
-#~ msgstr "Titel: %s"
-
-#~ msgid "Track number: %s"
-#~ msgstr "Spår: %s"
-
-#~ msgid "Organization: %s"
-#~ msgstr "Organisation: %s"
-
-#~ msgid "Genre: %s"
-#~ msgstr "Genre: %s"
-
-#~ msgid "Description: %s"
-#~ msgstr "Beskrivning: %s"
-
-#~ msgid "Location: %s"
-#~ msgstr "Plats: %s"
-
-#~ msgid "Copyright %s"
-#~ msgstr "Copyright %s"
-
-#~ msgid "Comment: %s"
-#~ msgstr "Kommentar: %s"
-
-#~ msgid "Version is %d"
-#~ msgstr "Version %d"
-
-#~ msgid ""
-#~ "Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
-#~ " At other than 44.1/48 kHz quality will be degraded.\n"
-#~ msgstr ""
-#~ "Varning: Vorbis är för närvarande inte justerad för denna\n"
-#~ "samplingsfrekvens på in-data (%.3f kHz).  Kvaliteten blir försämrad\n"
-#~ "vid annan frekvens än 44.1/48 kHz.\n"
-
-#~ msgid ""
-#~ "Warning: Vorbis is not currently tuned for this input (%.3f kHz).\n"
-#~ " At other than 44.1/48 kHz quality will be significantly degraded.\n"
-#~ msgstr ""
-#~ "Varning: Vorbis är för närvarande inte justerad för denna\n"
-#~ " samplingsfrekvens (%.3f kHz). Vid andra än 44.1 eller 48 kHz blir\n"
-#~ " kvaliteten påtagligt försämrad.\n"
-
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " General:\n"
-#~ " -Q, --quiet          Produce no output to stderr\n"
-#~ " -h, --help           Print this help text\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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\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.\n"
-#~ " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
-#~ "                      encoding for a fixed-size channel.\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"
-#~ "                      This is the normal mode of operation.\n"
-#~ "                      Fractional qualities (e.g. 2.75) are permitted\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"
-#~ "\n"
-#~ " Naming:\n"
-#~ " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times.\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 16 or 8 bit PCM WAV, AIFF, or AIFF/"
-#~ "C\n"
-#~ " files. Files may be mono or stereo (or more channels) and any sample "
-#~ "rate.\n"
-#~ " However, the encoder is only tuned for rates of 44.1 and 48 kHz and "
-#~ "while\n"
-#~ " other rates will be accepted quality will be significantly degraded.\n"
-#~ " Alternatively, the --raw option may be used to use a raw PCM data file, "
-#~ "which\n"
-#~ " must be 16bit stereo little-endian PCM ('headerless wav'), unless "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an outfile filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Användning: oggenc [flaggor] infil.wav [...]\n"
-#~ "\n"
-#~ "FLAGGOR:\n"
-#~ " Allmänna:\n"
-#~ " -Q, --quiet          Skriv inte på stderr\n"
-#~ " -h, --help           Visa denna hjälptext\n"
-#~ " -r, --raw            Rå-läge. Infiler läses direkt som PCM-data\n"
-#~ " -B, --raw-bits=n     Välj bitar/sample för rå-indata. Standardväre är "
-#~ "16\n"
-#~ " -C, --raw-chan=n     Välj antal kanaler för rå-indata. Standardväre är "
-#~ "2\n"
-#~ " -R, --raw-rate=n     Välj samples/sekund för rå-indata. Standardväre är "
-#~ "44100\n"
-#~ " -b, --bitrate        Välj en nominell bithastighet att koda\n"
-#~ "                      i. Försöker koda med en bithastighet som i\n"
-#~ "                      genomsnitt blir denna. Tar ett argument i kbps.\n"
-#~ " -m, --min-bitrate    Ange minimal bithastighet (i kbps). Användbart\n"
-#~ "                      för att koda för en kanal med bestämd storlek.\n"
-#~ " -M, --max-bitrate    Ange maximal bithastighet (i kbps).  Andvändbart\n"
-#~ "                      för strömmande applikationer.\n"
-#~ " -q, --quality        Ange kvalitet mellan 0 (låg) och 10 (hög),\n"
-#~ "                      istället för att ange särskilda bithastigheter.\n"
-#~ "                      Detta är det normala arbetssättet. Kvalitet i\n"
-#~ "                      bråkdelar (t.ex. 2.75) går bra.\n"
-#~ " -s, --serial         Ange ett serienummer för strömmen. Om flera\n"
-#~ "                      filer kodas kommer detta att ökas för varje\n"
-#~ "                      ström efter den första.\n"
-#~ "\n"
-#~ " Namngivning:\n"
-#~ " -o, --output=fn      Skriv till fil fn (endast giltig för enstaka fil)\n"
-#~ " -n, --names=sträng   Skapa filer med namn enligt sträng, med  %%a, %%t, %"
-#~ "%l,\n"
-#~ "                      %%n, %%d ersatta med artist, titel, album, spår\n"
-#~ "                      respektive datum (se nedan för att ange\n"
-#~ "                      dessa). %%%% ger ett bokstavligt %%.\n"
-#~ " -X, --name-remove=s  Ta bort angivna tecken från parametrarna till\n"
-#~ "                      formatsträngen för -n. Bra för att försäkra sig\n"
-#~ "                      om giltiga filnamn.\n"
-#~ " -P, --name-replace=s Ersätt tecken borttagna av --name-remove med\n"
-#~ "                      angivet tecken.  Om denna sträng är kortare än\n"
-#~ "                      listan till --name-remove, eller utelämnad, tas\n"
-#~ "                      extra tecken bort.\n"
-#~ "                      Förvalda värden för de två ovanstående\n"
-#~ "                      argumenten beror på plattformen.\n"
-#~ " -c, --comment=c      Lägg till argumentsträngen som en extra\n"
-#~ "                      kommentar.  Kan användas flrea gånger.\n"
-#~ " -d, --date           Datum för spåret (vanligtvis datum för "
-#~ "framträdande)\n"
-#~ " -N, --tracknum       Spårnummer för detta spår\n"
-#~ " -t, --title          Titel för detta spår\n"
-#~ " -l, --album          Namn på albumet\n"
-#~ " -a, --artist         Namn på artisten\n"
-#~ " -G, --genre          Spårets genre\n"
-#~ "                      Om flera infiler anges kommer flera fall av de\n"
-#~ "                      fem föregående flaggorna användas i given\n"
-#~ "                      orgdning. Om antalet titlar är färre än antalet\n"
-#~ "                      infiler visar OggEnc en varning och återanvänder\n"
-#~ "                      det sista argumentet. Om antalet spårnummer är\n"
-#~ "                      färre blir de resterande filerna onumrerade. För\n"
-#~ "                      övriga flaggor återanvänds den sista taggen utan\n"
-#~ "                      varning (så att du t.ex. kan ange datum en gång\n"
-#~ "                      och använda det för alla filer).\n"
-#~ "\n"
-#~ "INFILER:\n"
-#~ " Infiler till OggEnc måste för närvarande vara 16 eller 8 bitar RCM\n"
-#~ " WAV, AIFF eller AIFF/C.  De kan vara mono eller stereo (eller fler\n"
-#~ " kanaler) med godtycklig samplingshastighet.  Dock är kodaren bara\n"
-#~ " justerad för 44.1 och 48 kHz samplingshastighet, och även om andra\n"
-#~ " hastigheter accepteras blir kvaliteten påtagligt\n"
-#~ " försämrad. Alternativt kan flaggan --raw användas för att använda en\n"
-#~ " file med rå PCM-data, vilken måste vara 16 bitar stereo little-endian\n"
-#~ " PCM ('headerless wav') om inte ytterligare flaggor för rå-läge\n"
-#~ " används.\n"
-#~ " Du kan läsa från stdin genom att ange - som namn för infilen. I detta\n"
-#~ " läge går utdata till stdout om inget filnamn anges med -o\n"
-#~ "\n"
-
-#~ msgid "Usage: %s [filename1.ogg] ... [filenameN.ogg]\n"
-#~ msgstr "Användning: %s [filenamn1.ogg] ... [filenamnN.ogg]\n"
-
-#~ msgid "filename=%s\n"
-#~ msgstr "filenamn=%s\n"
-
-#~ msgid ""
-#~ "version=%d\n"
-#~ "channels=%d\n"
-#~ "rate=%ld\n"
-#~ msgstr ""
-#~ "version=%d\n"
-#~ "kanaler=%d\n"
-#~ "hastighet=%ld\n"
-
-#~ msgid "bitrate_nominal="
-#~ msgstr "nominell bithastighet="
-
-#~ msgid "bitrate_lower="
-#~ msgstr "undre bithastighet="
-
-#~ msgid "bitrate_average=%ld\n"
-#~ msgstr "genomsnittlig bithastighet=%ld\n"
-
-#~ msgid "length=%f\n"
-#~ msgstr "längd=%f\n"
-
-#~ msgid "playtime=%ld:%02ld\n"
-#~ msgstr "speltid=%ld:%02ld\n"
-
-#~ msgid "Unable to open \"%s\": %s\n"
-#~ msgstr "Kan inte öppna \"%s\": %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 ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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"
-#~ msgstr ""
-#~ "Användning:\n"
-#~ "  vorbiscomment [-l] fil.ogg (listar kommentarer)\n"
-#~ "  vorbiscomment -a in.ogg ut.ogg (lägger till kommentarer)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (ändrar kommentarer)\n"
-#~ "\tför skrivning förväntas nya kommentarer på formen 'TAG=värde'\n"
-#~ "\tpå stdin.  Dessa ersätter helt de gamla.\n"
-#~ "   Både -a och -w accepterar ett filnamn, i vilket fall en temporär\n"
-#~ "   fil används.\n"
-#~ "   -c kan användas för att läsa kommentarer från en fil istället för\n"
-#~ "   stdin.\n"
-#~ "   Exempel: vorbiscomment -a in.ogg -c kommentarer.txt\n"
-#~ "   lägger till kommentarerna i kommentarer.txt till in.ogg\n"
-#~ "   Till slut kan du ange taggar att lägga till på kommandoraden med\n"
-#~ "   flaggan -t.  T.ex.\n"
-#~ "   vorbiscomment -a in.ogg -t \"ARTIST=Någon Artist\" -t \"TITLE=En titel"
-#~ "\"\n"
-#~ "   (när du använder den här flaggan är läsning från kommentarfil eller\n"
-#~ "   stdin avslaget)\n"

Modified: trunk/vorbis-tools/po/uk.po
===================================================================
--- trunk/vorbis-tools/po/uk.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/uk.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.1.1\n"
 "Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2005-06-27 11:34+0200\n"
 "PO-Revision-Date: 2007-08-17 16:32+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <dziumanenko at gmail.com>\n"
 "Language-Team: Ukrainian <translation-team-uk at lists.sourceforge.net>\n"
@@ -14,494 +14,353 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ogg123/buffer.c:117
+#: ogg123/buffer.c:114
 #, c-format
 msgid "Error: Out of memory in malloc_action().\n"
 msgstr "Помилка: недостатньо пам'яті при виконанні malloc_action().\n"
 
-#: ogg123/buffer.c:360
+#: ogg123/buffer.c:347
 #, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
-msgstr ""
-"Помилка: не вдається розподілити пам'ять при виконанні malloc_buffer_stats"
-"()\n"
+msgstr "Помилка: не вдається розподілити пам'ять при виконанні malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:75
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Помилка: пристрій відсутній.\n"
 
-#: ogg123/callbacks.c:78
+#: 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:81
+#: ogg123/callbacks.c:77
 #, c-format
 msgid "Error: Unsupported option value to %s device.\n"
 msgstr "Помилка: непідтримуване значення параметра для пристрою %s.\n"
 
-#: ogg123/callbacks.c:85
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Помилка: не вдається відкрити пристрій %s.\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Помилка: збій пристрою %s.\n"
 
-#: ogg123/callbacks.c:92
+#: ogg123/callbacks.c:88
 #, c-format
 msgid "Error: An output file cannot be given for %s device.\n"
 msgstr "Помилка: вихідний файл не може бути переданий пристрою %s.\n"
 
-#: ogg123/callbacks.c:95
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Помилка: не вдається відкрити файл %s для записування.\n"
 
-#: ogg123/callbacks.c:99
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Помилка: файл %s вже існує.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Помилка: ця помилка не повинна ніколи траплятись (%d). Паніка!\n"
 
-#: ogg123/callbacks.c:125 ogg123/callbacks.c:130
+#: 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:174
+#: ogg123/callbacks.c:170
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
-msgstr ""
-"Помилка: недостатньо пам'яті при виконанні new_print_statistics_arg().\n"
+msgstr "Помилка: недостатньо пам'яті при виконанні new_print_statistics_arg().\n"
 
-#: ogg123/callbacks.c:233
+#: ogg123/callbacks.c:229
 msgid "Error: Out of memory in new_status_message_arg().\n"
 msgstr "Помилка: недостатньо пам'яті при виконанні new_status_message_arg().\n"
 
-#: ogg123/callbacks.c:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
-#: ogg123/callbacks.c:354
+#: 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"
+msgstr "Помилка: недостатньо пам'яті при виконанні decoder_buffered_metadata_callback().\n"
 
-#: ogg123/cfgfile_options.c:55
+#: ogg123/cfgfile_options.c:51
 msgid "System error"
 msgstr "Системна помилка"
 
-#: ogg123/cfgfile_options.c:58
+#: ogg123/cfgfile_options.c:54
 #, c-format
 msgid "=== Parse error: %s on line %d of %s (%s)\n"
 msgstr "=== Помилка аналізу: %s у рядку %d з %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Назва"
 
-#: ogg123/cfgfile_options.c:137
+#: ogg123/cfgfile_options.c:133
 msgid "Description"
 msgstr "Опис"
 
-#: ogg123/cfgfile_options.c:140
+#: ogg123/cfgfile_options.c:136
 msgid "Type"
 msgstr "Тип"
 
-#: ogg123/cfgfile_options.c:143
+#: ogg123/cfgfile_options.c:139
 msgid "Default"
 msgstr "Типово"
 
-#: ogg123/cfgfile_options.c:169
+#: ogg123/cfgfile_options.c:165
 #, c-format
 msgid "none"
 msgstr "none"
 
-#: ogg123/cfgfile_options.c:172
+#: ogg123/cfgfile_options.c:168
 #, c-format
 msgid "bool"
 msgstr "bool"
 
-#: ogg123/cfgfile_options.c:175
+#: ogg123/cfgfile_options.c:171
 #, c-format
 msgid "char"
 msgstr "char"
 
-#: ogg123/cfgfile_options.c:178
+#: ogg123/cfgfile_options.c:174
 #, c-format
 msgid "string"
 msgstr "string"
 
-#: ogg123/cfgfile_options.c:181
+#: ogg123/cfgfile_options.c:177
 #, c-format
 msgid "int"
 msgstr "int"
 
-#: ogg123/cfgfile_options.c:184
+#: ogg123/cfgfile_options.c:180
 #, c-format
 msgid "float"
 msgstr "float"
 
-#: ogg123/cfgfile_options.c:187
+#: ogg123/cfgfile_options.c:183
 #, c-format
 msgid "double"
 msgstr "double"
 
-#: ogg123/cfgfile_options.c:190
+#: ogg123/cfgfile_options.c:186
 #, c-format
 msgid "other"
 msgstr "інший"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: 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 "(немає)"
 
-#: ogg123/cfgfile_options.c:429
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Успішно завершено"
 
-#: ogg123/cfgfile_options.c:433
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Ключ не знайдено"
 
-#: ogg123/cfgfile_options.c:435
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Немає ключа"
 
-#: ogg123/cfgfile_options.c:437
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Неправильне значення"
 
-#: ogg123/cfgfile_options.c:439
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Неправильний тип у списку параметрів"
 
-#: ogg123/cfgfile_options.c:441
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "Внутрішня помилка при аналізі параметрів командного рядка.\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
 msgstr "Розмір вхідного буфера менше мінімального - %dкБ."
 
-#: ogg123/cmdline_options.c:102
+#: ogg123/cmdline_options.c:108
 #, c-format
 msgid ""
 "=== Error \"%s\" while parsing config option from command line.\n"
 "=== Option was: %s\n"
 msgstr ""
-"=== Помилка \"%s\" під час аналізу параметрів конфігурації командного "
-"рядка.\n"
+"=== Помилка \"%s\" під час аналізу параметрів конфігурації командного рядка.\n"
 "=== Помилку спричинив параметр: %s\n"
 
-#: ogg123/cmdline_options.c:109
+#: ogg123/cmdline_options.c:115
 #, c-format
 msgid "Available options:\n"
 msgstr "Доступні параметри:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Пристрій %s не існує.\n"
 
-#: ogg123/cmdline_options.c:138
+#: ogg123/cmdline_options.c:144
 #, c-format
 msgid "=== Driver %s is not a file output driver.\n"
 msgstr "=== Драйвер %s не є драйвером файлу виводу.\n"
 
-#: ogg123/cmdline_options.c:143
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "=== Не можна вказувати файл виводу без вказування драйвера.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Некоректний формат параметра: %s.\n"
 
-#: ogg123/cmdline_options.c:177
+#: ogg123/cmdline_options.c:183
 msgid "--- Prebuffer value invalid. Range is 0-100.\n"
 msgstr "--- Неправильне значення пре-буфера. Допустимий діапазон 0-100.\n"
 
-#: ogg123/cmdline_options.c:201
-#, fuzzy, c-format
-msgid "ogg123 from %s %s"
+#: ogg123/cmdline_options.c:198
+#, c-format
+msgid "ogg123 from %s %s\n"
 msgstr "ogg123 з %s %s\n"
 
-#: ogg123/cmdline_options.c:208
+#: ogg123/cmdline_options.c:205
 msgid "--- Cannot play every 0th chunk!\n"
 msgstr "--- Відтворити кожен 0-й фрагмент неможливо!\n"
 
-#: ogg123/cmdline_options.c:216
+#: 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 ""
 "--- Не можна відтворити фрагмент 0 разів.\n"
-"--- Для виконання перевірочного декодування, використовуйте драйвер виводу "
-"null.\n"
+"--- Для виконання перевірочного декодування, використовуйте драйвер виводу null.\n"
 
-#: ogg123/cmdline_options.c:232
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Не вдається відкрити файл списку відтворення %s. Пропущений.\n"
 
-#: ogg123/cmdline_options.c:248
+#: ogg123/cmdline_options.c:241
 msgid "=== Option conflict: End time is before start time.\n"
 msgstr "=== Конфлікт параметрів: кінцевий час раніший за початковий час.\n"
 
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Вказаний у конфігурації драйвер %s - неправильний.\n"
 
-#: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"=== Не вдається завантажити типовий драйвер, а у конфігураційному файлі "
-"драйвер не визначений. Завершення роботи.\n"
+#: ogg123/cmdline_options.c:264
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "=== Не вдається завантажити типовий драйвер, а у конфігураційному файлі драйвер не визначений. Завершення роботи.\n"
 
-#: ogg123/cmdline_options.c:292
+#: ogg123/cmdline_options.c:285
 #, c-format
 msgid ""
 "ogg123 from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
+" by the Xiph.org Foundation (http://www.xiph.org/)\n"
 "\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:295
-#, c-format
-msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\n"
+"Usage: ogg123 [<options>] <input file> ...\n"
 "\n"
+"  -h, --help     this help\n"
+"  -V, --version  display Ogg123 version\n"
+"  -d, --device=d uses 'd' as an output device\n"
+"      Possible devices are ('*'=live, '@'=file):\n"
+"        "
 msgstr ""
+"ogg123 з %s %s\n"
+" Xiph.org Foundation (http://www.xiph.org/)\n"
+"\n"
+"Використання: ogg123 [<параметри>] <вхідний файл> ...\n"
+"\n"
+"  -h, --help     ця довідка\n"
+"  -V, --version  вивести версію Ogg123\n"
+"  -d, --device=d використовувати \"d\" у якості пристрою вводу-виводу\n"
+"      Можливі пристрої: ('*'=справжній, '@'=файл):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Доступні параметри:\n"
-
-#: ogg123/cmdline_options.c:301
+#: ogg123/cmdline_options.c:306
 #, c-format
-msgid "FLAC, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
-msgstr ""
-
-#: ogg123/cmdline_options.c:308
-#, c-format
 msgid ""
-"Ogg Vorbis.\n"
+"  -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 (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"
+"  -@, --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"
 msgstr ""
+"  -f, --file=назва_файлу  Встановити назву файлу виводу з вказаного раніше\n"
+"      файлу пристрою (з параметром -d).\n"
+"  -k n, --skip n  Пропустити перші \"n\" секунд\n"
+"  -K n, --end n   Закінчити через 'n' секунд (або формат гг:хх:сс)\n"
+"  -o, --device-option=k:v передати спеціальний параметр k зі значенням\n"
+"      v раніше вказаному пристрою (ключем -d).  Додаткову\n"
+"      інформацію дивіться на man-сторінці.\n"
+"  -@, --list=файл    Прочитати список відтворення та URL з \"файл\"\n"
+"  -b n, --buffer n  використовувати вхідний буфер розміром \"n\" кБ\n"
+"  -p n, --prebuffer n  завантажити n%% з вхідного буфера перед відтворенням\n"
+"  -v, --verbose  показувати прогрес та іншу інформацію про статус\n"
+"  -q, --quiet    нічого не відображати (без заголовка)\n"
+"  -x n, --nth    відтворювати кожен \"n\"-й блок\n"
+"  -y n, --ntimes повторювати \"n\" разів кожен блок, що відтворюється\n"
+"  -z, --shuffle  випадкове відтворення\n"
+"\n"
+"При отриманні сигналу SIGINT (Ctrl-C) програма ogg123 пропускає наступну пісню;\n"
+"два сигнали SIGINT протягом s мілісекунд завершують роботу ogg123.\n"
+"  -l, --delay=s  встановлює значення s [у мілісекундах] (типово - 500).\n"
 
-#: ogg123/cmdline_options.c:310
+#: ogg123/file_transport.c:58 ogg123/http_transport.c:212
+#: ogg123/oggvorbis_format.c:91
 #, c-format
-msgid "Output options\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
-msgstr ""
-
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Файл: %s"
-
-#: ogg123/cmdline_options.c:331
-#, c-format
-msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:334
-#, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:335
-#, c-format
-msgid ""
-"  -o k:v, --device-option k:v\n"
-"                          Pass special option 'k' with value 'v' to the\n"
-"                          device previously specified with --device. See\n"
-"                          the ogg123 man page for available device options.\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:341
-#, fuzzy, c-format
-msgid "Playlist options\n"
-msgstr "Доступні параметри:\n"
-
-#: ogg123/cmdline_options.c:342
-#, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:343
-#, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:344
-#, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:345
-#, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:346
-#, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:349
-#, fuzzy, c-format
-msgid "Input options\n"
-msgstr "Вхідні дані не у форматі ogg.\n"
-
-#: ogg123/cmdline_options.c:350
-#, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Опис"
-
-#: ogg123/cmdline_options.c:355
-#, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:356
-#, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:357
-#, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:358
-#, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Доступні параметри:\n"
-
-#: ogg123/cmdline_options.c:362
-#, c-format
-msgid ""
-"  -l s, --delay s         Set termination timeout in milliseconds. ogg123\n"
-"                          will skip to the next song on SIGINT (Ctrl-C),\n"
-"                          and will terminate if two SIGINTs are received\n"
-"                          within the specified timeout 's'. (default 500)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
-#, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:368
-#, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:369
-#, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-
-#: ogg123/cmdline_options.c:370
-#, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
-
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
-#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Помилка: недостатньо пам'яті.\n"
 
-#: ogg123/format.c:82
+#: ogg123/format.c:81
 #, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
-msgstr ""
-"Помилка: не вдається розподілити пам'ять при виконанні malloc_decoder_stats"
-"()\n"
+msgstr "Помилка: не вдається розподілити пам'ять при виконанні malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:145
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Помилка: не вдається встановити маску сигналу."
 
-#: ogg123/http_transport.c:202
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
 msgstr "Помилка: не вдається створити вхідний буфер.\n"
 
-#: ogg123/ogg123.c:82
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "типовий пристрій виводу"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "перемішати список програвання"
 
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
-#, fuzzy, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr "Не вдається пропустити %f секунд звуку."
-
-#: ogg123/ogg123.c:378
+#: ogg123/ogg123.c:281
 #, c-format
 msgid ""
 "\n"
@@ -510,371 +369,234 @@
 "\n"
 "Звуковий пристрій:   %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:282
 #, c-format
 msgid "Author:   %s"
 msgstr "Автор:   %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:283
 #, c-format
 msgid "Comments: %s"
 msgstr "Коментарі: %s"
 
-#: ogg123/ogg123.c:424 ogg123/playlist.c:160
+#: ogg123/ogg123.c:327 ogg123/playlist.c:155
 #, c-format
 msgid "Warning: Could not read directory %s.\n"
 msgstr "Попередження: не вдається прочитати каталог %s.\n"
 
-#: ogg123/ogg123.c:460
+#: ogg123/ogg123.c:361
 msgid "Error: Could not create audio buffer.\n"
 msgstr "Помилка: не вдається створити буфер для звуку.\n"
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:449
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Не знайдені модулі для читання файлу з %s.\n"
 
-#: ogg123/ogg123.c:561
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Не вдається відкрити %s.\n"
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:460
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Формат файлу %s не підтримується.\n"
 
-#: ogg123/ogg123.c:577
+#: ogg123/ogg123.c:470
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
-msgstr ""
-"Помилка відкривання %s використовуючи модуль %s. Можливо, файл пошкоджений.\n"
+msgstr "Помилка відкривання %s використовуючи модуль %s. Можливо, файл пошкоджений.\n"
 
-#: ogg123/ogg123.c:596
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Відтворення: %s"
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:494
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Не вдається пропустити %f секунд звуку."
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Помилка: помилка декодування.\n"
 
-#: ogg123/ogg123.c:705
-#, fuzzy
-msgid "Error: buffer write failed.\n"
-msgstr "Помилка: збій пристрою %s.\n"
-
-#: ogg123/ogg123.c:743
+#: ogg123/ogg123.c:615
 msgid "Done."
 msgstr "Завершено."
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:153
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr "--- Пропуск у потокові; можливо нічого страшного\n"
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:159
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr "=== Бібліотека Vorbіs сповістила про помилку потоку.\n"
 
-#: ogg123/oggvorbis_format.c:310
+#: ogg123/oggvorbis_format.c:303
 #, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr "Потік Ogg Vorbis: %d канали, %ld Гц"
 
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:308
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr "Формат Vorbis: Версія %d"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:312
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
-msgstr ""
-"Значення щільності потоку бітів: верхнє=%ld номінальне=%ld нижнє=%ld вікно=%"
-"ld"
+msgstr "Значення щільності потоку бітів: верхнє=%ld номінальне=%ld нижнє=%ld вікно=%ld"
 
-#: ogg123/oggvorbis_format.c:327
+#: ogg123/oggvorbis_format.c:320
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Кодування: %s"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
+#: 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"
 
-#: ogg123/playlist.c:222
+#: ogg123/playlist.c:214
 #, c-format
 msgid "Warning from playlist %s: Could not read directory %s.\n"
-msgstr ""
-"Попередження зі списку відтворення %s: не вдається прочитати каталог %s.\n"
+msgstr "Попередження зі списку відтворення %s: не вдається прочитати каталог %s.\n"
 
-#: ogg123/playlist.c:267 ogg123/playlist.c:279
+#: 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"
 
-#: ogg123/status.c:60
+#: ogg123/status.c:47
 #, c-format
 msgid "%sPrebuf to %.1f%%"
 msgstr "%sПре-читання до %.1f%%"
 
-#: ogg123/status.c:65
+#: ogg123/status.c:52
 #, c-format
 msgid "%sPaused"
 msgstr "%sПауза"
 
-#: ogg123/status.c:69
+#: ogg123/status.c:56
 #, c-format
 msgid "%sEOS"
 msgstr "%sКінець потоку"
 
-#: ogg123/status.c:204 ogg123/status.c:222 ogg123/status.c:236
-#: ogg123/status.c:250 ogg123/status.c:282 ogg123/status.c:301
+#: 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"
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Час: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr "з %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr "Середн. потік біт: %5.1f"
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr " Вхідний буфер %5.1f%%"
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr " Вихідний буфер %5.1f%%"
 
-#: ogg123/transport.c:71
+#: ogg123/transport.c:70
 #, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
-msgstr ""
-"Помилка: не вдається розподілити пам'ять при виконанні "
-"malloc_data_source_stats()\n"
+msgstr "Помилка: не вдається розподілити пам'ять при виконанні malloc_data_source_stats()\n"
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 з %s %s\n"
-
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:57
-#, c-format
-msgid ""
-"Usage: oggdec [options] file1.ogg [file2.ogg ... fileN.ogg]\n"
-"\n"
-msgstr ""
-
-#: oggdec/oggdec.c:58
-#, c-format
-msgid "Supported options:\n"
-msgstr ""
-
-#: oggdec/oggdec.c:59
-#, c-format
-msgid " --quiet, -Q      Quiet mode. No console output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:60
-#, c-format
-msgid " --help,  -h      Produce this help message.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:61
-#, c-format
-msgid " --version, -V    Print out version number.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:62
-#, c-format
-msgid " --bits, -b       Bit depth for output (8 and 16 supported)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:63
-#, c-format
-msgid ""
-" --endianness, -e Output endianness for 16-bit output; 0 for\n"
-"                  little endian (default), 1 for big endian.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:65
-#, c-format
-msgid ""
-" --sign, -s       Sign for output PCM; 0 for unsigned, 1 for\n"
-"                  signed (default 1).\n"
-msgstr ""
-
-#: oggdec/oggdec.c:67
-#, c-format
-msgid " --raw, -R        Raw (headerless) output.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:68
-#, c-format
-msgid ""
-" --output, -o     Output to given filename. May only be used\n"
-"                  if there is only one input file, except in\n"
-"                  raw mode.\n"
-msgstr ""
-
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "ПОМИЛКА: Не вдається відкрити вхідний файл \"%s\": %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "ПОМИЛКА: Не вдається відкрити файл виводу \"%s\": %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Помилка при відкриванні файлу як файлу vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Помилка видалення старого файлу %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"%s%s\n"
-"ПОМИЛКА: Не вказані вхідні файли. Для отримання довідки використовуйте -h.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"ПОМИЛКА: Декілька вхідних файлів при вказаній назві вхідного файлу: "
-"рекомендується використовувати -n\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "Читання файлів WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "Читання файлів AIFF/AIFC"
 
-#: oggenc/audio.c:53
+#: oggenc/audio.c:51
 msgid "FLAC file reader"
 msgstr "Читання файлів FLAC"
 
-#: oggenc/audio.c:54
+#: oggenc/audio.c:52
 msgid "Ogg FLAC file reader"
 msgstr "Читання файлів Ogg FLAC"
 
-#: oggenc/audio.c:131 oggenc/audio.c:425
+#: 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:142
+#: oggenc/audio.c:140
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Пропускається фрагмент типу \"%s\", довжина %d\n"
 
-#: oggenc/audio.c:168
+#: oggenc/audio.c:158
 #, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Попередження: неочікуваний кінець файла у фрагменті AIFF\n"
 
-#: oggenc/audio.c:254
+#: oggenc/audio.c:243
 #, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Попередження: у файлі AIFF не знайдено загальний фрагмент\n"
 
-#: oggenc/audio.c:260
+#: oggenc/audio.c:249
 #, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Попередження: обрізаний загальний фрагмент у заголовку AIFF\n"
 
-#: oggenc/audio.c:268
+#: oggenc/audio.c:257
 #, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Попередження: неочікуваний кінець файлу при читанні заголовку AIFF\n"
 
-#: oggenc/audio.c:283
+#: oggenc/audio.c:272
 #, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Попередження: заголовок AIFF-C обрізаний.\n"
 
-#: oggenc/audio.c:297
+#: oggenc/audio.c:286
 #, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Попередження: неможливо обробити стиснений AIFF-C (%c%c%c%c)\n"
 
-#: oggenc/audio.c:304
+#: oggenc/audio.c:293
 #, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Попередження: у файлі AIFF не знайдено SSND-фрагмент\n"
 
-#: oggenc/audio.c:310
+#: oggenc/audio.c:299
 #, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Попередження: у заголовку AIFF пошкоджений SSND-фрагмент\n"
 
-#: oggenc/audio.c:316
+#: oggenc/audio.c:305
 #, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Попередження: неочікуваний кінець файлу при читанні заголовку AIFF\n"
 
-#: oggenc/audio.c:353
+#: oggenc/audio.c:336
 #, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
@@ -883,12 +605,12 @@
 "Попередження: OggEnc не підтримує цей тип AIFF/AIFC файлу\n"
 " Повинен бути 8-бітний чи 16-бітний PCM.\n"
 
-#: oggenc/audio.c:407
+#: oggenc/audio.c:379
 #, c-format
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Попередження: формат фрагменту у заголовку WAV не розпізнаний\n"
 
-#: oggenc/audio.c:420
+#: oggenc/audio.c:391
 #, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
@@ -897,147 +619,108 @@
 "Попередження: НЕПРАВИЛЬНИЙ формат фрагменту у заголовку wav.\n"
 " Але робиться спроба прочитати (може не спрацювати)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: 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"
+" or type 3 floating point PCM\n"
 msgstr ""
 "ПОМИЛКА: непідтримуваний тип wav файлу (повинен бути стандартним\n"
 "PCM або PCM типу 3 з плаваючою крапкою)\n"
 
-#: oggenc/audio.c:467
+#: oggenc/audio.c:480
 #, c-format
 msgid ""
-"Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
-"The software that created this file is incorrect.\n"
+"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
+"or floating point PCM\n"
 msgstr ""
-
-#: oggenc/audio.c:528
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
-"ПОМИЛКА: непідтримуваний підформат wav файлу (повинен бути 8,16 або 24-"
-"бітним\n"
+"ПОМИЛКА: непідтримуваний підформат wav файлу (повинен бути 8,16 або 24-бітним\n"
 "PCM або PCM з плаваючою крапкою)\n"
 
-#: oggenc/audio.c:604
+#: oggenc/audio.c:555
 #, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"Формат Big endian 24-біт PCM наразі не підтримується, завершення роботи.\n"
+msgstr "Формат Big endian 24-біт PCM наразі не підтримується, завершення роботи.\n"
 
-#: oggenc/audio.c:624
-#, fuzzy, c-format
-msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"Формат Big endian 24-біт PCM наразі не підтримується, завершення роботи.\n"
-
-#: oggenc/audio.c:630
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr "Внутрішня помилка: спроба прочитати непідтримувану розрядність %d\n"
 
-#: oggenc/audio.c:732
+#: oggenc/audio.c:658
 #, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"ПОМИЛКА: Від ресемплера отримане нульове число семплів. Повідомте про "
-"помилку автору.\n"
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "ПОМИЛКА: Від ресемплера отримане нульове число семплів. Повідомте про помилку автору.\n"
 
-#: oggenc/audio.c:750
+#: oggenc/audio.c:676
 #, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Не вдається ініціалізувати ресемплер\n"
 
-#: oggenc/encode.c:64
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Встановлення додаткового параметра кодувальника \"%s\" у значення %s\n"
 
-#: oggenc/encode.c:101
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Змінено нижню межу частоти з %f кГц на %f кГц\n"
 
-#: oggenc/encode.c:104
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Нерозпізнаний додатковий параметр \"%s\"\n"
 
-#: oggenc/encode.c:111
+#: oggenc/encode.c:129
 #, c-format
-msgid "Failed to set advanced rate management parameters\n"
-msgstr ""
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+msgstr "255 каналів повинно вистачити для усіх. (Вибачте, але vorbis не підтримує більшу кількість)\n"
 
-#: oggenc/encode.c:115 oggenc/encode.c:252
+#: oggenc/encode.c:137
 #, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-
-#: oggenc/encode.c:174
-#, fuzzy, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 каналів повинно вистачити для усіх. (Вибачте, але vorbis не підтримує "
-"більшу кількість)\n"
-
-#: oggenc/encode.c:182
-#, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
-msgstr ""
-"Для запиту мінімальної чи максимальної щільності потоку бітів вимагається --"
-"managed\n"
+msgstr "Для запиту мінімальної чи максимальної щільності потоку бітів вимагається --managed\n"
 
-#: oggenc/encode.c:200
+#: oggenc/encode.c:155
 #, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Помилка режиму ініціалізації: неправильні параметри для якості\n"
 
-#: oggenc/encode.c:245
+#: oggenc/encode.c:198
 #, c-format
 msgid "Set optional hard quality restrictions\n"
 msgstr "Встановити необов'язкові обмеження жорсткої якості\n"
 
-#: oggenc/encode.c:247
+#: oggenc/encode.c:200
 #, c-format
 msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-"Не вдається встановити мін/макс щільність потоку бітів у режимі якості\n"
+msgstr "Не вдається встановити мін/макс щільність потоку бітів у режимі якості\n"
 
-#: oggenc/encode.c:263
+#: oggenc/encode.c:212
 #, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
-msgstr ""
-"Помилка режиму ініціалізації: неправильні параметри для щільності потоку "
-"бітів\n"
+msgstr "Помилка режиму ініціалізації: неправильні параметри для щільності потоку бітів\n"
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:269
 msgid "Failed writing header to output stream\n"
 msgstr "Помилка при записуванні заголовку у потік виводу\n"
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:335
 msgid "Failed writing data to output stream\n"
 msgstr "Помилка при записуванні даних у потік виводу\n"
 
-#: oggenc/encode.c:472
+#: oggenc/encode.c:381
 #, c-format
 msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr "\t[%5.1f%%] [залишилось %2dхв%.2dс] %c"
 
-#: oggenc/encode.c:482
+#: oggenc/encode.c:391
 #, c-format
 msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr "\tКодування [виконано %2dхв%.2dс] %c"
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -1048,7 +731,7 @@
 "\n"
 "Кодування файлу завершено \"%s\"\n"
 
-#: oggenc/encode.c:502
+#: oggenc/encode.c:411
 #, c-format
 msgid ""
 "\n"
@@ -1059,7 +742,7 @@
 "\n"
 "Кодування завершено.\n"
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -1068,17 +751,17 @@
 "\n"
 "\tДовжина файлу:     %dхв %04.1fс\n"
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tЗалишилось часу:   %dхв %04.1fс\n"
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tСтиснення:         %.4f\n"
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -1087,7 +770,7 @@
 "\tСередня щільність: %.1f кбіт/с\n"
 "\n"
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1098,17 +781,17 @@
 "         %s%s%s \n"
 "з середньою щільністю %d кбіт/с "
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: 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:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: 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:559
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1119,7 +802,7 @@
 "         %s%s%s \n"
 "з приблизною щільністю %d кбіт/с (увімкнено кодування з VBR)\n"
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1130,7 +813,7 @@
 "         %s%s%s \n"
 "з рівнем якості %2.2f з використанням обмеженого VBR "
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1141,7 +824,7 @@
 "         %s%s%s \n"
 "з якістю %2.2f\n"
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1152,151 +835,107 @@
 "         %s%s%s \n"
 "з використанням керування щільністю бітів "
 
-#: oggenc/oggenc.c:103
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help.\n"
+#: oggenc/oggenc.c:98
+#, c-format
+msgid ""
+"%s%s\n"
+"ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 "%s%s\n"
 "ПОМИЛКА: Не вказані вхідні файли. Для отримання довідки використовуйте -h.\n"
 
-#: oggenc/oggenc.c:118
+#: oggenc/oggenc.c:113
 #, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
-msgstr ""
-"ПОМИЛКА: Вказано декілька файлів, але використовується стандартний ввід\n"
+msgstr "ПОМИЛКА: Вказано декілька файлів, але використовується стандартний ввід\n"
 
-#: oggenc/oggenc.c:125
+#: oggenc/oggenc.c:120
 #, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"ПОМИЛКА: Декілька вхідних файлів при вказаній назві вхідного файлу: "
-"рекомендується використовувати -n\n"
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "ПОМИЛКА: Декілька вхідних файлів при вказаній назві вхідного файлу: рекомендується використовувати -n\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:176
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ПОМИЛКА: Не вдається відкрити вхідний файл \"%s\": %s\n"
 
-#: oggenc/oggenc.c:202
-#, fuzzy
-msgid "RAW file reader"
-msgstr "Читання файлів WAV"
-
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:204
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Відкривається %s модулем: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:213
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "ПОМИЛКА: Вхідний файл \"%s\" має непідтримуваний формат\n"
 
-#: oggenc/oggenc.c:280
+#: oggenc/oggenc.c:263
 #, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: Не вказана назва файлу, використовується \"default.ogg\"\n"
+msgstr "ПОПЕРЕДЖЕННЯ: Не вказана назва файлу, використовується \"default.ogg\"\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:271
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"ПОМИЛКА: Не вдається створити необхідні каталоги для файлу виводу \"%s\"\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "ПОМИЛКА: Не вдається створити необхідні каталоги для файлу виводу \"%s\"\n"
 
-#: oggenc/oggenc.c:295
+#: oggenc/oggenc.c:278
 #, c-format
 msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
-msgstr ""
-"ПОМИЛКА: Назва вхідного файлу не може збігатися з назвою файлу виводу \"%s"
-"\"\n"
+msgstr "ПОМИЛКА: Назва вхідного файлу не може збігатися з назвою файлу виводу \"%s\"\n"
 
-#: oggenc/oggenc.c:306
+#: oggenc/oggenc.c:289
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ПОМИЛКА: Не вдається відкрити файл виводу \"%s\": %s\n"
 
-#: oggenc/oggenc.c:350
+#: oggenc/oggenc.c:319
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Зміна частоти вхідних файлів з %d Гц до %d Гц\n"
 
-#: oggenc/oggenc.c:357
+#: oggenc/oggenc.c:326
 #, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Змішування стерео у моно\n"
 
-#: oggenc/oggenc.c:360
+#: oggenc/oggenc.c:329
 #, c-format
 msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "ПОМИЛКА: Змішування сигналів можливе лише зі стерео у моно\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr "Змінюється масштаб вводу на %f\n"
 
-#: oggenc/oggenc.c:414
-#, fuzzy, c-format
-msgid "oggenc from %s %s"
-msgstr "ogg123 з %s %s\n"
-
-#: oggenc/oggenc.c:416
+#: oggenc/oggenc.c:381
 #, c-format
 msgid ""
-"Usage: oggenc [options] inputfile [...]\n"
+"%s%s\n"
+"Usage: oggenc [options] input.wav [...]\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:417
-#, c-format
-msgid ""
 "OPTIONS:\n"
 " General:\n"
 " -Q, --quiet          Produce no output to stderr\n"
 " -h, --help           Print this help text\n"
-" -V, --version        Print the version number\n"
-msgstr ""
-
-#: oggenc/oggenc.c:423
-#, c-format
-msgid ""
-" -k, --skeleton       Adds an Ogg Skeleton bitstream\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"
-" -R, --raw-rate=n     Set samples/sec for raw input; default is 44100\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"
+" -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:430
-#, c-format
-msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\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"
-msgstr ""
-
-#: oggenc/oggenc.c:437
-#, c-format
-msgid ""
 " --managed            Enable the bitrate management engine. This will allow\n"
-"                      much greater control over the precise bitrate(s) "
-"used,\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"
-msgstr ""
-
-#: oggenc/oggenc.c:443
-#, c-format
-msgid ""
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
 "                      encoding for a fixed-size channel. Using this will\n"
 "                      automatically enable managed bitrate mode (see\n"
@@ -1304,573 +943,542 @@
 " -M, --max-bitrate    Specify a maximum bitrate in kbps. Useful for\n"
 "                      streaming applications. Using this will automatically\n"
 "                      enable managed bitrate mode (see --managed).\n"
-msgstr ""
-
-#: oggenc/oggenc.c:451
-#, c-format
-msgid ""
 " --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"
-msgstr ""
-
-#: oggenc/oggenc.c:458
-#, c-format
-msgid ""
 " -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"
 "                      The default quality level is 3.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:464
-#, c-format
-msgid ""
 " --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"
-msgstr ""
-
-#: oggenc/oggenc.c:471
-#, c-format
-msgid ""
 " --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
 "                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
-"                      support for files > 4GB and STDIN data streams. \n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:477
-#, c-format
-msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:484
-#, c-format
-msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:493
-#, c-format
-msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
 "                      used multiple times. The argument should be in the\n"
 "                      format \"tag=value\".\n"
 " -d, --date           Date for track (usually date of performance)\n"
-msgstr ""
-
-#: oggenc/oggenc.c:501
-#, c-format
-msgid ""
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
 " -l, --album          Name of album\n"
 " -a, --artist         Name of artist\n"
 " -G, --genre          Genre of track\n"
-msgstr ""
-
-#: oggenc/oggenc.c:507
-#, c-format
-msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
-msgstr ""
-
-#: oggenc/oggenc.c:518
-#, c-format
-msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\n"
-" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
-"Files\n"
+" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or AIFF/C\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 "
-"additional\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 additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
 " In this mode, output is to stdout unless an output filename is specified\n"
 " with -o\n"
 "\n"
 msgstr ""
+"%s%s\n"
+"Використання: oggenc [параметри] input.wav [...]\n"
+"\n"
+"ПАРАМЕТРИ:\n"
+" Загальні:\n"
+" -Q, --quiet          Не виводити у потік помилок\n"
+" -h, --help           Виводить цю довідку\n"
+" -v, --version        Print the version number\n"
+" -r, --raw            Режим без обробки. Вхідні файли читаються як дані PCM\n"
+" -B, --raw-bits=n     Число біт/семпл для необробленого вводу. Типово - 16\n"
+" -C, --raw-chan=n     Число каналів для необробленого вводу. Типово - 2\n"
+" -R, --raw-rate=n     Число семплів/с для необробленого вводу. Типово - 44100\n"
+" --raw-endianness     1 для bigendian, 0 для little (типово - 0)\n"
+" -b, --bitrate        Номінальна щільність бітів для кодування. Намагається\n"
+"                      кодувати з вказаною щільністю. Очікує аргумент із\n"
+"                      зазначенням щільності у кбіт/с. Типово, використовується VBR\n"
+"                      кодування, еквівалентне використанню -q чи --quality.\n"
+"                      Для використання керованої щільності бітового потоку\n"
+"                      дивіться параметр --managed.\n"
+" --managed            Вмикає механізм керованої щільності бітового потоку. Це\n"
+"                      дозволяє краще керування при використані точної щільності,\n"
+"                      але кодування буде значно повільнішим. Не користуйтесь цим\n"
+"                      режимом, якщо вам не потрібен детальний контроль над щільністю\n"
+"                      потоку бітів, наприклад для потокової трансляції.\n"
+" -m, --min-bitrate    Мінімальна щільність бітів (у кбіт/с). Корисно при\n"
+"                      кодуванні для каналу постійного розміру. Використання\n"
+"                      ключа автоматично вмикає призначений режим щільності\n"
+"                      потоку (дивіться --managed).\n"
+" -M, --max-bitrate    Максимальна щільність бітів (у кбіт/с). Корисно для\n"
+"                      потокових прикладних програм. Використання\n"
+"                      ключа автоматично вмикає призначений режим щільності\n"
+"                      потоку (дивіться --managed).\n"
+" --advanced-encode-option параметр=значення\n"
+"                      Встановлює додаткові параметри механізму кодування.\n"
+"                      Можливі параметри (та їх значення) документовані\n"
+"                      на головній сторінці, що постачається з програмою.\n"
+"                      Лише для досвідчених користувачі, та має використовуватись\n"
+"                      обережно.\n"
+" -q, --quality        Якість від 0 (низька) до 10 (висока), замість \n"
+"                      вказування певної цільності бітів. Це звичайний режим.\n"
+"                      Допускається дробове значення якості (наприклад, 2.75)\n"
+"                      Значення -1 також допускається, але не забезпечує\n"
+"                      належної якості.\n"
+" --resample n         Змінює частоту вхідних даних до значення n (Гц)\n"
+" --downmix            Змішує стерео у моно. Допустимо лише для вхідного\n"
+"                      сигналу у стерео форматі.\n"
+" -s, --serial         Вказує серійний номер потоку. Якщо кодується декілька\n"
+"                      файлів, це значення автоматично збільшується на 1 для\n"
+"                      кожного наступного файлу.\n"
+"\n"
+" Присвоєння назв:\n"
+" -o, --output=fn      Записує файл у fn (можливе лише з одним вхідним файлом)\n"
+" -n, --names=string   Створити назви файлів за шаблоном з рядка string, де\n"
+"                      %%a, %%t, %%l, %%n, %%d замінюються на ім'я артиста,\n"
+"                      назву, альбом, номер доріжки, та дату (спосіб їх\n"
+"                      вказування дивіться нижче).\n"
+"                      %%%% перетворюється в літерал %%.\n"
+" -X, --name-remove=s  Видаляє певні символи з параметрів рядка формату -n\n"
+"                      Корисно для створення коректних назв файлів.\n"
+" -P, --name-replace=s Замінює символи, видалені з використанням --name-remove,\n"
+"                      на вказані символи. Якщо цей рядок коротший ніж рядок у\n"
+"                      --name-remove, або взагалі не вказаний, символи просто\n"
+"                      видаляються.\n"
+"                      Типові значення для двох наведених вище параметрів\n"
+"                      від платформи.\n"
+" -c, --comment=c      Додає вказаний рядок у якості додаткового коментарю.\n"
+"                      Може вказуватись декілька разів. Аргумент має бути у\n"
+"                      форматі \"тег=значення\".\n"
+"                      Може використовуватись декілька разів.\n"
+" -d, --date           Дата доріжки (зазвичай дата створення)\n"
+" -N, --tracknum       Номер цієї доріжки\n"
+" -t, --title          Заголовок цієї доріжки\n"
+" -l, --album          Назва альбому\n"
+" -a, --artist         Ім'я виконавця\n"
+" -G, --genre          Жанр доріжки\n"
+"                      Якщо вказано декілька вхідних файлів, тоді декілька\n"
+"                      екземплярів попередніх 5-ти параметрів, будуть\n"
+"                      використовуватись у тому самому порядку, у якому вони,\n"
+"                      наведені. Якщо заголовків вказано менше ніж файлів,\n"
+"                      OggEnc виведе попередження, та буде використовувати\n"
+"                      останнє значення до решти файлів. Якщо вказано\n"
+"                      недостатньо номерів доріжок, решта фалів не будуть\n"
+"                      пронумеровані. Для всіх інших, буде використовуватись\n"
+"                      останнє значення без будь-яких попереджень (таким\n"
+"                      чином, наприклад, можна один раз вказати дату та\n"
+"                      використовувати її для усіх файлів)\n"
+"\n"
+"ВХІДНІ ФАЙЛИ:\n"
+" Наразі вхідними файлами OggEnc можуть бути 16-бітні або 8-бітні PCM WAV,\n"
+" AIFF, чи AIFF/C файли, або 32-бітні WAV з плаваючою комою. Файли можуть бути\n"
+" моно, стерео (або з більшою кількістю каналів) з довільною дискретизацією.\n"
+" У якості альтернативи можна використовувати параметр --raw для зчитування\n"
+" сирих PCM даних, які повинні бути 16-бітним стерео little-endian PCM\n"
+" ('headerless wav'), якщо не вказані додаткові параметри для режиму сирих\n"
+"  даних.\n"
+" можна вказати зчитувати діні зі стандартного потоку вводу, використовуючи\n"
+" знак - у якості назви вхідного файлу.\n"
+" У цьому випадку, вивід направляється у стандартний потік виводу, якщо не\n"
+" вказана назва файлу виводу у параметрі -o\n"
+"\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:570
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: проігнорований некоректний керуючий символ '%c' у форматі "
-"назви\n"
+msgstr "ПОПЕРЕДЖЕННЯ: проігнорований некоректний керуючий символ '%c' у форматі назви\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
+#: 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:661
+#: oggenc/oggenc.c:605
 #, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: вказано порядок сирих байт для не сирих даних. Вважається, що "
-"дані сирі.\n"
+msgid "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
+msgstr "ПОПЕРЕДЖЕННЯ: вказано порядок сирих байт для не сирих даних. Вважається, що дані сирі.\n"
 
-#: oggenc/oggenc.c:664
+#: oggenc/oggenc.c:608
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: не вдається прочитати аргумент порядку слідування байт \"%s\"\n"
+msgstr "ПОПЕРЕДЖЕННЯ: не вдається прочитати аргумент порядку слідування байт \"%s\"\n"
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:615
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "ПОПЕРЕДЖЕННЯ: не вдається прочитати зміну частоти \"%s\"\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
-msgstr ""
-"Попередження: вказана зміна частоти дискретизації на %d Гц. Ви мали на увазі "
-"%d Гц?\n"
+msgstr "Попередження: вказана зміна частоти дискретизації на %d Гц. Ви мали на увазі %d Гц?\n"
 
-#: oggenc/oggenc.c:687
+#: oggenc/oggenc.c:631
 #, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Попередження: не вдається розібрати масштаб \"%s\"\n"
 
-#: oggenc/oggenc.c:700
+#: oggenc/oggenc.c:641
 #, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Не знайдено значення додаткового параметра кодувальника\n"
 
-#: oggenc/oggenc.c:718
+#: oggenc/oggenc.c:656
 #, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Внутрішня помилка аналізу командного рядка\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:667
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
-msgstr ""
-"Попередження: використано неправильний коментар (\"%s\"), ігнорується.\n"
+msgstr "Попередження: використано неправильний коментар (\"%s\"), ігнорується.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:702
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Попередження: номінальну щільність бітів \"%s\" не розпізнано\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:710
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Попередження: мінімальну щільність бітів \"%s\" не розпізнано\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:723
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Попередження: максимальну щільність бітів \"%s\" не розпізнано\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:735
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Параметр якості \"%s\" не розпізнано, ігнорується\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:743
 #, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: встановлено занадто високу якість, обмежено до максимальної\n"
+msgstr "ПОПЕРЕДЖЕННЯ: встановлено занадто високу якість, обмежено до максимальної\n"
 
-#: oggenc/oggenc.c:813
+#: oggenc/oggenc.c:749
 #, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: Вказано декілька форматів назв, використовується останній\n"
+msgstr "ПОПЕРЕДЖЕННЯ: Вказано декілька форматів назв, використовується останній\n"
 
-#: oggenc/oggenc.c:822
+#: oggenc/oggenc.c:758
 #, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: Вказано декілька фільтрів форматів назв, використовується "
-"останній\n"
+msgstr "ПОПЕРЕДЖЕННЯ: Вказано декілька фільтрів форматів назв, використовується останній\n"
 
-#: oggenc/oggenc.c:831
+#: oggenc/oggenc.c:767
 #, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: Вказано декілька замін фільтрів форматів назв, "
-"використовується останній\n"
+msgid "WARNING: Multiple name format filter replacements specified, using final\n"
+msgstr "ПОПЕРЕДЖЕННЯ: Вказано декілька замін фільтрів форматів назв, використовується останній\n"
 
-#: oggenc/oggenc.c:839
+#: oggenc/oggenc.c:775
 #, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: Вказано декілька файлів виводу, рекомендується використовувати "
-"-n\n"
+msgstr "ПОПЕРЕДЖЕННЯ: Вказано декілька файлів виводу, рекомендується використовувати -n\n"
 
-#: oggenc/oggenc.c:851
-#, fuzzy, c-format
-msgid "oggenc from %s %s\n"
-msgstr "ogg123 з %s %s\n"
-
-#: oggenc/oggenc.c:858
+#: oggenc/oggenc.c:794
 #, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: вказано значення сирих біт/семпл для не сирих даних. "
-"Вважається, що дані на вводі сирі.\n"
+msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+msgstr "ПОПЕРЕДЖЕННЯ: вказано значення сирих біт/семпл для не сирих даних. Вважається, що дані на вводі сирі.\n"
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
+#: 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:874
+#: oggenc/oggenc.c:810
 #, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: вказана кількість сирих каналів для не сирих даних. "
-"Вважається, що дані на вводі сирі.\n"
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "ПОПЕРЕДЖЕННЯ: вказана кількість сирих каналів для не сирих даних. Вважається, що дані на вводі сирі.\n"
 
-#: oggenc/oggenc.c:879
+#: oggenc/oggenc.c:815
 #, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "ПОПЕРЕДЖЕННЯ: вказана неправильна кількість каналів, вважається 2.\n"
 
-#: oggenc/oggenc.c:890
+#: oggenc/oggenc.c:826
 #, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: вказана сира частота вибірки даних для не сирих даних. "
-"Вважається, що дані на вводі сирі.\n"
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+msgstr "ПОПЕРЕДЖЕННЯ: вказана сира частота вибірки даних для не сирих даних. Вважається, що дані на вводі сирі.\n"
 
-#: oggenc/oggenc.c:895
+#: oggenc/oggenc.c:831
 #, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: вказана неправильна частота дискретизації, вважається 44100.\n"
+msgstr "ПОПЕРЕДЖЕННЯ: вказана неправильна частота дискретизації, вважається 44100.\n"
 
-#: oggenc/oggenc.c:902
+#: oggenc/oggenc.c:835
 #, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "ПОПЕРЕДЖЕННЯ: вказано невідомий параметр, ігнорується->\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Не вдається перетворити коментар у UTF-8, неможливо додати\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
+#: 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:954
+#: oggenc/oggenc.c:876
 #, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
-msgstr ""
-"ПОПЕРЕДЖЕННЯ: вказана недостатня кількість заголовків, встановлені останні "
-"значення.\n"
+msgstr "ПОПЕРЕДЖЕННЯ: вказана недостатня кількість заголовків, встановлені останні значення.\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Не вдається створити каталог \"%s\": %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Помилка при перевірці існування каталогу %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:167
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Помилка: сегмент шляху \"%s\" не є каталогом\n"
 
-#: ogginfo/ogginfo2.c:212
+#: ogginfo/ogginfo2.c:171
 #, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
-msgstr ""
-"Попередження: коментар %d потоку %d має некоректний формат, він не містить "
-"'=': \"%s\"\n"
+msgid "Warning: Comment %d in stream %d has invalid format, does not contain '=': \"%s\"\n"
+msgstr "Попередження: коментар %d потоку %d має некоректний формат, він не містить '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo2.c:179
 #, c-format
 msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Попередження: некоректна назва коментарю у коментарі %d (потік %d): \"%s\"\n"
+msgstr "Попередження: некоректна назва коментарю у коментарі %d (потік %d): \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: 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"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
+msgstr "Попередження: некоректна UTF-8 послідовність у коментарі %d (потік %d): неправильний маркер довжини\n"
 
-#: ogginfo/ogginfo2.c:266
+#: 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"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr "Попередження: неправильна UTF-8 послідовність у коментарі %d (потік %d): надто мало байтів\n"
 
-#: ogginfo/ogginfo2.c:342
-#, fuzzy, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\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:356
+#: ogginfo/ogginfo2.c:295
 msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
 msgstr "Попередження: помилка у utf8 декодері. Взагалі, це неможливо\n"
 
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Попередження: для потоку %d не встановлено маркер його кінця\n"
-
-#: ogginfo/ogginfo2.c:389
+#: ogginfo/ogginfo2.c:318
 #, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Попередження: не вдається розкодувати пакет заголовків theora - неправильний "
-"потік theora (%d)\n"
+msgid "Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr "Попередження: не вдається розкодувати пакет заголовків theora - неправильний потік theora (%d)\n"
 
-#: ogginfo/ogginfo2.c:396
+#: 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 ""
-"Попередження: заголовки theora потоку %d некоректно розділені. Остання "
-"сторінка заголовку містить додаткові пакети або має не-нульовий granulepos\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 "Попередження: заголовки theora потоку %d некоректно розділені. Остання сторінка заголовку містить додаткові пакети або має не-нульовий granulepos\n"
 
-#: ogginfo/ogginfo2.c:400
+#: ogginfo/ogginfo2.c:329
 #, c-format
 msgid "Theora headers parsed for stream %d, information follows...\n"
 msgstr "Оброблені заголовки theora для потоку %d, далі йде інформація...\n"
 
-#: ogginfo/ogginfo2.c:403
+#: ogginfo/ogginfo2.c:332
 #, c-format
 msgid "Version: %d.%d.%d\n"
 msgstr "Версія: %d.%d.%d\n"
 
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
 #, c-format
 msgid "Vendor: %s\n"
 msgstr "Постачальник: %s\n"
 
-#: ogginfo/ogginfo2.c:406
+#: ogginfo/ogginfo2.c:335
 #, c-format
 msgid "Width: %d\n"
 msgstr "Ширина: %d\n"
 
-#: ogginfo/ogginfo2.c:407
+#: ogginfo/ogginfo2.c:336
 #, c-format
 msgid "Height: %d\n"
 msgstr "Висота: %d\n"
 
-#: ogginfo/ogginfo2.c:408
+#: ogginfo/ogginfo2.c:337
 #, c-format
 msgid "Total image: %d by %d, crop offset (%d, %d)\n"
 msgstr "Повне зображення: %d на %d, зсув кадрування (%d, %d)\n"
 
-#: ogginfo/ogginfo2.c:411
+#: ogginfo/ogginfo2.c:340
 msgid "Frame offset/size invalid: width incorrect\n"
 msgstr "Некоректний зсув/розмір кадру: некоректна ширина\n"
 
-#: ogginfo/ogginfo2.c:413
+#: ogginfo/ogginfo2.c:342
 msgid "Frame offset/size invalid: height incorrect\n"
 msgstr "Некоректний зсув/розмір кадру: некоректна висота\n"
 
-#: ogginfo/ogginfo2.c:416
+#: ogginfo/ogginfo2.c:345
 msgid "Invalid zero framerate\n"
 msgstr "Некоректний нульова частота кадрів\n"
 
-#: ogginfo/ogginfo2.c:418
+#: ogginfo/ogginfo2.c:347
 #, c-format
 msgid "Framerate %d/%d (%.02f fps)\n"
 msgstr "Частота кадрів %d/%d (%.02f кадр/с)\n"
 
-#: ogginfo/ogginfo2.c:422
+#: ogginfo/ogginfo2.c:351
 msgid "Aspect ratio undefined\n"
 msgstr "Не визначено співвідношення сторін\n"
 
-#: ogginfo/ogginfo2.c:427
-#, fuzzy, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
+#: ogginfo/ogginfo2.c:356
+#, c-format
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
 msgstr "Співвідношення сторін точки %d:%d (1:%f)\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:358
 msgid "Frame aspect 4:3\n"
 msgstr "Співвідношення сторін кадру 4:3\n"
 
-#: ogginfo/ogginfo2.c:431
+#: ogginfo/ogginfo2.c:360
 msgid "Frame aspect 16:9\n"
 msgstr "Співвідношення сторін кадру 16:9\n"
 
-#: ogginfo/ogginfo2.c:433
-#, fuzzy, c-format
-msgid "Frame aspect %f:1\n"
-msgstr "Співвідношення сторін кадру 4:3\n"
+#: ogginfo/ogginfo2.c:362
+#, c-format
+msgid "Frame aspect 1:%d\n"
+msgstr "Співвідношення сторін кадру 1:%d\n"
 
-#: ogginfo/ogginfo2.c:437
+#: ogginfo/ogginfo2.c:366
 msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
 msgstr "Простір кольорів: Rec. ITU-R BT.470-6 System M (NTSC)\n"
 
-#: ogginfo/ogginfo2.c:439
+#: ogginfo/ogginfo2.c:368
 msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
 msgstr "Простір кольорів: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
 
-#: ogginfo/ogginfo2.c:441
+#: ogginfo/ogginfo2.c:370
 msgid "Colourspace unspecified\n"
 msgstr "Простір кольорів не визначений\n"
 
-#: ogginfo/ogginfo2.c:444
+#: ogginfo/ogginfo2.c:373
 msgid "Pixel format 4:2:0\n"
 msgstr "Формат точок 4:2:0\n"
 
-#: ogginfo/ogginfo2.c:446
+#: ogginfo/ogginfo2.c:375
 msgid "Pixel format 4:2:2\n"
 msgstr "Формат точок 4:2:2\n"
 
-#: ogginfo/ogginfo2.c:448
+#: ogginfo/ogginfo2.c:377
 msgid "Pixel format 4:4:4\n"
 msgstr "Формат точок 4:4:4\n"
 
-#: ogginfo/ogginfo2.c:450
+#: ogginfo/ogginfo2.c:379
 msgid "Pixel format invalid\n"
 msgstr "Некоректний формат точок\n"
 
-#: ogginfo/ogginfo2.c:452
+#: ogginfo/ogginfo2.c:381
 #, c-format
 msgid "Target bitrate: %d kbps\n"
 msgstr "Цільова щільність бітів: %d кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:453
+#: ogginfo/ogginfo2.c:382
 #, c-format
 msgid "Nominal quality setting (0-63): %d\n"
 msgstr "Номінальна якість (0-63): %d\n"
 
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
+#: ogginfo/ogginfo2.c:385 ogginfo/ogginfo2.c:514
 msgid "User comments section follows...\n"
 msgstr "Далі слідує секція коментарів користувача...\n"
 
-#: ogginfo/ogginfo2.c:477
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Попередження: для потоку %d не встановлено маркер його кінця\n"
+#: ogginfo/ogginfo2.c:401 ogginfo/ogginfo2.c:530
+msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
+msgstr "Попередження: значення granulepos потоку %d зменшилось з %I64d до %I64d"
 
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
 msgstr "Попередження: значення granulepos потоку %d зменшилось з %lld до %lld"
 
-#: ogginfo/ogginfo2.c:520
+#: ogginfo/ogginfo2.c:432
 msgid ""
 "Theora stream %d:\n"
-"\tTotal data length: %"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
+"Потік Theora %d:\n"
+"\tДовжина даних: %I64d байт\n"
+"\tЧас відтворення:  %ldхв:%02ld.%03ldс\n"
+"\tСередня щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:438
+#, c-format
 msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
+"Theora stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Попередження: не вдається розкодувати пакет заголовків vorbis - неправильний "
-"потік vorbis (%d)\n"
+"Потік Theora%d:\n"
+"\tДовжина даних: %lld байт\n"
+"\tЧас відтворення: %ldхв:%02ld.%03ldс\n"
+"\tСередня щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:466
 #, 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"
-msgstr ""
-"Попередження: заголовки vorbis потоку %d некоректно розділені. Остання "
-"сторінка заголовка містить додаткові пакети або має не-нульовий granulepos\n"
+msgid "Warning: Could not decode vorbis header packet - invalid vorbis stream (%d)\n"
+msgstr "Попередження: не вдається розкодувати пакет заголовків vorbis - неправильний потік vorbis (%d)\n"
 
-#: ogginfo/ogginfo2.c:569
+#: ogginfo/ogginfo2.c:473
 #, 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"
+msgstr "Попередження: заголовки vorbis потоку %d некоректно розділені. Остання сторінка заголовка містить додаткові пакети або має не-нульовий granulepos\n"
+
+#: ogginfo/ogginfo2.c:477
+#, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Оброблені заголовки vorbis для потоку %d, далі йде інформація...\n"
 
-#: ogginfo/ogginfo2.c:572
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Версія: %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Постачальник: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:492
 #, c-format
 msgid "Channels: %d\n"
 msgstr "Канали: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1879,208 +1487,96 @@
 "Дискретизація: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Номінальна щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Номінальна щільність бітів не встановлена\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Максимальна щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Максимальна щільність бітів не встановлена\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Мінімальна щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Мінімальна щільність бітів не встановлена\n"
 
-#: ogginfo/ogginfo2.c:630
-#, fuzzy, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
-"Від'ємне значення granulepos потоку vorbis на межами заголовку. Файл "
-"створений некоректним кодеком\n"
+#: ogginfo/ogginfo2.c:539
+msgid "Negative granulepos on vorbis stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "Від'ємне значення granulepos потоку vorbis на межами заголовку. Файл створений некоректним кодеком\n"
 
-#: ogginfo/ogginfo2.c:651
+#: ogginfo/ogginfo2.c:561
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
+"Потік vorbis %d:\n"
+"\tДовжина даних:  %I64d байт\n"
+"\tЧас відтворення:  %ldхв:%02ld.%03ldс\n"
+"\tСередня щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:692
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Попередження: не вдається розкодувати пакет заголовків theora - неправильний "
-"потік theora (%d)\n"
-
-#: ogginfo/ogginfo2.c:703
-#, fuzzy, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Попередження: не вдається розкодувати пакет заголовків theora - неправильний "
-"потік theora (%d)\n"
-
-#: ogginfo/ogginfo2.c:734
-#, fuzzy, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
-"Попередження: заголовки theora потоку %d некоректно розділені. Остання "
-"сторінка заголовку містить додаткові пакети або має не-нульовий granulepos\n"
-
-#: ogginfo/ogginfo2.c:738
-#, fuzzy, c-format
-msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr "Оброблені заголовки theora для потоку %d, далі йде інформація...\n"
-
-#: ogginfo/ogginfo2.c:741
-#, fuzzy, c-format
-msgid "Version: %d.%d\n"
-msgstr "Версія: %d.%d.%d\n"
-
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:567
 #, c-format
-msgid "Language: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:750
-msgid "No language set\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:753
-#, fuzzy, c-format
-msgid "Category: %s\n"
-msgstr "Постачальник: %s\n"
-
-#: ogginfo/ogginfo2.c:756
-#, fuzzy
-msgid "No category set\n"
-msgstr "Номінальна щільність бітів не встановлена\n"
-
-#: ogginfo/ogginfo2.c:761
-msgid "utf-8"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:765
-#, c-format
-msgid "Character encoding: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:768
-msgid "Unknown character encoding\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:773
-msgid "left to right, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:774
-msgid "right to left, top to bottom"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:775
-msgid "top to bottom, right to left"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:776
-msgid "top to bottom, left to right"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:780
-#, c-format
-msgid "Text directionality: %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:783
-msgid "Unknown text directionality\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:795
-#, fuzzy
-msgid "Invalid zero granulepos rate\n"
-msgstr "Некоректний нульова частота кадрів\n"
-
-#: ogginfo/ogginfo2.c:797
-#, fuzzy, c-format
-msgid "Granulepos rate %d/%d (%.02f gps)\n"
-msgstr "Частота кадрів %d/%d (%.02f кадр/с)\n"
-
-#: ogginfo/ogginfo2.c:810
-msgid "\n"
-msgstr "\n"
-
-#: ogginfo/ogginfo2.c:828
-#, fuzzy, c-format
 msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
-"Від'ємне значення granulepos потоку vorbis на межами заголовку. Файл "
-"створений некоректним кодеком\n"
+"Потік vorbis %d:\n"
+"\tДовжина даних: %lld байт\n"
+"\tЧас відтворення: %ldхв:%02ld.%03ldс\n"
+"\tСередня щільність бітів: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:853
-msgid ""
-"Kate stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:602
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Попередження: для потоку %d не встановлено маркер його кінця\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:738
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Попередження: неправильна сторінка заголовку, не знайдено пакет\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:756
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-"Попередження: неправильна сторінка заголовку у потоці %d, містить багато "
-"пакетів\n"
+msgstr "Попередження: неправильна сторінка заголовку у потоці %d, містить багато пакетів\n"
 
-#: ogginfo/ogginfo2.c:1088
+#: ogginfo/ogginfo2.c:770
 #, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-"Примітка: потік %d має серійний номер %d, що припускається, але може "
-"спричинити проблеми з деякими інструментами.\n"
+msgid "Note: Stream %d has serial number %d, which is legal but may cause problems with some tools.\n"
+msgstr "Примітка: потік %d має серійний номер %d, що припускається, але може спричинити проблеми з деякими інструментами.\n"
 
-#: ogginfo/ogginfo2.c:1105
-#, fuzzy
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-"Попередження: дірка у даних зі зсувом приблизно %lld байтів. Пошкоджений "
-"ogg.\n"
+#: ogginfo/ogginfo2.c:788
+msgid "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted ogg.\n"
+msgstr "Попередження: дірка у даних зі зсувом приблизно %I64d байтів. Пошкоджений ogg.\n"
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:790
 #, c-format
+msgid "Warning: Hole in data found at approximate offset %lld bytes. Corrupted ogg.\n"
+msgstr "Попередження: дірка у даних зі зсувом приблизно %lld байтів. Пошкоджений ogg.\n"
+
+#: ogginfo/ogginfo2.c:815
+#, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Помилка при відкриванні вхідного файлу \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2089,27 +1585,23 @@
 "Обробка файлу \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Не вдається знайти обробник потоку. Завдання повернуто\n"
 
-#: ogginfo/ogginfo2.c:1151
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
 msgstr "Сторінка не існує після ознаки EOS"
 
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-"Порушено обмеження мікшування Ogg, новий потік перед EOS усіх попередніх "
-"котоків"
+#: ogginfo/ogginfo2.c:840
+msgid "Ogg muxing constraints violated, new stream before EOS of all previous streams"
+msgstr "Порушено обмеження мікшування Ogg, новий потік перед EOS усіх попередніх котоків"
 
-#: ogginfo/ogginfo2.c:1158
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
 msgstr "Невідома помилка."
 
-#: ogginfo/ogginfo2.c:1161
+#: ogginfo/ogginfo2.c:847
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -2118,61 +1610,54 @@
 "Попередження: неправильно розташовані сторінки для потоку %d\n"
 "Це означає, що ogg-файл пошкоджений: %s.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Новий логічний потік (#%d, серійний номер: %08x): тип %s\n"
 
-#: ogginfo/ogginfo2.c:1176
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Попередження: для потоку %d не встановлена ознака його початку\n"
 
-#: ogginfo/ogginfo2.c:1180
+#: 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:1185
+#: 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 ""
-"Попередження: пропущений порядковий номер у потоку %d. Отримана сторінка %"
-"ld, але очікувалась %ld. Це свідчить про пропуск у даних.\n"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "Попередження: пропущений порядковий номер у потоку %d. Отримана сторінка %ld, але очікувалась %ld. Це свідчить про пропуск у даних.\n"
 
-#: ogginfo/ogginfo2.c:1200
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Логічний потік %d завершився\n"
 
-#: ogginfo/ogginfo2.c:1208
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:894
+#, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
-"Input probably not Ogg.\n"
+"Input probably not ogg.\n"
 msgstr ""
 "Помилка: Дані ogg не знайдені у файлі \"%s\".\n"
 "Ймовірно, вхідні дані не у форматі ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 з %s %s\n"
-
-#: ogginfo/ogginfo2.c:1225
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:905
+#, c-format
 msgid ""
+"ogginfo 1.1.0\n"
 "(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
 "\n"
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "Flags supported:\n"
 "\t-h Show this help message\n"
 "\t-q Make less verbose. Once will remove detailed informative\n"
 "\t   messages, two will remove warnings\n"
 "\t-v Make more verbose. This may enable more detailed checks\n"
 "\t   for some stream types.\n"
+"\n"
 msgstr ""
 "ogginfo 1.1.0\n"
 "(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
@@ -2186,17 +1671,12 @@
 "\t   перевірки для деяких типів потоків.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1234
+#: ogginfo/ogginfo2.c:926
 #, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:1246
-#, fuzzy, c-format
 msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
-"ogginfo is a tool for printing information about Ogg files\n"
+"Ogginfo is a tool for printing information about ogg files\n"
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
@@ -2206,12 +1686,10 @@
 "та діагностики проблем з цими файлами.\n"
 "Докладна довідка виводиться командою \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1280
+#: ogginfo/ogginfo2.c:955
 #, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
-msgstr ""
-"Не вказані вхідні файли. Для отримання довідки використовуйте \"ogginfo -h"
-"\"\n"
+msgstr "Не вказані вхідні файли. Для отримання довідки використовуйте \"ogginfo -h\"\n"
 
 #: share/getopt.c:673
 #, c-format
@@ -2268,42 +1746,37 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: параметр `-W %s' не допускає вказування аргументів\n"
 
-#: vcut/vcut.c:149
+#: vcut/vcut.c:133
 #, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Помилка сторінки. Пошкоджені вхідні дані.\n"
 
-#: vcut/vcut.c:166
+#: vcut/vcut.c:150
 #, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Помилка потоку бітів, продовження роботи\n"
 
-#: vcut/vcut.c:206
+#: vcut/vcut.c:175
 #, c-format
 msgid "Found EOS before cut point.\n"
 msgstr "Виявлено кінець потоку перед точкою відрізання.\n"
 
-#: vcut/vcut.c:215
+#: vcut/vcut.c:184
 #, c-format
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Встановлення ознаки кінця потоку: спроба оновлення повернула код 0\n"
 
-#: vcut/vcut.c:225
+#: vcut/vcut.c:194
 #, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Точка відрізання не в середині потоку. Другий файл буде порожнім.\n"
 
-#: vcut/vcut.c:277
+#: vcut/vcut.c:227
 #, c-format
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Необроблений спеціальний випадок: перший файл занадто короткий?\n"
 
-#: vcut/vcut.c:327
-#, fuzzy, c-format
-msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr "Точка відрізання не в середині потоку. Другий файл буде порожнім.\n"
-
-#: vcut/vcut.c:353
+#: vcut/vcut.c:286
 #, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
@@ -2312,60 +1785,57 @@
 "ПОМИЛКА: перші два звукових пакети не вміщаються у одну\n"
 "       сторінку ogg. Файл не може бути коректно декодований.\n"
 
-#: vcut/vcut.c:373
+#: vcut/vcut.c:299
 #, c-format
-msgid "Update sync returned 0, setting eos\n"
-msgstr "Спроба оновлення повернула 0, встановлення ознаки кінця потоку\n"
-
-#: vcut/vcut.c:378
-#, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Виправна помилка потоку бітів\n"
 
-#: vcut/vcut.c:387
+#: vcut/vcut.c:309
 #, c-format
 msgid "Bitstream error\n"
 msgstr "Помилка потоку бітів\n"
 
-#: vcut/vcut.c:449
+#: 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:459
+#: vcut/vcut.c:391
 #, c-format
 msgid "Error in first page\n"
 msgstr "Помилка на першій сторінці\n"
 
-#: vcut/vcut.c:464
+#: vcut/vcut.c:396
 #, c-format
 msgid "error in first packet\n"
 msgstr "помилка у першому пакеті\n"
 
-#: vcut/vcut.c:470
+#: vcut/vcut.c:402
 #, c-format
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Помилка у основному заголовку: не vorbis?\n"
 
-#: vcut/vcut.c:490
+#: vcut/vcut.c:422
 #, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Вторинний заголовок пошкоджений\n"
 
-#: vcut/vcut.c:503
+#: vcut/vcut.c:435
 #, c-format
 msgid "EOF in headers\n"
 msgstr "у заголовках виявлено кінець файлу\n"
 
-#: vcut/vcut.c:535
+#: vcut/vcut.c:468
 #, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
-msgstr ""
-"Використання: vcut вх_файл.ogg вих_файл1.ogg вих_файл2.ogg [точка_відрізання "
-"| +точка_відрізання]\n"
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+msgstr "Використання: vcut вх_файл.ogg вих_файл1.ogg вих_файл2.ogg [точка_відрізання | +точка_відрізання]\n"
 
-#: vcut/vcut.c:539
+#: vcut/vcut.c:472
 #, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
@@ -2376,744 +1846,202 @@
 "Перевірте коректність отриманих файлів перед видаленням вхідних.\n"
 "\n"
 
-#: vcut/vcut.c:544
+#: vcut/vcut.c:477
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Не вдається відкрити %s для читання\n"
 
-#: vcut/vcut.c:549 vcut/vcut.c:554
+#: vcut/vcut.c:482 vcut/vcut.c:487
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Не вдається відкрити %s для записування\n"
 
-#: vcut/vcut.c:560 vcut/vcut.c:565
+#: vcut/vcut.c:493 vcut/vcut.c:498
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Не вдається обробити точку відрізання \"%s\"\n"
 
-#: vcut/vcut.c:570
+#: vcut/vcut.c:503
 #, c-format
 msgid "Processing: Cutting at %lld seconds\n"
 msgstr "Обробка: Вирізання у позиції %lld секунд\n"
 
-#: vcut/vcut.c:572
+#: vcut/vcut.c:505
 #, c-format
 msgid "Processing: Cutting at %lld samples\n"
 msgstr "Обробка: Вирізання у позиції %lld секунд\n"
 
-#: vcut/vcut.c:582
+#: vcut/vcut.c:515
 #, c-format
 msgid "Processing failed\n"
 msgstr "Обробка не вдалась\n"
 
-#: vcut/vcut.c:604
+#: vcut/vcut.c:537
 #, c-format
 msgid "Error reading headers\n"
 msgstr "Помилка читання заголовків\n"
 
-#: vcut/vcut.c:627
+#: vcut/vcut.c:560
 #, c-format
 msgid "Error writing first output file\n"
 msgstr "Помилка запису першого файлу виводу\n"
 
-#: vcut/vcut.c:635
+#: vcut/vcut.c:568
 #, c-format
 msgid "Error writing second output file\n"
 msgstr "Помилка запису другого файлу виводу\n"
 
-#: vorbiscomment/vcedit.c:130 vorbiscomment/vcedit.c:156
-msgid "Couldn't get enough memory for input buffering."
-msgstr ""
+#: vorbiscomment/vcedit.c:229
+msgid "Input truncated or empty."
+msgstr "Вхідні дані обрізані чи порожні."
 
-#: vorbiscomment/vcedit.c:180 vorbiscomment/vcedit.c:551
+#: vorbiscomment/vcedit.c:231
+msgid "Input is not an Ogg bitstream."
+msgstr "Вхідні дані не є бітовим потоком Ogg."
+
+#: vorbiscomment/vcedit.c:249
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Помилка при читанні першої сторінки бітового потоку Ogg."
 
-#: vorbiscomment/vcedit.c:186 vorbiscomment/vcedit.c:558
+#: vorbiscomment/vcedit.c:255
 msgid "Error reading initial header packet."
 msgstr "Помилка при читання заголовка пакету."
 
-#: vorbiscomment/vcedit.c:238
-msgid "Couldn't get enough memory to register new stream serial number."
-msgstr ""
-
-#: vorbiscomment/vcedit.c:506
-msgid "Input truncated or empty."
-msgstr "Вхідні дані обрізані чи порожні."
-
-#: vorbiscomment/vcedit.c:508
-msgid "Input is not an Ogg bitstream."
-msgstr "Вхідні дані не є бітовим потоком Ogg."
-
-#: vorbiscomment/vcedit.c:566
+#: vorbiscomment/vcedit.c:261
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Бітовий потік Ogg не містить дані vorbis."
 
-#: vorbiscomment/vcedit.c:579
-#, fuzzy
-msgid "EOF before recognised stream."
-msgstr "Виявлено кінець файлу перед до закінчення заголовків."
-
-#: vorbiscomment/vcedit.c:595
-#, fuzzy
-msgid "Ogg bitstream does not contain a supported data-type."
-msgstr "Бітовий потік Ogg не містить дані vorbis."
-
-#: vorbiscomment/vcedit.c:639
+#: vorbiscomment/vcedit.c:284
 msgid "Corrupt secondary header."
 msgstr "Пошкоджений вторинний заголовок."
 
-#: vorbiscomment/vcedit.c:660
+#: vorbiscomment/vcedit.c:305
 msgid "EOF before end of vorbis headers."
 msgstr "Виявлено кінець файлу перед до закінчення заголовків."
 
-#: vorbiscomment/vcedit.c:835
+#: vorbiscomment/vcedit.c:458
 msgid "Corrupt or missing data, continuing..."
 msgstr "Пошкоджені або відсутні дані, продовження роботи..."
 
-#: vorbiscomment/vcedit.c:875
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
-msgstr ""
-"Помилка при записувані потоку виводу. Потік виводу може бути пошкоджений чи "
-"обрізаний."
+#: vorbiscomment/vcedit.c:498
+msgid "Error writing stream to output. Output stream may be corrupted or truncated."
+msgstr "Помилка при записувані потоку виводу. Потік виводу може бути пошкоджений чи обрізаний."
 
-#: vorbiscomment/vcomment.c:190 vorbiscomment/vcomment.c:216
+#: 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:235
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Неправильний коментар: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:247
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "неправильний коментар: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:257
+#: vorbiscomment/vcomment.c:175
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Помилка при записуванні коментарів у файл виводу: %s\n"
 
-#: vorbiscomment/vcomment.c:274
+#: vorbiscomment/vcomment.c:192
 #, c-format
 msgid "no action specified\n"
 msgstr "не вказана дія\n"
 
-#: vorbiscomment/vcomment.c:379
+#: vorbiscomment/vcomment.c:292
 #, c-format
 msgid ""
-"vorbiscomment from %s %s\n"
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:382
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:385
-#, c-format
-msgid ""
 "Usage: \n"
-"  vorbiscomment [-Vh]\n"
-"  vorbiscomment [-lR] file\n"
-"  vorbiscomment [-R] [-c file] [-t tag] <-a|-w> inputfile [outputfile]\n"
+"  vorbiscomment [-l] file.ogg (to list the comments)\n"
+"  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
+"  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
+"\tin the write case, a new set of comments in the form\n"
+"\t'TAG=value' is expected on stdin. This set will\n"
+"\tcompletely replace the existing set.\n"
+"   Either of -a and -w can take only a single filename,\n"
+"   in which case a temporary file will be used.\n"
+"   -c can be used to take comments from a specified file\n"
+"   instead of stdin.\n"
+"   Example: vorbiscomment -a in.ogg -c comments.txt\n"
+"   will append the comments in comments.txt to in.ogg\n"
+"   Finally, you may specify any number of tags to add on\n"
+"   the command line using the -t option. e.g.\n"
+"   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 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 ""
+"Використання: \n"
+"  vorbiscomment [-l] файл.ogg (перегляд коментарів)\n"
+"  vorbiscomment -a вх.ogg вих.ogg (додати коментар)\n"
+"  vorbiscomment -w вх.ogg вих.ogg (змінити коментар)\n"
+"\tпри записуванні, на стандартному потоку вводу очікується новий набір\n"
+"\tкоментарів у вигляді 'ТЕГ=значення'. Цей набір буде повністю замінювати\n"
+"\tіснуючий набір.\n"
+"   Аргументом параметрів -a та -w може бути лише один файл,\n"
+"   у цьому випаду буде використовуватись тимчасовий файл.\n"
+"   Параметр -c може використовуватись для вказування, що коментарі\n"
+"   слід брати з вказаного файлу, а не зі стандартного вводу.\n"
+"   Приклад: vorbiscomment -a in.ogg -c comments.txt\n"
+"   додасть коментарі з файлу comments.txt до in.ogg\n"
+"   Зрештою, ви можете вказати будь-яку кількість тегів у командному\n"
+"   рядку використовуючи параметр -t. Наприклад:\n"
+"   vorbiscomment -a in.ogg -t \"ARTIST=Певний артист\" -t \"TITLE=Назва\"\n"
+"   (зауважте, якщо використовується такий спосіб, читання коментарів з\n"
+"   файлу чи зі стандартного потоку помилок вимкнено)\n"
+"   У сирому режимі (--raw, -R) коментарі читаються та записуються у utf8,\n"
+"   замість перетворення їх у кодування користувача. Це корисно для\n"
+"   використання vorbiscomment у сценаріях. Проте цього недостатньо\n"
+"   для основної обробки коментарів в усіх випадках.\n"
 
-#: vorbiscomment/vcomment.c:391
+#: vorbiscomment/vcomment.c:376
 #, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:392
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:395
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Неправильний тип у списку параметрів"
-
-#: vorbiscomment/vcomment.c:396
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:397
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:399
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:403
-#, c-format
-msgid ""
-"  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:406
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:410
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:413
-#, c-format
-msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
-"errors are encountered during processing.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:418
-#, c-format
-msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
-"editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
-"disables reading from stdin.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:425
-#, c-format
-msgid ""
-"Examples:\n"
-"  vorbiscomment -a in.ogg -c comments.txt\n"
-"  vorbiscomment -a in.ogg -t \"ARTIST=Some Guy\" -t \"TITLE=A Title\"\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:430
-#, c-format
-msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
-"this is not sufficient for general round-tripping of comments in all cases.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:492
-#, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Внутрішня помилка при аналізі параметрів командного рядка\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:462
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Помилка при відкриванні вхідного файлу '%s'.\n"
 
-#: vorbiscomment/vcomment.c:587
+#: vorbiscomment/vcomment.c:471
 #, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Назва вхідного файлу не може співпадати з назвою файлу виводу\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:482
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Помилка при відкриванні файлу виводу '%s'.\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:497
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Помилка при відкриванні файлу коментарів '%s'.\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:514
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Помилка при відкриванні файлу коментарів '%s'\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:542
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Помилка видалення старого файлу %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:544
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Помилка перейменування %s у %s\n"
 
-#: vorbiscomment/vcomment.c:676
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Помилка видалення старого файлу %s\n"
-
-#~ msgid ""
-#~ "ogg123 from %s %s\n"
-#~ " by the Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Usage: ogg123 [<options>] <input file> ...\n"
-#~ "\n"
-#~ "  -h, --help     this help\n"
-#~ "  -V, --version  display Ogg123 version\n"
-#~ "  -d, --device=d uses 'd' as an output device\n"
-#~ "      Possible devices are ('*'=live, '@'=file):\n"
-#~ "        "
-#~ msgstr ""
-#~ "ogg123 з %s %s\n"
-#~ " Xiph.org Foundation (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Використання: ogg123 [<параметри>] <вхідний файл> ...\n"
-#~ "\n"
-#~ "  -h, --help     ця довідка\n"
-#~ "  -V, --version  вивести версію Ogg123\n"
-#~ "  -d, --device=d використовувати \"d\" у якості пристрою вводу-виводу\n"
-#~ "      Можливі пристрої: ('*'=справжній, '@'=файл):\n"
-#~ "        "
-
-#~ 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 (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"
-#~ "  -@, --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"
-#~ msgstr ""
-#~ "  -f, --file=назва_файлу  Встановити назву файлу виводу з вказаного "
-#~ "раніше\n"
-#~ "      файлу пристрою (з параметром -d).\n"
-#~ "  -k n, --skip n  Пропустити перші \"n\" секунд\n"
-#~ "  -K n, --end n   Закінчити через 'n' секунд (або формат гг:хх:сс)\n"
-#~ "  -o, --device-option=k:v передати спеціальний параметр k зі значенням\n"
-#~ "      v раніше вказаному пристрою (ключем -d).  Додаткову\n"
-#~ "      інформацію дивіться на man-сторінці.\n"
-#~ "  -@, --list=файл    Прочитати список відтворення та URL з \"файл\"\n"
-#~ "  -b n, --buffer n  використовувати вхідний буфер розміром \"n\" кБ\n"
-#~ "  -p n, --prebuffer n  завантажити n%% з вхідного буфера перед "
-#~ "відтворенням\n"
-#~ "  -v, --verbose  показувати прогрес та іншу інформацію про статус\n"
-#~ "  -q, --quiet    нічого не відображати (без заголовка)\n"
-#~ "  -x n, --nth    відтворювати кожен \"n\"-й блок\n"
-#~ "  -y n, --ntimes повторювати \"n\" разів кожен блок, що відтворюється\n"
-#~ "  -z, --shuffle  випадкове відтворення\n"
-#~ "\n"
-#~ "При отриманні сигналу SIGINT (Ctrl-C) програма ogg123 пропускає наступну "
-#~ "пісню;\n"
-#~ "два сигнали SIGINT протягом s мілісекунд завершують роботу ogg123.\n"
-#~ "  -l, --delay=s  встановлює значення s [у мілісекундах] (типово - 500).\n"
-
-#~ msgid ""
-#~ "%s%s\n"
-#~ "Usage: oggenc [options] input.wav [...]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ " 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"
-#~ " -R, --raw-rate=n     Set samples/sec for raw input. Default is 44100\n"
-#~ " --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. 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. 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. 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"
-#~ "                      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"
-#~ " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%"
-#~ "l,\n"
-#~ "                      %%n, %%d replaced by artist, title, album, track "
-#~ "number,\n"
-#~ "                      and date, respectively (see below for specifying "
-#~ "these).\n"
-#~ "                      %%%% gives a literal %%.\n"
-#~ " -X, --name-remove=s  Remove the specified characters from parameters to "
-#~ "the\n"
-#~ "                      -n format string. Useful to ensure legal "
-#~ "filenames.\n"
-#~ " -P, --name-replace=s Replace characters removed by --name-remove with "
-#~ "the\n"
-#~ "                      characters specified. If this string is shorter "
-#~ "than the\n"
-#~ "                      --name-remove list or is not specified, the extra\n"
-#~ "                      characters are just removed.\n"
-#~ "                      Default settings for the above two arguments are "
-#~ "platform\n"
-#~ "                      specific.\n"
-#~ " -c, --comment=c      Add the given string as an extra comment. This may "
-#~ "be\n"
-#~ "                      used multiple times. The argument should be in the\n"
-#~ "                      format \"tag=value\".\n"
-#~ " -d, --date           Date for track (usually date of performance)\n"
-#~ " -N, --tracknum       Track number for this track\n"
-#~ " -t, --title          Title for this track\n"
-#~ " -l, --album          Name of album\n"
-#~ " -a, --artist         Name of artist\n"
-#~ " -G, --genre          Genre of track\n"
-#~ "                      If multiple input files are given, then multiple\n"
-#~ "                      instances of the previous five arguments will be "
-#~ "used,\n"
-#~ "                      in the order they are given. If fewer titles are\n"
-#~ "                      specified than files, OggEnc will print a warning, "
-#~ "and\n"
-#~ "                      reuse the final one for the remaining files. If "
-#~ "fewer\n"
-#~ "                      track numbers are given, the remaining files will "
-#~ "be\n"
-#~ "                      unnumbered. For the others, the final tag will be "
-#~ "reused\n"
-#~ "                      for all others without warning (so you can specify "
-#~ "a date\n"
-#~ "                      once, for example, and have it used for all the "
-#~ "files)\n"
-#~ "\n"
-#~ "INPUT FILES:\n"
-#~ " OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-#~ "AIFF/C\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 "
-#~ "additional\n"
-#~ " parameters for raw mode are specified.\n"
-#~ " You can specify taking the file from stdin by using - as the input "
-#~ "filename.\n"
-#~ " In this mode, output is to stdout unless an output filename is "
-#~ "specified\n"
-#~ " with -o\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s%s\n"
-#~ "Використання: oggenc [параметри] input.wav [...]\n"
-#~ "\n"
-#~ "ПАРАМЕТРИ:\n"
-#~ " Загальні:\n"
-#~ " -Q, --quiet          Не виводити у потік помилок\n"
-#~ " -h, --help           Виводить цю довідку\n"
-#~ " -v, --version        Print the version number\n"
-#~ " -r, --raw            Режим без обробки. Вхідні файли читаються як дані "
-#~ "PCM\n"
-#~ " -B, --raw-bits=n     Число біт/семпл для необробленого вводу. Типово - "
-#~ "16\n"
-#~ " -C, --raw-chan=n     Число каналів для необробленого вводу. Типово - 2\n"
-#~ " -R, --raw-rate=n     Число семплів/с для необробленого вводу. Типово - "
-#~ "44100\n"
-#~ " --raw-endianness     1 для bigendian, 0 для little (типово - 0)\n"
-#~ " -b, --bitrate        Номінальна щільність бітів для кодування. "
-#~ "Намагається\n"
-#~ "                      кодувати з вказаною щільністю. Очікує аргумент із\n"
-#~ "                      зазначенням щільності у кбіт/с. Типово, "
-#~ "використовується VBR\n"
-#~ "                      кодування, еквівалентне використанню -q чи --"
-#~ "quality.\n"
-#~ "                      Для використання керованої щільності бітового "
-#~ "потоку\n"
-#~ "                      дивіться параметр --managed.\n"
-#~ " --managed            Вмикає механізм керованої щільності бітового "
-#~ "потоку. Це\n"
-#~ "                      дозволяє краще керування при використані точної "
-#~ "щільності,\n"
-#~ "                      але кодування буде значно повільнішим. Не "
-#~ "користуйтесь цим\n"
-#~ "                      режимом, якщо вам не потрібен детальний контроль "
-#~ "над щільністю\n"
-#~ "                      потоку бітів, наприклад для потокової трансляції.\n"
-#~ " -m, --min-bitrate    Мінімальна щільність бітів (у кбіт/с). Корисно при\n"
-#~ "                      кодуванні для каналу постійного розміру. "
-#~ "Використання\n"
-#~ "                      ключа автоматично вмикає призначений режим "
-#~ "щільності\n"
-#~ "                      потоку (дивіться --managed).\n"
-#~ " -M, --max-bitrate    Максимальна щільність бітів (у кбіт/с). Корисно "
-#~ "для\n"
-#~ "                      потокових прикладних програм. Використання\n"
-#~ "                      ключа автоматично вмикає призначений режим "
-#~ "щільності\n"
-#~ "                      потоку (дивіться --managed).\n"
-#~ " --advanced-encode-option параметр=значення\n"
-#~ "                      Встановлює додаткові параметри механізму "
-#~ "кодування.\n"
-#~ "                      Можливі параметри (та їх значення) документовані\n"
-#~ "                      на головній сторінці, що постачається з програмою.\n"
-#~ "                      Лише для досвідчених користувачі, та має "
-#~ "використовуватись\n"
-#~ "                      обережно.\n"
-#~ " -q, --quality        Якість від 0 (низька) до 10 (висока), замість \n"
-#~ "                      вказування певної цільності бітів. Це звичайний "
-#~ "режим.\n"
-#~ "                      Допускається дробове значення якості (наприклад, "
-#~ "2.75)\n"
-#~ "                      Значення -1 також допускається, але не забезпечує\n"
-#~ "                      належної якості.\n"
-#~ " --resample n         Змінює частоту вхідних даних до значення n (Гц)\n"
-#~ " --downmix            Змішує стерео у моно. Допустимо лише для вхідного\n"
-#~ "                      сигналу у стерео форматі.\n"
-#~ " -s, --serial         Вказує серійний номер потоку. Якщо кодується "
-#~ "декілька\n"
-#~ "                      файлів, це значення автоматично збільшується на 1 "
-#~ "для\n"
-#~ "                      кожного наступного файлу.\n"
-#~ "\n"
-#~ " Присвоєння назв:\n"
-#~ " -o, --output=fn      Записує файл у fn (можливе лише з одним вхідним "
-#~ "файлом)\n"
-#~ " -n, --names=string   Створити назви файлів за шаблоном з рядка string, "
-#~ "де\n"
-#~ "                      %%a, %%t, %%l, %%n, %%d замінюються на ім'я "
-#~ "артиста,\n"
-#~ "                      назву, альбом, номер доріжки, та дату (спосіб їх\n"
-#~ "                      вказування дивіться нижче).\n"
-#~ "                      %%%% перетворюється в літерал %%.\n"
-#~ " -X, --name-remove=s  Видаляє певні символи з параметрів рядка формату -"
-#~ "n\n"
-#~ "                      Корисно для створення коректних назв файлів.\n"
-#~ " -P, --name-replace=s Замінює символи, видалені з використанням --name-"
-#~ "remove,\n"
-#~ "                      на вказані символи. Якщо цей рядок коротший ніж "
-#~ "рядок у\n"
-#~ "                      --name-remove, або взагалі не вказаний, символи "
-#~ "просто\n"
-#~ "                      видаляються.\n"
-#~ "                      Типові значення для двох наведених вище параметрів\n"
-#~ "                      від платформи.\n"
-#~ " -c, --comment=c      Додає вказаний рядок у якості додаткового "
-#~ "коментарю.\n"
-#~ "                      Може вказуватись декілька разів. Аргумент має бути "
-#~ "у\n"
-#~ "                      форматі \"тег=значення\".\n"
-#~ "                      Може використовуватись декілька разів.\n"
-#~ " -d, --date           Дата доріжки (зазвичай дата створення)\n"
-#~ " -N, --tracknum       Номер цієї доріжки\n"
-#~ " -t, --title          Заголовок цієї доріжки\n"
-#~ " -l, --album          Назва альбому\n"
-#~ " -a, --artist         Ім'я виконавця\n"
-#~ " -G, --genre          Жанр доріжки\n"
-#~ "                      Якщо вказано декілька вхідних файлів, тоді "
-#~ "декілька\n"
-#~ "                      екземплярів попередніх 5-ти параметрів, будуть\n"
-#~ "                      використовуватись у тому самому порядку, у якому "
-#~ "вони,\n"
-#~ "                      наведені. Якщо заголовків вказано менше ніж "
-#~ "файлів,\n"
-#~ "                      OggEnc виведе попередження, та буде "
-#~ "використовувати\n"
-#~ "                      останнє значення до решти файлів. Якщо вказано\n"
-#~ "                      недостатньо номерів доріжок, решта фалів не будуть\n"
-#~ "                      пронумеровані. Для всіх інших, буде "
-#~ "використовуватись\n"
-#~ "                      останнє значення без будь-яких попереджень (таким\n"
-#~ "                      чином, наприклад, можна один раз вказати дату та\n"
-#~ "                      використовувати її для усіх файлів)\n"
-#~ "\n"
-#~ "ВХІДНІ ФАЙЛИ:\n"
-#~ " Наразі вхідними файлами OggEnc можуть бути 16-бітні або 8-бітні PCM "
-#~ "WAV,\n"
-#~ " AIFF, чи AIFF/C файли, або 32-бітні WAV з плаваючою комою. Файли можуть "
-#~ "бути\n"
-#~ " моно, стерео (або з більшою кількістю каналів) з довільною "
-#~ "дискретизацією.\n"
-#~ " У якості альтернативи можна використовувати параметр --raw для "
-#~ "зчитування\n"
-#~ " сирих PCM даних, які повинні бути 16-бітним стерео little-endian PCM\n"
-#~ " ('headerless wav'), якщо не вказані додаткові параметри для режиму "
-#~ "сирих\n"
-#~ "  даних.\n"
-#~ " можна вказати зчитувати діні зі стандартного потоку вводу, "
-#~ "використовуючи\n"
-#~ " знак - у якості назви вхідного файлу.\n"
-#~ " У цьому випадку, вивід направляється у стандартний потік виводу, якщо "
-#~ "не\n"
-#~ " вказана назва файлу виводу у параметрі -o\n"
-#~ "\n"
-
-#~ msgid "Frame aspect 1:%d\n"
-#~ msgstr "Співвідношення сторін кадру 1:%d\n"
-
-#~ msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-#~ msgstr ""
-#~ "Попередження: значення granulepos потоку %d зменшилось з %I64d до %I64d"
-
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Потік Theora %d:\n"
-#~ "\tДовжина даних: %I64d байт\n"
-#~ "\tЧас відтворення:  %ldхв:%02ld.%03ldс\n"
-#~ "\tСередня щільність бітів: %f кбіт/с\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 ""
-#~ "Потік Theora%d:\n"
-#~ "\tДовжина даних: %lld байт\n"
-#~ "\tЧас відтворення: %ldхв:%02ld.%03ldс\n"
-#~ "\tСередня щільність бітів: %f кбіт/с\n"
-
-#~ msgid ""
-#~ "Vorbis 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Довжина даних:  %I64d байт\n"
-#~ "\tЧас відтворення:  %ldхв:%02ld.%03ldс\n"
-#~ "\tСередня щільність бітів: %f кбіт/с\n"
-
-#~ msgid ""
-#~ "Vorbis 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Довжина даних: %lld байт\n"
-#~ "\tЧас відтворення: %ldхв:%02ld.%03ldс\n"
-#~ "\tСередня щільність бітів: %f кбіт/с\n"
-
-#~ msgid ""
-#~ "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
-#~ "ogg.\n"
-#~ msgstr ""
-#~ "Попередження: дірка у даних зі зсувом приблизно %I64d байтів. Пошкоджений "
-#~ "ogg.\n"
-
-#~ msgid ""
-#~ "Usage: \n"
-#~ "  vorbiscomment [-l] file.ogg (to list the comments)\n"
-#~ "  vorbiscomment -a in.ogg out.ogg (to append comments)\n"
-#~ "  vorbiscomment -w in.ogg out.ogg (to modify comments)\n"
-#~ "\tin the write case, a new set of comments in the form\n"
-#~ "\t'TAG=value' is expected on stdin. This set will\n"
-#~ "\tcompletely replace the existing set.\n"
-#~ "   Either of -a and -w can take only a single filename,\n"
-#~ "   in which case a temporary file will be used.\n"
-#~ "   -c can be used to take comments from a specified file\n"
-#~ "   instead of stdin.\n"
-#~ "   Example: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   will append the comments in comments.txt to in.ogg\n"
-#~ "   Finally, you may specify any number of tags to add on\n"
-#~ "   the command line using the -t option. e.g.\n"
-#~ "   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 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 ""
-#~ "Використання: \n"
-#~ "  vorbiscomment [-l] файл.ogg (перегляд коментарів)\n"
-#~ "  vorbiscomment -a вх.ogg вих.ogg (додати коментар)\n"
-#~ "  vorbiscomment -w вх.ogg вих.ogg (змінити коментар)\n"
-#~ "\tпри записуванні, на стандартному потоку вводу очікується новий набір\n"
-#~ "\tкоментарів у вигляді 'ТЕГ=значення'. Цей набір буде повністю "
-#~ "замінювати\n"
-#~ "\tіснуючий набір.\n"
-#~ "   Аргументом параметрів -a та -w може бути лише один файл,\n"
-#~ "   у цьому випаду буде використовуватись тимчасовий файл.\n"
-#~ "   Параметр -c може використовуватись для вказування, що коментарі\n"
-#~ "   слід брати з вказаного файлу, а не зі стандартного вводу.\n"
-#~ "   Приклад: vorbiscomment -a in.ogg -c comments.txt\n"
-#~ "   додасть коментарі з файлу comments.txt до in.ogg\n"
-#~ "   Зрештою, ви можете вказати будь-яку кількість тегів у командному\n"
-#~ "   рядку використовуючи параметр -t. Наприклад:\n"
-#~ "   vorbiscomment -a in.ogg -t \"ARTIST=Певний артист\" -t \"TITLE=Назва"
-#~ "\"\n"
-#~ "   (зауважте, якщо використовується такий спосіб, читання коментарів з\n"
-#~ "   файлу чи зі стандартного потоку помилок вимкнено)\n"
-#~ "   У сирому режимі (--raw, -R) коментарі читаються та записуються у "
-#~ "utf8,\n"
-#~ "   замість перетворення їх у кодування користувача. Це корисно для\n"
-#~ "   використання vorbiscomment у сценаріях. Проте цього недостатньо\n"
-#~ "   для основної обробки коментарів в усіх випадках.\n"
-
 #~ msgid "malloc"
 #~ msgstr "malloc"
 
@@ -3144,6 +2072,9 @@
 #~ msgid " to "
 #~ msgstr " до "
 
+#~ msgid "\n"
+#~ msgstr "\n"
+
 #~ msgid " bytes. Corrupted ogg.\n"
 #~ msgstr " байт. Пошкоджений ogg-файл.\n"
 

Modified: trunk/vorbis-tools/po/vi.po
===================================================================
--- trunk/vorbis-tools/po/vi.po	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/vi.po	2008-10-25 15:25:54 UTC (rev 15454)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: vorbis-tools 1.2.1\n"
 "Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-27 20:25+0100\n"
+"POT-Creation-Date: 2008-09-12 02:53+0100\n"
 "PO-Revision-Date: 2008-09-22 18:57+0930\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -25,9 +25,7 @@
 #: ogg123/buffer.c:360
 #, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
-msgstr ""
-"Lỗi: không thể phân địnha đủ bộ trong « malloc_buffer_stats() » (thống kê "
-"vùng đệm phân định bộ nhớ)\n"
+msgstr "Lỗi: không thể phân địnha đủ bộ trong « malloc_buffer_stats() » (thống kê vùng đệm phân định bộ nhớ)\n"
 
 #: ogg123/callbacks.c:75
 msgid "Error: Device not available.\n"
@@ -75,28 +73,20 @@
 
 #: ogg123/callbacks.c:125 ogg123/callbacks.c:130
 msgid "Error: Out of memory in new_audio_reopen_arg().\n"
-msgstr ""
-"Lỗi: hết bộ nhớ trong « new_audio_reopen_arg() » (đối số mở lại âm thanh "
-"má»›i).\n"
+msgstr "Lỗi: hết bộ nhớ trong « new_audio_reopen_arg() » (đối số mở lại âm thanh mới).\n"
 
 #: ogg123/callbacks.c:174
 msgid "Error: Out of memory in new_print_statistics_arg().\n"
-msgstr ""
-"Lỗi: hết bộ nhớ trong « new_print_statistics_arg() » (đối số thống kê in "
-"má»›i).\n"
+msgstr "Lỗi: hết bộ nhớ trong « new_print_statistics_arg() » (đối số thống kê in mới).\n"
 
 #: ogg123/callbacks.c:233
 msgid "Error: Out of memory in new_status_message_arg().\n"
-msgstr ""
-"Lỗi: hết bộ nhớ trong « new_status_message_arg() » (đối số thông điệp trạng "
-"thái mới).\n"
+msgstr "Lỗi: hết bộ nhớ trong « new_status_message_arg() » (đối số thông điệp trạng thái mới).\n"
 
 #: ogg123/callbacks.c:279 ogg123/callbacks.c:298 ogg123/callbacks.c:335
 #: ogg123/callbacks.c:354
 msgid "Error: Out of memory in decoder_buffered_metadata_callback().\n"
-msgstr ""
-"Lỗi: hết bộ nhớ trong « decoder_buffered_metadata_callback() » (gọi lại siêu "
-"dữ liệu có vùng đệm bộ giải mã).\n"
+msgstr "Lỗi: hết bộ nhớ trong « decoder_buffered_metadata_callback() » (gọi lại siêu dữ liệu có vùng đệm bộ giải mã).\n"
 
 #: ogg123/cfgfile_options.c:55
 msgid "System error"
@@ -167,9 +157,9 @@
 msgid "(NULL)"
 msgstr "(Rá»–NG)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:571 oggenc/oggenc.c:576
+#: oggenc/oggenc.c:581 oggenc/oggenc.c:586 oggenc/oggenc.c:591
+#: oggenc/oggenc.c:596
 msgid "(none)"
 msgstr "(không có)"
 
@@ -272,16 +262,11 @@
 #: ogg123/cmdline_options.c:261
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
-msgstr ""
-"━━ Trình điều khiển %s được ghi rõ trong tập tin cấu hình là không hợp lệ.\n"
+msgstr "━━ Trình điều khiển %s được ghi rõ trong tập tin cấu hình là không hợp lệ.\n"
 
 #: ogg123/cmdline_options.c:271
-msgid ""
-"=== Could not load default driver and no driver specified in config file. "
-"Exiting.\n"
-msgstr ""
-"━━ Không thể tải trình điều khiển mặc định và chưa ghi rõ trình điều khiển "
-"trong tập tin cấu hình nên thoát.\n"
+msgid "=== Could not load default driver and no driver specified in config file. Exiting.\n"
+msgstr "━━ Không thể tải trình điều khiển mặc định và chưa ghi rõ trình điều khiển trong tập tin cấu hình nên thoát.\n"
 
 #: ogg123/cmdline_options.c:292
 #, c-format
@@ -336,11 +321,8 @@
 
 #: ogg123/cmdline_options.c:311
 #, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
-msgstr ""
-"  -d thiết_bị, --device thiết_bị    Dùng thiết bị xuất này. Các thiết bị sẵn "
-"sàng:\n"
+msgid "  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
+msgstr "  -d thiết_bị, --device thiết_bị    Dùng thiết bị xuất này. Các thiết bị sẵn sàng:\n"
 
 #: ogg123/cmdline_options.c:313
 #, c-format
@@ -358,16 +340,13 @@
 "  -f file, --file file    Set the output filename for a file device\n"
 "                          previously specified with --device.\n"
 msgstr ""
-"  -f tập_tin, --file tập_tin    Đặt tên tập tin xuất cho một thiết bị tập "
-"tin\n"
+"  -f tập_tin, --file tập_tin    Đặt tên tập tin xuất cho một thiết bị tập tin\n"
 "\t\t\t\tđược xác định trước dùng « --device ».\n"
 
 #: ogg123/cmdline_options.c:334
 #, c-format
 msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
-"  --audio-buffer n        Dùng một vùng đệm âm thanh xuất có kích cỡ « n » "
-"kilô-byte\n"
+msgstr "  --audio-buffer n        Dùng một vùng đệm âm thanh xuất có kích cỡ « n » kilô-byte\n"
 
 #: ogg123/cmdline_options.c:335
 #, c-format
@@ -390,11 +369,8 @@
 
 #: ogg123/cmdline_options.c:342
 #, c-format
-msgid ""
-"  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
-msgstr ""
-"  -@ tập_tin, --list tập_tin    Đọc danh mục phát các tập tin và địa chỉ URL "
-"từ tập tin này\n"
+msgid "  -@ file, --list file    Read playlist of files and URLs from \"file\"\n"
+msgstr "  -@ tập_tin, --list tập_tin    Đọc danh mục phát các tập tin và địa chỉ URL từ tập tin này\n"
 
 #: ogg123/cmdline_options.c:343
 #, c-format
@@ -409,14 +385,12 @@
 #: ogg123/cmdline_options.c:345
 #, c-format
 msgid "  -z, --shuffle           Shuffle list of files before playing\n"
-msgstr ""
-"  -z, --shuffle           Trộn bài danh sách các tập tin trước khi phát\n"
+msgstr "  -z, --shuffle           Trộn bài danh sách các tập tin trước khi phát\n"
 
 #: ogg123/cmdline_options.c:346
 #, c-format
 msgid "  -Z, --random            Play files randomly until interrupted\n"
-msgstr ""
-"  -Z, --random            Phát ngẫu nhiên các tập tin đến khi bị giản đoạn\n"
+msgstr "  -Z, --random            Phát ngẫu nhiên các tập tin đến khi bị giản đoạn\n"
 
 #: ogg123/cmdline_options.c:349
 #, c-format
@@ -426,8 +400,7 @@
 #: ogg123/cmdline_options.c:350
 #, c-format
 msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
-msgstr ""
-"  -b n, --buffer n        Dùng một vùng đệm nhập có kích cỡ « n » kilô-byte\n"
+msgstr "  -b n, --buffer n        Dùng một vùng đệm nhập có kích cỡ « n » kilô-byte\n"
 
 #: ogg123/cmdline_options.c:351
 #, c-format
@@ -441,20 +414,16 @@
 
 #: ogg123/cmdline_options.c:355
 #, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
+msgid "  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
 msgstr ""
-"  -k n, --skip n          Bỏ qua « n » giây đầu tiên (hoặc dùng định dạng hh:"
-"mm:ss)\n"
+"  -k n, --skip n          Bỏ qua « n » giây đầu tiên (hoặc dùng định dạng hh:mm:ss)\n"
 "\n"
 "hh:mm:ss\tgiờ:phút:giây, mỗi phần theo hai chữ số\n"
 
 #: ogg123/cmdline_options.c:356
 #, c-format
 msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
-"  -K n, --end n           Kết thúc ở « n » giây (hoặc dùng định dạng hh:mm:"
-"ss)\n"
+msgstr "  -K n, --end n           Kết thúc ở « n » giây (hoặc dùng định dạng hh:mm:ss)\n"
 
 #: ogg123/cmdline_options.c:357
 #, c-format
@@ -466,7 +435,7 @@
 msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
 msgstr "  -y n, --ntimes n        Lặp lại « n » lần mỗi khối được phát\n"
 
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:402
+#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:399
 #, c-format
 msgid "Miscellaneous options\n"
 msgstr "Tùy chọn khác\n"
@@ -485,7 +454,7 @@
 "\t\t\t\tcũng chấm dứt nếu nhận hai SIGINT\n"
 "\t\t\t\ttrong thời hạn đã ghi rõ « s » (mặc định 500)\n"
 
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:409
+#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:406
 #, c-format
 msgid "  -h, --help              Display this help\n"
 msgstr "  -h, --help              Hiển thị trợ giúp này\n"
@@ -497,10 +466,8 @@
 
 #: ogg123/cmdline_options.c:369
 #, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
-"  -v, --verbose           Hiển thị tiến hành và thông tin trạng thái khác\n"
+msgid "  -v, --verbose           Display progress and other status information\n"
+msgstr "  -v, --verbose           Hiển thị tiến hành và thông tin trạng thái khác\n"
 
 #: ogg123/cmdline_options.c:370
 #, c-format
@@ -516,9 +483,7 @@
 #: ogg123/format.c:82
 #, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
-msgstr ""
-"Lỗi: không thể phân định bộ nhớ trong « malloc_decoder_stats() » (thống kê "
-"giải mã phân định bộ nhớ)\n"
+msgstr "Lỗi: không thể phân định bộ nhớ trong « malloc_decoder_stats() » (thống kê giải mã phân định bộ nhớ)\n"
 
 #: ogg123/http_transport.c:145
 msgid "Error: Could not set signal mask."
@@ -646,9 +611,7 @@
 #: ogg123/playlist.c:46 ogg123/playlist.c:57
 #, c-format
 msgid "Error: Out of memory in create_playlist_member().\n"
-msgstr ""
-"Lỗi: hết bộ nhớ trong « create_playlist_member() » (tạo thành viên danh sách "
-"phát).\n"
+msgstr "Lỗi: hết bộ nhớ trong « create_playlist_member() » (tạo thành viên danh sách phát).\n"
 
 #: ogg123/playlist.c:222
 #, c-format
@@ -658,8 +621,7 @@
 #: ogg123/playlist.c:267 ogg123/playlist.c:279
 #, c-format
 msgid "Error: Out of memory in playlist_to_array().\n"
-msgstr ""
-"Lỗi: hết bộ nhớ trong « playlist_to_array() » (danh sách phát tới mảng).\n"
+msgstr "Lỗi: hết bộ nhớ trong « playlist_to_array() » (danh sách phát tới mảng).\n"
 
 #: ogg123/status.c:60
 #, c-format
@@ -715,16 +677,14 @@
 #: ogg123/transport.c:71
 #, c-format
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
-msgstr ""
-"Lỗi: không thể phân chia bộ nhớ trong « malloc_data_source_stats() » (thống "
-"kê nguồn dữ liệu phân định bộ nhớ).\n"
+msgstr "Lỗi: không thể phân chia bộ nhớ trong « malloc_data_source_stats() » (thống kê nguồn dữ liệu phân định bộ nhớ).\n"
 
 #: oggdec/oggdec.c:50
 #, c-format
 msgid "oggdec from %s %s\n"
 msgstr "oggdec từ %s %s\n"
 
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
+#: oggdec/oggdec.c:56 oggenc/oggenc.c:396 ogginfo/ogginfo2.c:1223
 #, c-format
 msgid ""
 " by the Xiph.Org Foundation (http://www.xiph.org/)\n"
@@ -803,132 +763,82 @@
 "\t\t\t\tChỉ có thể dùng với 1 tập tin nhập vào,\n"
 "\t\t\t\ttrừ ở chế độ thô.\n"
 
-#: oggdec/oggdec.c:114
-#, c-format
-msgid "Internal error: Unrecognised argument\n"
-msgstr ""
-
-#: oggdec/oggdec.c:155 oggdec/oggdec.c:174
-#, c-format
-msgid "ERROR: Failed to write Wave header: %s\n"
-msgstr ""
-
-#: oggdec/oggdec.c:195
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input file: %s\n"
-msgstr "LỖI: không thể mở tập tin nhập « %s »: %s\n"
-
-#: oggdec/oggdec.c:217
-#, fuzzy, c-format
-msgid "ERROR: Failed to open output file: %s\n"
-msgstr "LỖI: không thể mở tập tin xuất « %s »: %s\n"
-
-#: oggdec/oggdec.c:266
-#, fuzzy, c-format
-msgid "ERROR: Failed to open input as Vorbis\n"
-msgstr "Lỗi mở tập tin là dạng vorbis: %s\n"
-
-#: oggdec/oggdec.c:308
-#, c-format
-msgid "Logical bitstreams with changing parameters are not supported\n"
-msgstr ""
-
-#: oggdec/oggdec.c:315
-#, c-format
-msgid "WARNING: hole in data (%d)\n"
-msgstr ""
-
-#: oggdec/oggdec.c:330
-#, fuzzy, c-format
-msgid "Error writing to file: %s\n"
-msgstr "Gặp lỗi khi gỡ bỏ tập tin cũ %s\n"
-
-#: oggdec/oggdec.c:371
-#, fuzzy, c-format
-msgid "ERROR: No input files specified. Use -h for help\n"
-msgstr ""
-"LỖI: chưa ghi rõ tập tin nhập vào. Hãy sử dụng lệnh « -h » để xem trợ giúp.\n"
-
-#: oggdec/oggdec.c:376
-#, fuzzy, c-format
-msgid ""
-"ERROR: Can only specify one input file if output filename is specified\n"
-msgstr ""
-"LỖI: có nhiều tập tin nhập với cùng một tên tập tin xuất: đệ nghị dùng tùy "
-"chọn « -n »\n"
-
-#: oggenc/audio.c:50
+#: oggenc/audio.c:51
 msgid "WAV file reader"
 msgstr "Bộ đọc tập tin WAV"
 
-#: oggenc/audio.c:51
+#: oggenc/audio.c:52
 msgid "AIFF/AIFC file reader"
 msgstr "Bộ đọc tập tin AIFF/AIFC"
 
-#: oggenc/audio.c:53
+#: oggenc/audio.c:54
 msgid "FLAC file reader"
 msgstr "Bộ đọc tập tin FLAC"
 
-#: oggenc/audio.c:54
+#: oggenc/audio.c:55
 msgid "Ogg FLAC file reader"
 msgstr "Bộ đọc tập tin FLAC Ogg"
 
-#: oggenc/audio.c:131 oggenc/audio.c:425
+#: oggenc/audio.c:57
+msgid "AU file reader"
+msgstr "Bộ đọc tập tin AU"
+
+#: oggenc/audio.c:133
 #, c-format
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr "Cảnh báo : gặp kết thúc tập tin bất thường khi đọc phần đầu WAV\n"
 
-#: oggenc/audio.c:142
+#: oggenc/audio.c:144
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Đang nhảy qua từng đoạn kiểu « %s », độ dài %d\n"
 
-#: oggenc/audio.c:168
+#: oggenc/audio.c:170
 #, c-format
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Cảnh báo : gặp kết thúc tập tin bất thường trong từng đoạn AIFF\n"
 
-#: oggenc/audio.c:254
+#: oggenc/audio.c:256
 #, c-format
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Cảnh báo : không tìm thấy từng đoạn dùng chung trong tập tin AIFF\n"
 
-#: oggenc/audio.c:260
+#: oggenc/audio.c:262
 #, c-format
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Cảnh báo : gặp từng đoạn dùng chung bị cụt trong phần đầu AIFF\n"
 
-#: oggenc/audio.c:268
+#: oggenc/audio.c:270
 #, c-format
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Cảnh báo : gặp kết thúc tập tin bất thường khi đọc phần đầu AIFF\n"
 
-#: oggenc/audio.c:283
+#: oggenc/audio.c:285
 #, c-format
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Cảnh báo : phần đầu AIFF bị cụt.\n"
 
-#: oggenc/audio.c:297
+#: oggenc/audio.c:299
 #, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
 msgstr "Cảnh báo : không thể xử lý AIFF-C đã nén (%c%c%c%c)\n"
 
-#: oggenc/audio.c:304
+#: oggenc/audio.c:306
 #, c-format
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Cảnh báo : không tìm thấy từng đoạn SSND trong tập tin AIFF\n"
 
-#: oggenc/audio.c:310
+#: oggenc/audio.c:312
 #, c-format
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Cảnh báo : gặp từng đoạn SSND trong phần đầu AIFF\n"
 
-#: oggenc/audio.c:316
+#: oggenc/audio.c:318
 #, c-format
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Cảnh báo : gặp kết thúc tập tin bất thường khi đọc phần đầu AIFF\n"
 
-#: oggenc/audio.c:353
+#: oggenc/audio.c:355
 #, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
@@ -937,30 +847,35 @@
 "Cảnh báo : OggEnc không hỗ trợ kiểu tập tin AIFF/AIFC này\n"
 "Phải là PCM 8 hay 16 bit.\n"
 
-#: oggenc/audio.c:407
-#, fuzzy, c-format
-msgid "Warning: Unrecognised format chunk in WAV header\n"
+#: oggenc/audio.c:409
+#, c-format
+msgid "Warning: Unrecognised format chunk in Wave header\n"
 msgstr "Cảnh báo : không nhận ra từng đoạn định dạng trong phần đầu Wave\n"
 
-#: oggenc/audio.c:420
-#, fuzzy, c-format
+#: oggenc/audio.c:422
+#, c-format
 msgid ""
-"Warning: INVALID format chunk in wav header.\n"
+"Warning: INVALID format chunk in Wave header.\n"
 " Trying to read anyway (may not work)...\n"
 msgstr ""
 "Cảnh báo : gặp từng đoạn định dạng KHÔNG HỢP LỆ trong phần đầu Wave.\n"
 "Vẫn đang thử đọc nó (có lẽ không thể)...\n"
 
-#: oggenc/audio.c:458
-#, fuzzy, c-format
+#: oggenc/audio.c:427
+#, c-format
+msgid "Warning: Unexpected EOF in reading Wave header\n"
+msgstr "Cảnh báo : gặp kết thúc tập tin bất thường khi đọc phần đầu Wave\n"
+
+#: oggenc/audio.c:460
+#, c-format
 msgid ""
-"ERROR: Wav file is unsupported type (must be standard PCM\n"
+"ERROR: Wave file is unsupported type (must be standard PCM\n"
 " or type 3 floating point PCM)\n"
 msgstr ""
 "LỖI: tập tin Wave có kiểu không được hỗ trợ (phải là PCM tiêu chuẩn\n"
 "hay PCM điểm động kiểu 3)\n"
 
-#: oggenc/audio.c:467
+#: oggenc/audio.c:469
 #, c-format
 msgid ""
 "Warning: WAV 'block alignment' value is incorrect, ignoring.\n"
@@ -969,7 +884,7 @@
 "Cảnh báo : giá trị « chỉnh canh khối » WAV không đúng nên bỏ qua.\n"
 "Tập tin này đã được tạo bởi phần mềm sai.\n"
 
-#: oggenc/audio.c:528
+#: oggenc/audio.c:530
 #, c-format
 msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16,24 or 32 bit PCM\n"
@@ -978,38 +893,46 @@
 "LỖI: tập tin Wav có định dạng con không được hỗ trợ\n"
 "(phải là PCM 8, 16, 24 hay 32-bit) hay PCM chấm động)\n"
 
-#: oggenc/audio.c:604
+#: oggenc/audio.c:606
 #, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"Dữ liệu PCM 24-bit kiểu cuối lớn không phải được hỗ trợ hiện thời nên hủy "
-"bỏ.\n"
+msgstr "Dữ liệu PCM 24-bit kiểu cuối lớn không phải được hỗ trợ hiện thời nên hủy bỏ.\n"
 
-#: oggenc/audio.c:624
+#: oggenc/audio.c:626
 #, c-format
 msgid "Big endian 32 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"Dữ liệu PCM 32-bit về cuối lớn hiện thời không được hỗ trợ nên hủy bỏ.\n"
+msgstr "Dữ liệu PCM 32-bit về cuối lớn hiện thời không được hỗ trợ nên hủy bỏ.\n"
 
-#: oggenc/audio.c:630
+#: oggenc/audio.c:632
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
 msgstr "Lỗi nội bộ : thử đọc độ sâu bit không được hỗ trợ %d\n"
 
-#: oggenc/audio.c:732
+#: oggenc/audio.c:734
 #, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-"LỖI: không nhận mẫu nào từ bộ lấy lại mẫu: tập tin bạn sẽ bị cụt. Vui lòng "
-"thông báo lỗi này.\n"
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
+msgstr "LỖI: không nhận mẫu nào từ bộ lấy lại mẫu: tập tin bạn sẽ bị cụt. Vui lòng thông báo lỗi này.\n"
 
-#: oggenc/audio.c:750
+#: oggenc/audio.c:752
 #, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Không thể khởi động bộ lấy lại mẫu.\n"
 
+#: oggenc/audio.c:882
+#, c-format
+msgid "Out of memory opening AU driver\n"
+msgstr "Cạn bộ nhớ khi mở trình điều khiển AU\n"
+
+#: oggenc/audio.c:889
+#, c-format
+msgid "At this moment, only linear 16 bit .au files are supported\n"
+msgstr "Hiện thời chỉ hỗ trợ tập tin kiểu .au 16-bit tuyến tính\n"
+
+#: oggenc/audio.c:941
+#, c-format
+msgid "Internal error! Please report this bug.\n"
+msgstr "Gặp lỗi nội bộ — thông báo nhé.\n"
+
 #: oggenc/encode.c:64
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
@@ -1032,27 +955,18 @@
 
 #: oggenc/encode.c:115 oggenc/encode.c:252
 #, c-format
-msgid ""
-"This version of libvorbisenc cannot set advanced rate management parameters\n"
-msgstr ""
-"Phiên bản libvorbisenc này không có khả năng đặt tham số quản lý tỷ lệ cấp "
-"cao\n"
+msgid "This version of libvorbisenc cannot set advanced rate management parameters\n"
+msgstr "Phiên bản libvorbisenc này không có khả năng đặt tham số quản lý tỷ lệ cấp cao\n"
 
 #: oggenc/encode.c:174
 #, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-"255 kênh nên là đủ cho bất cứ ai. (Tiếc là Vorbis không hỗ trợ nhiều hơn "
-"đó)\n"
+msgid "255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support more)\n"
+msgstr "255 kênh nên là đủ cho bất cứ ai. (Tiếc là Vorbis không hỗ trợ nhiều hơn đó)\n"
 
 #: oggenc/encode.c:182
 #, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
-msgstr ""
-"Việc yêu cầu tỷ lệ bit tối thiểu hay tối đa cần thiết tùy chọn « --managed "
-"» (đã quản lý)\n"
+msgstr "Việc yêu cầu tỷ lệ bit tối thiểu hay tối đa cần thiết tùy chọn « --managed » (đã quản lý)\n"
 
 #: oggenc/encode.c:200
 #, c-format
@@ -1207,93 +1121,86 @@
 "         %s%s%s \n"
 "bằng cách quản lý tỷ lệ bit"
 
-#: oggenc/oggenc.c:103
+#: oggenc/oggenc.c:100
 #, c-format
 msgid "ERROR: No input files specified. Use -h for help.\n"
-msgstr ""
-"LỖI: chưa ghi rõ tập tin nhập vào. Hãy sử dụng lệnh « -h » để xem trợ giúp.\n"
+msgstr "LỖI: chưa ghi rõ tập tin nhập vào. Hãy sử dụng lệnh « -h » để xem trợ giúp.\n"
 
-#: oggenc/oggenc.c:118
+#: oggenc/oggenc.c:115
 #, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr "LỖI: nhiều tập tin được ghi rõ khi dùng thiết bị nhập chuẩn\n"
 
-#: oggenc/oggenc.c:125
+#: oggenc/oggenc.c:122
 #, c-format
-msgid ""
-"ERROR: Multiple input files with specified output filename: suggest using -"
-"n\n"
-msgstr ""
-"LỖI: có nhiều tập tin nhập với cùng một tên tập tin xuất: đệ nghị dùng tùy "
-"chọn « -n »\n"
+msgid "ERROR: Multiple input files with specified output filename: suggest using -n\n"
+msgstr "LỖI: có nhiều tập tin nhập với cùng một tên tập tin xuất: đệ nghị dùng tùy chọn « -n »\n"
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:183
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "LỖI: không thể mở tập tin nhập « %s »: %s\n"
 
-#: oggenc/oggenc.c:202
+#: oggenc/oggenc.c:199
 msgid "RAW file reader"
 msgstr "Bộ đọc tập tin RAW"
 
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:216
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Đang mở bằng mô-đun %s: %s\n"
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:225
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "LỖI: tập tin nhập « %s » không phải là định dạng được hỗ trợ\n"
 
-#: oggenc/oggenc.c:280
+#: oggenc/oggenc.c:277
 #, c-format
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "CẢNH BÁO : không có tên tập tin nên dùng mặc định « default.ogg »\n"
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:285
 #, c-format
-msgid ""
-"ERROR: Could not create required subdirectories for output filename \"%s\"\n"
-msgstr ""
-"LỖI: không thể tạo những thư mục con cần thiết cho tên tập tin xuất « %s »\n"
+msgid "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
+msgstr "LỖI: không thể tạo những thư mục con cần thiết cho tên tập tin xuất « %s »\n"
 
-#: oggenc/oggenc.c:295
+#: oggenc/oggenc.c:292
 #, c-format
 msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
 msgstr "LỖI: tên tập tin nhập vào trùng với tên tập tin xuất ra « %s »\n"
 
-#: oggenc/oggenc.c:306
+#: oggenc/oggenc.c:303
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "LỖI: không thể mở tập tin xuất « %s »: %s\n"
 
-#: oggenc/oggenc.c:350
+#: oggenc/oggenc.c:335
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Đang lấy lại mẫu nhập từ %d Hz đến %d Hz\n"
 
-#: oggenc/oggenc.c:357
+#: oggenc/oggenc.c:342
 #, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Đang hoà trộn xuống âm lập thể thành nguồn đơn\n"
 
-#: oggenc/oggenc.c:360
+#: oggenc/oggenc.c:345
 #, c-format
 msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr "CẢNH BÁO : không thể hoà tiếng từ âm lập thể xuống nguồn đơn\n"
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:353
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr "Đang co dãn kết nhập thành %f\n"
 
-#: oggenc/oggenc.c:414
+#: oggenc/oggenc.c:395
 #, c-format
 msgid "oggenc from %s %s"
 msgstr "oggenc từ %s %s"
 
-#: oggenc/oggenc.c:416
+#: oggenc/oggenc.c:397
 #, c-format
 msgid ""
 "Usage: oggenc [options] inputfile [...]\n"
@@ -1302,7 +1209,7 @@
 "Sử dụng: oggenc [tùy_chọn] tập_tin_nhập [...]\n"
 "\n"
 
-#: oggenc/oggenc.c:417
+#: oggenc/oggenc.c:398
 #, c-format
 msgid ""
 "OPTIONS:\n"
@@ -1318,7 +1225,7 @@
 " -h, --help           In ra trợ giúp này\n"
 " -V, --version        In ra số thứ tự phiên bản\n"
 
-#: oggenc/oggenc.c:423
+#: oggenc/oggenc.c:404
 #, c-format
 msgid ""
 " -k, --skeleton       Adds an Ogg Skeleton bitstream\n"
@@ -1329,15 +1236,13 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 msgstr ""
 " -k, --skeleton       Thêm một luồng bit kiểu Ogg Skeleton\n"
-" -r, --raw            Chế độ thô. Tập tin nhập vào thì được đọc trực tiếp là "
-"dữ liệu PCM\n"
+" -r, --raw            Chế độ thô. Tập tin nhập vào thì được đọc trực tiếp là dữ liệu PCM\n"
 " -B, --raw-bits=n     Đặt số bit/mẫu cho dữ liệu nhập thô ; mặc định là 16\n"
 " -C, --raw-chan=n     Đặt số kênh cho dữ liệu nhập thô ; mặc định là 2\n"
-" -R, --raw-rate=n     Đặt số mẫu/giây cho dữ liệu nhập thô ; mặc định là "
-"44100\n"
+" -R, --raw-rate=n     Đặt số mẫu/giây cho dữ liệu nhập thô ; mặc định là 44100\n"
 " --raw-endianness     1 về cuối lớn, 0 về cuối nhỏ (mặc định là 0)\n"
 
-#: oggenc/oggenc.c:430
+#: oggenc/oggenc.c:411
 #, c-format
 msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
@@ -1355,12 +1260,11 @@
 "\t\t\tXem tùy chọn « --managed » để dùng một tỷ lệ bit\n"
 "\t\t\tđược quản lý nhắm mục đích là tỷ lệ bit được chọn.\n"
 
-#: oggenc/oggenc.c:437
+#: oggenc/oggenc.c:418
 #, c-format
 msgid ""
 " --managed            Enable the bitrate management engine. This will allow\n"
-"                      much greater control over the precise bitrate(s) "
-"used,\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"
@@ -1373,7 +1277,7 @@
 "\t\t\tcần điều khiển chi tiết tỷ lệ bit,\n"
 "\t\t\tv.d. để chạy luồng.\n"
 
-#: oggenc/oggenc.c:443
+#: oggenc/oggenc.c:424
 #, c-format
 msgid ""
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
@@ -1393,7 +1297,7 @@
 "\t\t\tDùng tùy chọn này cũng tự động bật chế độ tỷ lệ bit\n"
 "\t\t\tđược quản lý (xem tùy chọn « --managed »).\n"
 
-#: oggenc/oggenc.c:451
+#: oggenc/oggenc.c:432
 #, c-format
 msgid ""
 " --advanced-encode-option option=value\n"
@@ -1411,7 +1315,7 @@
 "\t\t\tTùy chọn kiểu này chỉ cho người dùng thành thạo,\n"
 "\t\t\tcũng nên dùng cẩn thận.\n"
 
-#: oggenc/oggenc.c:458
+#: oggenc/oggenc.c:439
 #, c-format
 msgid ""
 " -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
@@ -1427,7 +1331,7 @@
 "\t\t\tCũng cho phép giá trị phân số (v.d. 2.75).\n"
 "\t\t\tMức chất lượng mặc định là 3.\n"
 
-#: oggenc/oggenc.c:464
+#: oggenc/oggenc.c:445
 #, c-format
 msgid ""
 " --resample n         Resample input data to sampling rate n (Hz)\n"
@@ -1444,7 +1348,7 @@
 "\t\t\tNếu mã hoá nhiều tập tin, số thứ tự này\n"
 "\t\t\tsẽ tăng dần với mỗi luồng nằm sau cái đầu tiên.\n"
 
-#: oggenc/oggenc.c:471
+#: oggenc/oggenc.c:452
 #, c-format
 msgid ""
 " --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
@@ -1460,16 +1364,14 @@
 "\t\t\tvà luồng dữ liệu trên đầu vào tiêu chuẩn (STDIN).\n"
 "\n"
 
-#: oggenc/oggenc.c:477
+#: oggenc/oggenc.c:458
 #, c-format
 msgid ""
 " Naming:\n"
 " -o, --output=fn      Write file to fn (only valid in single-file mode)\n"
 " -n, --names=string   Produce filenames as this string, with %%a, %%t, %%l,\n"
-"                      %%n, %%d replaced by artist, title, album, track "
-"number,\n"
-"                      and date, respectively (see below for specifying "
-"these).\n"
+"                      %%n, %%d replaced by artist, title, album, track number,\n"
+"                      and date, respectively (see below for specifying these).\n"
 "                      %%%% gives a literal %%.\n"
 msgstr ""
 " Đặt tên:\n"
@@ -1484,19 +1386,16 @@
 "\t\t\txem dưới đây để tìm thông tin\n"
 "\t\t\tvề cách xác định những biến đặc biệt này.\n"
 
-#: oggenc/oggenc.c:484
+#: oggenc/oggenc.c:465
 #, c-format
 msgid ""
-" -X, --name-remove=s  Remove the specified characters from parameters to "
-"the\n"
+" -X, --name-remove=s  Remove the specified characters from parameters to the\n"
 "                      -n format string. Useful to ensure legal filenames.\n"
 " -P, --name-replace=s Replace characters removed by --name-remove with the\n"
-"                      characters specified. If this string is shorter than "
-"the\n"
+"                      characters specified. If this string is shorter than the\n"
 "                      --name-remove list or is not specified, the extra\n"
 "                      characters are just removed.\n"
-"                      Default settings for the above two arguments are "
-"platform\n"
+"                      Default settings for the above two arguments are platform\n"
 "                      specific.\n"
 msgstr ""
 " -X, --name-remove=s\t\tGỡ bỏ những ký tự được xác định ở đây\n"
@@ -1511,14 +1410,9 @@
 "\t\t\tThiết lập mặc định cho hai đối số trên\n"
 "\t\t\tcũng đặc trưng cho nền tảng.\n"
 
-#: oggenc/oggenc.c:493
-#, fuzzy, c-format
+#: oggenc/oggenc.c:474
+#, c-format
 msgid ""
-" --utf8               Tells oggenc that the command line parameters date, "
-"title,\n"
-"                      album, artist, genre, and comment are already in UTF-"
-"8.\n"
-"                      On Windows, this switch applies to file names too.\n"
 " -c, --comment=c      Add the given string as an extra comment. This may be\n"
 "                      used multiple times. The argument should be in the\n"
 "                      format \"tag=value\".\n"
@@ -1529,7 +1423,7 @@
 "\t\t\tĐối số nên có dạng « thẻ=giá_trị ».\n"
 " -d, --date           Ngày tháng của rãnh (thường là ngày biểu diễn)\n"
 
-#: oggenc/oggenc.c:501
+#: oggenc/oggenc.c:479
 #, c-format
 msgid ""
 " -N, --tracknum       Track number for this track\n"
@@ -1544,23 +1438,18 @@
 " -a, --artist         Tên của nghệ sĩ\n"
 " -G, --genre          Thể loại của rãnh\n"
 
-#: oggenc/oggenc.c:507
+#: oggenc/oggenc.c:485
 #, c-format
 msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
-"used,\n"
+"                      instances of the previous five arguments will be used,\n"
 "                      in the order they are given. If fewer titles are\n"
-"                      specified than files, OggEnc will print a warning, "
-"and\n"
+"                      specified than files, OggEnc will print a warning, and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. For the others, the final tag will be reused\n"
+"                      for all others without warning (so you can specify a date\n"
+"                      once, for example, and have it used for all the files)\n"
 "\n"
 msgstr ""
 "\t\t\tĐưa ra nhiều tập tin nhập vào, thì dùng nhiều lần\n"
@@ -1573,22 +1462,17 @@
 "\t\t\tmà không cảnh báo (thì có thể xác định một lần\n"
 "\t\t\tmột ngày tháng nào đó mà được dùng lại cho mọi tập tin)\n"
 
-#: oggenc/oggenc.c:518
-#, fuzzy, c-format
+#: oggenc/oggenc.c:496
+#, c-format
 msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
-"AIFF/C\n"
-" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
-"Files\n"
+" OggEnc input files must currently be 24, 16, or 8 bit PCM Wave, 16 bit u-Law (.au), AIFF, or AIFF/C\n"
+" files, 32 bit IEEE floating point Wave, 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 "
-"additional\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 wave'), unless additional\n"
 " parameters for raw mode are specified.\n"
-" You can specify taking the file from stdin by using - as the input "
-"filename.\n"
+" You can specify taking the file from stdin by using - as the input filename.\n"
 " In this mode, output is to stdout unless an output filename is specified\n"
 " with -o\n"
 "\n"
@@ -1608,383 +1492,330 @@
 "nếu không đặt tên tập tin kết xuất bằng « -o ».\n"
 "\n"
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:601
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
-msgstr ""
-"CẢNH BÁO : đang bỏ qua ký tự thoát không được phép « %c » trong định dạng "
-"tên\n"
+msgstr "CẢNH BÁO : đang bỏ qua ký tự thoát không được phép « %c » trong định dạng tên\n"
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
+#: oggenc/oggenc.c:630 oggenc/oggenc.c:755 oggenc/oggenc.c:768
 #, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr "Đang bật cơ chế quản lý tỷ lệ bit\n"
 
-#: oggenc/oggenc.c:661
+#: oggenc/oggenc.c:639
 #, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"CẢNH BÁO : tính trạng cuối thô được ghi rõ cho dữ liệu không phải thô. Như "
-"thế thì sẽ giả sử dữ liệu nhập có phải là thô.\n"
+msgid "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
+msgstr "CẢNH BÁO : tính trạng cuối thô được ghi rõ cho dữ liệu không phải thô. Như thế thì sẽ giả sử dữ liệu nhập có phải là thô.\n"
 
-#: oggenc/oggenc.c:664
+#: oggenc/oggenc.c:642
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "CẢNH BÁO : không thể đọc đối số tính trạng cuối « %s »\n"
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:649
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "CẢNH BÁO : không thể đọc tần số lấy lại mẫu « %s »\n"
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:655
 #, c-format
 msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
-msgstr ""
-"Cảnh báo : tỷ lệ lấy lại mẫu được ghi rõ là %d Hz. Bạn có định gõ %d Hz "
-"không?\n"
+msgstr "Cảnh báo : tỷ lệ lấy lại mẫu được ghi rõ là %d Hz. Bạn có định gõ %d Hz không?\n"
 
-#: oggenc/oggenc.c:687
+#: oggenc/oggenc.c:665
 #, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
 msgstr "Cảnh báo : không thể phân tách hệ số co dãn « %s »\n"
 
-#: oggenc/oggenc.c:700
+#: oggenc/oggenc.c:675
 #, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr "Không tìm thấy giá trị cho tùy chọn mã hóa cấp cao\n"
 
-#: oggenc/oggenc.c:718
+#: oggenc/oggenc.c:693
 #, c-format
 msgid "Internal error parsing command line options\n"
 msgstr "Gặp lỗi nội bộ khi phân tách tùy chọn dòng lệnh\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:704
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Cảnh báo : dùng ghi chú không được phép (« %s ») nên bỏ qua.\n"
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:741
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Cảnh báo : không nhận ra tỷ lệ không đáng kể « %s »\n"
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:749
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Cảnh báo : không nhận ra tỷ lệ tối thiểu « %s »\n"
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:762
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Cảnh báo : không nhận ra tỷ lệ tối đa « %s »\n"
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:774
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Không nhận ra tùy chọn chất lượng « %s » nên bỏ qua\n"
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:782
 #, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
-msgstr ""
-"CẢNH BÁO : thiết lập chất lượng quá cao nên lập thành chất lượng tối đa.\n"
+msgstr "CẢNH BÁO : thiết lập chất lượng quá cao nên lập thành chất lượng tối đa.\n"
 
-#: oggenc/oggenc.c:813
+#: oggenc/oggenc.c:788
 #, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "CẢNH BÁO : nhiều định dạng tên được ghi rõ nên dùng điều cuối cùng\n"
 
-#: oggenc/oggenc.c:822
+#: oggenc/oggenc.c:797
 #, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
-msgstr ""
-"CẢNH BÁO : nhiều bộ lọc định dạng tên được ghi rõ nên dùng điều cuối cùng\n"
+msgstr "CẢNH BÁO : nhiều bộ lọc định dạng tên được ghi rõ nên dùng điều cuối cùng\n"
 
-#: oggenc/oggenc.c:831
+#: oggenc/oggenc.c:806
 #, c-format
-msgid ""
-"WARNING: Multiple name format filter replacements specified, using final\n"
-msgstr ""
-"CẢNH BÁO : nhiều điều thay thế bộ lọc định dạng tên được ghi rõ nên dùng "
-"điều cuối cùng\n"
+msgid "WARNING: Multiple name format filter replacements specified, using final\n"
+msgstr "CẢNH BÁO : nhiều điều thay thế bộ lọc định dạng tên được ghi rõ nên dùng điều cuối cùng\n"
 
-#: oggenc/oggenc.c:839
+#: oggenc/oggenc.c:814
 #, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
-msgstr ""
-"CẢNH BÁO : nhiều tập tin xuất được ghi rõ nên đệ nghị dùng tùy chọn « -n »\n"
+msgstr "CẢNH BÁO : nhiều tập tin xuất được ghi rõ nên đệ nghị dùng tùy chọn « -n »\n"
 
-#: oggenc/oggenc.c:851
+#: oggenc/oggenc.c:826
 #, c-format
 msgid "oggenc from %s %s\n"
 msgstr "oggenc từ %s %s\n"
 
-#: oggenc/oggenc.c:858
+#: oggenc/oggenc.c:833
 #, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"CẢNH BÁO : bit/mẫu thô được ghi rõ cho dữ liệu không phải thô nên giả sử dữ "
-"liệu nhập có phải là thô.\n"
+msgid "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
+msgstr "CẢNH BÁO : bit/mẫu thô được ghi rõ cho dữ liệu không phải thô nên giả sử dữ liệu nhập có phải là thô.\n"
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
+#: oggenc/oggenc.c:838 oggenc/oggenc.c:842
 #, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr "CẢNH BÁO : ghi rõ bit/mẫu không hợp lệ nên giả sử 16.\n"
 
-#: oggenc/oggenc.c:874
+#: oggenc/oggenc.c:849
 #, c-format
-msgid ""
-"WARNING: Raw channel count specified for non-raw data. Assuming input is "
-"raw.\n"
-msgstr ""
-"CẢNH BÁO : số đếm kênh thô được ghi rõ cho dữ liệu không phải thô nên giả sử "
-"dữ liệu nhập có phải là thô.\n"
+msgid "WARNING: Raw channel count specified for non-raw data. Assuming input is raw.\n"
+msgstr "CẢNH BÁO : số đếm kênh thô được ghi rõ cho dữ liệu không phải thô nên giả sử dữ liệu nhập có phải là thô.\n"
 
-#: oggenc/oggenc.c:879
+#: oggenc/oggenc.c:854
 #, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr "CẢNH BÁO : ghi rõ số đếm kênh không hợp lệ nên giả sử 2.\n"
 
-#: oggenc/oggenc.c:890
+#: oggenc/oggenc.c:865
 #, c-format
-msgid ""
-"WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"CẢNH BÁO : tỷ lệ lấy mẫu thô được ghi rõ cho dữ liệu không phải thô nên giả "
-"sử dữ liệu nhập có phải là thô.\n"
+msgid "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
+msgstr "CẢNH BÁO : tỷ lệ lấy mẫu thô được ghi rõ cho dữ liệu không phải thô nên giả sử dữ liệu nhập có phải là thô.\n"
 
-#: oggenc/oggenc.c:895
+#: oggenc/oggenc.c:870
 #, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr "CẢNH BÁO : ghi rõ tỷ lệ lấy mẫu không hợp lệ nên giả sử 44100.\n"
 
-#: oggenc/oggenc.c:902
+#: oggenc/oggenc.c:877
 #, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "CẢNH BÁO : ghi rõ tùy chọn lạ nên giả sử →\n"
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
-#, fuzzy, c-format
-msgid "'%s' is not valid UTF-8, cannot add\n"
-msgstr "Không thể chuyển đôi ghi chú đến UTF-8 nên không thể thêm\n"
-
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
+#: oggenc/oggenc.c:899 vorbiscomment/vcomment.c:354
 #, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Không thể chuyển đôi ghi chú đến UTF-8 nên không thể thêm\n"
 
-#: oggenc/oggenc.c:954
+#: oggenc/oggenc.c:918
 #, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr "CẢNH BÁO : chưa ghi rõ đủ tựa nên dùng mặc định (tựa cuối cùng).\n"
 
-#: oggenc/platform.c:172
+#: oggenc/platform.c:150
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Không thể tạo thư mục « %s »: %s\n"
 
-#: oggenc/platform.c:179
+#: oggenc/platform.c:157
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Gặp lỗi khi kiểm tra có thư mục %s: %s\n"
 
-#: oggenc/platform.c:192
+#: oggenc/platform.c:170
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Lỗi: đoạn đường dẫn « %s » không phải là thư mục\n"
 
-#: ogginfo/ogginfo2.c:212
+#: ogginfo/ogginfo2.c:211
 #, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
-msgstr ""
-"Cảnh báo : ghi chú %d trong luồng %d có định dạng không hợp lệ, không chứa "
-"'=': \"%s\"\n"
+msgid "Warning: Comment %d in stream %d has invalid format, does not contain '=': \"%s\"\n"
+msgstr "Cảnh báo : ghi chú %d trong luồng %d có định dạng không hợp lệ, không chứa '=': \"%s\"\n"
 
-#: ogginfo/ogginfo2.c:220
+#: ogginfo/ogginfo2.c:219
 #, c-format
 msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
-msgstr ""
-"Cảnh báo : tên trường ghi chú không hợp lệ trong ghi chú %d (luồng %d): « %s "
-"»\n"
+msgstr "Cảnh báo : tên trường ghi chú không hợp lệ trong ghi chú %d (luồng %d): « %s »\n"
 
-#: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
+#: ogginfo/ogginfo2.c:250 ogginfo/ogginfo2.c:258
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
-msgstr ""
-"Cảnh báo : chuỗi UTF-8 không được phép trong ghi chú %d (luồng %d): dấu độ "
-"dài không đúng\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
+msgstr "Cảnh báo : chuỗi UTF-8 không được phép trong ghi chú %d (luồng %d): dấu độ dài không đúng\n"
 
-#: ogginfo/ogginfo2.c:266
+#: ogginfo/ogginfo2.c:265
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
-msgstr ""
-"Cảnh báo : chuỗi UTF-8 không được phép trong ghi chú %d (luồng %d): quá ít "
-"byte\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+msgstr "Cảnh báo : chuỗi UTF-8 không được phép trong ghi chú %d (luồng %d): quá ít byte\n"
 
-#: ogginfo/ogginfo2.c:342
+#: ogginfo/ogginfo2.c:341
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
-"\"%s\": %s\n"
-msgstr ""
-"Cảnh báo : chuỗi UTF-8 không được phép trong ghi chú %d (luồng %d): chuỗi "
-"không hợp lệ « %s »: %s\n"
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence \"%s\": %s\n"
+msgstr "Cảnh báo : chuỗi UTF-8 không được phép trong ghi chú %d (luồng %d): chuỗi không hợp lệ « %s »: %s\n"
 
-#: ogginfo/ogginfo2.c:356
+#: ogginfo/ogginfo2.c:355
 msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
 msgstr "Cảnh báo : bộ giải mã UTF-8 không chạy được. Mà nên không thể.\n"
 
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
+#: ogginfo/ogginfo2.c:380 ogginfo/ogginfo2.c:547 ogginfo/ogginfo2.c:680
 #, c-format
 msgid "Warning: discontinuity in stream (%d)\n"
 msgstr "Cảnh báo : gặp điểm gián đoạn trong luồng (%d)\n"
 
-#: ogginfo/ogginfo2.c:389
+#: ogginfo/ogginfo2.c:388
 #, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Cảnh báo : không thể giải mã gói tin phần đầu theora: luồng theora không hợp "
-"lệ (%d)\n"
+msgid "Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+msgstr "Cảnh báo : không thể giải mã gói tin phần đầu theora: luồng theora không hợp lệ (%d)\n"
 
-#: ogginfo/ogginfo2.c:396
+#: ogginfo/ogginfo2.c:395
 #, 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 ""
-"Cảnh báo : luồng theora %d không có phần đầu trong khung đúng. Trang phần "
-"đầu cuối cùng chứa các gói tin thêm, hoặc có granulepos khác số không\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 "Cảnh báo : luồng theora %d không có phần đầu trong khung đúng. Trang phần đầu cuối cùng chứa các gói tin thêm, hoặc có granulepos khác số không\n"
 
-#: ogginfo/ogginfo2.c:400
+#: ogginfo/ogginfo2.c:399
 #, c-format
 msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr ""
-"Phần đầu theora đã được phân tách cho luồng %d, thông tin theo đây...\n"
+msgstr "Phần đầu theora đã được phân tách cho luồng %d, thông tin theo đây...\n"
 
-#: ogginfo/ogginfo2.c:403
+#: ogginfo/ogginfo2.c:402
 #, c-format
 msgid "Version: %d.%d.%d\n"
 msgstr "Phiên bản: %d.%d.%d\n"
 
-#: ogginfo/ogginfo2.c:405 ogginfo/ogginfo2.c:583 ogginfo/ogginfo2.c:743
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:582 ogginfo/ogginfo2.c:742
 #, c-format
 msgid "Vendor: %s\n"
 msgstr "Nhà sản xuất: %s\n"
 
-#: ogginfo/ogginfo2.c:406
+#: ogginfo/ogginfo2.c:405
 #, c-format
 msgid "Width: %d\n"
 msgstr "Rá»™ng: %d\n"
 
-#: ogginfo/ogginfo2.c:407
+#: ogginfo/ogginfo2.c:406
 #, c-format
 msgid "Height: %d\n"
 msgstr "Cao : %d\n"
 
-#: ogginfo/ogginfo2.c:408
+#: ogginfo/ogginfo2.c:407
 #, c-format
 msgid "Total image: %d by %d, crop offset (%d, %d)\n"
 msgstr "Toàn ảnh: %d × %d, xén hiệu (%d, %d)\n"
 
-#: ogginfo/ogginfo2.c:411
+#: ogginfo/ogginfo2.c:410
 msgid "Frame offset/size invalid: width incorrect\n"
 msgstr "Hiệu/cỡ khung không hợp lệ: độ rộng không đúng\n"
 
-#: ogginfo/ogginfo2.c:413
+#: ogginfo/ogginfo2.c:412
 msgid "Frame offset/size invalid: height incorrect\n"
 msgstr "Hiệu/cỡ khung không hợp lệ: độ cao không đúng\n"
 
-#: ogginfo/ogginfo2.c:416
+#: ogginfo/ogginfo2.c:415
 msgid "Invalid zero framerate\n"
 msgstr "Tỷ lệ khung số không thì không hợp lệ\n"
 
-#: ogginfo/ogginfo2.c:418
+#: ogginfo/ogginfo2.c:417
 #, c-format
 msgid "Framerate %d/%d (%.02f fps)\n"
 msgstr "Tỷ lệ khung %d/%d (%.02f khung/giây)\n"
 
-#: ogginfo/ogginfo2.c:422
+#: ogginfo/ogginfo2.c:421
 msgid "Aspect ratio undefined\n"
 msgstr "Chưa xác định tỷ lệ hình thể\n"
 
-#: ogginfo/ogginfo2.c:427
+#: ogginfo/ogginfo2.c:426
 #, c-format
 msgid "Pixel aspect ratio %d:%d (%f:1)\n"
 msgstr "Tỷ lệ hình thể điểm ảnh %d:%d (%f:1)\n"
 
-#: ogginfo/ogginfo2.c:429
+#: ogginfo/ogginfo2.c:428
 msgid "Frame aspect 4:3\n"
 msgstr "Hình thể khung 4:3\n"
 
-#: ogginfo/ogginfo2.c:431
+#: ogginfo/ogginfo2.c:430
 msgid "Frame aspect 16:9\n"
 msgstr "Hình thể khung 16:9\n"
 
-#: ogginfo/ogginfo2.c:433
+#: ogginfo/ogginfo2.c:432
 #, c-format
 msgid "Frame aspect %f:1\n"
 msgstr "Hình thể khung %f:1\n"
 
-#: ogginfo/ogginfo2.c:437
+#: ogginfo/ogginfo2.c:436
 msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
 msgstr "Miền màu : Rec. ITU-R BT.470-6 System M (NTSC)\n"
 
-#: ogginfo/ogginfo2.c:439
+#: ogginfo/ogginfo2.c:438
 msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
 msgstr "Miền màu : Rec. ITU-R BT.470-6 Systems B và G (PAL)\n"
 
-#: ogginfo/ogginfo2.c:441
+#: ogginfo/ogginfo2.c:440
 msgid "Colourspace unspecified\n"
 msgstr "Chưa xác định miền màu\n"
 
-#: ogginfo/ogginfo2.c:444
+#: ogginfo/ogginfo2.c:443
 msgid "Pixel format 4:2:0\n"
 msgstr "Định dạng điểm ảnh 4:2:0\n"
 
-#: ogginfo/ogginfo2.c:446
+#: ogginfo/ogginfo2.c:445
 msgid "Pixel format 4:2:2\n"
 msgstr "Định dạng điểm ảnh 4:2:2\n"
 
-#: ogginfo/ogginfo2.c:448
+#: ogginfo/ogginfo2.c:447
 msgid "Pixel format 4:4:4\n"
 msgstr "Định dạng điểm ảnh 4:4:4\n"
 
-#: ogginfo/ogginfo2.c:450
+#: ogginfo/ogginfo2.c:449
 msgid "Pixel format invalid\n"
 msgstr "Định dạng điểm ảnh không hợp lệ\n"
 
-#: ogginfo/ogginfo2.c:452
+#: ogginfo/ogginfo2.c:451
 #, c-format
 msgid "Target bitrate: %d kbps\n"
 msgstr "Tỷ lệ bit đích: %d kbps\n"
 
-#: ogginfo/ogginfo2.c:453
+#: ogginfo/ogginfo2.c:452
 #, c-format
 msgid "Nominal quality setting (0-63): %d\n"
 msgstr "Thiết lập chất lượng danh nghĩa (0-63): %d\n"
 
-#: ogginfo/ogginfo2.c:456 ogginfo/ogginfo2.c:606 ogginfo/ogginfo2.c:802
+#: ogginfo/ogginfo2.c:455 ogginfo/ogginfo2.c:605 ogginfo/ogginfo2.c:801
 msgid "User comments section follows...\n"
 msgstr "Phần ghi chú người dùng theo đây...\n"
 
-#: ogginfo/ogginfo2.c:477
+#: ogginfo/ogginfo2.c:476
 msgid "Warning: Expected frame %"
 msgstr "Cảnh báo : mong đợi khung %"
 
-#: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
+#: ogginfo/ogginfo2.c:492 ogginfo/ogginfo2.c:620 ogginfo/ogginfo2.c:818
 msgid "Warning: granulepos in stream %d decreases from %"
 msgstr "Cảnh báo : granulepos trong luồng %d giảm từ %"
 
-#: ogginfo/ogginfo2.c:520
+#: ogginfo/ogginfo2.c:519
 msgid ""
 "Theora stream %d:\n"
 "\tTotal data length: %"
@@ -1992,46 +1823,37 @@
 "Luồng Theora %d:\n"
 "\tTổng chiều dài dữ liệu : %"
 
-#: ogginfo/ogginfo2.c:557
+#: ogginfo/ogginfo2.c:556
 #, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-"Cảnh báo : không thể giải mã gói tin phần đầu vorbis %d: luồng vorbis không "
-"hợp lệ (%d)\n"
+msgid "Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%d)\n"
+msgstr "Cảnh báo : không thể giải mã gói tin phần đầu vorbis %d: luồng vorbis không hợp lệ (%d)\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:564
 #, 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"
-msgstr ""
-"Cảnh báo : luồng vorbis %d không có phần đầu trong khung một cách đúng. "
-"Trang phần đầu cuối cùng chứa một số gói tin thêm, hoặc có granulepos (vị "
-"trí hột nhỏ?) không phải là số không\n"
+msgid "Warning: Vorbis stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n"
+msgstr "Cảnh báo : luồng vorbis %d không có phần đầu trong khung một cách đúng. Trang phần đầu cuối cùng chứa một số gói tin thêm, hoặc có granulepos (vị trí hột nhỏ?) không phải là số không\n"
 
-#: ogginfo/ogginfo2.c:569
+#: ogginfo/ogginfo2.c:568
 #, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Phần đầu vorbis được phân tách cho luồng %d, thông tin theo đây...\n"
 
-#: ogginfo/ogginfo2.c:572
+#: ogginfo/ogginfo2.c:571
 #, c-format
 msgid "Version: %d\n"
 msgstr "Phiên bản %d\n"
 
-#: ogginfo/ogginfo2.c:576
+#: ogginfo/ogginfo2.c:575
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Nhà sản xuất: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:584
+#: ogginfo/ogginfo2.c:583
 #, c-format
 msgid "Channels: %d\n"
 msgstr "Kênh: %d\n"
 
-#: ogginfo/ogginfo2.c:585
+#: ogginfo/ogginfo2.c:584
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -2040,43 +1862,39 @@
 "Tỷ lệ: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:588
+#: ogginfo/ogginfo2.c:587
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Tỷ lệ bit không đáng kể: %f kb/g\n"
 
-#: ogginfo/ogginfo2.c:591
+#: ogginfo/ogginfo2.c:590
 msgid "Nominal bitrate not set\n"
 msgstr "Chưa lập tỷ lệ bit không đáng kể\n"
 
-#: ogginfo/ogginfo2.c:594
+#: ogginfo/ogginfo2.c:593
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Tỷ lệ bit trên: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:597
+#: ogginfo/ogginfo2.c:596
 msgid "Upper bitrate not set\n"
 msgstr "Chưa lập tỷ lệ bit trên\n"
 
-#: ogginfo/ogginfo2.c:600
+#: ogginfo/ogginfo2.c:599
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Tỷ lệ bit dưới: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:603
+#: ogginfo/ogginfo2.c:602
 msgid "Lower bitrate not set\n"
 msgstr "Chưa ghi rõ tỷ lệ bit dưới\n"
 
-#: ogginfo/ogginfo2.c:630
+#: ogginfo/ogginfo2.c:629
 #, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
-msgstr ""
-"Gặp granulepos âm hay số không (%lld) trên luông vorbis bên ngoài phần đầu. "
-"Tập tin này đã được tạo bởi một bộ mã hoá có lỗi.\n"
+msgid "Negative or zero granulepos (%lld) on vorbis stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "Gặp granulepos âm hay số không (%lld) trên luông vorbis bên ngoài phần đầu. Tập tin này đã được tạo bởi một bộ mã hoá có lỗi.\n"
 
-#: ogginfo/ogginfo2.c:651
+#: ogginfo/ogginfo2.c:650
 msgid ""
 "Vorbis stream %d:\n"
 "\tTotal data length: %"
@@ -2084,122 +1902,106 @@
 "Luồng Vorbis %d:\n"
 "\tTổng chiều dài dữ liệu : %"
 
-#: ogginfo/ogginfo2.c:692
+#: ogginfo/ogginfo2.c:691
 #, c-format
-msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
-msgstr ""
-"Cảnh báo : không thể giải mã gói tin phần đầu kate %d: luồng kate không hợp "
-"lệ (%d)\n"
+msgid "Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
+msgstr "Cảnh báo : không thể giải mã gói tin phần đầu kate %d: luồng kate không hợp lệ (%d)\n"
 
-#: ogginfo/ogginfo2.c:703
+#: ogginfo/ogginfo2.c:702
 #, c-format
-msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
-"d)\n"
-msgstr ""
-"Cảnh báo : hình như gói tin %d không phải là một phần đầu kate: luồng kate "
-"không hợp lệ (%d)\n"
+msgid "Warning: packet %d does not seem to be a kate header - invalid kate stream (%d)\n"
+msgstr "Cảnh báo : hình như gói tin %d không phải là một phần đầu kate: luồng kate không hợp lệ (%d)\n"
 
-#: ogginfo/ogginfo2.c:734
+#: ogginfo/ogginfo2.c:733
 #, c-format
-msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
-"Cảnh báo : luồng Kate %d không có phần đầu trong khung đúng. Trang phần đầu "
-"cuối cùng chứa gói tin bổ sung, hoặc có granulepos khác số không\n"
+msgid "Warning: Kate stream %d does not have headers correctly framed. Terminal header page contains additional packets or has non-zero granulepos\n"
+msgstr "Cảnh báo : luồng Kate %d không có phần đầu trong khung đúng. Trang phần đầu cuối cùng chứa gói tin bổ sung, hoặc có granulepos khác số không\n"
 
-#: ogginfo/ogginfo2.c:738
+#: ogginfo/ogginfo2.c:737
 #, c-format
 msgid "Kate headers parsed for stream %d, information follows...\n"
-msgstr ""
-"Phần đầu Kate đã được phân tích cho luồng %d, có thông tin theo đây...\n"
+msgstr "Phần đầu Kate đã được phân tích cho luồng %d, có thông tin theo đây...\n"
 
-#: ogginfo/ogginfo2.c:741
+#: ogginfo/ogginfo2.c:740
 #, c-format
 msgid "Version: %d.%d\n"
 msgstr "Phiên bản: %d.%d\n"
 
-#: ogginfo/ogginfo2.c:747
+#: ogginfo/ogginfo2.c:746
 #, c-format
 msgid "Language: %s\n"
 msgstr "Ngôn ngữ : %s\n"
 
-#: ogginfo/ogginfo2.c:750
+#: ogginfo/ogginfo2.c:749
 msgid "No language set\n"
 msgstr "Chưa đặt ngôn ngữ\n"
 
-#: ogginfo/ogginfo2.c:753
+#: ogginfo/ogginfo2.c:752
 #, c-format
 msgid "Category: %s\n"
 msgstr "Phân loại: %s\n"
 
-#: ogginfo/ogginfo2.c:756
+#: ogginfo/ogginfo2.c:755
 msgid "No category set\n"
 msgstr "Chưa đặt phân loại\n"
 
-#: ogginfo/ogginfo2.c:761
+#: ogginfo/ogginfo2.c:760
 msgid "utf-8"
 msgstr "utf-8"
 
-#: ogginfo/ogginfo2.c:765
+#: ogginfo/ogginfo2.c:764
 #, c-format
 msgid "Character encoding: %s\n"
 msgstr "Bộ ký tự : %s\n"
 
-#: ogginfo/ogginfo2.c:768
+#: ogginfo/ogginfo2.c:767
 msgid "Unknown character encoding\n"
 msgstr "Không rõ bộ ký tự\n"
 
-#: ogginfo/ogginfo2.c:773
+#: ogginfo/ogginfo2.c:772
 msgid "left to right, top to bottom"
 msgstr "trái sang phải, trên xuống dưới"
 
-#: ogginfo/ogginfo2.c:774
+#: ogginfo/ogginfo2.c:773
 msgid "right to left, top to bottom"
 msgstr "phải sang trái, dưới lên trên"
 
-#: ogginfo/ogginfo2.c:775
+#: ogginfo/ogginfo2.c:774
 msgid "top to bottom, right to left"
 msgstr "trên xuống dưới, phải sang trái"
 
-#: ogginfo/ogginfo2.c:776
+#: ogginfo/ogginfo2.c:775
 msgid "top to bottom, left to right"
 msgstr "trên xuống dưới, trái sang phải"
 
-#: ogginfo/ogginfo2.c:780
+#: ogginfo/ogginfo2.c:779
 #, c-format
 msgid "Text directionality: %s\n"
 msgstr "Hướng văn bản: %s\n"
 
-#: ogginfo/ogginfo2.c:783
+#: ogginfo/ogginfo2.c:782
 msgid "Unknown text directionality\n"
 msgstr "Không rõ hướng văn bản\n"
 
-#: ogginfo/ogginfo2.c:795
+#: ogginfo/ogginfo2.c:794
 msgid "Invalid zero granulepos rate\n"
 msgstr "Tỷ lệ granulepos số không thì không hợp lệ\n"
 
-#: ogginfo/ogginfo2.c:797
+#: ogginfo/ogginfo2.c:796
 #, c-format
 msgid "Granulepos rate %d/%d (%.02f gps)\n"
 msgstr "Tỷ lệ granulepos %d/%d (%.02f khung/giây)\n"
 
-#: ogginfo/ogginfo2.c:810
+#: ogginfo/ogginfo2.c:809
 msgid "\n"
 msgstr "\n"
 
-#: ogginfo/ogginfo2.c:828
+#: ogginfo/ogginfo2.c:827
 #, c-format
-msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
-msgstr ""
-"granulepos âm (%lld) trên luông Kate bên ngoài phần đầu. Tập tin này đã được "
-"tạo bởi một bộ mã hoá có lỗi.\n"
+msgid "Negative granulepos (%lld) on kate stream outside of headers. This file was created by a buggy encoder\n"
+msgstr "granulepos âm (%lld) trên luông Kate bên ngoài phần đầu. Tập tin này đã được tạo bởi một bộ mã hoá có lỗi.\n"
 
-#: ogginfo/ogginfo2.c:853
+#: ogginfo/ogginfo2.c:852
 msgid ""
 "Kate stream %d:\n"
 "\tTotal data length: %"
@@ -2207,40 +2009,35 @@
 "Luồng Kate %d:\n"
 "\tTổng chiều dài dữ liệu : %"
 
-#: ogginfo/ogginfo2.c:893
+#: ogginfo/ogginfo2.c:892
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Cảnh báo : chưa lập kết thúc luồng trên luồng %d\n"
 
-#: ogginfo/ogginfo2.c:1048
+#: ogginfo/ogginfo2.c:1047
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Cảnh báo: trang phần đầu không hợp lệ, không tìm thấy gói tin\n"
 
-#: ogginfo/ogginfo2.c:1074
+#: ogginfo/ogginfo2.c:1073
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-"Cảnh báo: trang phần đầu không hợp lệ trong luồng %d, chứa nhiều gói tin\n"
+msgstr "Cảnh báo: trang phần đầu không hợp lệ trong luồng %d, chứa nhiều gói tin\n"
 
-#: ogginfo/ogginfo2.c:1088
+#: ogginfo/ogginfo2.c:1087
 #, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-"Ghi chú : luồng %d có số sản xuất %d mà hợp pháp nhưng có thể gây ra lỗi "
-"trong một số công cụ.\n"
+msgid "Note: Stream %d has serial number %d, which is legal but may cause problems with some tools.\n"
+msgstr "Ghi chú : luồng %d có số sản xuất %d mà hợp pháp nhưng có thể gây ra lỗi trong một số công cụ.\n"
 
-#: ogginfo/ogginfo2.c:1105
+#: ogginfo/ogginfo2.c:1104
 msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
 msgstr "Cảnh báo : gặp lỗ trong dữ liệu (%d byte) ở hiệu xấp xỉ %"
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:1128
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Gặp lỗi khi mở tập tin nhập « %s »: %s\n"
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:1133
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -2249,27 +2046,23 @@
 "Đang xử lý tập tin « %s »....\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:1142
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Không tìm thấy bộ xử lý cho luồng nên hủy bỏ\n"
 
-#: ogginfo/ogginfo2.c:1151
+#: ogginfo/ogginfo2.c:1150
 msgid "Page found for stream after EOS flag"
 msgstr "Tìm thấy trang cho luồng sau cờ EOS (kết thúc luồng)"
 
-#: ogginfo/ogginfo2.c:1154
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-"Vi phạm các ràng buộc mux Ogg, có luồng mới nằm trước EOS (kết thúc luồng) "
-"của các luồng trước"
+#: ogginfo/ogginfo2.c:1153
+msgid "Ogg muxing constraints violated, new stream before EOS of all previous streams"
+msgstr "Vi phạm các ràng buộc mux Ogg, có luồng mới nằm trước EOS (kết thúc luồng) của các luồng trước"
 
-#: ogginfo/ogginfo2.c:1158
+#: ogginfo/ogginfo2.c:1157
 msgid "Error unknown."
 msgstr "Gặp lỗi không rõ."
 
-#: ogginfo/ogginfo2.c:1161
+#: ogginfo/ogginfo2.c:1160
 #, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
@@ -2278,36 +2071,32 @@
 "Cảnh báo : (các) trang có vị trí cấm cho luồng luận lý %d\n"
 "Ngụ ý tập tin ogg bị hỏng: %s.\n"
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:1172
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Luồng hợp lý mới (#%d, nối tiếp: %08x): kiểu %s\n"
 
-#: ogginfo/ogginfo2.c:1176
+#: ogginfo/ogginfo2.c:1175
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Cảnh báo : chưa lập cờ bất đầu luồng trên luồng %d\n"
 
-#: ogginfo/ogginfo2.c:1180
+#: ogginfo/ogginfo2.c:1179
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "Cảnh báo : tìm thấy cờ bất đầu luồng trên giữa trên luồng %d\n"
 
-#: ogginfo/ogginfo2.c:1185
+#: ogginfo/ogginfo2.c:1184
 #, c-format
-msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
-"ld. Indicates missing data.\n"
-msgstr ""
-"Cảnh báo : gặp chỗ không có số trong luồng %d. Đã nhận trang %ld còn mong "
-"đợi trang %ld. Đó ngụ ý dữ liệu bị thiếu.\n"
+msgid "Warning: sequence number gap in stream %d. Got page %ld when expecting page %ld. Indicates missing data.\n"
+msgstr "Cảnh báo : gặp chỗ không có số trong luồng %d. Đã nhận trang %ld còn mong đợi trang %ld. Đó ngụ ý dữ liệu bị thiếu.\n"
 
-#: ogginfo/ogginfo2.c:1200
+#: ogginfo/ogginfo2.c:1199
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Luồng hợp lý %d đã kết thúc\n"
 
-#: ogginfo/ogginfo2.c:1208
+#: ogginfo/ogginfo2.c:1207
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -2316,12 +2105,12 @@
 "Lỗi: không tìm thấy dữ liệu ogg trong tập tin « %s ».\n"
 "Vì vậy dữ liệu nhập vào rất không phải là Ogg.\n"
 
-#: ogginfo/ogginfo2.c:1219
+#: ogginfo/ogginfo2.c:1218
 #, c-format
 msgid "ogginfo from %s %s\n"
 msgstr "ogginfo từ %s %s\n"
 
-#: ogginfo/ogginfo2.c:1225
+#: ogginfo/ogginfo2.c:1224
 #, c-format
 msgid ""
 "(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
@@ -2345,12 +2134,12 @@
 "\t-v \t\tXuất nhiều chi tiết hơn. Có thể bật các sự kiểm tra chi tiết hơn\n"
 "\t\tcho một số kiểu luồng\n"
 
-#: ogginfo/ogginfo2.c:1234
+#: ogginfo/ogginfo2.c:1233
 #, c-format
 msgid "\t-V Output version information and exit\n"
 msgstr "\t-V\t\tXuất thông tin phiên bản, sau đó thoát\n"
 
-#: ogginfo/ogginfo2.c:1246
+#: ogginfo/ogginfo2.c:1245
 #, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
@@ -2365,11 +2154,10 @@
 "và chẩn đoán vấn đề với nó.\n"
 "Có thể xem trợ giúp đầy đủ bằng cách sử dụng lệnh « ogginfo -h ».\n"
 
-#: ogginfo/ogginfo2.c:1280
+#: ogginfo/ogginfo2.c:1279
 #, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
-msgstr ""
-"Chưa ghi rõ tập tin nhập nào. Sử dụng lệnh « ogginfo -h » để xem trợ giúp.\n"
+msgstr "Chưa ghi rõ tập tin nhập nào. Sử dụng lệnh « ogginfo -h » để xem trợ giúp.\n"
 
 #: share/getopt.c:673
 #, c-format
@@ -2449,21 +2237,17 @@
 #: vcut/vcut.c:225
 #, c-format
 msgid "Cutpoint not within stream. Second file will be empty\n"
-msgstr ""
-"Điểm cắt không phải ở trong luồng. Như thế thì tập tin thứ hai sẽ là rỗng.\n"
+msgstr "Điểm cắt không phải ở trong luồng. Như thế thì tập tin thứ hai sẽ là rỗng.\n"
 
 #: vcut/vcut.c:277
 #, c-format
 msgid "Unhandled special case: first file too short?\n"
-msgstr ""
-"Trường hợp đặc biệt không được quản lý: tập tin thứ nhất quá ngắn không?\n"
+msgstr "Trường hợp đặc biệt không được quản lý: tập tin thứ nhất quá ngắn không?\n"
 
 #: vcut/vcut.c:327
 #, c-format
 msgid "Cutpoint too close to end of file. Second file will be empty.\n"
-msgstr ""
-"Điểm cắt quá gần với kết thúc của tập tin. Vì thế tập tin thứ hai sẽ là "
-"trống.\n"
+msgstr "Điểm cắt quá gần với kết thúc của tập tin. Vì thế tập tin thứ hai sẽ là trống.\n"
 
 #: vcut/vcut.c:353
 #, c-format
@@ -2522,11 +2306,8 @@
 
 #: vcut/vcut.c:535
 #, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
-msgstr ""
-"Cách sử dụng: vcut tập_tin_nhập.ogg tập_tin_xuất1.ogg tập_tin_xuất2.ogg "
-"[điểm_cắt | +điểm_cắt]\n"
+msgid "Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
+msgstr "Cách sử dụng: vcut tập_tin_nhập.ogg tập_tin_xuất1.ogg tập_tin_xuất2.ogg [điểm_cắt | +điểm_cắt]\n"
 
 #: vcut/vcut.c:539
 #, c-format
@@ -2633,8 +2414,7 @@
 msgstr "Dữ liệu bị hỏng hay còn thiếu, vẫn tiếp tục..."
 
 #: vorbiscomment/vcedit.c:875
-msgid ""
-"Error writing stream to output. Output stream may be corrupted or truncated."
+msgid "Error writing stream to output. Output stream may be corrupted or truncated."
 msgstr "Gặp lỗi khi ghi luồng vào xuất. Luồng xuất có lẽ bị hỏng hay bị cụt."
 
 #: vorbiscomment/vcomment.c:190 vorbiscomment/vcomment.c:216
@@ -2662,7 +2442,7 @@
 msgid "no action specified\n"
 msgstr "Chưa ghi rõ hành động nào\n"
 
-#: vorbiscomment/vcomment.c:379
+#: vorbiscomment/vcomment.c:376
 #, c-format
 msgid ""
 "vorbiscomment from %s %s\n"
@@ -2673,12 +2453,12 @@
 " của Tổ chức Xiph.Org (http://www.xiph.org/)\n"
 "\n"
 
-#: vorbiscomment/vcomment.c:382
+#: vorbiscomment/vcomment.c:379
 #, c-format
 msgid "List or edit comments in Ogg Vorbis files.\n"
 msgstr "Liệt kê hoặc chỉnh sửa ghi chú trong tập tin kiểu Ogg Vorbis.\n"
 
-#: vorbiscomment/vcomment.c:385
+#: vorbiscomment/vcomment.c:382
 #, c-format
 msgid ""
 "Usage: \n"
@@ -2689,34 +2469,29 @@
 "Sử dụng: \n"
 "  vorbiscomment [-Vh]\n"
 "  vorbiscomment [-lR] tập_tin\n"
-"  vorbiscomment [-R] [-c tập_tin] [-t thẻ] <-a|-w> tập_tin_nhập "
-"[tập_tin_xuất]\n"
+"  vorbiscomment [-R] [-c tập_tin] [-t thẻ] <-a|-w> tập_tin_nhập [tập_tin_xuất]\n"
 
-#: vorbiscomment/vcomment.c:391
+#: vorbiscomment/vcomment.c:388
 #, c-format
 msgid "Listing options\n"
 msgstr "Tùy chọn liệt kê\n"
 
-#: vorbiscomment/vcomment.c:392
+#: vorbiscomment/vcomment.c:389
 #, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-"  -l, --list              Liệt kê các ghi chú (mặc định nếu không đưa ra tùy "
-"chọn)\n"
+msgid "  -l, --list              List the comments (default if no options are given)\n"
+msgstr "  -l, --list              Liệt kê các ghi chú (mặc định nếu không đưa ra tùy chọn)\n"
 
-#: vorbiscomment/vcomment.c:395
+#: vorbiscomment/vcomment.c:392
 #, c-format
 msgid "Editing options\n"
 msgstr "Tùy chọn chỉnh sửa\n"
 
-#: vorbiscomment/vcomment.c:396
+#: vorbiscomment/vcomment.c:393
 #, c-format
 msgid "  -a, --append            Append comments\n"
 msgstr "  -a, --append            Phụ thêm các ghi chú\n"
 
-#: vorbiscomment/vcomment.c:397
+#: vorbiscomment/vcomment.c:394
 #, c-format
 msgid ""
 "  -t \"name=value\", --tag \"name=value\"\n"
@@ -2725,72 +2500,60 @@
 "  -t \"tên=giá_trị\", --tag \"ên=giá_trị\"\n"
 "                          Ghi rõ một ghi chú trên dòng lệnh\n"
 
-#: vorbiscomment/vcomment.c:399
+#: vorbiscomment/vcomment.c:396
 #, c-format
 msgid "  -w, --write             Write comments, replacing the existing ones\n"
 msgstr "  -w, --write             Ghi chú, mà thay thế ghi chú đã có\n"
 
-#: vorbiscomment/vcomment.c:403
+#: vorbiscomment/vcomment.c:400
 #, c-format
 msgid ""
 "  -c file, --commentfile file\n"
-"                          When listing, write comments to the specified "
-"file.\n"
-"                          When editing, read comments from the specified "
-"file.\n"
+"                          When listing, write comments to the specified file.\n"
+"                          When editing, read comments from the specified file.\n"
 msgstr ""
 "  -c tập_tin, --commentfile tập_tin\n"
-"                          Khi liệt kê thì cũng ghi các ghi chú vào tập tin "
-"Ä‘Æ°a ra.\n"
-"                          Khi chỉnh sửa thì cũng đọc các ghi chú từ tập tin "
-"Ä‘Æ°a ra.\n"
+"                          Khi liệt kê thì cũng ghi các ghi chú vào tập tin đưa ra.\n"
+"                          Khi chỉnh sửa thì cũng đọc các ghi chú từ tập tin đưa ra.\n"
 
-#: vorbiscomment/vcomment.c:406
+#: vorbiscomment/vcomment.c:403
 #, c-format
 msgid "  -R, --raw               Read and write comments in UTF-8\n"
 msgstr "  -R, --raw               Đọc và ghi các ghi chú theo UTF-8\n"
 
-#: vorbiscomment/vcomment.c:410
+#: vorbiscomment/vcomment.c:407
 #, c-format
 msgid "  -V, --version           Output version information and exit\n"
 msgstr "  -V, --version           Xuất thông tin phiên bản, sau đó thoát\n"
 
-#: vorbiscomment/vcomment.c:413
+#: vorbiscomment/vcomment.c:410
 #, c-format
 msgid ""
-"If no output file is specified, vorbiscomment will modify the input file. "
-"This\n"
-"is handled via temporary file, such that the input file is not modified if "
-"any\n"
+"If no output file is specified, vorbiscomment will modify the input file. This\n"
+"is handled via temporary file, such that the input file is not modified if any\n"
 "errors are encountered during processing.\n"
 msgstr ""
-"Nếu không đưa ra tập tin kết xuất thì vorbiscomment sửa đổi tập tin nhập "
-"vào.\n"
+"Nếu không đưa ra tập tin kết xuất thì vorbiscomment sửa đổi tập tin nhập vào.\n"
 "Việc này được quản lý dùng một tập tin tạm thời, để mà tập tin nhập vào\n"
 "không phải bị sửa đổi nếu gặp lỗi trong khi xử lý.\n"
 
-#: vorbiscomment/vcomment.c:418
+#: vorbiscomment/vcomment.c:415
 #, c-format
 msgid ""
-"vorbiscomment handles comments in the format \"name=value\", one per line. "
-"By\n"
-"default, comments are written to stdout when listing, and read from stdin "
-"when\n"
+"vorbiscomment handles comments in the format \"name=value\", one per line. By\n"
+"default, comments are written to stdout when listing, and read from stdin when\n"
 "editing. Alternatively, a file can be specified with the -c option, or tags\n"
-"can be given on the commandline with -t \"name=value\". Use of either -c or -"
-"t\n"
+"can be given on the commandline with -t \"name=value\". Use of either -c or -t\n"
 "disables reading from stdin.\n"
 msgstr ""
-"vorbiscomment quản lý ghi chú theo định dạng \"tên=giá_trị\", mỗi dòng một "
-"mục.\n"
+"vorbiscomment quản lý ghi chú theo định dạng \"tên=giá_trị\", mỗi dòng một mục.\n"
 "Mặc định là ghi chú được ghi ra đầu ra tiêu chuẩn khi liệt kê,\n"
 "và được đọc từ đầu vào tiêu chuẩn khi chỉnh sửa.\n"
 "Hoặc có thể xác định một tập tin dùng tùy chọn « -c »,\n"
 "hoặc có thê đưa ra thẻ trên dòng lệnh dùng « -t \"tên=giá_trị\" ».\n"
-"Dùng tùy chọn hoặc « -c » hoặc « -t » thì cũng tắt chức năng đọc từ đầu vào "
-"tiêu chuẩn.\n"
+"Dùng tùy chọn hoặc « -c » hoặc « -t » thì cũng tắt chức năng đọc từ đầu vào tiêu chuẩn.\n"
 
-#: vorbiscomment/vcomment.c:425
+#: vorbiscomment/vcomment.c:422
 #, c-format
 msgid ""
 "Examples:\n"
@@ -2801,77 +2564,58 @@
 "  vorbiscomment -a in.ogg -c ghi_chú.txt\n"
 "  vorbiscomment -a in.ogg -t \"ARTIST=Người Nào\" -t \"TITLE=Tên Bài\"\n"
 
-#: vorbiscomment/vcomment.c:430
+#: vorbiscomment/vcomment.c:427
 #, c-format
 msgid ""
-"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather "
-"than\n"
-"converting to the user's character set, which is useful in scripts. "
-"However,\n"
+"NOTE: Raw mode (--raw, -R) will read and write comments in UTF-8 rather than\n"
+"converting to the user's character set, which is useful in scripts. However,\n"
 "this is not sufficient for general round-tripping of comments in all cases.\n"
 msgstr ""
 "GHI CHÚ : chế độ thô (--raw, -R) thì đọc và ghi các ghi chú theo UTF-8\n"
-"thay vào chuyển đổi sang bộ ký tự riêng của người dùng, mà có ích đối với "
-"văn lệnh.\n"
-"Tuy nhiên, thiết lập này không đủ để « khứ hồi » chung các ghi chú trong mọi "
-"trường hợp.\n"
+"thay vào chuyển đổi sang bộ ký tự riêng của người dùng, mà có ích đối với văn lệnh.\n"
+"Tuy nhiên, thiết lập này không đủ để « khứ hồi » chung các ghi chú trong mọi trường hợp.\n"
 
-#: vorbiscomment/vcomment.c:492
+#: vorbiscomment/vcomment.c:489
 #, c-format
 msgid "Internal error parsing command options\n"
 msgstr "Gặp lỗi nội bộ khi phân tách tùy chọn lệnh\n"
 
-#: vorbiscomment/vcomment.c:578
+#: vorbiscomment/vcomment.c:575
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Gặp lỗi khi mở tập tin nhập « %s ».\n"
 
-#: vorbiscomment/vcomment.c:587
+#: vorbiscomment/vcomment.c:584
 #, c-format
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Tên tập tin nhập có lẽ không trùng với tên tập tin xuất\n"
 
-#: vorbiscomment/vcomment.c:598
+#: vorbiscomment/vcomment.c:595
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Gặp lỗi khi mở tập tin xuất « %s ».\n"
 
-#: vorbiscomment/vcomment.c:613
+#: vorbiscomment/vcomment.c:610
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Gặp lỗi khi mở tập tin ghi chú « %s ».\n"
 
-#: vorbiscomment/vcomment.c:630
+#: vorbiscomment/vcomment.c:627
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Gặp lỗi khi mở tập tin ghi chú  « %s ».\n"
 
-#: vorbiscomment/vcomment.c:664
+#: vorbiscomment/vcomment.c:661
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Gặp lỗi khi gỡ bỏ tập tin cũ %s\n"
 
-#: vorbiscomment/vcomment.c:666
+#: vorbiscomment/vcomment.c:663
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Gặp lỗi khi thay đổi tên %s thành %s\n"
 
-#: vorbiscomment/vcomment.c:676
+#: vorbiscomment/vcomment.c:673
 #, c-format
 msgid "Error removing erroneous temporary file %s\n"
 msgstr "Gặp lỗi khi gỡ bỏ tập tin tạm thời bị lỗi %s\n"
-
-#~ msgid "AU file reader"
-#~ msgstr "Bộ đọc tập tin AU"
-
-#~ msgid "Warning: Unexpected EOF in reading Wave header\n"
-#~ msgstr "Cảnh báo : gặp kết thúc tập tin bất thường khi đọc phần đầu Wave\n"
-
-#~ msgid "Out of memory opening AU driver\n"
-#~ msgstr "Cạn bộ nhớ khi mở trình điều khiển AU\n"
-
-#~ msgid "At this moment, only linear 16 bit .au files are supported\n"
-#~ msgstr "Hiện thời chỉ hỗ trợ tập tin kiểu .au 16-bit tuyến tính\n"
-
-#~ msgid "Internal error! Please report this bug.\n"
-#~ msgstr "Gặp lỗi nội bộ — thông báo nhé.\n"

Modified: trunk/vorbis-tools/po/vorbis-tools.pot
===================================================================
--- trunk/vorbis-tools/po/vorbis-tools.pot	2008-10-25 15:13:12 UTC (rev 15453)
+++ trunk/vorbis-tools/po/vorbis-tools.pot	2008-10-25 15:25:54 UTC (rev 15454)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2008-09-28 00:10+0100\n"
+"POT-Creation-Date: 2008-10-25 16:24+0100\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"
@@ -159,9 +159,9 @@
 msgid "(NULL)"
 msgstr ""
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:593 oggenc/oggenc.c:598
-#: oggenc/oggenc.c:603 oggenc/oggenc.c:608 oggenc/oggenc.c:613
-#: oggenc/oggenc.c:618
+#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:647 oggenc/oggenc.c:652
+#: oggenc/oggenc.c:657 oggenc/oggenc.c:662 oggenc/oggenc.c:667
+#: oggenc/oggenc.c:672
 msgid "(none)"
 msgstr ""
 
@@ -456,7 +456,7 @@
 msgstr ""
 
 #: ogg123/file_transport.c:64 ogg123/http_transport.c:215
-#: ogg123/oggvorbis_format.c:95
+#: ogg123/oggvorbis_format.c:106
 #, c-format
 msgid "ERROR: Out of memory.\n"
 msgstr ""
@@ -517,72 +517,72 @@
 msgid "Error: Could not create audio buffer.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:556
+#: ogg123/ogg123.c:557
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:561
+#: ogg123/ogg123.c:562
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:567
+#: ogg123/ogg123.c:568
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:577
+#: ogg123/ogg123.c:578
 #, c-format
 msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:596
+#: ogg123/ogg123.c:597
 #, c-format
 msgid "Playing: %s"
 msgstr ""
 
-#: ogg123/ogg123.c:607
+#: ogg123/ogg123.c:608
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr ""
 
-#: ogg123/ogg123.c:662
+#: ogg123/ogg123.c:663
 msgid "ERROR: Decoding failure.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:705
+#: ogg123/ogg123.c:706
 msgid "ERROR: buffer write failed.\n"
 msgstr ""
 
-#: ogg123/ogg123.c:743
+#: ogg123/ogg123.c:744
 msgid "Done."
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:178
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:184
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:310
+#: ogg123/oggvorbis_format.c:331
 #, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:336
 #, c-format
 msgid "Vorbis format: Version %d"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:340
 #, c-format
 msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:327
+#: ogg123/oggvorbis_format.c:348
 #, c-format
 msgid "Encoded by: %s"
 msgstr ""
@@ -668,7 +668,7 @@
 msgid "oggdec from %s %s\n"
 msgstr ""
 
-#: oggdec/oggdec.c:56 oggenc/oggenc.c:415 ogginfo/ogginfo2.c:1224
+#: oggdec/oggdec.c:56 oggenc/oggenc.c:463 ogginfo/ogginfo2.c:1228
 #, c-format
 msgid ""
 " by the Xiph.Org Foundation (http://www.xiph.org/)\n"
@@ -786,7 +786,7 @@
 msgstr ""
 
 #: oggenc/audio.c:50
-msgid "WAV file reader"
+msgid "Wave file reader"
 msgstr ""
 
 #: oggenc/audio.c:51
@@ -928,95 +928,126 @@
 msgid "Internal error! Please report this bug.\n"
 msgstr ""
 
-#: oggenc/encode.c:64
+#: oggenc/encode.c:69
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr ""
 
-#: oggenc/encode.c:101
+#: oggenc/encode.c:106
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr ""
 
-#: oggenc/encode.c:104
+#: oggenc/encode.c:109
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr ""
 
-#: oggenc/encode.c:111
+#: oggenc/encode.c:116
 #, c-format
 msgid "Failed to set advanced rate management parameters\n"
 msgstr ""
 
-#: oggenc/encode.c:115 oggenc/encode.c:252
+#: oggenc/encode.c:120 oggenc/encode.c:308
 #, c-format
 msgid ""
 "This version of libvorbisenc cannot set advanced rate management parameters\n"
 msgstr ""
 
-#: oggenc/encode.c:174
+#: oggenc/encode.c:194
 #, c-format
+msgid "WARNING: failed to add Kate karaoke style\n"
+msgstr ""
+
+#: oggenc/encode.c:230
+#, c-format
 msgid ""
 "255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
 "more)\n"
 msgstr ""
 
-#: oggenc/encode.c:182
+#: oggenc/encode.c:238
 #, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr ""
 
-#: oggenc/encode.c:200
+#: oggenc/encode.c:256
 #, c-format
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 
-#: oggenc/encode.c:245
+#: oggenc/encode.c:301
 #, c-format
 msgid "Set optional hard quality restrictions\n"
 msgstr ""
 
-#: oggenc/encode.c:247
+#: oggenc/encode.c:303
 #, c-format
 msgid "Failed to set bitrate min/max in quality mode\n"
 msgstr ""
 
-#: oggenc/encode.c:263
+#: oggenc/encode.c:319
 #, c-format
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 
-#: oggenc/encode.c:304
+#: oggenc/encode.c:366
+#, c-format
+msgid "WARNING: no language specified for %s\n"
+msgstr ""
+
+#: oggenc/encode.c:388
 msgid "Failed writing fishead packet to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:330 oggenc/encode.c:352
+#: oggenc/encode.c:414 oggenc/encode.c:435 oggenc/encode.c:471
+#: oggenc/encode.c:491
 msgid "Failed writing header to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:339
+#: oggenc/encode.c:425
+msgid "Failed encoding Kate header\n"
+msgstr ""
+
+#: oggenc/encode.c:447 oggenc/encode.c:454
 msgid "Failed writing fisbone header packet to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:362
+#: oggenc/encode.c:502
 msgid "Failed writing skeleton eos packet to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:426
+#: oggenc/encode.c:573 oggenc/encode.c:577
+msgid "Failed encoding karaoke style - continuing anyway\n"
+msgstr ""
+
+#: oggenc/encode.c:581
+msgid "Failed encoding karaoke motion - continuing anyway\n"
+msgstr ""
+
+#: oggenc/encode.c:586
+msgid "Failed encoding lyrics - continuing anyway\n"
+msgstr ""
+
+#: oggenc/encode.c:598 oggenc/encode.c:613 oggenc/encode.c:649
 msgid "Failed writing data to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:472
+#: oggenc/encode.c:633
+msgid "Failed encoding Kate EOS packet\n"
+msgstr ""
+
+#: oggenc/encode.c:705
 #, c-format
 msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
 msgstr ""
 
-#: oggenc/encode.c:482
+#: oggenc/encode.c:715
 #, c-format
 msgid "\tEncoding [%2dm%.2ds so far] %c "
 msgstr ""
 
-#: oggenc/encode.c:500
+#: oggenc/encode.c:733
 #, c-format
 msgid ""
 "\n"
@@ -1024,7 +1055,7 @@
 "Done encoding file \"%s\"\n"
 msgstr ""
 
-#: oggenc/encode.c:502
+#: oggenc/encode.c:735
 #, c-format
 msgid ""
 "\n"
@@ -1032,51 +1063,51 @@
 "Done encoding.\n"
 msgstr ""
 
-#: oggenc/encode.c:506
+#: oggenc/encode.c:739
 #, c-format
 msgid ""
 "\n"
 "\tFile length:  %dm %04.1fs\n"
 msgstr ""
 
-#: oggenc/encode.c:510
+#: oggenc/encode.c:743
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr ""
 
-#: oggenc/encode.c:513
+#: oggenc/encode.c:746
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr ""
 
-#: oggenc/encode.c:514
+#: oggenc/encode.c:747
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
 "\n"
 msgstr ""
 
-#: oggenc/encode.c:537
+#: oggenc/encode.c:770
 #, c-format
 msgid "(min %d kbps, max %d kbps)"
 msgstr ""
 
-#: oggenc/encode.c:539
+#: oggenc/encode.c:772
 #, c-format
 msgid "(min %d kbps, no max)"
 msgstr ""
 
-#: oggenc/encode.c:541
+#: oggenc/encode.c:774
 #, c-format
 msgid "(no min, max %d kbps)"
 msgstr ""
 
-#: oggenc/encode.c:543
+#: oggenc/encode.c:776
 #, c-format
 msgid "(no min or max)"
 msgstr ""
 
-#: oggenc/encode.c:551
+#: oggenc/encode.c:784
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1084,17 +1115,17 @@
 "at average bitrate %d kbps "
 msgstr ""
 
-#: oggenc/encode.c:553 oggenc/encode.c:560 oggenc/encode.c:568
-#: oggenc/encode.c:575 oggenc/encode.c:581
+#: oggenc/encode.c:786 oggenc/encode.c:793 oggenc/encode.c:801
+#: oggenc/encode.c:808 oggenc/encode.c:814
 msgid "standard input"
 msgstr ""
 
-#: oggenc/encode.c:554 oggenc/encode.c:561 oggenc/encode.c:569
-#: oggenc/encode.c:576 oggenc/encode.c:582
+#: oggenc/encode.c:787 oggenc/encode.c:794 oggenc/encode.c:802
+#: oggenc/encode.c:809 oggenc/encode.c:815
 msgid "standard output"
 msgstr ""
 
-#: oggenc/encode.c:559
+#: oggenc/encode.c:792
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1102,7 +1133,7 @@
 "at approximate bitrate %d kbps (VBR encoding enabled)\n"
 msgstr ""
 
-#: oggenc/encode.c:567
+#: oggenc/encode.c:800
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1110,7 +1141,7 @@
 "at quality level %2.2f using constrained VBR "
 msgstr ""
 
-#: oggenc/encode.c:574
+#: oggenc/encode.c:807
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1118,7 +1149,7 @@
 "at quality %2.2f\n"
 msgstr ""
 
-#: oggenc/encode.c:580
+#: oggenc/encode.c:813
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1126,96 +1157,103 @@
 "using bitrate management "
 msgstr ""
 
-#: oggenc/oggenc.c:103
+#: oggenc/oggenc.c:117
 #, c-format
 msgid "ERROR: No input files specified. Use -h for help.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:118
+#: oggenc/oggenc.c:132
 #, c-format
 msgid "ERROR: Multiple files specified when using stdin\n"
 msgstr ""
 
-#: oggenc/oggenc.c:125
+#: oggenc/oggenc.c:139
 #, c-format
 msgid ""
 "ERROR: Multiple input files with specified output filename: suggest using -"
 "n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:186
+#: oggenc/oggenc.c:203
 #, c-format
+msgid ""
+"WARNING: Insufficient lyrics languages specified, defaulting to final lyrics "
+"language.\n"
+msgstr ""
+
+#: oggenc/oggenc.c:227
+#, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:202
+#: oggenc/oggenc.c:243
 msgid "RAW file reader"
 msgstr ""
 
-#: oggenc/oggenc.c:219
+#: oggenc/oggenc.c:260
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:228
+#: oggenc/oggenc.c:269
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr ""
 
-#: oggenc/oggenc.c:280
+#: oggenc/oggenc.c:327
 #, c-format
-msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
+msgid "WARNING: No filename, defaulting to \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:288
+#: oggenc/oggenc.c:334
 #, c-format
 msgid ""
 "ERROR: Could not create required subdirectories for output filename \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:295
+#: oggenc/oggenc.c:341
 #, c-format
 msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:306
+#: oggenc/oggenc.c:352
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:350
+#: oggenc/oggenc.c:398
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr ""
 
-#: oggenc/oggenc.c:357
+#: oggenc/oggenc.c:405
 #, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:360
+#: oggenc/oggenc.c:408
 #, c-format
 msgid "WARNING: Can't downmix except from stereo to mono\n"
 msgstr ""
 
-#: oggenc/oggenc.c:368
+#: oggenc/oggenc.c:416
 #, c-format
 msgid "Scaling input to %f\n"
 msgstr ""
 
-#: oggenc/oggenc.c:414
+#: oggenc/oggenc.c:462
 #, c-format
 msgid "oggenc from %s %s"
 msgstr ""
 
-#: oggenc/oggenc.c:416
+#: oggenc/oggenc.c:464
 #, c-format
 msgid ""
 "Usage: oggenc [options] inputfile [...]\n"
 "\n"
 msgstr ""
 
-#: oggenc/oggenc.c:417
+#: oggenc/oggenc.c:465
 #, c-format
 msgid ""
 "OPTIONS:\n"
@@ -1225,7 +1263,7 @@
 " -V, --version        Print the version number\n"
 msgstr ""
 
-#: oggenc/oggenc.c:423
+#: oggenc/oggenc.c:471
 #, c-format
 msgid ""
 " -k, --skeleton       Adds an Ogg Skeleton bitstream\n"
@@ -1236,7 +1274,7 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 msgstr ""
 
-#: oggenc/oggenc.c:430
+#: oggenc/oggenc.c:478
 #, c-format
 msgid ""
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
@@ -1247,7 +1285,7 @@
 "                      targetting the selected bitrate.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:437
+#: oggenc/oggenc.c:485
 #, c-format
 msgid ""
 " --managed            Enable the bitrate management engine. This will allow\n"
@@ -1258,7 +1296,7 @@
 "                      bitrate, such as for streaming.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:443
+#: oggenc/oggenc.c:491
 #, c-format
 msgid ""
 " -m, --min-bitrate    Specify a minimum bitrate (in kbps). Useful for\n"
@@ -1270,7 +1308,7 @@
 "                      enable managed bitrate mode (see --managed).\n"
 msgstr ""
 
-#: oggenc/oggenc.c:451
+#: oggenc/oggenc.c:499
 #, c-format
 msgid ""
 " --advanced-encode-option option=value\n"
@@ -1281,7 +1319,7 @@
 "                      caution.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:458
+#: oggenc/oggenc.c:506
 #, c-format
 msgid ""
 " -q, --quality        Specify quality, between -1 (very low) and 10 (very\n"
@@ -1291,7 +1329,7 @@
 "                      The default quality level is 3.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:464
+#: oggenc/oggenc.c:512
 #, c-format
 msgid ""
 " --resample n         Resample input data to sampling rate n (Hz)\n"
@@ -1302,17 +1340,17 @@
 "                      stream after the first.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:471
+#: oggenc/oggenc.c:519
 #, c-format
 msgid ""
 " --discard-comments   Prevents comments in FLAC and Ogg FLAC files from\n"
 "                      being copied to the output Ogg Vorbis file.\n"
-" --ignorelength       Ignore the datalength in wav headers. This will allow\n"
+" --ignorelength       Ignore the datalength in Wave headers. This allows\n"
 "                      support for files > 4GB and STDIN data streams. \n"
 "\n"
 msgstr ""
 
-#: oggenc/oggenc.c:477
+#: oggenc/oggenc.c:525
 #, c-format
 msgid ""
 " Naming:\n"
@@ -1325,7 +1363,7 @@
 "                      %%%% gives a literal %%.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:484
+#: oggenc/oggenc.c:532
 #, c-format
 msgid ""
 " -X, --name-remove=s  Remove the specified characters from parameters to "
@@ -1341,7 +1379,7 @@
 "                      specific.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:493
+#: oggenc/oggenc.c:541
 #, c-format
 msgid ""
 " --utf8               Tells oggenc that the command line parameters date, "
@@ -1355,7 +1393,7 @@
 " -d, --date           Date for track (usually date of performance)\n"
 msgstr ""
 
-#: oggenc/oggenc.c:501
+#: oggenc/oggenc.c:549
 #, c-format
 msgid ""
 " -N, --tracknum       Track number for this track\n"
@@ -1365,199 +1403,218 @@
 " -G, --genre          Genre of track\n"
 msgstr ""
 
-#: oggenc/oggenc.c:507
+#: oggenc/oggenc.c:555
 #, c-format
 msgid ""
+" -L, --lyrics         Include lyrics from given file (.srt or .lrc format)\n"
+" -Y, --lyrics-language  Sets the language for the lyrics\n"
+msgstr ""
+
+#: oggenc/oggenc.c:558
+#, c-format
+msgid ""
 "                      If multiple input files are given, then multiple\n"
-"                      instances of the previous five arguments will be "
+"                      instances of the previous eight arguments will be "
 "used,\n"
 "                      in the order they are given. If fewer titles are\n"
 "                      specified than files, OggEnc will print a warning, "
 "and\n"
 "                      reuse the final one for the remaining files. If fewer\n"
 "                      track numbers are given, the remaining files will be\n"
-"                      unnumbered. For the others, the final tag will be "
-"reused\n"
-"                      for all others without warning (so you can specify a "
-"date\n"
-"                      once, for example, and have it used for all the "
-"files)\n"
+"                      unnumbered. If fewer lyrics are given, the remaining\n"
+"                      files will not have lyrics added. For the others, the\n"
+"                      final tag will be reused for all others without "
+"warning\n"
+"                      (so you can specify a date once, for example, and "
+"have\n"
+"                      it used for all the files)\n"
 "\n"
 msgstr ""
 
-#: oggenc/oggenc.c:518
+#: oggenc/oggenc.c:571
 #, c-format
 msgid ""
 "INPUT FILES:\n"
-" OggEnc input files must currently be 24, 16, or 8 bit PCM WAV, AIFF, or "
+" OggEnc input files must currently be 24, 16, or 8 bit PCM Wave, AIFF, or "
 "AIFF/C\n"
-" files, 32 bit IEEE floating point WAV, and optionally FLAC or Ogg FLAC. "
+" files, 32 bit IEEE floating point Wave, 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 "
+" must be 16 bit stereo little-endian PCM ('headerless Wave'), unless "
 "additional\n"
 " parameters for raw mode are specified.\n"
 " You can specify taking the file from stdin by using - as the input "
 "filename.\n"
 " In this mode, output is to stdout unless an output filename is specified\n"
 " with -o\n"
+" Lyrics files may be in SubRip (.srt) or LRC (.lrc) format\n"
 "\n"
 msgstr ""
 
-#: oggenc/oggenc.c:623
+#: oggenc/oggenc.c:677
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 
-#: oggenc/oggenc.c:652 oggenc/oggenc.c:780 oggenc/oggenc.c:793
+#: oggenc/oggenc.c:706 oggenc/oggenc.c:834 oggenc/oggenc.c:847
 #, c-format
 msgid "Enabling bitrate management engine\n"
 msgstr ""
 
-#: oggenc/oggenc.c:661
+#: oggenc/oggenc.c:715
 #, c-format
 msgid ""
 "WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:664
+#: oggenc/oggenc.c:718
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:671
+#: oggenc/oggenc.c:725
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:677
+#: oggenc/oggenc.c:731
 #, c-format
 msgid "WARNING: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
 msgstr ""
 
-#: oggenc/oggenc.c:687
+#: oggenc/oggenc.c:741
 #, c-format
 msgid "WARNING: Couldn't parse scaling factor \"%s\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:700
+#: oggenc/oggenc.c:754
 #, c-format
 msgid "No value for advanced encoder option found\n"
 msgstr ""
 
-#: oggenc/oggenc.c:718
+#: oggenc/oggenc.c:772
 #, c-format
 msgid "Internal error parsing command line options\n"
 msgstr ""
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:783
 #, c-format
 msgid "WARNING: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:766
+#: oggenc/oggenc.c:820
 #, c-format
 msgid "WARNING: nominal bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:774
+#: oggenc/oggenc.c:828
 #, c-format
 msgid "WARNING: minimum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:787
+#: oggenc/oggenc.c:841
 #, c-format
 msgid "WARNING: maximum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:799
+#: oggenc/oggenc.c:853
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr ""
 
-#: oggenc/oggenc.c:807
+#: oggenc/oggenc.c:861
 #, c-format
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:813
+#: oggenc/oggenc.c:867
 #, c-format
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:822
+#: oggenc/oggenc.c:876
 #, c-format
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:831
+#: oggenc/oggenc.c:885
 #, c-format
 msgid ""
 "WARNING: Multiple name format filter replacements specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:839
+#: oggenc/oggenc.c:893
 #, c-format
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:851
+#: oggenc/oggenc.c:905
 #, c-format
 msgid "oggenc from %s %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:858
+#: oggenc/oggenc.c:912
 #, c-format
 msgid ""
 "WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:863 oggenc/oggenc.c:867
+#: oggenc/oggenc.c:917 oggenc/oggenc.c:921
 #, c-format
 msgid "WARNING: Invalid bits/sample specified, assuming 16.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:874
+#: oggenc/oggenc.c:928
 #, c-format
 msgid ""
 "WARNING: Raw channel count specified for non-raw data. Assuming input is "
 "raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:879
+#: oggenc/oggenc.c:933
 #, c-format
 msgid "WARNING: Invalid channel count specified, assuming 2.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:890
+#: oggenc/oggenc.c:944
 #, c-format
 msgid ""
 "WARNING: Raw sample rate specified for non-raw data. Assuming input is raw.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:895
+#: oggenc/oggenc.c:949
 #, c-format
 msgid "WARNING: Invalid sample rate specified, assuming 44100.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:902
+#: oggenc/oggenc.c:961 oggenc/oggenc.c:973
 #, c-format
+msgid "WARNING: Kate support not compiled in; lyrics will not be included.\n"
+msgstr ""
+
+#: oggenc/oggenc.c:969
+#, c-format
+msgid "WARNING: language can not be longer than 15 characters; truncated.\n"
+msgstr ""
+
+#: oggenc/oggenc.c:977
+#, c-format
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr ""
 
-#: oggenc/oggenc.c:918 vorbiscomment/vcomment.c:344
+#: oggenc/oggenc.c:993 vorbiscomment/vcomment.c:344
 #, c-format
 msgid "'%s' is not valid UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:935 vorbiscomment/vcomment.c:357
+#: oggenc/oggenc.c:1010 vorbiscomment/vcomment.c:357
 #, c-format
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:954
+#: oggenc/oggenc.c:1029
 #, c-format
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
@@ -1580,54 +1637,54 @@
 #: ogginfo/ogginfo2.c:212
 #, c-format
 msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
+"WARNING: Comment %d in stream %d has invalid format, does not contain '=': "
 "\"%s\"\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:220
 #, c-format
-msgid "Warning: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
+msgid "WARNING: Invalid comment fieldname in comment %d (stream %d): \"%s\"\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:251 ogginfo/ogginfo2.c:259
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
+"WARNING: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
 "wrong\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:266
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
+"WARNING: Illegal UTF-8 sequence in comment %d (stream %d): too few bytes\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:342
 #, c-format
 msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
+"WARNING: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence "
 "\"%s\": %s\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:356
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgid "WARNING: Failure in UTF-8 decoder. This should not be possible\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:548 ogginfo/ogginfo2.c:681
+#: ogginfo/ogginfo2.c:381 ogginfo/ogginfo2.c:681
 #, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
+msgid "WARNING: discontinuity in stream (%d)\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:389
 #, c-format
 msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
+"WARNING: Could not decode Theora header packet - invalid Theora stream (%d)\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:396
 #, c-format
 msgid ""
-"Warning: Theora stream %d does not have headers correctly framed. Terminal "
+"WARNING: Theora stream %d does not have headers correctly framed. Terminal "
 "header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
@@ -1743,11 +1800,11 @@
 msgstr ""
 
 #: ogginfo/ogginfo2.c:477
-msgid "Warning: Expected frame %"
+msgid "WARNING: Expected frame %"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:493 ogginfo/ogginfo2.c:621 ogginfo/ogginfo2.c:819
-msgid "Warning: granulepos in stream %d decreases from %"
+msgid "WARNING: granulepos in stream %d decreases from %"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:520
@@ -1756,10 +1813,15 @@
 "\tTotal data length: %"
 msgstr ""
 
+#: ogginfo/ogginfo2.c:548
+#, c-format
+msgid "Warning: discontinuity in stream (%d)\n"
+msgstr ""
+
 #: ogginfo/ogginfo2.c:557
 #, c-format
 msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
+"Warning: Could not decode Vorbis header packet %d - invalid Vorbis stream (%"
 "d)\n"
 msgstr ""
 
@@ -1825,10 +1887,7 @@
 msgstr ""
 
 #: ogginfo/ogginfo2.c:630
-#, c-format
-msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
+msgid "Negative or zero granulepos (%"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:651
@@ -1840,20 +1899,20 @@
 #: ogginfo/ogginfo2.c:692
 #, c-format
 msgid ""
-"Warning: Could not decode kate header packet %d - invalid kate stream (%d)\n"
+"WARNING: Could not decode Kate header packet %d - invalid Kate stream (%d)\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:703
 #, c-format
 msgid ""
-"Warning: packet %d does not seem to be a kate header - invalid kate stream (%"
+"Warning: packet %d does not seem to be a Kate header - invalid Kate stream (%"
 "d)\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:734
 #, c-format
 msgid ""
-"Warning: Kate stream %d does not have headers correctly framed. Terminal "
+"WARNING: Kate stream %d does not have headers correctly framed. Terminal "
 "header page contains additional packets or has non-zero granulepos\n"
 msgstr ""
 
@@ -1937,10 +1996,7 @@
 msgstr ""
 
 #: ogginfo/ogginfo2.c:828
-#, c-format
-msgid ""
-"Negative granulepos (%lld) on kate stream outside of headers. This file was "
-"created by a buggy encoder\n"
+msgid "Negative granulepos (%"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:853
@@ -1951,16 +2007,16 @@
 
 #: ogginfo/ogginfo2.c:893
 #, c-format
-msgid "Warning: EOS not set on stream %d\n"
+msgid "WARNING: EOS not set on stream %d\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:1048
-msgid "Warning: Invalid header page, no packet found\n"
+msgid "WARNING: Invalid header page, no packet found\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:1074
 #, c-format
-msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
+msgid "WARNING: Invalid header page in stream %d, contains multiple packets\n"
 msgstr ""
 
 #: ogginfo/ogginfo2.c:1088
@@ -1970,87 +2026,87 @@
 "with some tools.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1105
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
+#: ogginfo/ogginfo2.c:1106
+msgid "WARNING: Hole in data (%d bytes) found at approximate offset %"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1129
+#: ogginfo/ogginfo2.c:1133
 #, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1134
+#: ogginfo/ogginfo2.c:1138
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
 "\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1143
+#: ogginfo/ogginfo2.c:1147
 msgid "Could not find a processor for stream, bailing\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1151
+#: ogginfo/ogginfo2.c:1155
 msgid "Page found for stream after EOS flag"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1154
+#: ogginfo/ogginfo2.c:1158
 msgid ""
 "Ogg muxing constraints violated, new stream before EOS of all previous "
 "streams"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1158
+#: ogginfo/ogginfo2.c:1162
 msgid "Error unknown."
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1161
+#: ogginfo/ogginfo2.c:1165
 #, c-format
 msgid ""
-"Warning: illegally placed page(s) for logical stream %d\n"
-"This indicates a corrupt ogg file: %s.\n"
+"WARNING: illegally placed page(s) for logical stream %d\n"
+"This indicates a corrupt Ogg file: %s.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1173
+#: ogginfo/ogginfo2.c:1177
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1176
+#: ogginfo/ogginfo2.c:1180
 #, c-format
-msgid "Warning: stream start flag not set on stream %d\n"
+msgid "WARNING: stream start flag not set on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1180
+#: ogginfo/ogginfo2.c:1184
 #, c-format
-msgid "Warning: stream start flag found in mid-stream on stream %d\n"
+msgid "WARNING: stream start flag found in mid-stream on stream %d\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1185
+#: ogginfo/ogginfo2.c:1189
 #, c-format
 msgid ""
-"Warning: sequence number gap in stream %d. Got page %ld when expecting page %"
+"WARNING: sequence number gap in stream %d. Got page %ld when expecting page %"
 "ld. Indicates missing data.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1200
+#: ogginfo/ogginfo2.c:1204
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1208
+#: ogginfo/ogginfo2.c:1212
 #, c-format
 msgid ""
-"Error: No ogg data found in file \"%s\".\n"
+"ERROR: No Ogg data found in file \"%s\".\n"
 "Input probably not Ogg.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1219
+#: ogginfo/ogginfo2.c:1223
 #, c-format
 msgid "ogginfo from %s %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1225
+#: ogginfo/ogginfo2.c:1229
 #, c-format
 msgid ""
 "(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
@@ -2064,12 +2120,12 @@
 "\t   for some stream types.\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1234
+#: ogginfo/ogginfo2.c:1238
 #, c-format
 msgid "\t-V Output version information and exit\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1246
+#: ogginfo/ogginfo2.c:1250
 #, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogx ... fileN.ogv]\n"
@@ -2079,7 +2135,7 @@
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:1280
+#: ogginfo/ogginfo2.c:1284
 #, c-format
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr ""



More information about the commits mailing list