[xiph-commits] r15058 - in trunk/vorbis-tools: . po

ivo at svn.xiph.org ivo at svn.xiph.org
Mon Jun 23 14:40:41 PDT 2008


Author: ivo
Date: 2008-06-23 14:40:34 -0700 (Mon, 23 Jun 2008)
New Revision: 15058

Added:
   trunk/vorbis-tools/po/en_GB.po
   trunk/vorbis-tools/po/sk.po
   trunk/vorbis-tools/po/vi.po
Modified:
   trunk/vorbis-tools/CHANGES
   trunk/vorbis-tools/po/be.po
   trunk/vorbis-tools/po/cs.po
   trunk/vorbis-tools/po/da.po
   trunk/vorbis-tools/po/es.po
   trunk/vorbis-tools/po/fr.po
   trunk/vorbis-tools/po/hr.po
   trunk/vorbis-tools/po/hu.po
   trunk/vorbis-tools/po/nl.po
   trunk/vorbis-tools/po/ro.po
   trunk/vorbis-tools/po/ru.po
   trunk/vorbis-tools/po/sv.po
   trunk/vorbis-tools/po/uk.po
Log:
Sync po files with the ones from the Translation Project.  Added new en_GB, sk and vi translations.

Modified: trunk/vorbis-tools/CHANGES
===================================================================
--- trunk/vorbis-tools/CHANGES	2008-06-22 21:07:32 UTC (rev 15057)
+++ trunk/vorbis-tools/CHANGES	2008-06-23 21:40:34 UTC (rev 15058)
@@ -1,19 +1,21 @@
 vorbis-tools 1.2.1 -- Unreleased
 
-* Fixed an error in configure.ac; --with-speex/flac work again (#1319)
-* Corrected problems in the Visual Studio project files
-* ogg123: backported fix from libfishsound to patch the Speex decoder (#1347)
-* ogg123: fixed CPU issue when outputting to a closed pipe (#1357)
-* ogg123: return value to stop decoding after buffer is shut down (#1357)
-* oggenc: fixed a core dump while resampling from FLAC (#1316)
-* oggenc: fixed a typo in the Skeleton handling routine
-* oggenc: fixed remapping channels bug (#1326)
-* oggenc: support for WAVE_FORMAT_EXTENSIBLE headers (#1326)
-* oggenc: support for 32 bit WAV files (#1326)
-* oggenc: --ignorelength; support for WAV files > 4 GB (#1326)
-* ogginfo: support for information in Kate streams (#1360)
-* vcut: 64 bit fixes (#1366)
-* vorbiscomment: correct memory allocation (#472)
+ * Fixed an error in configure.ac; --with-speex/flac work again (#1319)
+ * Corrected problems in the Visual Studio project files
+ * Updated po files from the Translation Project
+ * Added new en_GB.po, sk.po and vi.po translation files
+ * ogg123: backported fix from libfishsound to patch the Speex decoder (#1347)
+ * ogg123: fixed CPU issue when outputting to a closed pipe (#1357)
+ * ogg123: return value to stop decoding after buffer is shut down (#1357)
+ * oggenc: fixed a core dump while resampling from FLAC (#1316)
+ * oggenc: fixed a typo in the Skeleton handling routine
+ * oggenc: fixed remapping channels bug (#1326)
+ * oggenc: support for WAVE_FORMAT_EXTENSIBLE headers (#1326)
+ * oggenc: support for 32 bit WAV files (#1326)
+ * oggenc: --ignorelength; support for WAV files > 4 GB (#1326)
+ * ogginfo: support for information in Kate streams (#1360)
+ * vcut: 64 bit fixes (#1366)
+ * vorbiscomment: correct memory allocation (#472)
 
 vorbis-tools 1.2.0 -- 2008-02-21
 

Modified: trunk/vorbis-tools/po/be.po
===================================================================
--- trunk/vorbis-tools/po/be.po	2008-06-22 21:07:32 UTC (rev 15057)
+++ trunk/vorbis-tools/po/be.po	2008-06-23 21:40:34 UTC (rev 15058)
@@ -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: 2007-12-30 13:57+0900\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:351
-#, 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:554 oggenc/oggenc.c:559
-#: oggenc/oggenc.c:564 oggenc/oggenc.c:569 oggenc/oggenc.c:574
-#: oggenc/oggenc.c:579
+#: 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:426
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Пасьпяхова"
 
-#: ogg123/cfgfile_options.c:430
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Ключ ня знойдзены"
 
-#: ogg123/cfgfile_options.c:432
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Ключа няма"
 
-#: ogg123/cfgfile_options.c:434
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Кепскае значэньне"
 
-#: ogg123/cfgfile_options.c:436
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Кепскі від у сьпісе выбараў"
 
-#: ogg123/cfgfile_options.c:438
+#: 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:329
-#, 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:336
-#, 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:214
-#: 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:144
+#: ogg123/http_transport.c:137
 msgid "Error: Could not set signal mask."
 msgstr "Памылка: немагчыма вызначыць маску сыгнала."
 
-#: ogg123/http_transport.c:201
+#: 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,250 +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:557
+#: ogg123/ogg123.c:429
 #, c-format
 msgid "No module could be found to read from %s.\n"
 msgstr "Немагчыма адшукаць модуль, каб чытаць з %s.\n"
 
-#: ogg123/ogg123.c:562
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Немагчыма адчыніць %s.\n"
 
-#: ogg123/ogg123.c:568
+#: ogg123/ogg123.c:440
 #, c-format
 msgid "The file format of %s is not supported.\n"
 msgstr "Фармат файла %s не падтрымліваецца.\n"
 
-#: ogg123/ogg123.c:578
+#: 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:597
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
 msgstr "Прайграваньне: %s"
 
-#: ogg123/ogg123.c:608
+#: ogg123/ogg123.c:474
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Немагчыма абмінуць %f сэкундаў."
 
-#: ogg123/ogg123.c:663
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
 msgstr "Памылка: памылка дэкадаваньня.\n"
 
-#: ogg123/ogg123.c:742
+#. 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 ogginfo/ogginfo2.c:964
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggenc/audio.c:47
+#: oggenc/audio.c:39
 msgid "WAV file reader"
 msgstr "Чытач файлаў WAV"
 
-#: oggenc/audio.c:48
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
 msgstr "Чытач файлаў AIFF/AIFC"
 
-#: oggenc/audio.c:50
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "Чытач файлаў WAV"
-
-#: oggenc/audio.c:51
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "Чытач файлаў WAV"
-
-#: oggenc/audio.c:128 oggenc/audio.c:421
-#, 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:139
+#: oggenc/audio.c:128
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr "Пропуск кавалка віду \"%s\", даўжынёй %d.\n"
 
-#: oggenc/audio.c:165
-#, c-format
+#: oggenc/audio.c:146
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўку AIFF.\n"
 
-#: oggenc/audio.c:251
-#, c-format
+#: oggenc/audio.c:231
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr "Увага: ня знойдзена ніводнага агульнага кавалка ў AIFF файле.\n"
 
-#: oggenc/audio.c:257
-#, c-format
+#: oggenc/audio.c:237
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr "Увага: няпоўны агульны кавалак у загалоўку AIFF.\n"
 
-#: oggenc/audio.c:265
-#, c-format
+#: oggenc/audio.c:245
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўку AIFF.\n"
 
-#: oggenc/audio.c:280
-#, c-format
+#: oggenc/audio.c:258
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Увага: няпоўны загаловак AIFF-C.\n"
 
-#: oggenc/audio.c:294
-#, 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:301
-#, c-format
+#: oggenc/audio.c:270
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr "Увага: кавалак SSND ня знойдзены ў AIFF файле.\n"
 
-#: oggenc/audio.c:307
-#, c-format
+#: oggenc/audio.c:276
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr "Увага: сапсаваны кавалак SSND у загалоўку AIFF.\n"
 
-#: oggenc/audio.c:313
-#, c-format
+#: oggenc/audio.c:282
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr "Увага: нечаканы канец файла пры чытаньні загалоўку AIFF.\n"
 
-#: oggenc/audio.c:350
-#, fuzzy, 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"
@@ -759,13 +610,11 @@
 "Увага: oggenc не падтрымлівае гэткі від файлаў AIFF/AIFC.\n"
 " Мае быць 8-мі ці 16-ці бітавым ІКМ.\n"
 
-#: oggenc/audio.c:404
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr "Увага: нераспазнаны фармат кавалка ў загалоўку WAV.\n"
 
-#: oggenc/audio.c:416
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -773,57 +622,33 @@
 "Увага: недапушчальны фармат кавалка ў загалоўку WAV.\n"
 " Усё адно спраба прачытаць (магчыма не спрацуе)...\n"
 
-#: oggenc/audio.c:453
-#, 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:462
-#, 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:524
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
-"or floating point PCM)\n"
-msgstr ""
 "ПАМЫЛКА: падфармат файла WAV не падтрымліваецца (мае быць 16 бітавы\n"
 "ІКМ ці ІКМ з незамацаванай коскай.\n"
 
-#: oggenc/audio.c:600
-#, 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:606
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:708
-#, 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:726
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr "Немагчыма распачаць рэсэмплер.\n"
 
-#: oggenc/encode.c:63
+#: oggenc/encode.c:59
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Пашыраны выбар \"%s\" кадавальніка ўсталяваны ў %s.\n"
@@ -838,58 +663,41 @@
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Невядомы дадатковы выбар \"%s\".\n"
 
-#: oggenc/encode.c:170
-#, 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:133
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+msgstr "255 каналаў павінна хапіць кожнаму. (Нажаль vorbis не падтрымлівае болей)\n"
 
-#: oggenc/encode.c:178
-#, c-format
+#: oggenc/encode.c:141
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Запыт найменшага ці найбольшага бітрэйту патрабуе \"--managed\".\n"
 
-#: oggenc/encode.c:196
-#, c-format
+#: oggenc/encode.c:159
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr "Няўдалае распачынаньне рэжыму: недапушчальнае значэньне якасьці.\n"
 
-#: oggenc/encode.c:240
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:242
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:254
-#, c-format
+#: oggenc/encode.c:183
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr "Няўдалае распачынаньне рэжыму: недапушчальнае значэньне бітрэйту.\n"
 
-#: oggenc/encode.c:319 oggenc/encode.c:341
+#: oggenc/encode.c:237
 msgid "Failed writing header to output stream\n"
 msgstr "Няўдалы запіс загалоўку ў плыню вываду.\n"
 
-#: oggenc/encode.c:415
+#: oggenc/encode.c:303
 msgid "Failed writing data to output stream\n"
 msgstr "Няўдалы запіс даньняў у плыню вываду.\n"
 
-#: oggenc/encode.c:461
-#, 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:471
-#, 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:489
+#: oggenc/encode.c:377
 #, c-format
 msgid ""
 "\n"
@@ -900,8 +708,7 @@
 "\n"
 "Файл \"%s\" закадаваны.\n"
 
-#: oggenc/encode.c:491
-#, c-format
+#: oggenc/encode.c:379
 msgid ""
 "\n"
 "\n"
@@ -911,7 +718,7 @@
 "\n"
 "Кадаваньне скончана.\n"
 
-#: oggenc/encode.c:495
+#: oggenc/encode.c:383
 #, c-format
 msgid ""
 "\n"
@@ -920,17 +727,17 @@
 "\n"
 "\tДаўжыня файла:  %d хв %04.1f с.\n"
 
-#: oggenc/encode.c:499
+#: oggenc/encode.c:387
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tПрайшло часу: %d хв %04.1f с.\n"
 
-#: oggenc/encode.c:502
+#: oggenc/encode.c:390
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tХуткасьць:         %.4f.\n"
 
-#: oggenc/encode.c:503
+#: oggenc/encode.c:391
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -939,7 +746,7 @@
 "\tСярэдні бітрэйт: %.1f Кбіт/с.\n"
 "\n"
 
-#: oggenc/encode.c:540
+#: oggenc/encode.c:428
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -950,17 +757,17 @@
 "         %s%s%s \n"
 "зь сярэднім бітрэйтам %d кбіт/с"
 
-#: oggenc/encode.c:542 oggenc/encode.c:549 oggenc/encode.c:557
-#: oggenc/encode.c:564 oggenc/encode.c:570
+#: 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:543 oggenc/encode.c:550 oggenc/encode.c:558
-#: oggenc/encode.c:565 oggenc/encode.c:571
+#: 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:548
+#: oggenc/encode.c:436
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -971,7 +778,7 @@
 "         %s%s%s \n"
 "з прыблізным бітрэйтам %d Кбіт/с (з выкарыстаньнем VBR)\n"
 
-#: oggenc/encode.c:556
+#: oggenc/encode.c:444
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -982,7 +789,7 @@
 "         %s%s%s \n"
 "з узроўнем якасьці %2.2f ужываючы вымушаны VBR "
 
-#: oggenc/encode.c:563
+#: oggenc/encode.c:451
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -993,7 +800,7 @@
 "         %s%s%s \n"
 "зь якасьцю %2.2f\n"
 
-#: oggenc/encode.c:569
+#: oggenc/encode.c:457
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1004,7 +811,7 @@
 "         %s%s%s \n"
 "выкарыстоўваючы кіраваньне бітрэйтам "
 
-#: oggenc/oggenc.c:103
+#: oggenc/oggenc.c:96
 #, c-format
 msgid ""
 "%s%s\n"
@@ -1013,95 +820,68 @@
 "%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:184
+#: oggenc/oggenc.c:172
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr "ПАМЫЛКА: немагчыма адкрыць файл уводу \"%s\": %s\n"
 
 #: oggenc/oggenc.c:200
-#, fuzzy
-msgid "RAW file reader"
-msgstr "Чытач файлаў WAV"
-
-#: oggenc/oggenc.c:217
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Адкрыцьцё модулем %s: %s\n"
 
-#: oggenc/oggenc.c:226
+#: oggenc/oggenc.c:209
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr "ПАМЫЛКА: фармат файла ўводу \"%s\" не падтрымліваецца.\n"
 
-#: oggenc/oggenc.c:277
-#, c-format
+#: oggenc/oggenc.c:259
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr "УВАГА: няма назвы файла, дапомная назва \"default.ogg\".\n"
 
-#: oggenc/oggenc.c:285
+#: 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:292
-#, fuzzy, c-format
-msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
-msgstr "Назвы файлаў уводу й вываду не павінны супадаць\n"
-
-#: oggenc/oggenc.c:303
+#: oggenc/oggenc.c:278
 #, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr "ПАМЫЛКА: немагчыма адкрыць файл вываду \"%s\": %s\n"
 
-#: oggenc/oggenc.c:333
+#: oggenc/oggenc.c:308
 #, c-format
 msgid "Resampling input from %d Hz to %d Hz\n"
 msgstr "Рэсэмплінг уводу з %d Гц да %d Гц.\n"
 
-#: oggenc/oggenc.c:340
-#, c-format
+#: oggenc/oggenc.c:315
 msgid "Downmixing stereo to mono\n"
 msgstr "Пераўтварэньне якасьці са стэрэа ў мона.\n"
 
-#: oggenc/oggenc.c:343
-#, 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:351
+#: oggenc/oggenc.c:365
 #, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:394
-#, fuzzy, c-format
 msgid ""
 "%s%s\n"
-"Usage: oggenc [options] inputfile [...]\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"
-" -k, --skeleton       Outputs ogg skeleton metadata\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"
@@ -1109,65 +889,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. 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"
+"                      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"
-" --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"
+"                      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"
+"                      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"
-" --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"
+"                      %%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"
+" -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"
 " -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"
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
@@ -1175,34 +932,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"
+"                      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"
 "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 ""
@@ -1212,11 +959,9 @@
 "Агульныя выбары:\n"
 " -Q, --quiet                 Бяз вываду ў stderr.\n"
 " -h, --help                  Надрукаваць тэкст гэтае даведкі\n"
-" -r, --raw                     Просты рэжым. Уваходныя файлы чытаюцца "
-"наўпрост\n"
+" -r, --raw                     Просты рэжым. Уваходныя файлы чытаюцца наўпрост\n"
 "                             як ІКМ даныя\n"
-" -B, --raw-bits=n              Усталяваць колькасьць бітаў на сэмпл для "
-"простага\n"
+" -B, --raw-bits=n              Усталяваць колькасьць бітаў на сэмпл для простага\n"
 "                             ўводу. Дапомнае значэньне 16.\n"
 " -C, --raw-chan=n     Устанавіць колькасьць каналаў для простага ўваходу.\n"
 "                      Даўнята 2\n"
@@ -1225,54 +970,39 @@
 " --raw-endianness     1 для bigendian, 0 для little (даўнята 0)\n"
 " -b, --bitrate        Выбар намінальнага бітрэйту для кадаваньня. Спроба\n"
 "                      кадаваньня зь бітрэйтам, які спасярэджвае даны.\n"
-"                      Атрымоўвае парамэтар ў kb/s. Гэная апэрацыя "
-"задзейнічае\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"
+" -M, --max-bitrate    Максымальны бітрэйт. Пасуе для патокавых дастасаваньняў.\n"
+" -q, --quality        Вызначае якасьць ад 0 (нізкая) да 10 (высокая), замест\n"
 "                      вызначэньня пэўнага бітрэйту. Гэта звычайны рэжым\n"
-"                      функцыянаваньня. Дробныя значэньні якасьці (2,75 і г."
-"д.)\n"
+"                      функцыянаваньня. Дробныя значэньні якасьці (2,75 і г.д.)\n"
 "                      таксама дазволеныя. Якасьць -1 магчымая, але наўрад\n"
 "                      будзе мець прымальную якасьць.\n"
 " --resample n         Рэсэмплаваць уваходныя даныя да часьціні n (Hz)\n"
-" --downmix            Пераўтварыць стэрэа ў мона. Дазволена толькі са "
-"стэрэа\n"
+" --downmix            Пераўтварыць стэрэа ў мона. Дазволена толькі са стэрэа\n"
 "                      ўваходам.\n"
 " -s, --serial         Вызначае сэрыйны нумар для патоку. Калі кадуеш колькі\n"
-"                      файлаў нумар павялічваецца для кожнага файла, "
-"пачынаючы\n"
+"                      файлаў нумар павялічваецца для кожнага файла, пачынаючы\n"
 "                      з другога.\n"
 "\n"
 "Выбары, зьвязаныя з назвамі:\n"
 " -o, --output=fn      Запіс файла ў fn (толькі ў аднафайлавым рэжыме)\n"
-" -n, --names=радок    Ствараць імёны файлаў паводле гэтага радка. %%a, %%t, %"
-"%l,\n"
-"                      %%n, %%d замяняюцца на выканаўцу, назву, альбом, "
-"нумар\n"
+" -n, --names=радок    Ствараць імёны файлаў паводле гэтага радка. %%a, %%t, %%l,\n"
+"                      %%n, %%d замяняюцца на выканаўцу, назву, альбом, нумар\n"
 "                      запісу і дату, адпаведна (гл. ніжэй)\n"
 "                      %%%% дае знак %%.\n"
-" -X, --name-remove=s  Выдаляць вызначаныя знакі з парамэтраў фарматнага "
-"радка,\n"
-"                      вызначанага -n. Карыснае для атрыманьня карэктных "
-"імёнаў\n"
+" -X, --name-remove=s  Выдаляць вызначаныя знакі з парамэтраў фарматнага радка,\n"
+"                      вызначанага -n. Карыснае для атрыманьня карэктных імёнаў\n"
 "                      файлаў.\n"
-" -P, --name-replace=s Замяняць знакі, выдаленыя --name-remove, на "
-"вызначаныя\n"
-"                      знакі. Калі гэты радок карацейшы за сьпіс --name-"
-"remove ці\n"
+" -P, --name-replace=s Замяняць знакі, выдаленыя --name-remove, на вызначаныя\n"
+"                      знакі. Калі гэты радок карацейшы за сьпіс --name-remove ці\n"
 "                      ня вызначаны, то лішнія знакі папросту выдаляюцца.\n"
-"                      Даўнятыя ўсталёўкі для вышэйшых двух парамэтраў "
-"залежаць\n"
+"                      Даўнятыя ўсталёўкі для вышэйшых двух парамэтраў залежаць\n"
 "                      ад пляцформы.\n"
-" -c, --comment=c      Дадаць радок як камэнтар. Гэтая опцыя можа ўжывацца "
-"колькі\n"
+" -c, --comment=c      Дадаць радок як камэнтар. Гэтая опцыя можа ўжывацца колькі\n"
 "                      разоў.\n"
 " -d, --date           Дата запісу (звычайна дата выкананьня)\n"
 " -N, --tracknum       Нумар запісу\n"
@@ -1280,442 +1010,198 @@
 " -l, --album          Назва альбома\n"
 " -a, --artist         Імя выканаўцы\n"
 " -G, --genre          Стыль запісу\n"
-"                      Калі вызначана колькі файлаў, тады асобнікі папярэдніх "
-"пяці\n"
+"                      Калі вызначана колькі файлаў, тады асобнікі папярэдніх пяці\n"
 "                      парамэтраў будуць ужывацца ў тым парадку, у якім яны\n"
-"                      вызначаныя. Калі назваў запісаў вызначана менш, чым "
-"файлаў,\n"
-"                      OggEnc надрукуе папярэджаньне і будзе ўжываць апошнюю "
-"для \n"
-"                      астатніх файлаў. Калі вызначана меней нумароў, то "
-"рэшта\n"
-"                      файлаў застанецца непранумараваная. Іншыя парамэтры "
-"будуць\n"
-"                      скарыстаныя ізноў без папярэджаньня (прыкладам ты "
-"можаш\n"
-"                      вызначыць адзін раз дату, і яна будзе ўжытая для "
-"ўсіх)\n"
+"                      вызначаныя. Калі назваў запісаў вызначана менш, чым файлаў,\n"
+"                      OggEnc надрукуе папярэджаньне і будзе ўжываць апошнюю для \n"
+"                      астатніх файлаў. Калі вызначана меней нумароў, то рэшта\n"
+"                      файлаў застанецца непранумараваная. Іншыя парамэтры будуць\n"
+"                      скарыстаныя ізноў без папярэджаньня (прыкладам ты можаш\n"
+"                      вызначыць адзін раз дату, і яна будзе ўжытая для ўсіх)\n"
 "\n"
 "Файлы ўводу:\n"
-"OggEnc падтрымлівае наступныя тыпы ўваходных тыпаў: 16 ці 8 бітавы ІКМ WAV, "
-"AIFF\n"
-"ці AIFF/C, ці 32 бітавы WAV з рацыянальнымі лікамі IEEE. Файлы могуць быць "
-"мона,\n"
+"OggEnc падтрымлівае наступныя тыпы ўваходных тыпаў: 16 ці 8 бітавы ІКМ WAV, AIFF\n"
+"ці AIFF/C, ці 32 бітавы WAV з рацыянальнымі лікамі IEEE. Файлы могуць быць мона,\n"
 "стэрэа ці з большай колькасьцю каналаў і зь любой верхняй часьцінёй.\n"
-"Зь іншага боку, опцыя --raw дазваляе ўжываць простыя ІКМ файлы, якія маюць "
-"быць\n"
-"16 бітавымі стэрэа ІКМ файламі зь little-endian парадкам байтаў "
-"(\"неразборлівыя\n"
+"Зь іншага боку, опцыя --raw дазваляе ўжываць простыя ІКМ файлы, якія маюць быць\n"
+"16 бітавымі стэрэа ІКМ файламі зь little-endian парадкам байтаў (\"неразборлівыя\n"
 "WAV\"), калі ня вызначаныя дадатковыя парамэтры простага рэжыму.\n"
-"Можна атрымоўваць файл са стандартнага ўваходу, ужыўшы - замест імя файла. "
-"У \n"
-"гэтым рэжыме выхад накіраваны ў stdout, калі ня вызначана імя выходнага "
-"файла з\n"
+"Можна атрымоўваць файл са стандартнага ўваходу, ужыўшы - замест імя файла. У \n"
+"гэтым рэжыме выхад накіраваны ў stdout, калі ня вызначана імя выходнага файла з\n"
 "дапамогай -o.\n"
 "\n"
 
-#: oggenc/oggenc.c:584
+#: oggenc/oggenc.c:536
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr "УВАГА: праігнараваны няправільны запабежны знак '%c' у фармаце імя\n"
 
-#: oggenc/oggenc.c:613 oggenc/oggenc.c:735 oggenc/oggenc.c:748
-#, 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:622
-#, 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:625
+#: oggenc/oggenc.c:574
 #, c-format
 msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
 msgstr "УВАГА: немагчыма прачытаць парамэтар парадку байтаў \"%s\"\n"
 
-#: oggenc/oggenc.c:632
+#: oggenc/oggenc.c:581
 #, c-format
 msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
 msgstr "УВАГА: немагчыма прачытаць часьціню рэсэмплінгу \"%s\"\n"
 
-#: oggenc/oggenc.c:638
+#: 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:648
-#, fuzzy, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Увага: немагчыма прачытаць тэчку %s.\n"
-
-#: oggenc/oggenc.c:658
-#, c-format
+#: oggenc/oggenc.c:599
 msgid "No value for advanced encoder option found\n"
 msgstr "Ня знойдзена значэньне для зададзенай пашыранай опцыі кадаваньніка\n"
 
-#: oggenc/oggenc.c:673
-#, c-format
+#: oggenc/oggenc.c:610
 msgid "Internal error parsing command line options\n"
 msgstr "Нутраная памылка разбору опцый каманднага радка\n"
 
-#: oggenc/oggenc.c:684
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
 msgstr "Увага: няправільны камэнтар (\"%s\"), праігнараваны.\n"
 
-#: oggenc/oggenc.c:721
+#: oggenc/oggenc.c:656
 #, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr "Увага: намінальны бітрэйт \"%s\" не распазнаны\n"
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:664
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr "Увага: мінімальны бітрэйт \"%s\" не распазнаны\n"
 
-#: oggenc/oggenc.c:742
+#: oggenc/oggenc.c:677
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr "Увага: максымальны бітрэйт \"%s\" не распазнаны\n"
 
-#: oggenc/oggenc.c:754
+#: oggenc/oggenc.c:689
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr "Не распазнаная опцыя якасьці \"%s\", праігнараваная\n"
 
-#: oggenc/oggenc.c:762
-#, c-format
+#: oggenc/oggenc.c:697
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr "УВАГА: запытана завысокая якасьць, устаноўлена ў максымальную.\n"
 
-#: oggenc/oggenc.c:768
-#, c-format
+#: oggenc/oggenc.c:703
 msgid "WARNING: Multiple name formats specified, using final\n"
 msgstr "УВАГА: вызначана колькі фарматаў імя, ужыты апошні\n"
 
-#: oggenc/oggenc.c:777
-#, c-format
+#: oggenc/oggenc.c:712
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr "УВАГА: вызначана колькі фільтраў фармату імя, ужыты апошні\n"
 
-#: oggenc/oggenc.c:786
-#, 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:794
-#, c-format
+#: oggenc/oggenc.c:729
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr "УВАГА: вызначана колькі выходных файлаў, лепей ужывай -n\n"
 
-#: oggenc/oggenc.c:813
-#, c-format
-msgid ""
-"WARNING: Raw bits/sample specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-"УВАГА: вызначаныя біты на сэмпл для няпростых даных. Лічым уваход простым.\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:818 oggenc/oggenc.c:822
-#, 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:829
-#, 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:834
-#, 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:845
-#, 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:850
-#, 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:857
-#, c-format
+#: oggenc/oggenc.c:789
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "УВАГА: вызначана невядомая опцыя, праігнараваная->\n"
 
-#: oggenc/oggenc.c:879 vorbiscomment/vcomment.c:284
-#, c-format
+#: oggenc/oggenc.c:811
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr "Немагчыма сканвэртаваць камэнтар у UTF-8, немагчыма дадаць\n"
 
-#: oggenc/oggenc.c:898
-#, c-format
+#: oggenc/oggenc.c:830
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr "УВАГА: вызначана замала загалоўкаў, даўнімаецца апошні загаловак.\n"
 
-#: oggenc/platform.c:150
+#: oggenc/platform.c:147
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr "Немагчыма стварыць каталёг \"%s\": %s\n"
 
-#: oggenc/platform.c:157
+#: oggenc/platform.c:154
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr "Памылка праверкі на існаваньне каталёгу %s: %s\n"
 
-#: oggenc/platform.c:170
+#: oggenc/platform.c:167
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr "Памылка: сэгмэнт шляху \"%s\" не зьяўляецца каталёгам\n"
 
-#: ogginfo/ogginfo2.c:186
-#, 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:194
+#: 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:225 ogginfo/ogginfo2.c:233
+#: 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:240
+#: 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:316
-#, 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:330
-msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
-msgstr "Увага: памылка ў дэкодэры utf8. Павінна быць немагчымым\n"
-
-#: ogginfo/ogginfo2.c:355 ogginfo/ogginfo2.c:522
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Увага: канец-патоку ня вызначаны ў патоку %d\n"
-
-#: ogginfo/ogginfo2.c:363
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Увага: немагчыма раскадаваць пакет загалоўку vorbis - няправільны паток "
-"vorbis (%d)\n"
-
-#: ogginfo/ogginfo2.c:370
-#, 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:374
-#, fuzzy, c-format
-msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr "Загалоўкі Vorbis разабраныя ў патоку %d, зьвесткі ніжэй...\n"
-
-#: ogginfo/ogginfo2.c:377
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Вэрсія: %d\n"
-
-#: ogginfo/ogginfo2.c:379 ogginfo/ogginfo2.c:557
-#, c-format
-msgid "Vendor: %s\n"
-msgstr "Распаўсюднік: %s\n"
-
-#: ogginfo/ogginfo2.c:380
-#, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:381
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Вэрсія: %d\n"
-
-#: ogginfo/ogginfo2.c:382
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:385
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:387
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:390
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:392
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:396
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:401
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:403
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:405
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:415
-#, fuzzy
-msgid "Colourspace unspecified\n"
-msgstr "дзеяньне ня вызначана\n"
-
-#: ogginfo/ogginfo2.c:418
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:420
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:424
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:426
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr "Найбольшы бітрэйт: %f кбіт/с\n"
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:430 ogginfo/ogginfo2.c:580
-msgid "User comments section follows...\n"
-msgstr "Камэнтары карыстальніка йдуць ніжэй...\n"
-
-#: ogginfo/ogginfo2.c:451
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Увага: канец-патоку ня вызначаны ў патоку %d\n"
-
-#: ogginfo/ogginfo2.c:467 ogginfo/ogginfo2.c:595
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Увага: granulepos у патоку %d зьмяншаецца ад "
-
-#: ogginfo/ogginfo2.c:494
-msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:531
-#, 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:539
-#, 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:543
-#, c-format
 msgid "Vorbis headers parsed for stream %d, information follows...\n"
 msgstr "Загалоўкі Vorbis разабраныя ў патоку %d, зьвесткі ніжэй...\n"
 
-#: ogginfo/ogginfo2.c:546
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid "Version: %d\n"
 msgstr "Вэрсія: %d\n"
 
-#: ogginfo/ogginfo2.c:550
+#: ogginfo/ogginfo2.c:175
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Распаўсюднік: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:558
+#: 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:559
+#: ogginfo/ogginfo2.c:184
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1724,80 +1210,120 @@
 "Ступень: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:562
+#: ogginfo/ogginfo2.c:187
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Пачатковы бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:190
 msgid "Nominal bitrate not set\n"
 msgstr "Пачатковы бітрэйт ня вызначаны\n"
 
-#: ogginfo/ogginfo2.c:568
+#: ogginfo/ogginfo2.c:193
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Найбольшы бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:571
+#: ogginfo/ogginfo2.c:196
 msgid "Upper bitrate not set\n"
 msgstr "Найбольшы бітрэйт ня вызначаны\n"
 
-#: ogginfo/ogginfo2.c:574
+#: ogginfo/ogginfo2.c:199
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Найменшы бітрэйт: %f кбіт/с\n"
 
-#: ogginfo/ogginfo2.c:577
+#: ogginfo/ogginfo2.c:202
 msgid "Lower bitrate not set\n"
 msgstr "Найменшы бітрэйт ня вызначаны\n"
 
-#: ogginfo/ogginfo2.c:604
+#: 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:625
+#: 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:257 ogginfo/ogginfo2.c:266
+#, c-format
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
+msgstr "Увага: недапушчальная пасьлядоўнасьць UTF-8 у камэнтары %d (паток %d): маркер даўжыні няправільны\n"
+
+#: ogginfo/ogginfo2.c:274
+#, 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:335
+#, 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:347
+msgid "Warning: Failure in utf8 decoder. This should be impossible\n"
+msgstr "Увага: памылка ў дэкодэры utf8. Павінна быць немагчымым\n"
+
+#: ogginfo/ogginfo2.c:364
+#, c-format
+msgid "Warning: granulepos in stream %d decreases from "
+msgstr "Увага: granulepos у патоку %d зьмяншаецца ад "
+
+#: ogginfo/ogginfo2.c:365
+msgid " to "
+msgstr " у "
+
+#: ogginfo/ogginfo2.c:365
+msgid "\n"
+msgstr "\n"
+
+#: ogginfo/ogginfo2.c:384
+#, c-format
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %"
+"\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:659
+#: ogginfo/ogginfo2.c:418
 #, c-format
 msgid "Warning: EOS not set on stream %d\n"
 msgstr "Увага: канец-патоку ня вызначаны ў патоку %d\n"
 
-#: ogginfo/ogginfo2.c:796
+#: ogginfo/ogginfo2.c:537
 msgid "Warning: Invalid header page, no packet found\n"
 msgstr "Увага: Няправільная старонка загалоўкаў, ня знойдзена пакетаў\n"
 
-#: ogginfo/ogginfo2.c:814
+#: 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:828
-#, 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:845
-#, 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:869
+#: 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:874
+#: ogginfo/ogginfo2.c:604
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1806,63 +1332,45 @@
 "Апрацоўка файла \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:883
+#: ogginfo/ogginfo2.c:613
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Немагчыма знайсьці апрацоўшчыка для патока, bailing\n"
 
-#: ogginfo/ogginfo2.c:891
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:894
+#: ogginfo/ogginfo2.c:618
+#, c-format
 msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:898
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:901
-#, 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:913
+#: ogginfo/ogginfo2.c:625
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Новы лягічны паток (#%d, нумар: %08x): тып %s\n"
 
-#: ogginfo/ogginfo2.c:916
+#: ogginfo/ogginfo2.c:628
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Увага: сьцяг пачатку патока не ўстаноўлены ў патоку %d\n"
 
-#: ogginfo/ogginfo2.c:920
+#: 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:925
+#: 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:940
+#: ogginfo/ogginfo2.c:652
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Лягічная плыня %d скончылася\n"
 
-#: ogginfo/ogginfo2.c:948
+#: ogginfo/ogginfo2.c:659
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1871,23 +1379,19 @@
 "Памылка: ня знойдзена даных ogg у файле \"%s\".\n"
 "Уваход, магчыма, ня ogg.\n"
 
-#: ogginfo/ogginfo2.c:959
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 з %s %s\n"
-
-#: ogginfo/ogginfo2.c:965
-#, 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.ogg ... fileN.ogg]\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"
@@ -1895,21 +1399,13 @@
 "Ужывай: 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:974
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:987
-#, c-format
+#: ogginfo/ogginfo2.c:691
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1923,8 +1419,7 @@
 "і дыягназаваньня іхных праблем.\n"
 "Поўная даведка адлюстроўваецца па \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1019
-#, c-format
+#: ogginfo/ogginfo2.c:720
 msgid "No input files specified. \"ogginfo -h\" for help\n"
 msgstr "Ня вызначана ўваходных файлаў. \"ogginfo -h\" для даведкі\n"
 
@@ -1948,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"
@@ -1968,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"
@@ -1983,38 +1482,35 @@
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: опцыя `-W %s' не павінная мець парамэтра\n"
 
-#: vcut/vcut.c:137
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr "Памылка старонкі. Пашкоджаны ўваход.\n"
 
-#: vcut/vcut.c:154
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr "Памылка бітавагай плыні, працяг...\n"
 
-#: vcut/vcut.c:179
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr "Знодзены канец-плыні раней за пункт разрэзкі.\n"
 
-#: vcut/vcut.c:188
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr "Устаноўка канца плыні: абнаўленьне сынхра вернула 0\n"
 
-#: vcut/vcut.c:198
-#, c-format
+#: vcut/vcut.c:192
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr "Пункт разрэзкі па-за плыняй. Другі файл будзе пустым\n"
 
-#: vcut/vcut.c:231
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr "Некіраваны асобны выпадак: першы файл занадта кароткі?\n"
 
-#: vcut/vcut.c:290
-#, 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"
@@ -2022,61 +1518,47 @@
 "Памылка: першыя два скрутка аўдыё не зьмяшчаюцца ў адну\n"
 "         старонку ogg. Файл можа няправільна дэкадавацца.\n"
 
-#: vcut/vcut.c:303
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr "Памылка бітавай плыні якую можна выправіць\n"
 
-#: vcut/vcut.c:313
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr "Памылка бітавай плыні\n"
 
-#: vcut/vcut.c:336
-#, c-format
+#: vcut/vcut.c:330
 msgid "Update sync returned 0, setting eos\n"
 msgstr "Абнаўленьне сынхра вернула 0, усталяваньне канца плыні\n"
 
-#: vcut/vcut.c:385
-#, c-format
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "Увод - ня ogg.\n"
 
-#: vcut/vcut.c:395
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Памылка на першай старонцы\n"
 
-#: vcut/vcut.c:400
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "Памылка ў першым скрутку\n"
 
-#: vcut/vcut.c:406
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr "Памылка ў першасным загалоўку: ня vorbis?\n"
 
-#: vcut/vcut.c:426
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Пашкоджаны другасны загаловак\n"
 
-#: vcut/vcut.c:439
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "EOF (канец файла) ў загалоўках\n"
 
-#: vcut/vcut.c:472
-#, 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:476
-#, 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"
@@ -2086,490 +1568,190 @@
 "Праверце выходныя файлы на правільнасьць перад выдаленьнем крыніц.\n"
 "\n"
 
-#: vcut/vcut.c:481
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Немагчыма адкрыць %s для чытаньня\n"
 
-#: vcut/vcut.c:486 vcut/vcut.c:491
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr "Немагчыма адкрыць %s для запісу\n"
 
-#: vcut/vcut.c:497 vcut/vcut.c:502
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Немагчыма разабраць пункт разрэзкі \"%s\"\n"
 
-#: vcut/vcut.c:507
-#, 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:509
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr "Апрацоўка: разрэз ля %lld\n"
-
-#: vcut/vcut.c:519
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr "Памылка апрацоўкі\n"
 
-#: vcut/vcut.c:541
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr "Памылка чатаньня загалоўкаў\n"
 
-#: vcut/vcut.c:564
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr "Памылка запісу першага файла вываду\n"
 
-#: vcut/vcut.c:572
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr "Памылка запісу другога файла вываду\n"
 
-#: vorbiscomment/vcedit.c:233
+#: vorbiscomment/vcedit.c:220
 msgid "Input truncated or empty."
 msgstr "Увод абрэзаны ці пусты."
 
-#: vorbiscomment/vcedit.c:235
+#: vorbiscomment/vcedit.c:222
 msgid "Input is not an Ogg bitstream."
 msgstr "Увод не зьяўляецца бітавый плыняй ogg."
 
-#: vorbiscomment/vcedit.c:253
+#: vorbiscomment/vcedit.c:239
 msgid "Error reading first page of Ogg bitstream."
 msgstr "Памылка чытаньня першай старонкі бітавае плыні ogg."
 
-#: vorbiscomment/vcedit.c:259
+#: vorbiscomment/vcedit.c:245
 msgid "Error reading initial header packet."
 msgstr "Памылка чытаньня пачатковага скрутка загалоўка."
 
-#: vorbiscomment/vcedit.c:265
+#: vorbiscomment/vcedit.c:251
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Бітавая плынь ogg ня ўтрымлівае даньняў vorbis."
 
-#: vorbiscomment/vcedit.c:288
+#: vorbiscomment/vcedit.c:274
 msgid "Corrupt secondary header."
 msgstr "Пашкоджаны другасны загаловак."
 
-#: vorbiscomment/vcedit.c:309
+#: vorbiscomment/vcedit.c:295
 msgid "EOF before end of vorbis headers."
 msgstr "Канец файла (EOF) раней за канец загалоўка vorbis."
 
-#: vorbiscomment/vcedit.c:462
+#: vorbiscomment/vcedit.c:448
 msgid "Corrupt or missing data, continuing..."
 msgstr "Пашкоджаныя ці прапушчаныя даньні, працяг..."
 
-#: vorbiscomment/vcedit.c:502
-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:120 vorbiscomment/vcomment.c:146
+#: 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:165
+#: vorbiscomment/vcomment.c:148
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Кепскі камэнтар: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:177
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "кепскі камэнтар: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:170
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr "Памылка запісу камэнтароў у файл вываду: %s\n"
 
-#: vorbiscomment/vcomment.c:204
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:187
 msgid "no action specified\n"
 msgstr "дзеяньне ня вызначана\n"
 
-#: vorbiscomment/vcomment.c:306
-#, 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:309
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:312
-#, 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:318
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:319
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:322
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Кепскі від у сьпісе выбараў"
-
-#: vorbiscomment/vcomment.c:323
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:324
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:326
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:330
-#, 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:333
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:337
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:340
-#, 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:345
-#, 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:352
-#, 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:357
-#, 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:419
-#, c-format
+#: vorbiscomment/vcomment.c:371
 msgid "Internal error parsing command options\n"
 msgstr "Унутраная памылка апрацоўкі выбараў загаду\n"
 
-#: vorbiscomment/vcomment.c:505
+#: vorbiscomment/vcomment.c:456
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Памылка адкрыцьця файла ўводу \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:514
-#, c-format
+#: vorbiscomment/vcomment.c:465
 msgid "Input filename may not be the same as output filename\n"
 msgstr "Назвы файлаў уводу й вываду не павінны супадаць\n"
 
-#: vorbiscomment/vcomment.c:525
+#: vorbiscomment/vcomment.c:476
 #, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Памылка адкрыцьця файла вываду \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:540
+#: vorbiscomment/vcomment.c:491
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Памылка адкрыцьця файла камэнтараў \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:557
+#: vorbiscomment/vcomment.c:508
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Памылка адкрыцьця файла камэнтараў \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:591
+#: vorbiscomment/vcomment.c:536
 #, c-format
 msgid "Error removing old file %s\n"
 msgstr "Памылка выдаленьня старога файла %s\n"
 
-#: vorbiscomment/vcomment.c:593
+#: vorbiscomment/vcomment.c:538
 #, c-format
 msgid "Error renaming %s to %s\n"
 msgstr "Памылка перайменаваньня \"%s\" у \"%s\"\n"
-
-#: vorbiscomment/vcomment.c:603
-#, 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 (http://www.xiph.org/)\n"
-#~ "\n"
-#~ "Выкарыстаньне: ogg123 [<выбары>] <файл уводу> ...\n"
-#~ "\n"
-#~ "  -h, --help                 Гэтая даведка.\n"
-#~ "  -V, --version              Адлюстроўвае вэрсыю Ogg123.\n"
-#~ "  -d, --device=d             Ужывае 'd' ў якасьці прылады вываду.\n"
-#~ "    Магчамыя прылады ('*'=жывая, '@'=файл):\n"
-#~ "        "
-
-#, fuzzy
-#~ 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"
-#~ "                             вызначанай прылады 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"
-
-#, fuzzy
-#~ msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-#~ msgstr "Увага: granulepos у патоку %d зьмяншаецца ад "
-
-#, fuzzy
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Плыня Vorbis %d:\n"
-#~ "\tАгульная даўжыня даньняў: %ld байтаў\n"
-#~ "\tДаўжыня прайграваньня: %ldm:%02ld s.\n"
-#~ "\tСярэдні бітрэйт: %f кбіт/с\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %lld bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Плыня Vorbis %d:\n"
-#~ "\tАгульная даўжыня даньняў: %ld байтаў\n"
-#~ "\tДаўжыня прайграваньня: %ldm:%02ld s.\n"
-#~ "\tСярэдні бітрэйт: %f кбіт/с\n"
-
-#, fuzzy
-#~ 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Агульная даўжыня даньняў: %ld байтаў\n"
-#~ "\tДаўжыня прайграваньня: %ldm:%02ld s.\n"
-#~ "\tСярэдні бітрэйт: %f кбіт/с\n"
-
-#, fuzzy
-#~ 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Агульная даўжыня даньняў: %ld байтаў\n"
-#~ "\tДаўжыня прайграваньня: %ldm:%02ld s.\n"
-#~ "\tСярэдні бітрэйт: %f кбіт/с\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
-#~ "ogg.\n"
-#~ msgstr "Увага: Дзірка ў даных знойдзена на прыблізнай адлегласьці "
-
-#, 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 ""
-#~ "Выкарыстаньне: \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"
-
-#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
-#~ msgstr "Немагчыма пераўтварыць камэнтар у UTF8, немагчыма дадаць\n"
-
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
-#~ 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 " to "
-#~ msgstr " у "
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid " bytes. Corrupted ogg.\n"
-#~ msgstr " байт(аў). Пашкоджаны ogg.\n"

Modified: trunk/vorbis-tools/po/cs.po
===================================================================
--- trunk/vorbis-tools/po/cs.po	2008-06-22 21:07:32 UTC (rev 15057)
+++ trunk/vorbis-tools/po/cs.po	2008-06-23 21:40:34 UTC (rev 15058)
@@ -1,248 +1,246 @@
 # Czech translation of vorbis-tools
-# Copyright (C) 2003 Miloslav Trmac
+# 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.
+# Miloslav Trmac <mitr at volny.cz>, 2003, 2007.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: vorbis-tools 1.0\n"
+"Project-Id-Version: vorbis-tools 1.1.1\n"
 "Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2007-12-30 13:57+0900\n"
-"PO-Revision-Date: 2003-04-30 22:59+0200\n"
+"POT-Creation-Date: 2005-06-27 11:34+0200\n"
+"PO-Revision-Date: 2007-09-06 22:34+0200\n"
 "Last-Translator: Miloslav Trmac <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"
 "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 "Chyba: Nedostatek paměti v malloc_action().\n"
 
-#: ogg123/buffer.c:351
+#: ogg123/buffer.c:347
 #, c-format
 msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
 msgstr "Chyba: Nemohu alokovat paměť v malloc_buffer_stats()\n"
 
-#: ogg123/callbacks.c:75
+#: ogg123/callbacks.c:71
 msgid "Error: Device not available.\n"
 msgstr "Chyba: Zařízení není 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 určení názvu souboru výstupu pomocí -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 přepínače zařízení %s.\n"
 
-#: ogg123/callbacks.c:85
+#: ogg123/callbacks.c:81
 #, c-format
 msgid "Error: Cannot open device %s.\n"
 msgstr "Chyba: Nemohu otevřít zařízení %s.\n"
 
-#: ogg123/callbacks.c:89
+#: ogg123/callbacks.c:85
 #, c-format
 msgid "Error: Device %s failure.\n"
 msgstr "Chyba: Selhání zařízení %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 "Chyba: Výstupní soubor nemůže být pro zařízení %s zadán.\n"
 
-#: ogg123/callbacks.c:95
+#: ogg123/callbacks.c:91
 #, c-format
 msgid "Error: Cannot open file %s for writing.\n"
 msgstr "Chyba: Nemohu otevřít soubor %s pro zápis.\n"
 
-#: ogg123/callbacks.c:99
+#: ogg123/callbacks.c:95
 #, c-format
 msgid "Error: File %s already exists.\n"
 msgstr "Chyba: Soubor %s již existuje.\n"
 
-#: ogg123/callbacks.c:102
+#: ogg123/callbacks.c:98
 #, c-format
 msgid "Error: This error should never happen (%d).  Panic!\n"
 msgstr "Chyba: Tato chyba by se neměla nikdy stát (%d). Panikařím!\n"
 
-#: ogg123/callbacks.c: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: Nedostatek 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: Nedostatek 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: Nedostatek 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: Nedostatek 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 zpracování: %s na řádku %d souboru %s (%s)\n"
 
-#: ogg123/cfgfile_options.c:134
+#: ogg123/cfgfile_options.c:130
 msgid "Name"
 msgstr "Název"
 
-#: 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 "Implicitní"
 
-#: ogg123/cfgfile_options.c:169
+#: ogg123/cfgfile_options.c:165
 #, c-format
 msgid "none"
 msgstr "žádný"
 
-#: 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 "jiný"
 
-#: ogg123/cfgfile_options.c:196
+#: ogg123/cfgfile_options.c:192
 msgid "(NULL)"
 msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:554 oggenc/oggenc.c:559
-#: oggenc/oggenc.c:564 oggenc/oggenc.c:569 oggenc/oggenc.c:574
-#: oggenc/oggenc.c:579
+#: ogg123/cfgfile_options.c:196 oggenc/oggenc.c:540 oggenc/oggenc.c:545
+#: oggenc/oggenc.c:550 oggenc/oggenc.c:555 oggenc/oggenc.c:560
+#: oggenc/oggenc.c:565
 msgid "(none)"
 msgstr "(žádný)"
 
-#: ogg123/cfgfile_options.c:426
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Úspěch"
 
-#: ogg123/cfgfile_options.c:430
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Klíč nenalezen"
 
-#: ogg123/cfgfile_options.c:432
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Žádný klíč"
 
-#: ogg123/cfgfile_options.c:434
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Špatná hodnota"
 
-#: ogg123/cfgfile_options.c:436
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Špatný typ v seznamu přepínačů"
 
-#: ogg123/cfgfile_options.c:438
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: ogg123/cmdline_options.c:83
+#: ogg123/cmdline_options.c:89
 msgid "Internal error parsing command line options.\n"
 msgstr "Interní chyba při zpracovávání přepínačů na příkazovém řádku.\n"
 
-#: ogg123/cmdline_options.c:90
+#: ogg123/cmdline_options.c:96
 #, c-format
 msgid "Input buffer size smaller than minimum size of %dkB."
-msgstr ""
-"Velikost vstupní vyrovnávací paměti menší než minimální velikost %d kB."
+msgstr "Velikost vstupního bufferu menší než minimální velikost %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\" 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
+#: ogg123/cmdline_options.c:115
 #, c-format
 msgid "Available options:\n"
 msgstr "Dostupné přepínače:\n"
 
-#: ogg123/cmdline_options.c:118
+#: ogg123/cmdline_options.c:124
 #, c-format
 msgid "=== No such device %s.\n"
 msgstr "=== Takové zařízení %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 "=== Ovladač %s není ovladač výstupu do souboru.\n"
 
-#: ogg123/cmdline_options.c:143
+#: ogg123/cmdline_options.c:149
 msgid "=== Cannot specify output file without specifying a driver.\n"
 msgstr "=== Nelze určit výstupní soubor bez určení ovladače.\n"
 
-#: ogg123/cmdline_options.c:162
+#: ogg123/cmdline_options.c:168
 #, c-format
 msgid "=== Incorrect option format: %s.\n"
 msgstr "=== Nesprávný formát přepínače: %s.\n"
 
-#: ogg123/cmdline_options.c: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 "--- Nemohu přehrávat 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"
@@ -250,252 +248,119 @@
 "--- Nemohu každý úsek přehrávat nulakrát.\n"
 "--- Pro provedení testovacího dekódování použijte výstupní ovladač null.\n"
 
-#: ogg123/cmdline_options.c:232
+#: ogg123/cmdline_options.c:225
 #, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
 msgstr "--- Nemohu otevřít soubor seznamu skladeb %s. Přeskočeno.\n"
 
-#: ogg123/cmdline_options.c:248
+#: ogg123/cmdline_options.c:241
 msgid "=== Option conflict: End time is before start time.\n"
-msgstr ""
+msgstr "=== Konflikt přepínačů: Čas konce je před časem začátku.\n"
 
-#: ogg123/cmdline_options.c:261
+#: ogg123/cmdline_options.c:254
 #, c-format
 msgid "--- Driver %s specified in configuration file invalid.\n"
 msgstr "--- Ovladač %s zadaný v konfiguračním souboru je neplatný.\n"
 
-#: ogg123/cmdline_options.c: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"
+#: ogg123/cmdline_options.c:264
+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
+#: 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žití: ogg123 [<přepínače>] <vstupní soubor> ...\n"
+"\n"
+"  -h, --help     tato nápověda\n"
+"  -V, --version  zobrazit verzi Ogg123\n"
+"  -d, --device=d používá 'd' jako výstupní zařízení\n"
+"      Možná zařízení jsou ('*'=živě, '@'=soubor):\n"
+"        "
 
-#: ogg123/cmdline_options.c:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Dostupné přepí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á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"
+"  -o, --device-option=k:v předává speciální přepínač k s hodnotou\n"
+"      v dříve určenému zařízení (pomocí -d). Pro více informací\n"
+"      viz manuálovou stránku.\n"
+"  -b n, --buffer n  Používat vstupní buffer 'n' kilobajtů\n"
+"  -p n, --prebuffer n  Načíst n%% vstupního bufferu před přehráváním\n"
+"  -v, --verbose  Zobrazovat průběh a jiné stavové informace\n"
+"  -q, --quiet    Nezobrazovat nic (žádný název)\n"
+"  -x n, --nth    Přehrávat každý 'n'tý blok\n"
+"  -y n, --ntimes Zopakovat každý přehrávaný blok 'n'-krát\n"
+"  -z, --shuffle  Promíchat přehrávání\n"
+"\n"
+"ogg123 přeskočí na další píseň při SIGINT (Ctrl-C); dva SIGINTy v rámci\n"
+"s milisekund způsobí ukončení ogg123.\n"
+"  -l, --delay=s  nastavit s [milisekund] (implicitnÄ› 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é přepí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:329
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Dostupné přepí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:336
-#, 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:214
-#: ogg123/oggvorbis_format.c:95
-#, c-format
 msgid "Error: Out of memory.\n"
 msgstr "Chyba: Nedostatek paměti.\n"
 
-#: ogg123/format.c:82
+#: ogg123/format.c:81
 #, c-format
 msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr "Chyba: Nemohu alokovat paměť v malloc_decoder_stats()\n"
 
-#: ogg123/http_transport.c:144
+#: ogg123/http_transport.c:142
 msgid "Error: Could not set signal mask."
 msgstr "Chyba: Nemohu nastavit masku signálů."
 
-#: ogg123/http_transport.c:201
+#: ogg123/http_transport.c:199
 msgid "Error: Unable to create input buffer.\n"
-msgstr "Chyba: Nemohu vytvořit vstupní vyrovnávací paměť.\n"
+msgstr "Chyba: Nemohu vytvořit vstupní buffer.\n"
 
-#: ogg123/ogg123.c:82
+#: ogg123/ogg123.c:75
 msgid "default output device"
 msgstr "implicitní výstupní zařízení"
 
-#: ogg123/ogg123.c:84
+#: ogg123/ogg123.c:77
 msgid "shuffle playlist"
 msgstr "promíchat seznam skladeb"
 
-#: 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"
@@ -504,249 +369,235 @@
 "\n"
 "Zařízení zvuku: %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 "Varování: Nemohu číst adresář %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"
+msgstr "Chyba: Nemohu vytvořit buffer zvuku.\n"
 
-#: ogg123/ogg123.c:557
+#: 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:562
+#: ogg123/ogg123.c:454
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Nemohu otevřít %s.\n"
 
-#: ogg123/ogg123.c:568
+#: 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:578
+#: 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:597
+#: ogg123/ogg123.c:489
 #, c-format
 msgid "Playing: %s"
 msgstr "Přehrávám: %s"
 
-#: ogg123/ogg123.c:608
+#: 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:663
+#: ogg123/ogg123.c:536
 msgid "Error: Decoding failure.\n"
 msgstr "Chyba: Selhání dekódování.\n"
 
-#: ogg123/ogg123.c:742
+#: 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
-#, fuzzy, c-format
+#: ogg123/oggvorbis_format.c:303
+#, c-format
 msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr "Bitový proud je %d kanálů, %ldHz"
+msgstr "Proud 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 ""
+msgstr "Formát Vorbis: Verze %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%%"
+msgstr " Vstupní buffer %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%%"
+msgstr " Výstupní buffer %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 ogginfo/ogginfo2.c:964
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggenc/audio.c:47
+#: oggenc/audio.c:48
 msgid "WAV file reader"
 msgstr "Čteč souborů WAV"
 
-#: oggenc/audio.c:48
+#: oggenc/audio.c:49
 msgid "AIFF/AIFC file reader"
 msgstr "Čteč souborů AIFF/AIFC"
 
-#: oggenc/audio.c:50
-#, fuzzy
+#: oggenc/audio.c:51
 msgid "FLAC file reader"
-msgstr "Čteč souborů WAV"
+msgstr "Čteč souborů FLAC"
 
-#: oggenc/audio.c:51
-#, fuzzy
+#: oggenc/audio.c:52
 msgid "Ogg FLAC file reader"
-msgstr "Čteč souborů WAV"
+msgstr "Čteč souborů Ogg FLAC"
 
-#: oggenc/audio.c:128 oggenc/audio.c:421
+#: 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:139
+#: 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:165
+#: 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:251
+#: 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:257
+#: 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:265
+#: 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:280
+#: 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:294
-#, fuzzy, c-format
+#: oggenc/audio.c:286
+#, c-format
 msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
-msgstr "Varování: Neumím obsloužit komprimované AIFF-C\n"
+msgstr "Varování: Neumím obsloužit komprimované AIFF-C (%c%c%c%c)\n"
 
-#: oggenc/audio.c:301
+#: 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:307
+#: 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:313
+#: 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:350
-#, fuzzy, c-format
+#: oggenc/audio.c:336
+#, c-format
 msgid ""
 "Warning: OggEnc does not support this type of AIFF/AIFC file\n"
 " Must be 8 or 16 bit PCM.\n"
@@ -754,12 +605,12 @@
 "Varování: OggEnc nepodporuje tento typ souboru AIFF/AIFC\n"
 " Musí to být osmi nebo šestnáctibitový PCM.\n"
 
-#: oggenc/audio.c:404
+#: 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:416
+#: oggenc/audio.c:391
 #, c-format
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
@@ -768,122 +619,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:453
-#, 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:462
+#: 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"
-msgstr ""
-
-#: oggenc/audio.c:524
-#, fuzzy, c-format
-msgid ""
 "ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
-"or floating point PCM)\n"
+"or floating point PCM\n"
 msgstr ""
-"CHYBA> Soubor wav je nepodporované subformátu (musí být šestnáctibitový\n"
-"PCM nebo PCM s plovoucí desetinnou čárkou\n"
+"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"
 
-#: oggenc/audio.c:600
+#: oggenc/audio.c:555
 #, c-format
 msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
+msgstr "Dvacetičtyřbitová data PCM v big endian nejsou momentálně podporována, končím.\n"
 
-#: oggenc/audio.c:606
+#: oggenc/audio.c:561
 #, c-format
 msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
+msgstr "Interní chyba: pokus čít nepodporovanou bitovou hloubku %d\n"
 
-#: oggenc/audio.c:708
+#: 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:726
+#: oggenc/audio.c:676
 #, c-format
 msgid "Couldn't initialise resampler\n"
 msgstr "Nemohu inicializovat převzorkovávač\n"
 
-#: oggenc/encode.c:63
+#: oggenc/encode.c:58
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr "Nastavuji pokročilý přepínač \"%s\" enkodéru na %s\n"
 
-#: oggenc/encode.c:100
+#: oggenc/encode.c:95
 #, c-format
 msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
 msgstr "Změněna frekvence lowpass z %f kHz na %f kHz\n"
 
-#: oggenc/encode.c:103
+#: oggenc/encode.c:98
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Nerozpoznaný pokročilý přepínač \"%s\"\n"
 
-#: oggenc/encode.c:170
-#, 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:129
+#, c-format
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
+msgstr "255 kanálů by mělo být dost pro všechny. (Lituji, vorbis nepodporuje více)\n"
 
-#: oggenc/encode.c:178
+#: oggenc/encode.c:137
 #, c-format
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr "Požadování minimální nebo maximální bitrate vyžaduje --managed\n"
 
-#: oggenc/encode.c:196
+#: 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:240
+#: oggenc/encode.c:198
 #, c-format
 msgid "Set optional hard quality restrictions\n"
-msgstr ""
+msgstr "Nastavit nepovinná pevná omezení kvality\n"
 
-#: oggenc/encode.c:242
+#: oggenc/encode.c:200
 #, c-format
 msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
+msgstr "Nemohu nastavit min/max bitrate v režimu kvality\n"
 
-#: oggenc/encode.c:254
+#: 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:319 oggenc/encode.c:341
+#: 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:415
+#: 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:461
-#, fuzzy, c-format
+#: oggenc/encode.c:381
+#, c-format
 msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
-msgstr "\t[%5.1f%%] [%2dm%.2ds zbývá] %c"
+msgstr "\t[%5.1f%%] [%2dm%.2ds zbývá] %c "
 
-#: oggenc/encode.c:471
-#, fuzzy, c-format
+#: oggenc/encode.c:391
+#, c-format
 msgid "\tEncoding [%2dm%.2ds so far] %c "
-msgstr "\tKóduji [zatím %2dm%.2ds] %c"
+msgstr "\tKóduji [zatím %2dm%.2ds] %c "
 
-#: oggenc/encode.c:489
+#: oggenc/encode.c:409
 #, c-format
 msgid ""
 "\n"
@@ -894,7 +731,7 @@
 "\n"
 "Kódování souboru \"%s\" hotovo\n"
 
-#: oggenc/encode.c:491
+#: oggenc/encode.c:411
 #, c-format
 msgid ""
 "\n"
@@ -905,7 +742,7 @@
 "\n"
 "Kódování hotovo.\n"
 
-#: oggenc/encode.c:495
+#: oggenc/encode.c:415
 #, c-format
 msgid ""
 "\n"
@@ -914,17 +751,17 @@
 "\n"
 "\tDélka souboru:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:499
+#: oggenc/encode.c:419
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tStrávený čas: %dm %04.1fs\n"
 
-#: oggenc/encode.c:502
+#: oggenc/encode.c:422
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tPoměr:        %.4f\n"
 
-#: oggenc/encode.c:503
+#: oggenc/encode.c:423
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -933,7 +770,7 @@
 "\tPrůměr bitrate:  %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:540
+#: oggenc/encode.c:460
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -944,17 +781,17 @@
 "         %s%s%s \n"
 "při průměrné bitrate %d kb/s "
 
-#: oggenc/encode.c:542 oggenc/encode.c:549 oggenc/encode.c:557
-#: oggenc/encode.c:564 oggenc/encode.c:570
+#: 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:543 oggenc/encode.c:550 oggenc/encode.c:558
-#: oggenc/encode.c:565 oggenc/encode.c:571
+#: 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:548
+#: oggenc/encode.c:468
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -965,7 +802,7 @@
 "       %s%s%s \n"
 "při průměrné bitrate %d kb/s (VBR kódování povoleno)\n"
 
-#: oggenc/encode.c:556
+#: oggenc/encode.c:476
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -976,7 +813,7 @@
 "       %s%s%s \n"
 "při úrovni kvality %2.2f s použitím omezeného VBR "
 
-#: oggenc/encode.c:563
+#: oggenc/encode.c:483
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -987,7 +824,7 @@
 "       %s%s%s \n"
 "při kvalitě %2.2f\n"
 
-#: oggenc/encode.c:569
+#: oggenc/encode.c:489
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -998,7 +835,7 @@
 "       %s%s%s \n"
 "s použitím správy bitrate "
 
-#: oggenc/oggenc.c:103
+#: oggenc/oggenc.c:98
 #, c-format
 msgid ""
 "%s%s\n"
@@ -1007,96 +844,82 @@
 "%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:184
+#: 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:200
-#, fuzzy
-msgid "RAW file reader"
-msgstr "Čteč souborů WAV"
-
-#: oggenc/oggenc.c:217
+#: 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:226
+#: 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:277
+#: 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:285
+#: 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:292
-#, fuzzy, c-format
+#: oggenc/oggenc.c:278
+#, c-format
 msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
-msgstr ""
-"Název vstupního souboru nemůže být stejný jako název výstupního souboru\n"
+msgstr "CHYBA: Název vstupního souboru je stený jako název výstupního souboru \"%s\"\n"
 
-#: oggenc/oggenc.c:303
+#: 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:333
+#: 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:340
+#: oggenc/oggenc.c:326
 #, c-format
 msgid "Downmixing stereo to mono\n"
 msgstr "Mixuji stereo na mono\n"
 
-#: oggenc/oggenc.c:343
-#, fuzzy, c-format
+#: oggenc/oggenc.c:329
+#, c-format
 msgid "WARNING: Can't downmix except from stereo to mono\n"
-msgstr "CHYBA: Neumím mixovat kromě stereo do mono\n"
+msgstr "VAROVÁNÍ: Neumím mixovat kromě stereo do mono\n"
 
-#: oggenc/oggenc.c:351
+#: oggenc/oggenc.c:337
 #, c-format
 msgid "Scaling input to %f\n"
-msgstr ""
+msgstr "Měním velikost vstupu na %f\n"
 
-#: oggenc/oggenc.c:394
-#, fuzzy, c-format
+#: oggenc/oggenc.c:381
+#, c-format
 msgid ""
 "%s%s\n"
-"Usage: oggenc [options] inputfile [...]\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"
-" -k, --skeleton       Outputs ogg skeleton metadata\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"
@@ -1109,8 +932,7 @@
 "                      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"
+"                      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"
@@ -1144,21 +966,16 @@
 " 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"
-" -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"
 " -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"
@@ -1170,33 +987,23 @@
 " -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"
+"                      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"
 "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"
@@ -1207,81 +1014,77 @@
 "PŘEPÍNAČE:\n"
 " Obecné:\n"
 " -Q, --quiet          Neposílat na stderr žádný výstup\n"
-" -h, --help           Vytisknout tento text nápovědy\n"
-" -r, --raw            Přímý režim. Soubory vstupu jsou čteny přímo jako data "
-"PCM\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"
+" -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. Používá systém správy bitrate a pro většinu\n"
-"                      uživatelů se nedoporučuje.\n"
-"                      Pro lepší alternativu viz -q, --quality.\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"
 " -m, --min-bitrate    Určení minimální bitrate (v kb/s). Užitečné pro\n"
-"                      kódování pro kanál fixní propustnosti.\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.\n"
-" -q, --quality        Určení kvality mezi 0 (nízká) a 10 (vysoká),\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"
+"                      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"
 "                      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"
-"                      Kvalita -1 je také možná, ale asi není přijatelně\n"
-"                      kvalitní.\n"
+"                      Implicitní úroveň kvality je 3.\n"
 " --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"
 "                      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"
+"                      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"
 "                      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"
-" -t, --title          Název pr tuto stopu\n"
+" -t, --title          Název pro tuto stopu\n"
 " -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"
+"                      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"
+"                      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 šestnáctibitového nebo\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"
@@ -1293,412 +1096,376 @@
 " pomocí -o\n"
 "\n"
 
-#: oggenc/oggenc.c:584
+#: 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:613 oggenc/oggenc.c:735 oggenc/oggenc.c:748
+#: 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:622
+#: 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:625
+#: 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:632
+#: 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:638
+#: 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:648
-#, fuzzy, c-format
+#: oggenc/oggenc.c:631
+#, c-format
 msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Varování: Nemohu číst adresář %s.\n"
+msgstr "Varování: Nemohu zpracovat faktor škálování \"%s\"\n"
 
-#: oggenc/oggenc.c:658
+#: 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:673
+#: 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:684
+#: 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:721
+#: 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:729
+#: 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:742
+#: 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:754
+#: 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:762
+#: 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:768
+#: 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:777
+#: 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:786
+#: 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:794
+#: 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:813
+#: 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:818 oggenc/oggenc.c:822
+#: 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:829
+#: 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:834
+#: 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:845
+#: 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:850
+#: 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:857
+#: 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:879 vorbiscomment/vcomment.c:284
+#: 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:898
+#: 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:150
+#: 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:157
+#: 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:170
+#: 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:186
-#, fuzzy, c-format
-msgid ""
-"Warning: Comment %d in stream %d has invalid format, does not contain '=': "
-"\"%s\"\n"
-msgstr ""
-"Varování: Poznámka %d v proudu %d je neplatně formátovaná, neobsahuje '=': "
-"\"%s\"\n"
+#: ogginfo/ogginfo2.c:171
+#, 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"
 
-#: ogginfo/ogginfo2.c:194
+#: 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:225 ogginfo/ogginfo2.c:233
+#: 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:240
+#: 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:316
-#, 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:330
+#: 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:355 ogginfo/ogginfo2.c:522
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Varování: EOS nenastaveno v proudu %d\n"
+#: ogginfo/ogginfo2.c:318
+#, 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"
 
-#: ogginfo/ogginfo2.c:363
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Varování: Nemohu dekódovat paket hlavičky vorbis - neplatný proud vorbis (%"
-"d)\n"
+#: ogginfo/ogginfo2.c:325
+#, 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"
 
-#: ogginfo/ogginfo2.c:370
-#, fuzzy, c-format
-msgid ""
-"Warning: Theora stream %d does not have headers correctly framed. Terminal "
-"header page contains additional packets or has non-zero granulepos\n"
-msgstr ""
-"Varování: Proud vorbis %d nemá hlavičky správně umístěné v rámech. Poslední "
-"strana hlavičky obsahuje další pakety nebo má nenulovou granulepos\n"
-
-#: ogginfo/ogginfo2.c:374
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:329
+#, c-format
 msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr "Hlavičky vorbis zpracovány pro proud %d, následují informace...\n"
+msgstr "Hlavičky theora zpracovány pro proud %d, následují informace...\n"
 
-#: ogginfo/ogginfo2.c:377
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:332
+#, c-format
 msgid "Version: %d.%d.%d\n"
-msgstr "Verze: %d\n"
+msgstr "Verze: %d.%d.%d\n"
 
-#: ogginfo/ogginfo2.c:379 ogginfo/ogginfo2.c:557
+#: ogginfo/ogginfo2.c:334 ogginfo/ogginfo2.c:491
 #, c-format
 msgid "Vendor: %s\n"
 msgstr "Dodavatel: %s\n"
 
-#: ogginfo/ogginfo2.c:380
+#: ogginfo/ogginfo2.c:335
 #, c-format
 msgid "Width: %d\n"
-msgstr ""
+msgstr "Šířka: %d\n"
 
-#: ogginfo/ogginfo2.c:381
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:336
+#, c-format
 msgid "Height: %d\n"
-msgstr "Verze: %d\n"
+msgstr "Výška: %d\n"
 
-#: ogginfo/ogginfo2.c:382
+#: ogginfo/ogginfo2.c:337
 #, c-format
 msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
+msgstr "Celkový obrázek: %d krát %d, posun ořezu (%d, %d)\n"
 
-#: ogginfo/ogginfo2.c:385
+#: ogginfo/ogginfo2.c:340
 msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
+msgstr "Posun/velikost políčka neplatná: nesprávná šířka\n"
 
-#: ogginfo/ogginfo2.c:387
+#: ogginfo/ogginfo2.c:342
 msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
+msgstr "Posun políčka/velikost neplatná: nesprávná výška\n"
 
-#: ogginfo/ogginfo2.c:390
+#: ogginfo/ogginfo2.c:345
 msgid "Invalid zero framerate\n"
-msgstr ""
+msgstr "Neplatná nulová rychlost políček\n"
 
-#: ogginfo/ogginfo2.c:392
+#: ogginfo/ogginfo2.c:347
 #, c-format
 msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
+msgstr "Rychlost políček %d/%d (%.02f/s)\n"
 
-#: ogginfo/ogginfo2.c:396
+#: ogginfo/ogginfo2.c:351
 msgid "Aspect ratio undefined\n"
-msgstr ""
+msgstr "Poměr stran nedefinován\n"
 
-#: ogginfo/ogginfo2.c:401
+#: ogginfo/ogginfo2.c:356
 #, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
+msgid "Pixel aspect ratio %d:%d (1:%f)\n"
+msgstr "Poměr stran pixelu %d:%d (1:%f)\n"
 
-#: ogginfo/ogginfo2.c:403
+#: ogginfo/ogginfo2.c:358
 msgid "Frame aspect 4:3\n"
-msgstr ""
+msgstr "Poměr stran políčka 4:3\n"
 
-#: ogginfo/ogginfo2.c:405
+#: ogginfo/ogginfo2.c:360
 msgid "Frame aspect 16:9\n"
-msgstr ""
+msgstr "Poměr stran políčka 16:9\n"
 
-#: ogginfo/ogginfo2.c:407
+#: ogginfo/ogginfo2.c:362
 #, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
+msgid "Frame aspect 1:%d\n"
+msgstr "Poměr stran políčka 1:%d\n"
 
-#: ogginfo/ogginfo2.c:411
+#: ogginfo/ogginfo2.c:366
 msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
+msgstr "Prostor barev: Dop. ITU-R BT.470-6 Systém M (NTSC)\n"
 
-#: ogginfo/ogginfo2.c:413
+#: ogginfo/ogginfo2.c:368
 msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
+msgstr "Prostor barev: Dop. ITU-R BT.470-6 Systémy B a G (PAL)\n"
 
-#: ogginfo/ogginfo2.c:415
-#, fuzzy
+#: ogginfo/ogginfo2.c:370
 msgid "Colourspace unspecified\n"
-msgstr "neurčena žádná akce\n"
+msgstr "Prostor barev nedefinován\n"
 
-#: ogginfo/ogginfo2.c:418
+#: ogginfo/ogginfo2.c:373
 msgid "Pixel format 4:2:0\n"
-msgstr ""
+msgstr "Formát pixelů 4:2:0\n"
 
-#: ogginfo/ogginfo2.c:420
+#: ogginfo/ogginfo2.c:375
 msgid "Pixel format 4:2:2\n"
-msgstr ""
+msgstr "Formát pixelů 4:2:2\n"
 
-#: ogginfo/ogginfo2.c:422
+#: ogginfo/ogginfo2.c:377
 msgid "Pixel format 4:4:4\n"
-msgstr ""
+msgstr "Formát pixelů 4:4:4\n"
 
-#: ogginfo/ogginfo2.c:424
+#: ogginfo/ogginfo2.c:379
 msgid "Pixel format invalid\n"
-msgstr ""
+msgstr "Neplatný formát pixelů\n"
 
-#: ogginfo/ogginfo2.c:426
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:381
+#, c-format
 msgid "Target bitrate: %d kbps\n"
-msgstr "Vyšší bitrate: %f kb/s\n"
+msgstr "Cílová bitrate: %d kb/s\n"
 
-#: ogginfo/ogginfo2.c:427
+#: ogginfo/ogginfo2.c:382
 #, c-format
 msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
+msgstr "Nominální nastavení kvality (0-63): %d\n"
 
-#: ogginfo/ogginfo2.c:430 ogginfo/ogginfo2.c:580
+#: 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:451
-#, 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 "Varování: granulepos v proudu %d se snižuje z %I64d na %I64d"
 
-#: ogginfo/ogginfo2.c:467 ogginfo/ogginfo2.c:595
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Varování: granulepos v proudu %d se snižuje z "
+#: ogginfo/ogginfo2.c:404 ogginfo/ogginfo2.c:533
+#, c-format
+msgid "Warning: granulepos in stream %d decreases from %lld to %lld"
+msgstr "Varování: granulepos v proudu %d se snižuje z %lld na %lld"
 
-#: ogginfo/ogginfo2.c:494
+#: 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 ""
+"Proud theora %d:\n"
+"\tCelková délka dat: %I64d bajtů\n"
+"\tDélka přehrávání: %ldm:%02ld.%03lds\n"
+"\tPrůměrná bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:531
-#, 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"
+"Proud theora %d:\n"
+"\tCelková délka dat: %lld bajtů\n"
+"\tDélka přehrávání: %ldm:%02ld.%03lds\n"
+"\tPrůměrná bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:539
+#: 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:543
+#: 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:546
+#: ogginfo/ogginfo2.c:480
 #, c-format
 msgid "Version: %d\n"
 msgstr "Verze: %d\n"
 
-#: ogginfo/ogginfo2.c:550
+#: ogginfo/ogginfo2.c:484
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Dodavatel: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:558
+#: ogginfo/ogginfo2.c:492
 #, c-format
 msgid "Channels: %d\n"
 msgstr "Kanálů: %d\n"
 
-#: ogginfo/ogginfo2.c:559
+#: ogginfo/ogginfo2.c:493
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1707,78 +1474,96 @@
 "Frekvence: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:562
+#: ogginfo/ogginfo2.c:496
 #, c-format
 msgid "Nominal bitrate: %f kb/s\n"
 msgstr "Nominální bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:565
+#: ogginfo/ogginfo2.c:499
 msgid "Nominal bitrate not set\n"
 msgstr "Nominální bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:568
+#: ogginfo/ogginfo2.c:502
 #, c-format
 msgid "Upper bitrate: %f kb/s\n"
 msgstr "Vyšší bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:571
+#: ogginfo/ogginfo2.c:505
 msgid "Upper bitrate not set\n"
 msgstr "Vyšší bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:574
+#: ogginfo/ogginfo2.c:508
 #, c-format
 msgid "Lower bitrate: %f kb/s\n"
 msgstr "Nižší bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:577
+#: ogginfo/ogginfo2.c:511
 msgid "Lower bitrate not set\n"
 msgstr "Nižší bitrate nenastavena\n"
 
-#: ogginfo/ogginfo2.c:604
-#, c-format
+#: 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 v proudu vorbis mimo hlavičky. Tento soubor byl vytvořen chybným enkodérem\n"
+
+#: ogginfo/ogginfo2.c:561
 msgid ""
-"Negative or zero granulepos (%lld) on vorbis stream outside of headers. This "
-"file was created by a buggy encoder\n"
+"Vorbis stream %d:\n"
+"\tTotal data length: %I64d bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
+"Proud vorbis %d:\n"
+"\tCelková délka dat: %I64d bajtů\n"
+"\tDélka přehrávání: %ldm:%02ld.%03lds\n"
+"\tPrůměrná bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:625
+#: ogginfo/ogginfo2.c:567
+#, c-format
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %"
+"\tTotal data length: %lld bytes\n"
+"\tPlayback length: %ldm:%02ld.%03lds\n"
+"\tAverage bitrate: %f kb/s\n"
 msgstr ""
+"Proud vorbis %d:\n"
+"\tCelková délka dat: %lld bajtů\n"
+"\tDélka přehrávání: %ldm:%02ld.%03lds\n"
+"\tPrůměrná bitrate: %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:659
+#: 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:796
+#: 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:814
+#: 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:828
+#: 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 ""
+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:845
-#, fuzzy
-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í "
+#: ogginfo/ogginfo2.c:788
+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"
 
-#: ogginfo/ogginfo2.c:869
+#: ogginfo/ogginfo2.c:790
 #, c-format
+msgid "Warning: Hole in data found at approximate offset %lld bytes. Corrupted ogg.\n"
+msgstr "Varování: V datech nalezena díra na přibližném posunutí %lld bajtů. Ogg poškozen.\n"
+
+#: ogginfo/ogginfo2.c:815
+#, c-format
 msgid "Error opening input file \"%s\": %s\n"
 msgstr "Chyba při otevírání vstupního souboru \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:874
+#: ogginfo/ogginfo2.c:820
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1787,63 +1572,57 @@
 "Zpracovávám soubor \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:883
+#: ogginfo/ogginfo2.c:829
 msgid "Could not find a processor for stream, bailing\n"
 msgstr "Nemohu najít obsluhu pro proud, vzdávám to\n"
 
-#: ogginfo/ogginfo2.c:891
+#: ogginfo/ogginfo2.c:837
 msgid "Page found for stream after EOS flag"
-msgstr ""
+msgstr "Strana proudu nalezena po značce EOS"
 
-#: ogginfo/ogginfo2.c:894
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
+#: ogginfo/ogginfo2.c:840
+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:898
+#: ogginfo/ogginfo2.c:844
 msgid "Error unknown."
-msgstr ""
+msgstr "Neznámá chyba."
 
-#: ogginfo/ogginfo2.c:901
-#, fuzzy, c-format
+#: ogginfo/ogginfo2.c:847
+#, c-format
 msgid ""
 "Warning: illegally placed page(s) for logical stream %d\n"
 "This indicates a corrupt ogg file: %s.\n"
 msgstr ""
 "Varování: neplatně umístěná stránka (stránky) pro logický proud %d\n"
-"To indikuje poškozený soubor ogg.\n"
+"To indikuje poškozený soubor ogg: %s.\n"
 
-#: ogginfo/ogginfo2.c:913
+#: ogginfo/ogginfo2.c:859
 #, c-format
 msgid "New logical stream (#%d, serial: %08x): type %s\n"
 msgstr "Nový logický proud (#%d, sériové: %08x): type %s\n"
 
-#: ogginfo/ogginfo2.c:916
+#: ogginfo/ogginfo2.c:862
 #, c-format
 msgid "Warning: stream start flag not set on stream %d\n"
 msgstr "Varování: příznak začátku proudu nenastaven na proudu %d\n"
 
-#: ogginfo/ogginfo2.c:920
+#: ogginfo/ogginfo2.c:866
 #, c-format
 msgid "Warning: stream start flag found in mid-stream on stream %d\n"
 msgstr "Varování: příznak začátku proudu nalezen uvnitř proudu %d\n"
 
-#: ogginfo/ogginfo2.c:925
+#: 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:940
+#: ogginfo/ogginfo2.c:886
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Logický proud %d skončil\n"
 
-#: ogginfo/ogginfo2.c:948
+#: ogginfo/ogginfo2.c:894
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1852,15 +1631,10 @@
 "Chyba: V souboru \"%s\" nenalezena data ogg\n"
 "Vstup pravděpodobně není ogg.\n"
 
-#: ogginfo/ogginfo2.c:959
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 z %s %s\n"
-
-# FIXME: s/files1/file1/
-#: ogginfo/ogginfo2.c:965
-#, 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.ogg ... fileN.ogg]\n"
@@ -1870,26 +1644,22 @@
 "\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"
+"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"
 "Podporované přepínače:\n"
 "\t-h Zobrazit tuto zprávu nápovědy\n"
-"\t-q Být méně podrobný. Jednou odstraní detailní informativní\n"
-"\t   zprávy, dvakrát odstraní varování\n"
+"\t-q Být méně podrobný. Jeden odstraní detailní 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"
 
-#: ogginfo/ogginfo2.c:974
+#: ogginfo/ogginfo2.c:926
 #, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:987
-#, c-format
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1903,7 +1673,7 @@
 "a pro diagnostiku problémů s nimi.\n"
 "Úplná nápověda je zobrazena pomocí \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1019
+#: 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"
@@ -1963,37 +1733,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:137
+#: vcut/vcut.c:133
 #, c-format
 msgid "Page error. Corrupt input.\n"
 msgstr "Chyba strany. Poškozený vstup.\n"
 
-#: vcut/vcut.c:154
+#: vcut/vcut.c:150
 #, c-format
 msgid "Bitstream error, continuing\n"
 msgstr "Chyba bitového proudu, pokračuji\n"
 
-#: vcut/vcut.c:179
+#: 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:188
+#: 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:198
+#: 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:231
+#: 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:290
+#: vcut/vcut.c:286
 #, c-format
 msgid ""
 "ERROR: First two audio packets did not fit into one\n"
@@ -2002,58 +1772,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:303
+#: vcut/vcut.c:299
 #, c-format
 msgid "Recoverable bitstream error\n"
 msgstr "Zotavitelná chyba bitového proudu\n"
 
-#: vcut/vcut.c:313
+#: vcut/vcut.c:309
 #, c-format
 msgid "Bitstream error\n"
 msgstr "Chyba bitového proudu\n"
 
-#: vcut/vcut.c:336
+#: 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:385
+#: vcut/vcut.c:381
 #, c-format
 msgid "Input not ogg.\n"
 msgstr "Vstup není ogg.\n"
 
-#: vcut/vcut.c:395
+#: vcut/vcut.c:391
 #, c-format
 msgid "Error in first page\n"
 msgstr "Chyba v první straně\n"
 
-#: vcut/vcut.c:400
+#: vcut/vcut.c:396
 #, c-format
 msgid "error in first packet\n"
 msgstr "chyba v prvním paketu\n"
 
-#: vcut/vcut.c:406
+#: 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:426
+#: vcut/vcut.c:422
 #, c-format
 msgid "Secondary header corrupt\n"
 msgstr "Sekundární hlavička poškozena\n"
 
-#: vcut/vcut.c:439
+#: vcut/vcut.c:435
 #, c-format
 msgid "EOF in headers\n"
 msgstr "EOF v hlavičkách\n"
 
-#: vcut/vcut.c:472
-#, fuzzy, c-format
-msgid ""
-"Usage: vcut infile.ogg outfile1.ogg outfile2.ogg [cutpoint | +cutpoint]\n"
-msgstr "Použití: vcut vstup.ogg výstupní1.ogg výstupní2.ogg bodřezu\n"
+#: vcut/vcut.c:468
+#, 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"
 
-#: vcut/vcut.c:476
+#: vcut/vcut.c:472
 #, c-format
 msgid ""
 "WARNING: vcut is still experimental code.\n"
@@ -2064,459 +1833,202 @@
 "Zkontrolujte, že výstupní soubory jsou správné, před odstraněním zdrojů.\n"
 "\n"
 
-#: vcut/vcut.c:481
+#: 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:486 vcut/vcut.c:491
+#: 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:497 vcut/vcut.c:502
+#: 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:507
-#, fuzzy, c-format
+#: vcut/vcut.c:503
+#, c-format
 msgid "Processing: Cutting at %lld seconds\n"
-msgstr "Zpracovávám: Řežu na %lld\n"
+msgstr "Zpracovávám: Řežu na %lld sekundách\n"
 
-#: vcut/vcut.c:509
-#, fuzzy, c-format
+#: vcut/vcut.c:505
+#, c-format
 msgid "Processing: Cutting at %lld samples\n"
-msgstr "Zpracovávám: Řežu na %lld\n"
+msgstr "Zpracovávám: Řežu na %lld vzorcích\n"
 
-#: vcut/vcut.c:519
+#: vcut/vcut.c:515
 #, c-format
 msgid "Processing failed\n"
 msgstr "Zpracování selhalo\n"
 
-#: vcut/vcut.c:541
+#: vcut/vcut.c:537
 #, c-format
 msgid "Error reading headers\n"
 msgstr "Chyba při čtení hlaviček\n"
 
-#: vcut/vcut.c:564
+#: 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:572
+#: 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:233
+#: vorbiscomment/vcedit.c:229
 msgid "Input truncated or empty."
 msgstr "Vstup useknut nebo prázdný."
 
-#: vorbiscomment/vcedit.c:235
+#: vorbiscomment/vcedit.c:231
 msgid "Input is not an Ogg bitstream."
 msgstr "Vstup není bitový proud Ogg."
 
-#: vorbiscomment/vcedit.c:253
+#: 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:259
+#: vorbiscomment/vcedit.c:255
 msgid "Error reading initial header packet."
 msgstr "Chyba při čtení prvního paketu hlavičky."
 
-#: vorbiscomment/vcedit.c:265
+#: vorbiscomment/vcedit.c:261
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Bitový proud ogg neobsahuje data vorbis."
 
-#: vorbiscomment/vcedit.c:288
+#: vorbiscomment/vcedit.c:284
 msgid "Corrupt secondary header."
 msgstr "Poškozená sekundární hlavička."
 
-#: vorbiscomment/vcedit.c:309
+#: vorbiscomment/vcedit.c:305
 msgid "EOF before end of vorbis headers."
 msgstr "EOF před koncem hlaviček vorbis."
 
-#: vorbiscomment/vcedit.c:462
+#: vorbiscomment/vcedit.c:458
 msgid "Corrupt or missing data, continuing..."
 msgstr "Poškozená nebo chybějící data, pokračuji..."
 
-#: vorbiscomment/vcedit.c:502
-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:120 vorbiscomment/vcomment.c:146
+#: 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:165
+#: vorbiscomment/vcomment.c:153
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Špatná poznámka: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:177
+#: vorbiscomment/vcomment.c:165
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "špatná poznámka: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:187
+#: 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:204
+#: vorbiscomment/vcomment.c:192
 #, c-format
 msgid "no action specified\n"
 msgstr "neurčena žádná akce\n"
 
-#: vorbiscomment/vcomment.c:306
+#: 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:309
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:312
-#, 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 UTF-8\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:318
+#: vorbiscomment/vcomment.c:376
 #, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:319
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:322
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Špatný typ v seznamu přepínačů"
-
-#: vorbiscomment/vcomment.c:323
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:324
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:326
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:330
-#, 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:333
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:337
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:340
-#, 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:345
-#, 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:352
-#, 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:357
-#, 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:419
-#, 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:505
+#: 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:514
+#: 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:525
+#: 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:540
+#: 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:557
+#: 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:591
+#: 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:593
+#: 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:603
-#, 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žití: ogg123 [<přepínače>] <vstupní soubor> ...\n"
-#~ "\n"
-#~ "  -h, --help     tato nápověda\n"
-#~ "  -V, --version  zobrazit verzi Ogg123\n"
-#~ "  -d, --device=d používá 'd' jako výstupní zařízení\n"
-#~ "      Možná zařízení jsou ('*'=živě, '@'=soubor):\n"
-#~ "        "
-
-#, fuzzy
-#~ 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á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\n"
-#~ "  -o, --device-option=k:v předává speciální přepínač k s hodnotou\n"
-#~ "      v dříve určenému zařízení (pomocí -d). Pro více informací\n"
-#~ "      viz manuálovou stránku.\n"
-#~ "  -b n, --buffer n  používat vstupní vyrovnávací paměť 'n' kilobajtů\n"
-#~ "  -p n, --prebuffer n  načíst n%% vstupní vyrovnávací paměti před "
-#~ "přehráváním\n"
-#~ "  -v, --verbose  zobrazovat průběh a jiné stavové informace\n"
-#~ "  -q, --quiet    nezobrazovat nic (žádný název)\n"
-#~ "  -x n, --nth    přehrávat každý 'n'tý blok\n"
-#~ "  -y n, --ntimes zopakovat každý přehrávaný blok 'n'-krát\n"
-#~ "  -z, --shuffle  promíchat přehrávání\n"
-#~ "\n"
-#~ "ogg123 přeskočí na další píseň při SIGINT (Ctrl-C); dva SIGINTy v rámci\n"
-#~ "s milisekund způsobí ukončení ogg123.\n"
-#~ "  -l, --delay=s  nastavit s [milisekund] (implicitnÄ› 500).\n"
-
-#, fuzzy
-#~ msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-#~ msgstr "Varování: granulepos v proudu %d se snižuje z "
-
-#, fuzzy
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Proud vorbis %d:\n"
-#~ "\tCelková délka dat: %ld bajtů\n"
-#~ "\tDélka přehrávání: %ldm:%02lds\n"
-#~ "\tPrůměrná bitrate: %f kb/s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %lld bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Proud vorbis %d:\n"
-#~ "\tCelková délka dat: %ld bajtů\n"
-#~ "\tDélka přehrávání: %ldm:%02lds\n"
-#~ "\tPrůměrná bitrate: %f kb/s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Proud vorbis %d:\n"
-#~ "\tCelková délka dat: %ld bajtů\n"
-#~ "\tDélka přehrávání: %ldm:%02lds\n"
-#~ "\tPrůměrná bitrate: %f kb/s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %lld bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Proud vorbis %d:\n"
-#~ "\tCelková délka dat: %ld bajtů\n"
-#~ "\tDélka přehrávání: %ldm:%02lds\n"
-#~ "\tPrůměrná bitrate: %f kb/s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
-#~ "ogg.\n"
-#~ msgstr "Varování: V datech nalezena díra na přibližném posunutí "
-
-#, 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"
-
-# FIXME: should not be translatable
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
 #~ msgid "Track number:"
 #~ msgstr "Číslo stopy:"
 
@@ -2532,20 +2044,11 @@
 #~ msgid "ReplayGain (Album) Peak:"
 #~ msgstr "Vrchol ReplayGain (Album):"
 
-#~ msgid "Copyright"
-#~ msgstr "Copyright"
-
 #~ msgid "Comment:"
 #~ msgstr "Poznámka:"
 
 #~ msgid "Version is %d"
 #~ msgstr "Verze je %d"
 
-#~ msgid " to "
-#~ msgstr " do "
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid " bytes. Corrupted ogg.\n"
-#~ msgstr " bajtů. Poškozený ogg.\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/da.po
===================================================================
--- trunk/vorbis-tools/po/da.po	2008-06-22 21:07:32 UTC (rev 15057)
+++ trunk/vorbis-tools/po/da.po	2008-06-23 21:40:34 UTC (rev 15058)
@@ -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: 2007-12-30 13:57+0900\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:351
-#, 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:554 oggenc/oggenc.c:559
-#: oggenc/oggenc.c:564 oggenc/oggenc.c:569 oggenc/oggenc.c:574
-#: oggenc/oggenc.c:579
+#: 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:426
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Lykkedes"
 
-#: ogg123/cfgfile_options.c:430
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Nøgle fandtes ikke"
 
-#: ogg123/cfgfile_options.c:432
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Ingen nøgle"
 
-#: ogg123/cfgfile_options.c:434
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Fejlagtig værdi"
 
-#: ogg123/cfgfile_options.c:436
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Fejlagtig type i argumentliste"
 
-#: ogg123/cfgfile_options.c:438
+#: 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,517 +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:329
-#, 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:336
-#, 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:214
-#: 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: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:201
+#: 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:557
+#: 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:562
+#: ogg123/ogg123.c:392
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Kan ikke åbne %s.\n"
 
-#: ogg123/ogg123.c:568
+#: 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:578
+#: 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:597
+#: ogg123/ogg123.c:430
 #, c-format
 msgid "Playing: %s"
 msgstr "Spiller: %s"
 
-#: ogg123/ogg123.c:608
+#: ogg123/ogg123.c:435
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Mislykkedes at overspringe %f sekunder lyd."
 
-#: ogg123/ogg123.c:663
+#: ogg123/ogg123.c:473
 msgid "Error: Decoding failure.\n"
 msgstr "Fejl: Afkodning mislykkedes.\n"
 
-#: ogg123/ogg123.c:742
+#. 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 ogginfo/ogginfo2.c:964
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggenc/audio.c:47
+#: oggenc/audio.c:38
 msgid "WAV file reader"
 msgstr "WAV-fillæser"
 
-#: oggenc/audio.c:48
+#: oggenc/audio.c:39
 msgid "AIFF/AIFC file reader"
 msgstr "AIFF/AIFC-fillæser"
 
-#: oggenc/audio.c:50
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "WAV-fillæser"
-
-#: oggenc/audio.c:51
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "WAV-fillæser"
-
-#: oggenc/audio.c:128 oggenc/audio.c:421
-#, 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:139
+#: 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:165
-#, 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:251
-#, 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:257
-#, 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:265
-#, 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:280
-#, c-format
+#: oggenc/audio.c:253
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "Advarsel: AIFF-C-hoved afkortet.\n"
 
-#: oggenc/audio.c:294
-#, 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:301
-#, 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:307
-#, 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:313
-#, 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:350
-#, fuzzy, c-format
+#: 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:404
-#, 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:416
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -766,115 +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:453
-#, 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:462
-#, 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:524
+#: oggenc/audio.c:558
 #, c-format
 msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 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:600
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:606
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:708
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-
-#: oggenc/audio.c:726
-#, c-format
-msgid "Couldn't initialise resampler\n"
-msgstr ""
-
-#: oggenc/encode.c:63
-#, c-format
-msgid "Setting advanced encoder option \"%s\" to %s\n"
-msgstr ""
-
-#: oggenc/encode.c:100
-#, c-format
-msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
-msgstr ""
-
-#: oggenc/encode.c:103
-#, fuzzy, c-format
-msgid "Unrecognised advanced option \"%s\"\n"
-msgstr "%s: ukendt flag \"--%s\"\n"
-
-#: oggenc/encode.c:170
-#, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-
-#: oggenc/encode.c:178
-#, c-format
-msgid "Requesting a minimum or maximum bitrate requires --managed\n"
-msgstr ""
-
-#: oggenc/encode.c:196
-#, c-format
+#: oggenc/encode.c:59
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 
-#: oggenc/encode.c:240
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:242
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:254
-#, c-format
+#: oggenc/encode.c:71
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 
-#: oggenc/encode.c:319 oggenc/encode.c:341
+#: oggenc/encode.c:110
 msgid "Failed writing header to output stream\n"
 msgstr "Mislykkedes at skrive hoved til udstrømmen\n"
 
-#: oggenc/encode.c:415
+#: oggenc/encode.c:178
 msgid "Failed writing data to output stream\n"
 msgstr "Mislykkedes at skrive data til udstrømmen\n"
 
-#: oggenc/encode.c:461
-#, 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:471
-#, 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:489
+#: oggenc/encode.c:252
 #, c-format
 msgid ""
 "\n"
@@ -885,8 +694,7 @@
 "\n"
 "Kodning af \"%s\" færdig\n"
 
-#: oggenc/encode.c:491
-#, c-format
+#: oggenc/encode.c:254
 msgid ""
 "\n"
 "\n"
@@ -896,7 +704,7 @@
 "\n"
 "Kodning klar.\n"
 
-#: oggenc/encode.c:495
+#: oggenc/encode.c:258
 #, c-format
 msgid ""
 "\n"
@@ -905,17 +713,17 @@
 "\n"
 "\tFillængde:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:499
+#: oggenc/encode.c:262
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tForløbet tid: %dm %04.1fs\n"
 
-#: oggenc/encode.c:502
+#: oggenc/encode.c:265
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tHastighed:    %.4f\n"
 
-#: oggenc/encode.c:503
+#: oggenc/encode.c:266
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -924,69 +732,35 @@
 "\tGennemsnitlig bithastighed: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:540
-#, 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:542 oggenc/encode.c:549 oggenc/encode.c:557
-#: oggenc/encode.c:564 oggenc/encode.c:570
+#: oggenc/encode.c:291 oggenc/encode.c:298
 msgid "standard input"
 msgstr "standard ind"
 
-#: oggenc/encode.c:543 oggenc/encode.c:550 oggenc/encode.c:558
-#: oggenc/encode.c:565 oggenc/encode.c:571
+#: oggenc/encode.c:292 oggenc/encode.c:299
 msgid "standard output"
 msgstr "standard ud"
 
-#: oggenc/encode.c:548
-#, 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:556
-#, fuzzy, c-format
-msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at quality level %2.2f using constrained VBR "
-msgstr ""
-"Koder %s%s%s til \n"
-"         %s%s%s med kvalitet %2.2f\n"
-
-#: oggenc/encode.c:563
-#, 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:569
-#, 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
+#: oggenc/oggenc.c:90
 #, c-format
 msgid ""
 "%s%s\n"
@@ -995,157 +769,103 @@
 "%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:184
+#: 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:200
-#, fuzzy
-msgid "RAW file reader"
-msgstr "WAV-fillæser"
-
-#: oggenc/oggenc.c:217
+#: oggenc/oggenc.c:193
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Åbner med %s-modul: %s\n"
 
-#: oggenc/oggenc.c:226
+#: 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:277
-#, 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:285
+#: 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:292
-#, 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:303
+#: 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:333
-#, c-format
-msgid "Resampling input from %d Hz to %d Hz\n"
+#: oggenc/oggenc.c:316
+msgid ""
+"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:340
-#, c-format
-msgid "Downmixing stereo to mono\n"
-msgstr ""
-
-#: oggenc/oggenc.c:343
-#, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
-msgstr ""
-
-#: oggenc/oggenc.c:351
-#, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:394
+#: oggenc/oggenc.c:331
 #, fuzzy, c-format
 msgid ""
 "%s%s\n"
-"Usage: oggenc [options] inputfile [...]\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"
-" -k, --skeleton       Outputs ogg skeleton metadata\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"
+"                      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"
-" --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"
+"                      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"
-" --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"
+"                      %%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"
+" -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"
 " -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"
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
@@ -1153,34 +873,25 @@
 " -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"
+"                      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"
 "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 ""
@@ -1194,8 +905,7 @@
 " -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"
+" -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"
@@ -1213,8 +923,7 @@
 "\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, --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"
@@ -1259,576 +968,227 @@
 " tilstand går uddata til stdout hvis intet filnavn angives med -o\n"
 "\n"
 
-#: oggenc/oggenc.c:584
+#: 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:613 oggenc/oggenc.c:735 oggenc/oggenc.c:748
-#, c-format
+#: oggenc/oggenc.c:518
 msgid "Enabling bitrate management engine\n"
 msgstr ""
 
-#: oggenc/oggenc.c:622
-#, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:625
-#, c-format
-msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:632
-#, c-format
-msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:638
-#, c-format
-msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
-msgstr ""
-
-#: oggenc/oggenc.c:648
-#, fuzzy, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Kunne ikke tolke skærepunkt \"%s\"\n"
-
-#: oggenc/oggenc.c:658
-#, c-format
-msgid "No value for advanced encoder option found\n"
-msgstr ""
-
-#: oggenc/oggenc.c:673
-#, c-format
+#: oggenc/oggenc.c:522
 msgid "Internal error parsing command line options\n"
 msgstr ""
 
-#: oggenc/oggenc.c:684
+#: oggenc/oggenc.c:569
 #, c-format
-msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:721
-#, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:582
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:742
+#: oggenc/oggenc.c:594
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:754
+#: oggenc/oggenc.c:600
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr ""
 
-#: oggenc/oggenc.c:762
-#, c-format
+#: oggenc/oggenc.c:607
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:768
-#, 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:777
-#, c-format
+#: oggenc/oggenc.c:627
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:786
-#, 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:794
-#, c-format
+#: oggenc/oggenc.c:644
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:813
-#, 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:818 oggenc/oggenc.c:822
-#, 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:829
-#, 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:834
-#, 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:845
-#, 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:850
-#, 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:857
-#, c-format
+#: oggenc/oggenc.c:704
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr ""
 
-#: oggenc/oggenc.c:879 vorbiscomment/vcomment.c:284
-#, c-format
+#: oggenc/oggenc.c:726
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:898
-#, c-format
+#: oggenc/oggenc.c:745
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 
-#: oggenc/platform.c:150
+#: 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:157
+#: oggenc/platform.c:146
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr ""
 
-#: oggenc/platform.c:170
+#: oggenc/platform.c:157
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:186
+#: 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:194
+#: 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:225 ogginfo/ogginfo2.c:233
+#: ogginfo/ogginfo.c:68
 #, c-format
-msgid ""
-"Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker "
-"wrong\n"
-msgstr ""
+msgid "vendor=%s\n"
+msgstr "leverandør=%s\n"
 
-#: ogginfo/ogginfo2.c:240
+#: 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 ""
+"version=%d\n"
+"kanaler=%d\n"
+"hastighed=%ld\n"
 
-#: ogginfo/ogginfo2.c:316
-#, 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:330
-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:355 ogginfo/ogginfo2.c:522
-#, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr ""
+#: ogginfo/ogginfo.c:81
+msgid "bitrate_nominal="
+msgstr "nominel bithastighed="
 
-#: ogginfo/ogginfo2.c:363
-#, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
+#: ogginfo/ogginfo.c:87
+msgid "bitrate_lower="
+msgstr "nedre bithastighed="
 
-#: ogginfo/ogginfo2.c:370
+#: 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:374
+#: ogginfo/ogginfo.c:100
 #, c-format
-msgid "Theora headers parsed for stream %d, information follows...\n"
-msgstr ""
+msgid "bitrate_average=%ld\n"
+msgstr "gennemsnitlig bithastighed=%ld\n"
 
-#: ogginfo/ogginfo2.c:377
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Version: %s"
-
-#: ogginfo/ogginfo2.c:379 ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
-msgid "Vendor: %s\n"
-msgstr "leverandør=%s\n"
-
-#: ogginfo/ogginfo2.c:380
+#: ogginfo/ogginfo.c:101
 #, c-format
-msgid "Width: %d\n"
-msgstr ""
+msgid "length=%f\n"
+msgstr "længde=%f\n"
 
-#: ogginfo/ogginfo2.c:381
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Version: %s"
-
-#: ogginfo/ogginfo2.c:382
+#: ogginfo/ogginfo.c:102
 #, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
+msgid "playtime=%ld:%02ld\n"
+msgstr "spilletid=%ld:%02ld\n"
 
-#: ogginfo/ogginfo2.c:385
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:387
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:390
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:392
+#: ogginfo/ogginfo.c:300
 #, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
+msgid "Unable to open \"%s\": %s\n"
+msgstr "Kan ikke åbne \"%s\": %s\n"
 
-#: ogginfo/ogginfo2.c:396
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:401
+#: ogginfo/ogginfo.c:319
 #, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:403
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:405
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:415
-msgid "Colourspace unspecified\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:420
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:424
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:426
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:430 ogginfo/ogginfo2.c:580
-msgid "User comments section follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:451
-msgid "Warning: Expected frame %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:467 ogginfo/ogginfo2.c:595
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:494
 msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:531
-#, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:539
-#, 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:543
-#, c-format
-msgid "Vorbis headers parsed for stream %d, information follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:546
-#, fuzzy, c-format
-msgid "Version: %d\n"
-msgstr "Version: %s"
-
-#: ogginfo/ogginfo2.c:550
-#, fuzzy, c-format
-msgid "Vendor: %s (%s)\n"
-msgstr "leverandør=%s\n"
-
-#: ogginfo/ogginfo2.c:558
-#, c-format
-msgid "Channels: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:559
-#, fuzzy, c-format
-msgid ""
-"Rate: %ld\n"
 "\n"
-msgstr "Dato: %s"
-
-#: ogginfo/ogginfo2.c:562
-#, fuzzy, c-format
-msgid "Nominal bitrate: %f kb/s\n"
+"serial=%ld\n"
 msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:565
-msgid "Nominal bitrate not set\n"
+#: ogginfo/ogginfo.c:320
+msgid "header_integrity=pass\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:568
-#, fuzzy, c-format
-msgid "Upper bitrate: %f kb/s\n"
+#: ogginfo/ogginfo.c:323
+msgid "header_integrity=fail\n"
 msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:571
-msgid "Upper bitrate not set\n"
+#: ogginfo/ogginfo.c:328
+msgid "stream_integrity=pass\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:574
-#, fuzzy, c-format
-msgid "Lower bitrate: %f kb/s\n"
+#: ogginfo/ogginfo.c:331
+msgid "stream_integrity=fail\n"
 msgstr ""
-"\tGennemsnitlig bithastighed: %.1f kb/s\n"
-"\n"
 
-#: ogginfo/ogginfo2.c:577
-msgid "Lower bitrate not set\n"
+#: ogginfo/ogginfo.c:334
+msgid "stream_truncated=false\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:604
-#, 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:625
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:659
+#: ogginfo/ogginfo.c:344
 #, c-format
-msgid "Warning: EOS not set on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:796
-msgid "Warning: Invalid header page, no packet found\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:814
-#, c-format
-msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:828
-#, 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:845
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:869
-#, fuzzy, c-format
-msgid "Error opening input file \"%s\": %s\n"
-msgstr "Fejl ved åbning af indfil \"%s\".\n"
-
-#: ogginfo/ogginfo2.c:874
-#, fuzzy, c-format
-msgid ""
-"Processing file \"%s\"...\n"
 "\n"
+"total_length=%f\n"
 msgstr ""
-"\n"
-"\n"
-"Kodning af \"%s\" færdig\n"
 
-#: ogginfo/ogginfo2.c:883
-#, fuzzy
-msgid "Could not find a processor for stream, bailing\n"
-msgstr "Kunne ikke åbne %s for læsning\n"
-
-#: ogginfo/ogginfo2.c:891
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:894
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:898
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:901
+#: 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:913
-#, c-format
-msgid "New logical stream (#%d, serial: %08x): type %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:916
-#, c-format
-msgid "Warning: stream start flag not set on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:920
-#, c-format
-msgid "Warning: stream start flag found in mid-stream on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:925
-#, 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:940
-#, c-format
-msgid "Logical stream %d ended\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:948
-#, c-format
-msgid ""
-"Error: No ogg data found in file \"%s\".\n"
-"Input probably not ogg.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:959
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 fra %s %s\n"
-
-#: ogginfo/ogginfo2.c:965
-#, c-format
-msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
-"\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"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:974
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:987
-#, c-format
-msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\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:1019
-#, 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"
@@ -1849,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"
@@ -1869,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"
@@ -1884,96 +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:137
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr ""
 
-#: vcut/vcut.c:154
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr ""
 
-#: vcut/vcut.c:179
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr ""
 
-#: vcut/vcut.c:188
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr ""
 
-#: vcut/vcut.c:198
-#, 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:231
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr ""
 
-#: vcut/vcut.c:290
-#, 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:303
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr ""
 
-#: vcut/vcut.c:313
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr ""
 
-#: vcut/vcut.c:336
-#, c-format
+#: vcut/vcut.c:330
 msgid "Update sync returned 0, setting eos\n"
 msgstr ""
 
-#: vcut/vcut.c:385
-#, c-format
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "Inddata ikke ogg.\n"
 
-#: vcut/vcut.c:395
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Fejl på første side\n"
 
-#: vcut/vcut.c:400
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "fejl i første pakke\n"
 
-#: vcut/vcut.c:406
-#, 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:426
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Sekundært hoved fejlagtigt\n"
 
-#: vcut/vcut.c:439
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "EOF i hoved\n"
 
-#: vcut/vcut.c:472
-#, 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:476
-#, 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"
@@ -1983,472 +1333,166 @@
 "Undersøg resultatet inden kilderne slettes.\n"
 "\n"
 
-#: vcut/vcut.c:481
+#: 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:486 vcut/vcut.c:491
+#: 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:497 vcut/vcut.c:502
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr "Kunne ikke tolke skærepunkt \"%s\"\n"
 
-#: vcut/vcut.c:507
+#: vcut/vcut.c:484
 #, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+msgid "Processing: Cutting at %lld\n"
 msgstr ""
 
-#: vcut/vcut.c:509
-#, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr ""
-
-#: vcut/vcut.c:519
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr ""
 
-#: vcut/vcut.c:541
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr ""
 
-#: vcut/vcut.c:564
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr ""
 
-#: vcut/vcut.c:572
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr ""
 
-#: vorbiscomment/vcedit.c:233
+#: vorbiscomment/vcedit.c:214
 msgid "Input truncated or empty."
 msgstr "Inddata trunkeret eller tomt."
 
-#: vorbiscomment/vcedit.c:235
+#: vorbiscomment/vcedit.c:216
 msgid "Input is not an Ogg bitstream."
 msgstr "Inddata er ikke en Ogg-bitstrøm."
 
-#: vorbiscomment/vcedit.c:253
+#: vorbiscomment/vcedit.c:232
 msgid "Error reading first page of Ogg bitstream."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:259
+#: vorbiscomment/vcedit.c:238
 msgid "Error reading initial header packet."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:265
+#: vorbiscomment/vcedit.c:244
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr "Ogg-bitstrøm indeholder ikke vorbisdata."
 
-#: vorbiscomment/vcedit.c:288
+#: vorbiscomment/vcedit.c:267
 msgid "Corrupt secondary header."
 msgstr "Fejlagtigt sekundær-hoved."
 
-#: vorbiscomment/vcedit.c:309
+#: vorbiscomment/vcedit.c:288
 msgid "EOF before end of vorbis headers."
 msgstr "EOF før slutningen på vorbis-hovedet."
 
-#: vorbiscomment/vcedit.c:462
+#: vorbiscomment/vcedit.c:444
 msgid "Corrupt or missing data, continuing..."
 msgstr "Data ødelagt eller mangler, fortsætter..."
 
-#: vorbiscomment/vcedit.c:502
-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:120 vorbiscomment/vcomment.c:146
+#: 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:165
+#: vorbiscomment/vcomment.c:138
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Fejlagtig kommentar: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:177
+#: vorbiscomment/vcomment.c:150
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "fejlagtig kommentar: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:187
+#: 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:204
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:173
 msgid "no action specified\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:306
-#, 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:309
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:312
-#, 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:318
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:319
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:322
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Fejlagtig type i argumentliste"
-
-#: vorbiscomment/vcomment.c:323
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:324
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:326
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:330
-#, 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:333
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:337
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:340
-#, 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:345
-#, 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:352
-#, 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:357
-#, 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:419
-#, c-format
+#: vorbiscomment/vcomment.c:339
 msgid "Internal error parsing command options\n"
 msgstr "Intern fejl ved tolkning af kommandoflag\n"
 
-#: vorbiscomment/vcomment.c:505
+#: vorbiscomment/vcomment.c:422
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr "Fejl ved åbning af indfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:514
+#: vorbiscomment/vcomment.c:438
 #, c-format
-msgid "Input filename may not be the same as output filename\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:525
-#, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr "Fejl ved åbning af udfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:540
+#: vorbiscomment/vcomment.c:453
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr "Fejl ved åbning af kommentarfil \"%s\".\n"
 
-#: vorbiscomment/vcomment.c:557
+#: vorbiscomment/vcomment.c:470
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr "Fejl ved åbning af kommentarfil \"%s\"\n"
-
-#: vorbiscomment/vcomment.c:591
-#, fuzzy, c-format
-msgid "Error removing old file %s\n"
-msgstr "Fejl ved åbning af kommentarfil \"%s\"\n"
-
-#: vorbiscomment/vcomment.c:593
-#, fuzzy, c-format
-msgid "Error renaming %s to %s\n"
-msgstr "Fejl ved åbning af indfil \"%s\".\n"
-
-#: vorbiscomment/vcomment.c:603
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Fejl ved åbning af kommentarfil \"%s\"\n"
-
-#, fuzzy
-#~ 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 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"
-#~ "        "
-
-#, fuzzy
-#~ 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=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"
-
-#, 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 ""
-#~ "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"
-
-#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
-#~ msgstr "Kunne ikke konvertere til UTF8, kan ikke tilføje\n"
-
-#~ msgid "Internal error: long option given when none expected.\n"
-#~ msgstr "Intern fejl: langt flag brugt når det ikke forventedes.\n"
-
-#~ 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"
-
-#~ 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"

Added: trunk/vorbis-tools/po/en_GB.po
===================================================================
--- trunk/vorbis-tools/po/en_GB.po	                        (rev 0)
+++ trunk/vorbis-tools/po/en_GB.po	2008-06-23 21:40:34 UTC (rev 15058)
@@ -0,0 +1,1745 @@
+# The translation of vorbis-tools messages to British English
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Gareth Owen <gowen72 at yahoo.com>, 2004
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vorbis-tools 1.0\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: 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:344
+msgid "Error: Could not allocate memory in malloc_buffer_stats()\n"
+msgstr "Error: Could not allocate memory in malloc_buffer_stats()\n"
+
+#: 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: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:76
+#, c-format
+msgid "Error: Unsupported option value to %s device.\n"
+msgstr "Error: Unsupported option value to %s device.\n"
+
+#: ogg123/callbacks.c:80
+#, c-format
+msgid "Error: Cannot open device %s.\n"
+msgstr "Error: Cannot open device %s.\n"
+
+#: ogg123/callbacks.c:84
+#, c-format
+msgid "Error: Device %s failure.\n"
+msgstr "Error: Device %s failure.\n"
+
+#: 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:90
+#, c-format
+msgid "Error: Cannot open file %s for writing.\n"
+msgstr "Error: Cannot open file %s for writing.\n"
+
+#: ogg123/callbacks.c:94
+#, c-format
+msgid "Error: File %s already exists.\n"
+msgstr "Error: File %s already exists.\n"
+
+#: 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: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: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: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: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:51
+msgid "System error"
+msgstr "System error"
+
+#: 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"
+
+#. Column headers
+#. Name
+#: ogg123/cfgfile_options.c:130
+msgid "Name"
+msgstr "Name"
+
+#. Description
+#: ogg123/cfgfile_options.c:133
+msgid "Description"
+msgstr "Description"
+
+#. Type
+#: ogg123/cfgfile_options.c:136
+msgid "Type"
+msgstr "Type"
+
+#. Default
+#: ogg123/cfgfile_options.c:139
+msgid "Default"
+msgstr "Default"
+
+#: ogg123/cfgfile_options.c:165
+msgid "none"
+msgstr "none"
+
+#: ogg123/cfgfile_options.c:168
+msgid "bool"
+msgstr "bool"
+
+#: ogg123/cfgfile_options.c:171
+msgid "char"
+msgstr "char"
+
+#: ogg123/cfgfile_options.c:174
+msgid "string"
+msgstr "string"
+
+#: ogg123/cfgfile_options.c:177
+msgid "int"
+msgstr "int"
+
+#: ogg123/cfgfile_options.c:180
+msgid "float"
+msgstr "float"
+
+#: ogg123/cfgfile_options.c:183
+msgid "double"
+msgstr "double"
+
+#: ogg123/cfgfile_options.c:186
+msgid "other"
+msgstr "other"
+
+#: ogg123/cfgfile_options.c:192
+msgid "(NULL)"
+msgstr "(NULL)"
+
+#: 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:422
+msgid "Success"
+msgstr "Success"
+
+#: ogg123/cfgfile_options.c:426
+msgid "Key not found"
+msgstr "Key not found"
+
+#: ogg123/cfgfile_options.c:428
+msgid "No key"
+msgstr "No key"
+
+#: ogg123/cfgfile_options.c:430
+msgid "Bad value"
+msgstr "Bad value"
+
+#: ogg123/cfgfile_options.c:432
+msgid "Bad type in options list"
+msgstr "Bad type in options list"
+
+#: ogg123/cfgfile_options.c:434
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: 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: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:93
+#, c-format
+msgid ""
+"=== Error \"%s\" while parsing config option from command line.\n"
+"=== Option was: %s\n"
+msgstr ""
+"=== Error \"%s\" while parsing config option from command line.\n"
+"=== Option was: %s\n"
+
+#. not using the status interface here
+#: ogg123/cmdline_options.c:100
+msgid "Available options:\n"
+msgstr "Available options:\n"
+
+#: ogg123/cmdline_options.c:109
+#, c-format
+msgid "=== No such device %s.\n"
+msgstr "=== No such device %s.\n"
+
+#: 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: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:149
+#, c-format
+msgid "=== Incorrect option format: %s.\n"
+msgstr "=== Incorrect option format: %s.\n"
+
+#: 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:179
+#, c-format
+msgid "ogg123 from %s %s\n"
+msgstr "ogg123 from %s %s\n"
+
+#: ogg123/cmdline_options.c:186
+msgid "--- Cannot play every 0th chunk!\n"
+msgstr "--- Cannot play every 0th chunk!\n"
+
+#: 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 ""
+"--- Cannot play every chunk 0 times.\n"
+"--- To do a test decode, use the null output driver.\n"
+
+#: 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: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: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:258
+#, c-format
+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"
+"        "
+
+#: ogg123/cmdline_options.c:279
+#, c-format
+msgid ""
+"  -f, --file=filename  Set the output filename for a previously\n"
+"      specified file device (with -d).\n"
+"  -k n, --skip n  Skip the first 'n' seconds\n"
+"  -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/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: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:137
+msgid "Error: Could not set signal mask."
+msgstr "Error: Could not set signal mask."
+
+#: ogg123/http_transport.c:191
+msgid "Error: Unable to create input buffer.\n"
+msgstr "Error: Unable to create input buffer.\n"
+
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:75
+msgid "default output device"
+msgstr "default output device"
+
+#: ogg123/ogg123.c:77
+msgid "shuffle playlist"
+msgstr "shuffle playlist"
+
+#: ogg123/ogg123.c:261
+#, c-format
+msgid ""
+"\n"
+"Audio Device:   %s"
+msgstr ""
+"\n"
+"Audio Device:   %s"
+
+#: ogg123/ogg123.c:262
+#, c-format
+msgid "Author:   %s"
+msgstr "Author:   %s"
+
+#: ogg123/ogg123.c:263
+#, c-format
+msgid "Comments: %s"
+msgstr "Comments: %s"
+
+#: 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:341
+msgid "Error: Could not create audio buffer.\n"
+msgstr "Error: Could not create audio buffer.\n"
+
+#: 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:434
+#, c-format
+msgid "Cannot open %s.\n"
+msgstr "Cannot open %s.\n"
+
+#: 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: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:469
+#, c-format
+msgid "Playing: %s"
+msgstr "Playing: %s"
+
+#: 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:512
+msgid "Error: Decoding failure.\n"
+msgstr "Error: Decoding failure.\n"
+
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:585
+msgid "Done."
+msgstr "Done."
+
+#: 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:173
+msgid "=== Vorbis library reported a stream error.\n"
+msgstr "=== Vorbis library reported a stream error.\n"
+
+#: ogg123/oggvorbis_format.c:402
+#, c-format
+msgid "Version is %d"
+msgstr "Version is %d"
+
+#: 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: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: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: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: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:47
+#, c-format
+msgid "%sPrebuf to %.1f%%"
+msgstr "%sPrebuf to %.1f%%"
+
+#: ogg123/status.c:52
+#, c-format
+msgid "%sPaused"
+msgstr "%sPaused"
+
+#: ogg123/status.c:56
+#, c-format
+msgid "%sEOS"
+msgstr "%sEOS"
+
+#: 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:198
+#, c-format
+msgid "File: %s"
+msgstr "File: %s"
+
+#: ogg123/status.c:204
+#, c-format
+msgid "Time: %s"
+msgstr "Time: %s"
+
+#: ogg123/status.c:232
+#, c-format
+msgid "of %s"
+msgstr "of %s"
+
+#: ogg123/status.c:252
+#, c-format
+msgid "Avg bitrate: %5.1f"
+msgstr "Avg bitrate: %5.1f"
+
+#: ogg123/status.c:258
+#, c-format
+msgid " Input Buffer %5.1f%%"
+msgstr " Input Buffer %5.1f%%"
+
+#: ogg123/status.c:277
+#, c-format
+msgid " Output Buffer %5.1f%%"
+msgstr " Output Buffer %5.1f%%"
+
+#: 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"
+
+#: oggenc/audio.c:39
+msgid "WAV file reader"
+msgstr "WAV file reader"
+
+#: oggenc/audio.c:40
+msgid "AIFF/AIFC file reader"
+msgstr "AIFF/AIFC file reader"
+
+#: 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:128
+#, c-format
+msgid "Skipping chunk of type \"%s\", length %d\n"
+msgstr "Skipping chunk of type \"%s\", length %d\n"
+
+#: oggenc/audio.c:146
+msgid "Warning: Unexpected EOF in AIFF chunk\n"
+msgstr "Warning: Unexpected EOF in AIFF chunk\n"
+
+#: 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:237
+msgid "Warning: Truncated common chunk in AIFF header\n"
+msgstr "Warning: Truncated common chunk in AIFF header\n"
+
+#: 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:258
+msgid "Warning: AIFF-C header truncated.\n"
+msgstr "Warning: AIFF-C header truncated.\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:270
+msgid "Warning: No SSND chunk found in AIFF file\n"
+msgstr "Warning: No SSND chunk found in AIFF file\n"
+
+#: 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:282
+msgid "Warning: Unexpected EOF reading AIFF header\n"
+msgstr "Warning: Unexpected EOF reading AIFF header\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 ""
+"Warning: OggEnc does not support this type of AIFF/AIFC file\n"
+" Must be 8 or 16 bit PCM.\n"
+
+#: 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:369
+msgid ""
+"Warning: INVALID format chunk in wav header.\n"
+" Trying to read anyway (may not work)...\n"
+msgstr ""
+"Warning: INVALID format chunk in wav header.\n"
+" Trying to read anyway (may not work)...\n"
+
+#: oggenc/audio.c:406
+msgid ""
+"ERROR: Wav file is unsupported type (must be standard 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:455
+msgid ""
+"ERROR: Wav file is unsupported subformat (must be 16 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: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:625
+msgid "Couldn't initialise resampler\n"
+msgstr "Couldn't initialise resampler\n"
+
+#: 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: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:103
+#, c-format
+msgid "Unrecognised advanced option \"%s\"\n"
+msgstr "Unrecognised advanced option \"%s\"\n"
+
+#: 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:141
+msgid "Requesting a minimum or maximum bitrate requires --managed\n"
+msgstr "Requesting a minimum or maximum bitrate requires --managed\n"
+
+#: 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:183
+msgid "Mode initialisation failed: invalid parameters for bitrate\n"
+msgstr "Mode initialisation failed: invalid parameters for bitrate\n"
+
+#: oggenc/encode.c:237
+msgid "Failed writing header to output stream\n"
+msgstr "Failed writing header to output stream\n"
+
+#: oggenc/encode.c:303
+msgid "Failed writing data to output stream\n"
+msgstr "Failed writing data to output stream\n"
+
+#: 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:359
+#, c-format
+msgid "\tEncoding [%2dm%.2ds so far] %c"
+msgstr "\tEncoding [%2dm%.2ds so far] %c"
+
+#: oggenc/encode.c:377
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Done encoding file \"%s\"\n"
+msgstr ""
+"\n"
+"\n"
+"Done encoding file \"%s\"\n"
+
+#: oggenc/encode.c:379
+msgid ""
+"\n"
+"\n"
+"Done encoding.\n"
+msgstr ""
+"\n"
+"\n"
+"Done encoding.\n"
+
+#: oggenc/encode.c:383
+#, c-format
+msgid ""
+"\n"
+"\tFile length:  %dm %04.1fs\n"
+msgstr ""
+"\n"
+"\tFile length:  %dm %04.1fs\n"
+
+#: oggenc/encode.c:387
+#, c-format
+msgid "\tElapsed time: %dm %04.1fs\n"
+msgstr "\tElapsed time: %dm %04.1fs\n"
+
+#: oggenc/encode.c:390
+#, c-format
+msgid "\tRate:         %.4f\n"
+msgstr "\tRate:         %.4f\n"
+
+#: oggenc/encode.c:391
+#, c-format
+msgid ""
+"\tAverage bitrate: %.1f kb/s\n"
+"\n"
+msgstr ""
+"\tAverage bitrate: %.1f kb/s\n"
+"\n"
+
+#: oggenc/encode.c:428
+#, c-format
+msgid ""
+"Encoding %s%s%s to \n"
+"         %s%s%s \n"
+"at average bitrate %d kbps "
+msgstr ""
+"Encoding %s%s%s to \n"
+"         %s%s%s \n"
+"at average bitrate %d kbps "
+
+#: 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: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:436
+#, c-format
+msgid ""
+"Encoding %s%s%s to \n"
+"         %s%s%s \n"
+"at approximate bitrate %d kbps (VBR encoding enabled)\n"
+msgstr ""
+"Encoding %s%s%s to \n"
+"         %s%s%s \n"
+"at approximate bitrate %d kbps (VBR encoding enabled)\n"
+
+#: oggenc/encode.c:444
+#, c-format
+msgid ""
+"Encoding %s%s%s to \n"
+"         %s%s%s \n"
+"at quality level %2.2f using constrained VBR "
+msgstr ""
+"Encoding %s%s%s to \n"
+"         %s%s%s \n"
+"at quality level %2.2f using constrained VBR "
+
+#: oggenc/encode.c:451
+#, c-format
+msgid ""
+"Encoding %s%s%s to \n"
+"         %s%s%s \n"
+"at quality %2.2f\n"
+msgstr ""
+"Encoding %s%s%s to \n"
+"         %s%s%s \n"
+"at quality %2.2f\n"
+
+#: oggenc/encode.c:457
+#, c-format
+msgid ""
+"Encoding %s%s%s to \n"
+"         %s%s%s \n"
+"using bitrate management "
+msgstr ""
+"Encoding %s%s%s to \n"
+"         %s%s%s \n"
+"using bitrate management "
+
+#: 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:111
+msgid "ERROR: Multiple files specified when using stdin\n"
+msgstr "ERROR: Multiple files specified when using stdin\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:172
+#, c-format
+msgid "ERROR: Cannot open input file \"%s\": %s\n"
+msgstr "ERROR: Cannot open input file \"%s\": %s\n"
+
+#: oggenc/oggenc.c:200
+#, c-format
+msgid "Opening with %s module: %s\n"
+msgstr "Opening with %s module: %s\n"
+
+#: 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:259
+msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
+msgstr "WARNING: No filename, defaulting to \"default.ogg\"\n"
+
+#: 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"
+
+#: 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: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:315
+msgid "Downmixing stereo to mono\n"
+msgstr "Downmixing 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:365
+#, 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"
+" -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"
+
+#: 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:562 oggenc/oggenc.c:670 oggenc/oggenc.c:683
+msgid "Enabling bitrate management engine\n"
+msgstr "Enabling bitrate management engine\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:574
+#, c-format
+msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
+msgstr "WARNING: Couldn't read endianness argument \"%s\"\n"
+
+#: 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: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:599
+msgid "No value for advanced encoder option found\n"
+msgstr "No value for advanced encoder option found\n"
+
+#: oggenc/oggenc.c:610
+msgid "Internal error parsing command line options\n"
+msgstr "Internal error parsing command line options\n"
+
+#: 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:656
+#, c-format
+msgid "Warning: nominal bitrate \"%s\" not recognised\n"
+msgstr "Warning: nominal bitrate \"%s\" not recognised\n"
+
+#: 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:677
+#, c-format
+msgid "Warning: maximum bitrate \"%s\" not recognised\n"
+msgstr "Warning: maximum bitrate \"%s\" not recognised\n"
+
+#: 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: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:703
+msgid "WARNING: Multiple name formats specified, using final\n"
+msgstr "WARNING: Multiple name formats specified, using final\n"
+
+#: 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: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:729
+msgid "WARNING: Multiple output files specified, suggest using -n\n"
+msgstr "WARNING: Multiple output files specified, suggest using -n\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"
+
+#. 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: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"
+
+#. 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: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"
+
+#. 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:789
+msgid "WARNING: Unknown option specified, ignoring->\n"
+msgstr "WARNING: Unknown option specified, ignoring->\n"
+
+#: 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:830
+msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
+msgstr "WARNING: Insufficient titles specified, defaulting to final title.\n"
+
+#: 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: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: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:156
+#, c-format
+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:164
+#, 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:168
+#, 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:171
+#, c-format
+msgid "Version: %d\n"
+msgstr "Version: %d\n"
+
+#: ogginfo/ogginfo2.c:175
+#, c-format
+msgid "Vendor: %s (%s)\n"
+msgstr "Vendor: %s (%s)\n"
+
+#: 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:184
+#, c-format
+msgid ""
+"Rate: %ld\n"
+"\n"
+msgstr ""
+"Rate: %ld\n"
+"\n"
+
+#: ogginfo/ogginfo2.c:187
+#, c-format
+msgid "Nominal bitrate: %f kb/s\n"
+msgstr "Nominal bitrate: %f kb/s\n"
+
+#: ogginfo/ogginfo2.c:190
+msgid "Nominal bitrate not set\n"
+msgstr "Nominal bitrate not set\n"
+
+#: ogginfo/ogginfo2.c:193
+#, c-format
+msgid "Upper bitrate: %f kb/s\n"
+msgstr "Upper bitrate: %f kb/s\n"
+
+#: ogginfo/ogginfo2.c:196
+msgid "Upper bitrate not set\n"
+msgstr "Upper bitrate not set\n"
+
+#: ogginfo/ogginfo2.c:199
+#, c-format
+msgid "Lower bitrate: %f kb/s\n"
+msgstr "Lower bitrate: %f kb/s\n"
+
+#: ogginfo/ogginfo2.c:202
+msgid "Lower bitrate not set\n"
+msgstr "Lower bitrate not set\n"
+
+#: ogginfo/ogginfo2.c:205
+msgid "User comments section follows...\n"
+msgstr "User comments section follows...\n"
+
+#: ogginfo/ogginfo2.c:217
+#, c-format
+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: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:257 ogginfo/ogginfo2.c:266
+#, 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"
+
+#: ogginfo/ogginfo2.c:274
+#, 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:335
+#, c-format
+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: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:364
+#, c-format
+msgid "Warning: granulepos in stream %d decreases from "
+msgstr "Warning: granulepos in stream %d decreases from "
+
+#: ogginfo/ogginfo2.c:365
+msgid " to "
+msgstr " to "
+
+#: ogginfo/ogginfo2.c:365
+msgid "\n"
+msgstr "\n"
+
+#: ogginfo/ogginfo2.c:384
+#, c-format
+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"
+
+#: 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:537
+msgid "Warning: Invalid header page, no packet found\n"
+msgstr "Warning: Invalid header page, no packet found\n"
+
+#: 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:574
+msgid "Warning: Hole in data found at approximate offset "
+msgstr "Warning: Hole in data found at approximate offset "
+
+#: 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:604
+#, c-format
+msgid ""
+"Processing file \"%s\"...\n"
+"\n"
+msgstr ""
+"Processing file \"%s\"...\n"
+"\n"
+
+#: 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:618
+#, c-format
+msgid ""
+"Warning: illegally placed page(s) for logical stream %d\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: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: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: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: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"
+
+#: ogginfo/ogginfo2.c:652
+#, c-format
+msgid "Logical stream %d ended\n"
+msgstr "Logical stream %d ended\n"
+
+#: ogginfo/ogginfo2.c:659
+#, c-format
+msgid ""
+"Error: No ogg data found in file \"%s\".\n"
+"Input probably not ogg.\n"
+msgstr ""
+"Error: No ogg data found in file \"%s\".\n"
+"Input probably not ogg.\n"
+
+#: ogginfo/ogginfo2.c:670
+msgid ""
+"ogginfo 1.0\n"
+"(c) 2002 Michael Smith <msmith at labyrinth.net.au>\n"
+"\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"
+"\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"
+
+#: ogginfo/ogginfo2.c:691
+msgid ""
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\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 ""
+"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\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"
+
+#: ogginfo/ogginfo2.c:720
+msgid "No input files specified. \"ogginfo -h\" for help\n"
+msgstr "No input files specified. \"ogginfo -h\" for help\n"
+
+#: share/getopt.c:673
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: option `%s' is ambiguous\n"
+
+#: share/getopt.c:698
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: option `--%s' doesn't allow an argument\n"
+
+#: share/getopt.c:703
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: option `%c%s' doesn't allow an argument\n"
+
+#: share/getopt.c:721 share/getopt.c:894
+#, c-format
+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"
+msgstr "%s: illegal option -- %c\n"
+
+#: share/getopt.c:783
+#, c-format
+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"
+msgstr "%s: option requires an argument -- %c\n"
+
+#: share/getopt.c:860
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: option `-W %s' is ambiguous\n"
+
+#: share/getopt.c:878
+#, c-format
+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:131
+msgid "Page error. Corrupt input.\n"
+msgstr "Page error. Corrupt input.\n"
+
+#: vcut/vcut.c:148
+msgid "Bitstream error, continuing\n"
+msgstr "Bitstream error, continuing\n"
+
+#: vcut/vcut.c:173
+msgid "Found EOS before cut point.\n"
+msgstr "Found EOS before cut point.\n"
+
+#: vcut/vcut.c:182
+msgid "Setting eos: update sync returned 0\n"
+msgstr "Setting eos: update sync returned 0\n"
+
+#: 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:225
+msgid "Unhandled special case: first file too short?\n"
+msgstr "Unhandled special case: first file too short?\n"
+
+#. Might this happen for _really_ high bitrate modes, if we're
+#. * spectacularly unlucky? Doubt it, but let's check for it just
+#. * in case.
+#.
+#: vcut/vcut.c:284
+msgid ""
+"ERROR: First two audio packets did not fit into one\n"
+"       ogg page. File may not decode correctly.\n"
+msgstr ""
+"ERROR: First two audio packets did not fit into one\n"
+"       ogg page. File may not decode correctly.\n"
+
+#: vcut/vcut.c:297
+msgid "Recoverable bitstream error\n"
+msgstr "Recoverable bitstream error\n"
+
+#: vcut/vcut.c:307
+msgid "Bitstream error\n"
+msgstr "Bitstream error\n"
+
+#: 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:386
+msgid "Error in first page\n"
+msgstr "Error in first page\n"
+
+#: vcut/vcut.c:391
+msgid "error in first packet\n"
+msgstr "error in first packet\n"
+
+#: vcut/vcut.c:397
+msgid "Error in primary header: not vorbis?\n"
+msgstr "Error in primary header: not vorbis?\n"
+
+#: vcut/vcut.c:417
+msgid "Secondary header corrupt\n"
+msgstr "Secondary header corrupt\n"
+
+#: vcut/vcut.c:430
+msgid "EOF in headers\n"
+msgstr "EOF in headers\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:460
+msgid ""
+"WARNING: vcut is still experimental code.\n"
+"Check that the output files are correct before deleting sources.\n"
+"\n"
+msgstr ""
+"WARNING: vcut is still experimental code.\n"
+"Check that the output files are correct before deleting sources.\n"
+"\n"
+
+#: 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: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:480
+#, c-format
+msgid "Couldn't parse cutpoint \"%s\"\n"
+msgstr "Couldn't parse cutpoint \"%s\"\n"
+
+#: vcut/vcut.c:484
+#, c-format
+msgid "Processing: Cutting at %lld\n"
+msgstr "Processing: Cutting at %lld\n"
+
+#: vcut/vcut.c:493
+msgid "Processing failed\n"
+msgstr "Processing failed\n"
+
+#: vcut/vcut.c:514
+msgid "Error reading headers\n"
+msgstr "Error reading headers\n"
+
+#: vcut/vcut.c:537
+msgid "Error writing first output file\n"
+msgstr "Error writing first output file\n"
+
+#: vcut/vcut.c:545
+msgid "Error writing second output file\n"
+msgstr "Error writing second output file\n"
+
+#: vorbiscomment/vcedit.c:220
+msgid "Input truncated or empty."
+msgstr "Input truncated or empty."
+
+#: 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:245
+msgid "Error reading initial header packet."
+msgstr "Error reading initial header packet."
+
+#: vorbiscomment/vcedit.c:251
+msgid "Ogg bitstream does not contain vorbis data."
+msgstr "Ogg bitstream does not contain vorbis data."
+
+#: vorbiscomment/vcedit.c:274
+msgid "Corrupt secondary header."
+msgstr "Corrupt secondary header."
+
+#: vorbiscomment/vcedit.c:295
+msgid "EOF before end of vorbis headers."
+msgstr "EOF before end of vorbis headers."
+
+#: vorbiscomment/vcedit.c:448
+msgid "Corrupt or missing data, continuing..."
+msgstr "Corrupt or missing data, continuing..."
+
+#: 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: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:148
+#, c-format
+msgid "Bad comment: \"%s\"\n"
+msgstr "Bad comment: \"%s\"\n"
+
+#: vorbiscomment/vcomment.c:160
+#, c-format
+msgid "bad comment: \"%s\"\n"
+msgstr "bad comment: \"%s\"\n"
+
+#: 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"
+
+#. should never reach this point
+#: vorbiscomment/vcomment.c:187
+msgid "no action specified\n"
+msgstr "no action specified\n"
+
+#: 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:287
+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"
+
+#: vorbiscomment/vcomment.c:371
+msgid "Internal error parsing command options\n"
+msgstr "Internal error parsing command options\n"
+
+#: vorbiscomment/vcomment.c:456
+#, c-format
+msgid "Error opening input file '%s'.\n"
+msgstr "Error opening input file '%s'.\n"
+
+#: 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:476
+#, c-format
+msgid "Error opening output file '%s'.\n"
+msgstr "Error opening output file '%s'.\n"
+
+#: vorbiscomment/vcomment.c:491
+#, c-format
+msgid "Error opening comment file '%s'.\n"
+msgstr "Error opening comment file '%s'.\n"
+
+#: vorbiscomment/vcomment.c:508
+#, c-format
+msgid "Error opening comment file '%s'\n"
+msgstr "Error opening comment file '%s'\n"
+
+#: vorbiscomment/vcomment.c:536
+#, c-format
+msgid "Error removing old file %s\n"
+msgstr "Error removing old file %s\n"
+
+#: vorbiscomment/vcomment.c:538
+#, c-format
+msgid "Error renaming %s to %s\n"
+msgstr "Error renaming %s to %s\n"

Modified: trunk/vorbis-tools/po/es.po
===================================================================
--- trunk/vorbis-tools/po/es.po	2008-06-22 21:07:32 UTC (rev 15057)
+++ trunk/vorbis-tools/po/es.po	2008-06-23 21:40:34 UTC (rev 15058)
@@ -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: 2007-12-30 13:57+0900\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:351
-#, 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:554 oggenc/oggenc.c:559
-#: oggenc/oggenc.c:564 oggenc/oggenc.c:569 oggenc/oggenc.c:574
-#: oggenc/oggenc.c:579
+#: 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:426
+#: 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:430
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Clave no encontrada"
 
-#: ogg123/cfgfile_options.c:432
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "No hay ninguna clave"
 
-#: ogg123/cfgfile_options.c:434
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Valor no válido"
 
-#: ogg123/cfgfile_options.c:436
+#: 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:438
+#: 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:329
-#, 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:336
-#, 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:214
-#: 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:144
+#: 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:201
+#: 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,257 +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:557
+#: 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:562
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Imposible abrir %s.\n"
 
 # supported / soportado, puagh - EM
-#: ogg123/ogg123.c:568
+#: 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:578
+#: 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:597
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
 msgstr "Reproduciendo: %s"
 
-#: ogg123/ogg123.c:608
+#: ogg123/ogg123.c:474
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Imposible saltar %f segundos de audio."
 
-#: ogg123/ogg123.c:663
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
 msgstr "Error: Fallo de decodificación \n"
 
-#: ogg123/ogg123.c:742
+#. 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 ogginfo/ogginfo2.c:964
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggenc/audio.c:47
+#: oggenc/audio.c:39
 msgid "WAV file reader"
 msgstr "Lector de ficheros WAV"
 
-#: oggenc/audio.c:48
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
 msgstr "Lector de ficheros AIFF/AIFC"
 
-#: oggenc/audio.c:50
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "Lector de ficheros WAV"
-
-#: oggenc/audio.c:51
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "Lector de ficheros WAV"
-
-#: oggenc/audio.c:128 oggenc/audio.c:421
-#, 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:139
+#: 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:165
-#, 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:251
-#, 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:257
-#, 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:265
-#, 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:280
-#, c-format
+#: oggenc/audio.c:258
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr "AVISO: Cabecera AIFF-C truncada.\n"
 
-#: oggenc/audio.c:294
-#, 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:301
-#, 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:307
-#, 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:313
-#, 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:350
-#, fuzzy, 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"
@@ -787,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:404
-#, 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:416
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -801,62 +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:453
-#, 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:462
-#, 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:524
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 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:600
-#, 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:606
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:708
-#, 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:726
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr "Imposible inicializar resampler\n"
 
 # encoder / codificador ??? EM
-#: oggenc/encode.c:63
+#: 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"
@@ -874,62 +685,43 @@
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "Opción avanzada \"%s\" no reconocida\n"
 
-#: oggenc/encode.c:170
-#, 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"
+#: 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"
 
 # he cambiado bastante el texto ¿es OK? EM
 # He cambiado indicar por solicitar. -Quique
-#: oggenc/encode.c:178
-#, 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:196
-#, 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:240
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:242
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:254
-#, 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:319 oggenc/encode.c:341
+#: 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:415
+#: 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:461
-#, 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:471
-#, 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:489
+#: oggenc/encode.c:377
 #, c-format
 msgid ""
 "\n"
@@ -940,8 +732,7 @@
 "\n"
 "Codificación del fichero finalizada \"%s\"\n"
 
-#: oggenc/encode.c:491
-#, c-format
+#: oggenc/encode.c:379
 msgid ""
 "\n"
 "\n"
@@ -951,7 +742,7 @@
 "\n"
 "Codificación finalizada.\n"
 
-#: oggenc/encode.c:495
+#: oggenc/encode.c:383
 #, c-format
 msgid ""
 "\n"
@@ -960,17 +751,17 @@
 "\n"
 "\tLongitud del fichero:  %dm %04.1fs\n"
 
-#: oggenc/encode.c:499
+#: oggenc/encode.c:387
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr "\tTiempo consumido: %dm %04.1fs\n"
 
-#: oggenc/encode.c:502
+#: oggenc/encode.c:390
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tTasa:         %.4f\n"
 
-#: oggenc/encode.c:503
+#: oggenc/encode.c:391
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
@@ -979,7 +770,7 @@
 "\tTasa de bits media: %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:540
+#: oggenc/encode.c:428
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -990,17 +781,17 @@
 "         %s%s%s \n"
 "con tasa de bits media %d kbps "
 
-#: oggenc/encode.c:542 oggenc/encode.c:549 oggenc/encode.c:557
-#: oggenc/encode.c:564 oggenc/encode.c:570
+#: 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:543 oggenc/encode.c:550 oggenc/encode.c:558
-#: oggenc/encode.c:565 oggenc/encode.c:571
+#: 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:548
+#: oggenc/encode.c:436
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1011,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:556
+#: oggenc/encode.c:444
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1022,7 +813,7 @@
 "         %s%s%s \n"
 "con nivel de calidad %2.2f usando VBR restringido "
 
-#: oggenc/encode.c:563
+#: oggenc/encode.c:451
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1033,7 +824,7 @@
 "         %s%s%s \n"
 "con calidad %2.2f\n"
 
-#: oggenc/encode.c:569
+#: oggenc/encode.c:457
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
@@ -1044,7 +835,7 @@
 "         %s%s%s \n"
 "usando gestión de transferencia de bits"
 
-#: oggenc/oggenc.c:103
+#: oggenc/oggenc.c:96
 #, c-format
 msgid ""
 "%s%s\n"
@@ -1053,99 +844,66 @@
 "%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:184
+#: 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:200
-#, fuzzy
-msgid "RAW file reader"
-msgstr "Lector de ficheros WAV"
-
-#: oggenc/oggenc.c:217
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr "Abriendo con el módulo %s: %s\n"
 
-#: oggenc/oggenc.c:226
+#: 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:277
-#, 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:285
+#: 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:292
-#, 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:303
+#: 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:333
+#: 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:340
-#, 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:343
-#, 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:351
+#: oggenc/oggenc.c:365
 #, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:394
-#, fuzzy, c-format
 msgid ""
 "%s%s\n"
-"Usage: oggenc [options] inputfile [...]\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"
-" -k, --skeleton       Outputs ogg skeleton metadata\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"
@@ -1153,65 +911,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. 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"
+"                      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"
-" --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"
+"                      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"
+"                      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"
-" --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"
+"                      %%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"
+" -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"
 " -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"
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
@@ -1219,34 +954,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"
+"                      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"
 "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 ""
@@ -1257,29 +982,21 @@
 " 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"
+" -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"
+" -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"
+" -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"
+" -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"
+"                       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"
+" -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"
@@ -1287,45 +1004,31 @@
 "                      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"
+"                      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"
+" -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"
+" -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"
+"                      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"
+" -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"
+"                      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"
+" -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"
@@ -1338,15 +1041,11 @@
 "                      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"
+"                      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"
+"                      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"
@@ -1354,12 +1053,9 @@
 " 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"
+" 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"
@@ -1367,425 +1063,177 @@
 " fichero de salida con -o\n"
 "\n"
 
-#: oggenc/oggenc.c:584
+#: 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:613 oggenc/oggenc.c:735 oggenc/oggenc.c:748
-#, 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:622
-#, 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:625
+#: 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:632
+#: 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:638
+#: 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:648
-#, fuzzy, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Aviso: Imposible leer el directorio %s.\n"
-
-#: oggenc/oggenc.c:658
-#, 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:673
-#, 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:684
+#: 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:721
+#: 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:729
+#: 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:742
+#: 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:754
+#: 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:762
-#, 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:768
-#, 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:777
-#, 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:786
-#, 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:794
-#, 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:813
-#, 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: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:818 oggenc/oggenc.c:822
-#, 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:829
-#, 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:834
-#, 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:845
-#, 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:850
-#, 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:857
-#, c-format
+#: oggenc/oggenc.c:789
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr "AVISO: Especificada opción desconocida, ignorada->\n"
 
-#: oggenc/oggenc.c:879 vorbiscomment/vcomment.c:284
-#, 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:898
-#, 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:150
+#: 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:157
+#: 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:170
+#: 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:186
-#, 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:194
+#: 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:225 ogginfo/ogginfo2.c:233
+#: 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:240
+#: 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:316
-#, 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:330
-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:355 ogginfo/ogginfo2.c:522
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Aviso: Falta indicador EOS en el flujo %d\n"
-
-#: ogginfo/ogginfo2.c:363
-#, 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:370
-#, 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:374
-#, 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:377
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Versión: %d\n"
-
-#: ogginfo/ogginfo2.c:379 ogginfo/ogginfo2.c:557
-#, c-format
-msgid "Vendor: %s\n"
-msgstr "Distribuidor: %s\n"
-
-#: ogginfo/ogginfo2.c:380
-#, c-format
-msgid "Width: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:381
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Versión: %d\n"
-
-#: ogginfo/ogginfo2.c:382
-#, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:385
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:387
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:390
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:392
-#, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:396
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:401
-#, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:403
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:405
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:415
-#, fuzzy
-msgid "Colourspace unspecified\n"
-msgstr "no se ha indicado ninguna acción\n"
-
-#: ogginfo/ogginfo2.c:418
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:420
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:424
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:426
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr "Tasa de bits máxima: %f kb/s\n"
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:430 ogginfo/ogginfo2.c:580
-msgid "User comments section follows...\n"
-msgstr "Sigue la sección de comentarios del usuario...\n"
-
-#: ogginfo/ogginfo2.c:451
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Aviso: Falta indicador EOS en el flujo %d\n"
-
-#: ogginfo/ogginfo2.c:467 ogginfo/ogginfo2.c:595
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Aviso: granulepos en el flujo %d se decrementa desde "
-
-#: ogginfo/ogginfo2.c:494
-msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:531
-#, 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:539
-#, 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:543
-#, 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:546
+#: ogginfo/ogginfo2.c:171
 #, c-format
 msgid "Version: %d\n"
 msgstr "Versión: %d\n"
 
-#: ogginfo/ogginfo2.c:550
+#: ogginfo/ogginfo2.c:175
 #, c-format
 msgid "Vendor: %s (%s)\n"
 msgstr "Distribuidor: %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:558
+#: 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:559
+#: ogginfo/ogginfo2.c:184
 #, c-format
 msgid ""
 "Rate: %ld\n"
@@ -1794,81 +1242,123 @@
 "Tasa de transferencia: %ld\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:562
+#: 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:565
+#: ogginfo/ogginfo2.c:190
 msgid "Nominal bitrate not set\n"
 msgstr "Tasa de bits nominal no especificada\n"
 
-#: ogginfo/ogginfo2.c:568
+#: 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:571
+#: 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:574
+#: 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:577
+#: ogginfo/ogginfo2.c:202
 msgid "Lower bitrate not set\n"
 msgstr "Tasa de transferencia de bits mínima no especificada\n"
 
-#: ogginfo/ogginfo2.c:604
+#: 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:625
+# 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:257 ogginfo/ogginfo2.c:266
+#, c-format
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): length marker wrong\n"
+msgstr "Aviso: Secuencia UTF-8 no válida en el comentario %d (flujo %d): marcador de longitud erróneo\n"
+
+#: ogginfo/ogginfo2.c:274
+#, 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:335
+#, c-format
+msgid "Warning: Illegal UTF-8 sequence in comment %d (stream %d): invalid sequence\n"
+msgstr "Aviso: Secuencia UTF-8 no válida en el comentario %d (flujo %d): secuencia no válida\n"
+
+#: ogginfo/ogginfo2.c: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:364
+#, c-format
+msgid "Warning: granulepos in stream %d decreases from "
+msgstr "Aviso: granulepos en el flujo %d se decrementa desde "
+
+#: ogginfo/ogginfo2.c:365
+msgid " to "
+msgstr " a "
+
+#: ogginfo/ogginfo2.c:365
+msgid "\n"
+msgstr "\n"
+
+#: ogginfo/ogginfo2.c:384
+#, c-format
 msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %"
+"\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:659
+#: 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:796
+#: 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:814
+#: 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:828
-#, 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:845
-#, 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:869
+# ¿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:874
+#: ogginfo/ogginfo2.c:604
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
@@ -1877,65 +1367,45 @@
 "Procesando fichero \"%s\"...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:883
+#: 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:891
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:894
+#: ogginfo/ogginfo2.c:618
+#, c-format
 msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:898
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:901
-#, 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:913
+#: 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:916
+#: 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:920
+#: 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:925
+#: 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:940
+#: ogginfo/ogginfo2.c:652
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Flujo lógico %d finalizado\n"
 
-#: ogginfo/ogginfo2.c:948
+#: ogginfo/ogginfo2.c:659
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
@@ -1944,24 +1414,20 @@
 "Error: No se encontraron datos ogg en el fichero \"%s\".\n"
 "La entrada probablemente no sea ogg.\n"
 
-#: ogginfo/ogginfo2.c:959
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 de %s %s\n"
-
 # no soporte "support" :P
-#: ogginfo/ogginfo2.c:965
-#, 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.ogg ... fileN.ogg]\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"
@@ -1969,20 +1435,13 @@
 "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:974
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:987
-#, c-format
+#: ogginfo/ogginfo2.c:691
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -1996,12 +1455,9 @@
 "y para diagnosticar problemas.\n"
 "La ayuda completa se obtiene con \"ogginfo -h\".\n"
 
-#: ogginfo/ogginfo2.c:1019
-#, 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
@@ -2023,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"
@@ -2043,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"
@@ -2058,40 +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:137
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr "Error de paginación. Entrada dañada.\n"
 
-#: vcut/vcut.c:154
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr "Error en el flujo de bits, continuando\n"
 
-#: vcut/vcut.c:179
-#, 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:188
-#, 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:198
-#, 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:231
-#, 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:290
-#, 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"
@@ -2099,562 +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:303
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr "Error recuperable en la transferencia\n"
 
-#: vcut/vcut.c:313
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr "Error en la transferencia\n"
 
-#: vcut/vcut.c:336
-#, 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"
+msgstr "La actualización de sincronización ha devuelto 0, fijando final de fichero\n"
 
-#: vcut/vcut.c:385
-#, c-format
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "El fichero de entrada no es ogg.\n"
 
-#: vcut/vcut.c:395
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Error en la primera página\n"
 
-#: vcut/vcut.c:400
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "error en el primer paquete\n"
 
-#: vcut/vcut.c:406
-#, 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:426
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Cabecera secundaria dañada\n"
 
-#: vcut/vcut.c:439
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr "Fin de fichero (EOF) en las cabeceras\n"
 
-#: vcut/vcut.c:472
-#, 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:476
-#, 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:481
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr "Imposible abrir %s para lectura\n"
 
-#: vcut/vcut.c:486 vcut/vcut.c:491
+#: 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:497 vcut/vcut.c:502
+#: 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:507
-#, 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:509
-#, fuzzy, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr "Procesando: Cortando en %lld\n"
-
-#: vcut/vcut.c:519
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr "Procesamiento fallido\n"
 
-#: vcut/vcut.c:541
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr "Error de lectura de cabeceras\n"
 
-#: vcut/vcut.c:564
-#, 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:572
-#, 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:233
+#: vorbiscomment/vcedit.c:220
 msgid "Input truncated or empty."
 msgstr "Entrada truncada o vacía."
 
-#: vorbiscomment/vcedit.c:235
+#: vorbiscomment/vcedit.c:222
 msgid "Input is not an Ogg bitstream."
 msgstr "La entrada no es un flujo de bits Ogg."
 
-#: vorbiscomment/vcedit.c:253
+#: 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:259
+#: vorbiscomment/vcedit.c:245
 msgid "Error reading initial header packet."
 msgstr "Error al leer el paquete inicial de las cabeceras."
 
-#: vorbiscomment/vcedit.c:265
+#: 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:288
+#: vorbiscomment/vcedit.c:274
 msgid "Corrupt secondary header."
 msgstr "Cabecera secundaria dañada."
 
-#: vorbiscomment/vcedit.c:309
+#: 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:462
+#: vorbiscomment/vcedit.c:448
 msgid "Corrupt or missing data, continuing..."
 msgstr "Datos dañados o faltan datos, continuando..."
 
-#: vorbiscomment/vcedit.c:502
-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:120 vorbiscomment/vcomment.c:146
+#: 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:165
+#: vorbiscomment/vcomment.c:148
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr "Comentario defectuoso: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:177
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr "comentario defectuoso: \"%s\"\n"
 
-#: vorbiscomment/vcomment.c:187
+#: 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:204
-#, 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:306
-#, 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:309
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:312
-#, 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:318
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:319
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:322
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Tipo no válido en la lista de opciones"
-
-#: vorbiscomment/vcomment.c:323
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:324
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:326
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:330
-#, 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:333
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:337
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:340
-#, 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:345
-#, 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:352
-#, 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:357
-#, 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:419
-#, 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:505
+#: 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:514
-#, 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:525
+#: 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:540
+#: 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:557
+#: 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:591
+#: 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:593
+#: 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:603
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Error al borrar el fichero antiguo %s\n"
-
-# "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"
-#~ "        "
-
-#, fuzzy
-#~ 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=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"
-
-#, fuzzy
-#~ msgid "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-#~ msgstr "Aviso: granulepos en el flujo %d se decrementa desde "
-
-#, fuzzy
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Flujo Vorbis %d:\n"
-#~ "\tLongitud total de los datos: %ld bytes\n"
-#~ "\tLongitud de reproducción: %ldm:%02lds\n"
-#~ "\tTasa de bits promedio: %f kbps\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %lld bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Flujo Vorbis %d:\n"
-#~ "\tLongitud total de los datos: %ld bytes\n"
-#~ "\tLongitud de reproducción: %ldm:%02lds\n"
-#~ "\tTasa de bits promedio: %f kbps\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Flujo Vorbis %d:\n"
-#~ "\tLongitud total de los datos: %ld bytes\n"
-#~ "\tLongitud de reproducción: %ldm:%02lds\n"
-#~ "\tTasa de bits promedio: %f kbps\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %lld bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Flujo Vorbis %d:\n"
-#~ "\tLongitud total de los datos: %ld bytes\n"
-#~ "\tLongitud de reproducción: %ldm:%02lds\n"
-#~ "\tTasa de bits promedio: %f kbps\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
-#~ "ogg.\n"
-#~ msgstr "Aviso: encontrado vacío en los datos en el offset aproximado "
-
-#, 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 ""
-#~ "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"
-
-#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
-#~ msgstr "Imposible convertir comentario a UTF8, no se puede ser añadir\n"
-
-#~ msgid "malloc"
-#~ msgstr "malloc"
-
-# "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 " to "
-#~ msgstr " a "
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-# ¿corrupto? EM
-#~ msgid " bytes. Corrupted ogg.\n"
-#~ msgstr " bytes. ogg corrupto.\n"

Modified: trunk/vorbis-tools/po/fr.po
===================================================================
--- trunk/vorbis-tools/po/fr.po	2008-06-22 21:07:32 UTC (rev 15057)
+++ trunk/vorbis-tools/po/fr.po	2008-06-23 21:40:34 UTC (rev 15058)
@@ -1,7 +1,6 @@
-# translation of vorbis-tools-1.0.1.fr.po to French
-# Copyright (C) 2002-2004 Free Software Foundation, Inc.
+# translation of vorbis-tools-1.0.fr.po to French
+# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 # Martin Quinson <Martin.Quinson at ens-lyon.fr>, 2002, 2003.
-# Éric Lassauge <lassauge AT users.sourceforge.net>, 2004.
 #
 # # Choix de traduction :
 # 	bitrate		= débit
@@ -18,7 +17,6 @@
 # 	raw		= brut [adjectif]
 # 	sample rate 	= taux d'échantillonnage
 # 	streaming 	= diffusion en flux (streaming)
-#       ' :' '« ' ' »'  = utilisation du 'blanc insécable' = ' ' comme recommandé pour le français
 #
 # # Problématiques:
 # 	granulepos	= granulepos (c'est en fait le nom propre d'un index spécial dans le
@@ -29,247 +27,240 @@
 # 			   en français.
 msgid ""
 msgstr ""
-"Project-Id-Version: vorbis-tools 1.0.1\n"
-"Report-Msgid-Bugs-To: http://trac.xiph.org/\n"
-"POT-Creation-Date: 2007-12-30 13:57+0900\n"
-"PO-Revision-Date: 2004-12-06 15:15+0100\n"
-"Last-Translator: Éric Lassauge <lassauge AT users.sourceforge.net> 2004\n"
+"Project-Id-Version: vorbis-tools 1.0\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"
 "MIME-Version: 1.0\n"
 "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"
+msgstr "Erreur : Plus de mémoire dans malloc_action().\n"
 
-#: ogg123/buffer.c:351
-#, 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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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:554 oggenc/oggenc.c:559
-#: oggenc/oggenc.c:564 oggenc/oggenc.c:569 oggenc/oggenc.c:574
-#: oggenc/oggenc.c:579
+#: 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:426
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Réussite"
 
-#: ogg123/cfgfile_options.c:430
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Clé introuvable"
 
-#: ogg123/cfgfile_options.c:432
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Pas de clé"
 
-#: ogg123/cfgfile_options.c:434
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Valeur invalide"
 
-#: ogg123/cfgfile_options.c:436
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Mauvais typage dans la liste des options"
 
-#: ogg123/cfgfile_options.c:438
+#: 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"
-"=== L'option était : %s\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"
+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"
+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"
+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"
@@ -277,584 +268,407 @@
 "--- 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 "=== Conflit d'option : heure finale avant heure de début.\n"
-
-#: 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:329
-#, 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:336
-#, 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:214
-#: 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"
+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:144
+#: ogg123/http_transport.c:137
 msgid "Error: Could not set signal mask."
-msgstr "Erreur : Impossible de fixer le masque de signal."
+msgstr "Erreur : Impossible de fixer le masque de signal."
 
-#: ogg123/http_transport.c:201
+#: 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"
+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"
 "Audio Device:   %s"
 msgstr ""
 "\n"
-"Périphérique audio : %s"
+"Périphérique audio : %s"
 
-#: ogg123/ogg123.c:379
+#: ogg123/ogg123.c:262
 #, c-format
 msgid "Author:   %s"
-msgstr "Auteur : %s"
+msgstr "Auteur : %s"
 
-#: ogg123/ogg123.c:380
+#: ogg123/ogg123.c:263
 #, c-format
 msgid "Comments: %s"
-msgstr "Commentaires : %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"
+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"
+msgstr "Erreur : Impossible de créer les tampons audio.\n"
 
-#: ogg123/ogg123.c:557
+#: 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:562
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
 msgstr "Impossible d'ouvrir %s.\n"
 
-#: ogg123/ogg123.c:568
+#: 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:578
+#: 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:597
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
-msgstr "Écoute de : %s"
+msgstr "Écoute de : %s"
 
-#: ogg123/ogg123.c:608
+#: 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:663
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
-msgstr "Erreur : Échec du décodage.\n"
+msgstr "Erreur : Échec du décodage.\n"
 
-#: ogg123/ogg123.c:742
+#. 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 anodin\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
+#: ogg123/oggvorbis_format.c:402
 #, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr "Flux Ogg Vorbis : %d canaux, %ld Hz"
+msgid "Version is %d"
+msgstr "Version est %d"
 
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:406
 #, c-format
-msgid "Vorbis format: Version %d"
-msgstr "Format vorbis : Version %d"
+msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
+msgstr "Débit : max=%ld nominal=%ld min=%ld fenêtre=%ld"
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:414
 #, 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"
+msgid "Bitstream is %d channel, %ldHz"
+msgstr "Le flux a %d canaux, %ldHz"
 
-#: ogg123/oggvorbis_format.c:327
+#: ogg123/oggvorbis_format.c:419
 #, c-format
 msgid "Encoded by: %s"
-msgstr "Encodé par : %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"
+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"
+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"
+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"
+msgstr "Fichier : %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
-msgstr "Temps : %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"
+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 ogginfo/ogginfo2.c:964
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggenc/audio.c:47
+#: oggenc/audio.c:39
 msgid "WAV file reader"
 msgstr "lecteur de fichier WAV"
 
-#: oggenc/audio.c:48
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
 msgstr "lecteur de fichier AIFF/AIFC"
 
-#: oggenc/audio.c:50
-msgid "FLAC file reader"
-msgstr "lecteur de fichier FLAC"
-
-#: oggenc/audio.c:51
-msgid "Ogg FLAC file reader"
-msgstr "lecteur Ogg de fichier FLAC"
-
-#: oggenc/audio.c:128 oggenc/audio.c:421
-#, 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 en-têtes WAV\n"
+msgstr "Attention : fin de fichier inattendue lors de la lecture des entêtes WAV\n"
 
-#: oggenc/audio.c:139
+#: 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"
+msgstr "Omition d'un tronçon de type « %s » et de longueur %d\n"
 
-#: oggenc/audio.c:165
-#, 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"
+msgstr "Attention : fin de fichier inattendue dans un tronçon AIFF\n"
 
-#: oggenc/audio.c:251
-#, 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"
+msgstr "Attention : aucun tronçon commun dans le fichier AIFF\n"
 
-#: oggenc/audio.c:257
-#, c-format
+#: oggenc/audio.c:237
 msgid "Warning: Truncated common chunk in AIFF header\n"
-msgstr "Attention : tronçon commun tronqué dans l'en-tête AIFF\n"
+msgstr "Attention : tronçon commun tronqué dans l'entête AIFF\n"
 
-#: oggenc/audio.c:265
-#, c-format
+#: oggenc/audio.c:245
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
-msgstr "Attention : fin de fichier inattendue dans l'en-tête AIFF\n"
+msgstr "Attention : fin de fichier inattendue dans l'entête AIFF\n"
 
-#: oggenc/audio.c:280
-#, c-format
+#: oggenc/audio.c:258
 msgid "Warning: AIFF-C header truncated.\n"
-msgstr "Attention : l'en-tête AIFF-C est tronqué.\n"
+msgstr "Attention : l'entête AIFF-C est tronqué.\n"
 
-#: oggenc/audio.c:294
-#, c-format
-msgid "Warning: Can't handle compressed AIFF-C (%c%c%c%c)\n"
-msgstr "Attention : Je ne sais pas gérer l'AIFF-C compressé (%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:301
-#, 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"
+msgstr "Attention : le fichier AIFF ne contient pas de tronçon SSND\n"
 
-#: oggenc/audio.c:307
-#, c-format
+#: oggenc/audio.c:276
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
-msgstr "Attention : tronçon SSND corrompu dans l'en-tête AIFF\n"
+msgstr "Attention : tronçon SSND corrompu dans l'entête AIFF\n"
 
-#: oggenc/audio.c:313
-#, c-format
+#: oggenc/audio.c:282
 msgid "Warning: Unexpected EOF reading AIFF header\n"
-msgstr "Attention : fin de fichier inattendue dans l'en-tête AIFF\n"
+msgstr "Attention : fin de fichier inattendue dans l'entête AIFF\n"
 
-#: oggenc/audio.c:350
-#, fuzzy, 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"
 msgstr ""
-"Attention : OggEnc ne supporte pas ce type de fichier AIFF/AIFC\n"
-" Il doit s'agir de PCM en 8,16 ou 24 bits.\n"
+"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:404
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
-msgstr "Attention : format de tronçon inconnu dans l'en-tête WAV\n"
+msgstr "Attention : format de tronçon inconnu dans l'entête WAV\n"
 
-#: oggenc/audio.c:416
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
 msgstr ""
-"Attention : format de tronçon invalide dans l'en-tête WAV.\n"
+"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:453
-#, 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"
+"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:462
-#, 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 ""
+"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:524
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 bit PCM\n"
-"or floating point PCM)\n"
+#: oggenc/audio.c:607
+msgid "BUG: Got zero samples from resampler: your file will be truncated. Please report this.\n"
 msgstr ""
-"Erreur : Fichier WAV de sous-type non supporté (doit être un PCM 8, 16\n"
-"ou 24 bits, ou un PCM en nombre flottant\n"
-
-#: oggenc/audio.c:600
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-"Les données PCM 24 bits grand-boutistes (Big endian) ne sont pas supportées, "
-"abandon.\n"
-
-#: oggenc/audio.c:606
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr "Erreur interne : tentative de lire un format %d bits non supporté\n"
-
-#: oggenc/audio.c:708
-#, 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:726
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr "Impossible d'initialiser le rééchantilloneur\n"
 
-#: oggenc/encode.c:63
+#: 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"
+msgstr "Réglage de l'option avancée « %s » à %s\n"
 
 #: oggenc/encode.c:100
 #, c-format
@@ -864,62 +678,43 @@
 #: oggenc/encode.c:103
 #, c-format
 msgid "Unrecognised advanced option \"%s\"\n"
-msgstr "Option avancée « %s » inconnue\n"
+msgstr "Option avancée « %s » inconnue\n"
 
-#: oggenc/encode.c:170
-#, 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: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:178
-#, 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:196
-#, 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"
+msgstr "Échec de l'initialisation du mode : paramètres de qualité invalides\n"
 
-#: oggenc/encode.c:240
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:242
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:254
-#, 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:319 oggenc/encode.c:341
+#: oggenc/encode.c:237
 msgid "Failed writing header to output stream\n"
-msgstr "Écriture d'en-têtes du flux de sortie infructueuse\n"
+msgstr "Écriture d'entêtes du flux de sortie infructueuse\n"
 
-#: oggenc/encode.c:415
+#: oggenc/encode.c:303
 msgid "Failed writing data to output stream\n"
 msgstr "Écriture dans le flux de sortie infructueuse\n"
 
-#: oggenc/encode.c:461
-#, 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:471
-#, fuzzy, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
-msgstr "\tCodage [%2dm%.2ds pour l'instant] %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:489
+#: oggenc/encode.c:377
 #, c-format
 msgid ""
 "\n"
@@ -928,10 +723,9 @@
 msgstr ""
 "\n"
 "\n"
-"Fin de l'encodage du fichier « %s »\n"
+"Fin de l'encodage du fichier « %s »\n"
 
-#: oggenc/encode.c:491
-#, c-format
+#: oggenc/encode.c:379
 msgid ""
 "\n"
 "\n"
@@ -941,200 +735,170 @@
 "\n"
 "Fin de l'encodage.\n"
 
-#: oggenc/encode.c:495
+#: oggenc/encode.c:383
 #, c-format
 msgid ""
 "\n"
 "\tFile length:  %dm %04.1fs\n"
 msgstr ""
 "\n"
-"\tLongueur de fichier :  %dm %04.1fs\n"
+"\tLongueur de fichier :  %dm %04.1fs\n"
 
-#: oggenc/encode.c:499
+#: oggenc/encode.c:387
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
-msgstr "\tTemps écoulé : %dm %04.1fs\n"
+msgstr "\tTemps écoulé : %dm %04.1fs\n"
 
-#: oggenc/encode.c:502
+#: oggenc/encode.c:390
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr "\tTaux:         %.4f\n"
 
-#: oggenc/encode.c:503
+#: oggenc/encode.c:391
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
 "\n"
 msgstr ""
-"\tDébit moyen : %.1f kb/s\n"
+"\tDébit moyen : %.1f kb/s\n"
 "\n"
 
-#: oggenc/encode.c:540
+#: oggenc/encode.c:428
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
 "         %s%s%s \n"
 "at average bitrate %d kbps "
 msgstr ""
-"Codage de %s%s%s \n"
+"Encodage de %s%s%s \n"
 "         en %s%s%s \n"
 "au débit moyen de %d kbps "
 
-#: oggenc/encode.c:542 oggenc/encode.c:549 oggenc/encode.c:557
-#: oggenc/encode.c:564 oggenc/encode.c:570
+#: 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:543 oggenc/encode.c:550 oggenc/encode.c:558
-#: oggenc/encode.c:565 oggenc/encode.c:571
+#: 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:548
+#: oggenc/encode.c:436
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
 "         %s%s%s \n"
 "at approximate bitrate %d kbps (VBR encoding enabled)\n"
 msgstr ""
-"Codage de %s%s%s \n"
+"Encodage de %s%s%s \n"
 "         en %s%s%s \n"
 "au débit approximatif de %d kbps (encodage VBR en cours)\n"
 
-#: oggenc/encode.c:556
+#: oggenc/encode.c:444
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
 "         %s%s%s \n"
 "at quality level %2.2f using constrained VBR "
 msgstr ""
-"Codage de %s%s%s \n"
+"Encodage de %s%s%s \n"
 "         en %s%s%s \n"
 "au niveau de qualité %2.2f en utilisant un VBR contraint "
 
-#: oggenc/encode.c:563
+#: oggenc/encode.c:451
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
 "         %s%s%s \n"
 "at quality %2.2f\n"
 msgstr ""
-"Codage de %s%s%s \n"
+"Encodage de %s%s%s \n"
 "         en %s%s%s \n"
 "à la qualité %2.2f\n"
 
-#: oggenc/encode.c:569
+#: oggenc/encode.c:457
 #, c-format
 msgid ""
 "Encoding %s%s%s to \n"
 "         %s%s%s \n"
 "using bitrate management "
 msgstr ""
-"Codage de %s%s%s \n"
+"Encodage de %s%s%s \n"
 "         en %s%s%s \n"
 "en utilisant la gestion du débit "
 
-#: oggenc/oggenc.c:103
+#: 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"
+"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"
+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"
+"Erreur : plusieurs fichiers d'entrée pour le fichier de sortie spécifié : \n"
 " vous devriez peut-être utiliser -n\n"
 
-#: oggenc/oggenc.c:184
+#: 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"
+msgstr "Erreur : impossible d'ouvrir le fichier d'entrée « %s » : %s\n"
 
 #: oggenc/oggenc.c:200
-#, fuzzy
-msgid "RAW file reader"
-msgstr "lecteur de fichier WAV"
-
-#: oggenc/oggenc.c:217
 #, c-format
 msgid "Opening with %s module: %s\n"
-msgstr "Ouverture avec le module %s : %s\n"
+msgstr "Ouverture avec le module %s : %s\n"
 
-#: oggenc/oggenc.c:226
+#: 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"
+msgstr "Erreur : le fichier d'entrée « %s » n'est pas dans un format reconnu\n"
 
-#: oggenc/oggenc.c:277
-#, 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:285
+#: 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:292
-#, 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:303
+#: 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"
+msgstr "Erreur : impossible d'ouvrir le fichier de sortie « %s » : %s\n"
 
-#: oggenc/oggenc.c:333
+#: 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:340
-#, 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:343
-#, 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:351
+#: oggenc/oggenc.c:365
 #, c-format
-msgid "Scaling input to %f\n"
-msgstr "Ajustement de l'entrée à %f\n"
-
-#: oggenc/oggenc.c:394
-#, fuzzy, c-format
 msgid ""
 "%s%s\n"
-"Usage: oggenc [options] inputfile [...]\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"
-" -k, --skeleton       Outputs ogg skeleton metadata\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"
@@ -1142,65 +906,42 @@
 " --raw-endianness     1 for bigendian, 0 for little (defaults to 0)\n"
 " -b, --bitrate        Choose a nominal bitrate to encode at. Attempt\n"
 "                      to encode at a bitrate averaging this. Takes an\n"
-"                      argument in kbps. 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"
+"                      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"
-" --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"
+"                      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"
+"                      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"
-" --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"
+"                      %%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"
+" -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"
 " -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"
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
@@ -1208,785 +949,493 @@
 " -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"
+"                      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"
 "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énerales :\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"
+" -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"
+" -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"
+" -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"
+" -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"
+" --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"
+" -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"
-" --discard-comments   Inhibe la copie des commentaires des fichiers FLAC ou "
-"Ogg FLAC\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"
+" 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"
+" -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"
+" -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"
+"                      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"
+" -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"
+" -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"
+"                      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"
+"                      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"
+"                      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 24, 16 ou 8 bits, ou bien des WAV en 32 bit et en "
-"virgule\n"
-"   flottante IEEE. et optionnellement des fichiers FLAC ou Ogg FLAC.\n"
-"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 en-tête, c'est à dire être 16 bits stéréo petit-"
-"boutiste\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"
+"   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:584
+#: 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:613 oggenc/oggenc.c:735 oggenc/oggenc.c:748
-#, 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:622
-#, 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"
+"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:625
+#: 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"
+"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:632
+#: 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:638
+#: 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:648
-#, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr "Attention : Impossible de lire le facteur d'échelle « %s ».\n"
-
-#: oggenc/oggenc.c:658
-#, 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:673
-#, 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:684
+#: oggenc/oggenc.c:621
 #, c-format
 msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
-msgstr "Attention : commande illégale (« %s »). ignorée.\n"
+msgstr "Attention : commande illégale (« %s »). ignorée.\n"
 
-#: oggenc/oggenc.c:721
+#: 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"
+msgstr "Attention : le débit nominal « %s » n'est pas reconnu\n"
 
-#: oggenc/oggenc.c:729
+#: 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"
+msgstr "Attention : le débit minimum « %s » n'est pas reconnu\n"
 
-#: oggenc/oggenc.c:742
+#: 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"
+msgstr "Attention : le débit maximum « %s » n'est pas reconnu\n"
 
-#: oggenc/oggenc.c:754
+#: oggenc/oggenc.c:689
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
-msgstr "Option de qualité « %s » inconnue, ignorée\n"
+msgstr "Option de qualité « %s » inconnue, ignorée\n"
 
-#: oggenc/oggenc.c:762
-#, 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:768
-#, 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:777
-#, 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:786
-#, 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:794
-#, 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"
+"ATTENTION : Plusieurs fichiers de sortie spécifiés, vous devriez peut-être \n"
 "utiliser -n\n"
 
-#: oggenc/oggenc.c:813
-#, 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"
+"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:818 oggenc/oggenc.c:822
-#, 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:829
-#, 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"
+"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:834
-#, 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"
+msgstr "Attention : Nombre de canaux invalide. Utilisation de 2.\n"
 
-#: oggenc/oggenc.c:845
-#, 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:850
-#, 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:857
-#, c-format
+#: oggenc/oggenc.c:789
 msgid "WARNING: Unknown option specified, ignoring->\n"
-msgstr "Attention : Option inconnue donnée, ignorée ->\n"
+msgstr "Attention : Option inconnue donnée, ignorée ->\n"
 
-#: oggenc/oggenc.c:879 vorbiscomment/vcomment.c:284
-#, 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:898
-#, 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:150
+#: 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"
+msgstr "Impossible de créer le répertoire « %s » : %s\n"
 
-#: oggenc/platform.c:157
+#: 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"
+msgstr "Erreur lors de la vérification du répertoire %s : %s\n"
 
-#: oggenc/platform.c:170
+#: 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"
+msgstr "Erreur : le segment de chemin « %s » n'est pas un répertoire\n"
 
-#: ogginfo/ogginfo2.c:186
-#, 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:194
+#: 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:225 ogginfo/ogginfo2.c:233
+# FIXME
+#: ogginfo/ogginfo2.c:164
 #, 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"
+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:240
+#: ogginfo/ogginfo2.c:168
 #, 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:316
-#, 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:330
-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:355 ogginfo/ogginfo2.c:522
-#, fuzzy, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
-msgstr "Attention: EOS non positionné dans le flux %d\n"
-
-#: ogginfo/ogginfo2.c:363
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode theora header packet - invalid theora stream (%d)\n"
-msgstr ""
-"Attention : Impossible de décoder l'en-tête du paquet vorbis - flux vorbis "
-"invalide (%d)\n"
-
-# FIXME
-#: ogginfo/ogginfo2.c:370
-#, 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 en-têtes du flux Vorbis %d malformés. La dernière "
-"page des en-têtes contient des paquets supplémentaires ou a un granulepos "
-"non-nul.\n"
-
-#: ogginfo/ogginfo2.c:374
-#, fuzzy, c-format
-msgid "Theora headers parsed for stream %d, information follows...\n"
+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:377
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Version : %d\n"
+#: ogginfo/ogginfo2.c:171
+#, c-format
+msgid "Version: %d\n"
+msgstr "Version : %d\n"
 
-#: ogginfo/ogginfo2.c:379 ogginfo/ogginfo2.c:557
+#: ogginfo/ogginfo2.c:175
 #, c-format
-msgid "Vendor: %s\n"
-msgstr "Vendeur : %s\n"
+msgid "Vendor: %s (%s)\n"
+msgstr "Vendeur : %s (%s)\n"
 
-#: ogginfo/ogginfo2.c:380
+#: ogginfo/ogginfo2.c:182
 #, c-format
-msgid "Width: %d\n"
-msgstr ""
+msgid "Vendor: %s\n"
+msgstr "Vendeur : %s\n"
 
-#: ogginfo/ogginfo2.c:381
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Version : %d\n"
-
-#: ogginfo/ogginfo2.c:382
+#: ogginfo/ogginfo2.c:183
 #, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
-msgstr ""
+msgid "Channels: %d\n"
+msgstr "Canaux : %d\n"
 
-#: ogginfo/ogginfo2.c:385
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:387
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:390
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:392
+#: ogginfo/ogginfo2.c:184
 #, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
+msgid ""
+"Rate: %ld\n"
+"\n"
 msgstr ""
+"Taux : %ld\n"
+"\n"
 
-#: ogginfo/ogginfo2.c:396
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:401
+#: ogginfo/ogginfo2.c:187
 #, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
+msgid "Nominal bitrate: %f kb/s\n"
+msgstr "Débit nominal : %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:403
-msgid "Frame aspect 4:3\n"
-msgstr ""
+#: ogginfo/ogginfo2.c:190
+msgid "Nominal bitrate not set\n"
+msgstr "Pas de débit nominal indiqué\n"
 
-#: ogginfo/ogginfo2.c:405
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
+#: ogginfo/ogginfo2.c:193
 #, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
+msgid "Upper bitrate: %f kb/s\n"
+msgstr "Débit maximal : %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:411
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
+#: ogginfo/ogginfo2.c:196
+msgid "Upper bitrate not set\n"
+msgstr "Pas de débit maximal indiqué\n"
 
-#: ogginfo/ogginfo2.c:413
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:415
-#, fuzzy
-msgid "Colourspace unspecified\n"
-msgstr "Pas d'action spécifiée\n"
-
-#: ogginfo/ogginfo2.c:418
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:420
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:424
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:426
-#, fuzzy, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr "Débit maximal : %f kb/s\n"
-
-#: ogginfo/ogginfo2.c:427
+#: ogginfo/ogginfo2.c:199
 #, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
+msgid "Lower bitrate: %f kb/s\n"
+msgstr "Débit minimal : %f kb/s\n"
 
-#: ogginfo/ogginfo2.c:430 ogginfo/ogginfo2.c:580
+#: ogginfo/ogginfo2.c:202
+msgid "Lower bitrate not set\n"
+msgstr "Pas de débit minimal indiqué\n"
+
+#: ogginfo/ogginfo2.c:205
 msgid "User comments section follows...\n"
 msgstr "Les commentaires de l'utilisateur suivent...\n"
 
-#: ogginfo/ogginfo2.c:451
-#, fuzzy
-msgid "Warning: Expected frame %"
-msgstr "Attention: EOS non positionné dans le flux %d\n"
-
-#: ogginfo/ogginfo2.c:467 ogginfo/ogginfo2.c:595
-#, fuzzy
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr "Attention : le granulepos du flux %d a décru de %lld à %lld"
-
-#: ogginfo/ogginfo2.c:494
-msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:531
-#, fuzzy, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-"Attention : Impossible de décoder l'en-tête du paquet vorbis - flux vorbis "
-"invalide (%d)\n"
-
-# FIXME
-#: ogginfo/ogginfo2.c:539
+#: ogginfo/ogginfo2.c:217
 #, 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 en-têtes du flux Vorbis %d malformés. La dernière "
-"page des en-têtes contient des paquets supplémentaires ou a un granulepos "
-"non-nul.\n"
+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:543
+#: ogginfo/ogginfo2.c:226
 #, 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"
+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:546
+#: ogginfo/ogginfo2.c:257 ogginfo/ogginfo2.c:266
 #, c-format
-msgid "Version: %d\n"
-msgstr "Version : %d\n"
+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:550
+#: ogginfo/ogginfo2.c:274
 #, c-format
-msgid "Vendor: %s (%s)\n"
-msgstr "Vendeur : %s (%s)\n"
+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:558
+#: ogginfo/ogginfo2.c:335
 #, c-format
-msgid "Channels: %d\n"
-msgstr "Canaux : %d\n"
+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:559
-#, c-format
-msgid ""
-"Rate: %ld\n"
-"\n"
-msgstr ""
-"Taux : %ld\n"
-"\n"
+#: 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:562
+#: ogginfo/ogginfo2.c:364
 #, c-format
-msgid "Nominal bitrate: %f kb/s\n"
-msgstr "Débit nominal : %f kb/s\n"
+msgid "Warning: granulepos in stream %d decreases from "
+msgstr "Attention : le granulepos du flux %d a décru de "
 
-#: ogginfo/ogginfo2.c:565
-msgid "Nominal bitrate not set\n"
-msgstr "Pas de débit nominal indiqué\n"
+#: ogginfo/ogginfo2.c:365
+msgid " to "
+msgstr " à "
 
-#: ogginfo/ogginfo2.c:568
-#, c-format
-msgid "Upper bitrate: %f kb/s\n"
-msgstr "Débit maximal : %f kb/s\n"
+#: ogginfo/ogginfo2.c:365
+msgid "\n"
+msgstr "\n"
 
-#: ogginfo/ogginfo2.c:571
-msgid "Upper bitrate not set\n"
-msgstr "Pas de débit maximal indiqué\n"
-
-#: ogginfo/ogginfo2.c:574
+#: ogginfo/ogginfo2.c:384
 #, c-format
-msgid "Lower bitrate: %f kb/s\n"
-msgstr "Débit minimal : %f kb/s\n"
-
-#: ogginfo/ogginfo2.c:577
-msgid "Lower bitrate not set\n"
-msgstr "Pas de débit minimal indiqué\n"
-
-#: ogginfo/ogginfo2.c:604
-#, 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 négatif en dehors de l'en-tête du flux vorbis. Ce fichier a été "
-"crée par un encodeur plein de bogues\n"
-
-#: ogginfo/ogginfo2.c:625
-msgid ""
 "Vorbis stream %d:\n"
-"\tTotal data length: %"
+"\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:659
+#: 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:796
+#: ogginfo/ogginfo2.c:537
 msgid "Warning: Invalid header page, no packet found\n"
-msgstr "Attention : Page d'en-tête invalide, aucun paquet trouvé\n"
+msgstr "Attention : Page d'entête invalide, aucun paquet trouvé\n"
 
-#: ogginfo/ogginfo2.c:814
+#: ogginfo/ogginfo2.c:549
 #, c-format
 msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-"Attention : Page d'en-tê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:828
-#, fuzzy, c-format
-msgid ""
-"Note: Stream %d has serial number %d, which is legal but may cause problems "
-"with some tools.\n"
-msgstr ""
-"Note : le flux %d a un numéro de série %d, qui est correct mais peut poser "
-"des problèmes à certains outils."
+#: 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:845
-#, fuzzy
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-"Attention : trou trouvé dans les données après environ %lld octets. Ogg "
-"corrompu.\n"
+#: ogginfo/ogginfo2.c:575
+msgid " bytes. Corrupted ogg.\n"
+msgstr " octets. Ogg corrompu.\n"
 
-#: ogginfo/ogginfo2.c:869
+#: 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"
+msgstr "Erreur lors de l'ouverture du fichier d'entrée « %s » : %s\n"
 
-#: ogginfo/ogginfo2.c:874
+#: ogginfo/ogginfo2.c:604
 #, c-format
 msgid ""
 "Processing file \"%s\"...\n"
 "\n"
 msgstr ""
-"Traitement du fichier « %s »...\n"
+"Traitement du fichier « %s »...\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:883
+#: 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:891
-msgid "Page found for stream after EOS flag"
-msgstr "Page trouvée pour le flux après le marqueur EOS"
-
-#: ogginfo/ogginfo2.c:894
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-"Violation des contraintes de mixage Ogg, nouveau flux avant le EOS des "
-"précédents flux"
-
-#: ogginfo/ogginfo2.c:898
-msgid "Error unknown."
-msgstr "Erreur inconnue."
-
-#: ogginfo/ogginfo2.c:901
+#: 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 ""
-"Attention : page(s) mal placée(s) dans le flux logique %d\n"
-"Ceci indique un fichier ogg corrompu: %s\n"
+"Attention : page(s) mal placée(s) dans le flux logique %d\n"
+"Ceci indique un fichier ogg corrompu.\n"
 
-#: ogginfo/ogginfo2.c:913
+#: 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"
+msgstr "Nouveau flux logique (n°%d, n° de série : %08x) : type %s\n"
 
-#: ogginfo/ogginfo2.c:916
+#: 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:920
+#: 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"
+msgstr "Attention : fanion de début de flux au milieu du flux %d\n"
 
-#: ogginfo/ogginfo2.c:925
+#: 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:940
+#: ogginfo/ogginfo2.c:652
 #, c-format
 msgid "Logical stream %d ended\n"
 msgstr "Fin du flux logique %d\n"
 
-#: ogginfo/ogginfo2.c:948
+#: ogginfo/ogginfo2.c:659
 #, c-format
 msgid ""
 "Error: No ogg data found in file \"%s\".\n"
 "Input probably not ogg.\n"
 msgstr ""
-"Erreur : aucune donnée ogg trouvée dans le fichier « %s ».\n"
+"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:959
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 de %s %s\n"
-
-#: ogginfo/ogginfo2.c:965
-#, 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.ogg ... fileN.ogg]\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"
 "\n"
-"Usage : ogginfo [options] fich1.ogg [fich2.ogg ... fichN.ogg]\n"
-"Options possibles :\n"
+"Usage : ogginfo [options] fich1.ogg [fich2.ogg ... fichN.ogg]\n"
+"Options possibles :\n"
 "\t-h Afficher cette aide\n"
 "\t-q Rendre moins verbeux. Une fois supprimera les messages\n"
 "           informatifs détaillés. Deux fois supprimera les avertissements.\n"
@@ -1994,13 +1443,7 @@
 "           détaillés pour certains types de flux.\n"
 "\n"
 
-#: ogginfo/ogginfo2.c:974
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:987
-#, c-format
+#: ogginfo/ogginfo2.c:691
 msgid ""
 "Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\n"
 "\n"
@@ -2008,631 +1451,348 @@
 "and for diagnosing problems with them.\n"
 "Full help shown with \"ogginfo -h\".\n"
 msgstr ""
-"Usage : ogginfo [options] fich1.ogg [fich2.ogg ... fichN.ogg]\n"
+"Usage : ogginfo [options] fich1.ogg [fich2.ogg ... fichN.ogg]\n"
 "\n"
 "Ogginfo est un outil permettant d'afficher des informations\n"
 "à propos de fichiers ogg et de diagnostiquer des problèmes les\n"
 "concernant.\n"
-"Pour avoir toute l'aide, faites « ogginfo -h ».\n"
+"Pour avoir toute l'aide, faites « ogginfo -h ».\n"
 
-#: ogginfo/ogginfo2.c:1019
-#, 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
 msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s : l'option « %s » est ambiguë\n"
+msgstr "%s : l'option « %s » est ambiguë\n"
 
 #: share/getopt.c:698
 #, c-format
 msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s : l'option « %s » n'admet pas d'argument\n"
+msgstr "%s : l'option « %s » n'admet pas d'argument\n"
 
 #: share/getopt.c:703
 #, c-format
 msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s : l'option « %c%s » n'admet pas d'argument\n"
+msgstr "%s : l'option « %c%s » n'admet pas d'argument\n"
 
 #: share/getopt.c:721 share/getopt.c:894
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
-msgstr "%s : l'option « %s » nécessite un 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"
+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"
+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"
-msgstr "%s : option illégale -- %c\n"
+msgstr "%s : option illégale -- %c\n"
 
 #: share/getopt.c:783
 #, c-format
 msgid "%s: invalid option -- %c\n"
-msgstr "%s : option invalide -- %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"
-msgstr "%s : cette option nécessite un argument -- %c\n"
+msgstr "%s : cette option nécessite un argument -- %c\n"
 
 #: share/getopt.c:860
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s : l'option « -W %s » est ambiguë\n"
+msgstr "%s : l'option « -W %s » est ambiguë\n"
 
 #: share/getopt.c:878
 #, c-format
 msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s : l'option « -W %s » n'admet pas d'argument\n"
+msgstr "%s : l'option « -W %s » n'admet pas d'argument\n"
 
-#: vcut/vcut.c:137
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr "Erreur de page. Entrée corrompue.\n"
 
-#: vcut/vcut.c:154
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr "Erreur de flux, on continue\n"
 
-#: vcut/vcut.c:179
-#, 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:188
-#, 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"
+msgstr "Placement de eos : la mise à jour de sync a retourné 0\n"
 
-#: vcut/vcut.c:198
-#, 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:231
-#, 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"
+msgstr "Cas spécial non traité : le premier fichier est il trop petit ?\n"
 
-#: vcut/vcut.c:290
-#, 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 ""
-"Erreur : Les deux premiers paquets audio ne rentrent pas sur une page ogg.\n"
+"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:303
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr "Erreur non fatale dans le flux\n"
 
-#: vcut/vcut.c:313
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr "Erreur dans le flux\n"
 
-#: vcut/vcut.c:336
-#, 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:385
-#, c-format
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr "L'entrée n'est pas un ogg.\n"
 
-#: vcut/vcut.c:395
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr "Erreur à la première page\n"
 
-#: vcut/vcut.c:400
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr "erreur dans le premier paquet\n"
 
-#: vcut/vcut.c:406
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
-msgstr "Erreur dans l'en-tête primaire : pas du vorbis ?\n"
+msgstr "Erreur dans l'entête primaire : pas du vorbis ?\n"
 
-#: vcut/vcut.c:426
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr "Entête secondaire corrompu\n"
 
-#: vcut/vcut.c:439
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
-msgstr "EOF dans les en-têtes\n"
+msgstr "EOF dans les entêtes\n"
 
-#: vcut/vcut.c:472
-#, 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 | +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:476
-#, 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"
+"Attention : vcut est encore un code expérimental.\n"
+"Vérifiez que les fichiers produits soient corrects avant d'effacer les sources.\n"
 "\n"
 
-#: vcut/vcut.c:481
+#: 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:486 vcut/vcut.c:491
+#: 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:497 vcut/vcut.c:502
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
-msgstr "point de césure « %s » incompréhensible\n"
+msgstr "point de césure « %s » incompréhensible\n"
 
-#: vcut/vcut.c:507
+#: vcut/vcut.c:484
 #, c-format
-msgid "Processing: Cutting at %lld seconds\n"
-msgstr "Traitement : Coupure à %lld secondes\n"
+msgid "Processing: Cutting at %lld\n"
+msgstr "Traitement : Coupure à %lld\n"
 
-#: vcut/vcut.c:509
-#, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr "Traitement : Coupure à %lld échantillons\n"
-
-#: vcut/vcut.c:519
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr "Échec du traitement\n"
 
-#: vcut/vcut.c:541
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
-msgstr "Erreur lors de la lecture des en-têtes\n"
+msgstr "Erreur lors de la lecture des entêtes\n"
 
-#: vcut/vcut.c:564
-#, 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:572
-#, 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:233
+#: vorbiscomment/vcedit.c:220
 msgid "Input truncated or empty."
 msgstr "Entrée tronquée ou vide."
 
-#: vorbiscomment/vcedit.c:235
+#: vorbiscomment/vcedit.c:222
 msgid "Input is not an Ogg bitstream."
 msgstr "L'entrée n'est pas un flux Ogg."
 
-#: vorbiscomment/vcedit.c:253
+#: 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:259
+#: vorbiscomment/vcedit.c:245
 msgid "Error reading initial header packet."
-msgstr "Erreur lors de la lecture du paquet d'en-tête initial."
+msgstr "Erreur lors de la lecture du paquet d'entête initial."
 
-#: vorbiscomment/vcedit.c:265
+#: 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:288
+#: vorbiscomment/vcedit.c:274
 msgid "Corrupt secondary header."
 msgstr "Entête secondaire corrompu."
 
-#: vorbiscomment/vcedit.c:309
+#: vorbiscomment/vcedit.c:295
 msgid "EOF before end of vorbis headers."
-msgstr "Fin de fichier avant la fin des en-têtes vorbis."
+msgstr "Fin de fichier avant la fin des entêtes vorbis."
 
-#: vorbiscomment/vcedit.c:462
+#: vorbiscomment/vcedit.c:448
 msgid "Corrupt or missing data, continuing..."
 msgstr "Données corrompues ou manquantes, on continue..."
 
-#: vorbiscomment/vcedit.c:502
-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:120 vorbiscomment/vcomment.c:146
+#: 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"
+msgstr "Impossible d'ouvrir le fichier comme un vorbis : %s\n"
 
-#: vorbiscomment/vcomment.c:165
+#: vorbiscomment/vcomment.c:148
 #, c-format
 msgid "Bad comment: \"%s\"\n"
-msgstr "Mauvais commentaire : « %s »\n"
+msgstr "Mauvais commentaire : « %s »\n"
 
-#: vorbiscomment/vcomment.c:177
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "bad comment: \"%s\"\n"
-msgstr "mauvais commentaire : « %s »\n"
+msgstr "mauvais commentaire : « %s »\n"
 
-#: vorbiscomment/vcomment.c:187
+#: 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"
+msgstr "Impossible d'écrire les commentaires dans le fichier de sortie : %s\n"
 
-#: vorbiscomment/vcomment.c:204
-#, 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:306
-#, 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:309
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:312
-#, 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:318
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:319
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:322
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Mauvais typage dans la liste des options"
-
-#: vorbiscomment/vcomment.c:323
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:324
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:326
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:330
-#, 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:333
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:337
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:340
-#, 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:345
-#, 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:352
-#, 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:357
-#, 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:419
-#, 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:505
+#: 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"
+msgstr "Erreur lors de l'ouverture du fichier d'entrée « %s ».\n"
 
-#: vorbiscomment/vcomment.c:514
-#, 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:525
+#: 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"
+msgstr "Erreur lors de l'ouverture du fichier de sortie « %s ».\n"
 
-#: vorbiscomment/vcomment.c:540
+#: 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"
+msgstr "Erreur lors de l'ouverture du fichier de commentaires « %s ».\n"
 
-#: vorbiscomment/vcomment.c:557
+#: 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"
+msgstr "Erreur lors de l'ouverture du fichier de commentaires « %s »\n"
 
-#: vorbiscomment/vcomment.c:591
+#: 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:593
+#: 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:603
-#, fuzzy, c-format
-msgid "Error removing erroneous temporary file %s\n"
-msgstr "Erreur lors de la suppression du vieux fichier %s\n"
-
-# 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 (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=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 (ou format hh:mm:ss)\n"
-#~ "  -K n, --end n  Arrête à « n » secondes (ou format hh:mm:ss)\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 "Warning: granulepos in stream %d decreases from %I64d to %I64d"
-#~ msgstr "Attention : le granulepos du flux %d a décru de %I64d à %I64d"
-
-#, fuzzy
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Flux Vorbis %d :\n"
-#~ "\tLongueur totale des données : %I64d octets\n"
-#~ "\tDurée totale : %ldm:%02lds\n"
-#~ "\tDébit moyen : %f kbps\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Theora stream %d:\n"
-#~ "\tTotal data length: %lld bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Flux Vorbis %d :\n"
-#~ "\tLongueur totale des données : %lld octets\n"
-#~ "\tDurée totale : %ldm:%02lds\n"
-#~ "\tDébit moyen : %f kbps\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %I64d bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Flux Vorbis %d :\n"
-#~ "\tLongueur totale des données : %I64d octets\n"
-#~ "\tDurée totale : %ldm:%02lds\n"
-#~ "\tDébit moyen : %f kbps\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Vorbis stream %d:\n"
-#~ "\tTotal data length: %lld bytes\n"
-#~ "\tPlayback length: %ldm:%02ld.%03lds\n"
-#~ "\tAverage bitrate: %f kb/s\n"
-#~ msgstr ""
-#~ "Flux Vorbis %d :\n"
-#~ "\tLongueur totale des données : %lld octets\n"
-#~ "\tDurée totale : %ldm:%02lds\n"
-#~ "\tDébit moyen : %f kbps\n"
-
-#~ msgid ""
-#~ "Warning: Hole in data found at approximate offset %I64d bytes. Corrupted "
-#~ "ogg.\n"
-#~ msgstr ""
-#~ "Attention : trou trouvé dans les données après environ %I64d octets. Ogg "
-#~ "corrompu.\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 ""
-#~ "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"
-
-#~ msgid "Couldn't convert comment to UTF8, cannot add\n"
-#~ msgstr ""
-#~ "Impossible de convertir les commentaires en UTF8, impossible de les "
-#~ "ajouter\n"

Modified: trunk/vorbis-tools/po/hr.po
===================================================================
--- trunk/vorbis-tools/po/hr.po	2008-06-22 21:07:32 UTC (rev 15057)
+++ trunk/vorbis-tools/po/hr.po	2008-06-23 21:40:34 UTC (rev 15058)
@@ -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: 2007-12-30 13:57+0900\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:351
-#, 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,798 +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:554 oggenc/oggenc.c:559
-#: oggenc/oggenc.c:564 oggenc/oggenc.c:569 oggenc/oggenc.c:574
-#: oggenc/oggenc.c:579
+#: 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:426
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Uspjeh"
 
-#: ogg123/cfgfile_options.c:430
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Ključ nije pronađen"
 
-#: ogg123/cfgfile_options.c:432
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Nema ključa"
 
-#: ogg123/cfgfile_options.c:434
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Neispravna vrijednost"
 
-#: ogg123/cfgfile_options.c:436
+#: ogg123/cfgfile_options.c:432
 msgid "Bad type in options list"
 msgstr "Neispravni tip u popisu opcija"
 
-#: ogg123/cfgfile_options.c:438
+#: 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"
+"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:295
+#: ogg123/cmdline_options.c:267
 #, c-format
 msgid ""
-"Usage: ogg123 [options] file ...\n"
-"Play Ogg audio files and network streams.\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:298
-#, fuzzy, c-format
-msgid "Available codecs: "
-msgstr "Raspoložive opcije:\n"
+#: 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/cmdline_options.c:301
-#, c-format
-msgid "FLAC, "
+#: ogg123/format.c:59
+msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:305
-#, c-format
-msgid "Speex, "
+#: ogg123/http_transport.c:119
+msgid "Error: Out of memory in new_curl_thread_arg().\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:308
-#, c-format
-msgid ""
-"Ogg Vorbis.\n"
-"\n"
+#: ogg123/http_transport.c:144
+msgid "Error: Could not set signal mask."
 msgstr ""
 
-#: ogg123/cmdline_options.c:310
-#, c-format
-msgid "Output options\n"
+#: ogg123/http_transport.c:196
+msgid "Error: Unable to create input buffer.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:311
-#, c-format
-msgid ""
-"  -d dev, --device dev    Use output device \"dev\". Available devices:\n"
+#. found, name, description, type, ptr, default
+#: ogg123/ogg123.c:72
+msgid "default output device"
 msgstr ""
 
-#: ogg123/cmdline_options.c:313
-#, c-format
-msgid "Live:"
+#: ogg123/ogg123.c:74
+msgid "shuffle playlist"
 msgstr ""
 
-#: ogg123/cmdline_options.c:322
-#, fuzzy, c-format
-msgid "File:"
-msgstr "Datoteka: %s"
-
-#: ogg123/cmdline_options.c:331
+#: ogg123/ogg123.c:255
 #, c-format
 msgid ""
-"  -f file, --file file    Set the output filename for a file device\n"
-"                          previously specified with --device.\n"
+"\n"
+"Device:   %s"
 msgstr ""
 
-#: ogg123/cmdline_options.c:334
+#: ogg123/ogg123.c:256
 #, c-format
-msgid "  --audio-buffer n        Use an output audio buffer of 'n' kilobytes\n"
-msgstr ""
+msgid "Author:   %s"
+msgstr "Autor:   %s"
 
-#: ogg123/cmdline_options.c:335
+#: ogg123/ogg123.c:257
 #, 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 ""
+msgid "Comments: %s\n"
+msgstr "Komentari: %s\n"
 
-#: 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"
+#: ogg123/ogg123.c:313
+msgid "Error: Could not create audio buffer.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:343
+#: ogg123/ogg123.c:387
 #, c-format
-msgid "  -r, --repeat            Repeat playlist indefinitely\n"
+msgid "No module could be found to read from %s.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:344
+#: ogg123/ogg123.c:392
 #, c-format
-msgid "  -R, --remote            Use remote control interface\n"
-msgstr ""
+msgid "Cannot open %s.\n"
+msgstr "Ne mogu otvoriti %s.\n"
 
-#: ogg123/cmdline_options.c:345
+#: ogg123/ogg123.c:398
 #, c-format
-msgid "  -z, --shuffle           Shuffle list of files before playing\n"
+msgid "The file format of %s is not supported.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:346
+#: ogg123/ogg123.c:405
 #, c-format
-msgid "  -Z, --random            Play files randomly until interrupted\n"
+msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:349
+#: ogg123/ogg123.c:430
 #, c-format
-msgid "Input options\n"
-msgstr ""
+msgid "Playing: %s"
+msgstr "Reproduciram: %s"
 
-#: ogg123/cmdline_options.c:350
+#: ogg123/ogg123.c:435
 #, c-format
-msgid "  -b n, --buffer n        Use an input buffer of 'n' kilobytes\n"
+msgid "Could not skip %f seconds of audio."
 msgstr ""
 
-#: ogg123/cmdline_options.c:351
-#, c-format
-msgid "  -p n, --prebuffer n     Load n%% of the input buffer before playing\n"
+#: ogg123/ogg123.c:473
+msgid "Error: Decoding failure.\n"
 msgstr ""
 
-#: ogg123/cmdline_options.c:354
-#, fuzzy, c-format
-msgid "Decode options\n"
-msgstr "Opis"
+#. In case we were killed mid-output
+#: ogg123/ogg123.c:546
+msgid "Done."
+msgstr "Gotovo."
 
-#: ogg123/cmdline_options.c:355
+#: ogg123/oggvorbis_format.c:50
 #, c-format
-msgid ""
-"  -k n, --skip n          Skip the first 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
+msgid "Artist: %s"
+msgstr "Umjetnik: %s"
 
-#: ogg123/cmdline_options.c:356
+#: ogg123/oggvorbis_format.c:51
 #, c-format
-msgid "  -K n, --end n           End at 'n' seconds (or hh:mm:ss format)\n"
-msgstr ""
+msgid "Album: %s"
+msgstr "Album: %s"
 
-#: ogg123/cmdline_options.c:357
+#: ogg123/oggvorbis_format.c:52
 #, c-format
-msgid "  -x n, --nth n           Play every 'n'th block\n"
-msgstr ""
+msgid "Title: %s"
+msgstr "Naslov: %s"
 
-#: ogg123/cmdline_options.c:358
+#: ogg123/oggvorbis_format.c:53
 #, c-format
-msgid "  -y n, --ntimes n        Repeat every played block 'n' times\n"
-msgstr ""
+msgid "Version: %s"
+msgstr "Inačica: %s"
 
-#: ogg123/cmdline_options.c:361 vorbiscomment/vcomment.c:329
-#, fuzzy, c-format
-msgid "Miscellaneous options\n"
-msgstr "Raspoložive opcije:\n"
-
-#: ogg123/cmdline_options.c:362
+#: ogg123/oggvorbis_format.c:54
 #, 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 ""
+msgid "Track number: %s"
+msgstr "Broj pjesme: %s"
 
-#: ogg123/cmdline_options.c:367 vorbiscomment/vcomment.c:336
+#: ogg123/oggvorbis_format.c:55
 #, c-format
-msgid "  -h, --help              Display this help\n"
-msgstr ""
+msgid "Organization: %s"
+msgstr "Organizacija: %s"
 
-#: ogg123/cmdline_options.c:368
+#: ogg123/oggvorbis_format.c:56
 #, c-format
-msgid "  -q, --quiet             Don't display anything (no title)\n"
-msgstr ""
+msgid "Genre: %s"
+msgstr "Žanr: %s"
 
-#: ogg123/cmdline_options.c:369
+#: ogg123/oggvorbis_format.c:57
 #, c-format
-msgid ""
-"  -v, --verbose           Display progress and other status information\n"
-msgstr ""
+msgid "Description: %s"
+msgstr "Opis: %s"
 
-#: ogg123/cmdline_options.c:370
+#: ogg123/oggvorbis_format.c:58
 #, c-format
-msgid "  -V, --version           Display ogg123 version\n"
-msgstr ""
+msgid "Date: %s"
+msgstr "Nadnevak: %s"
 
-#: ogg123/file_transport.c:64 ogg123/http_transport.c:214
-#: ogg123/oggvorbis_format.c:95
+#: ogg123/oggvorbis_format.c:59
 #, c-format
-msgid "Error: Out of memory.\n"
-msgstr "Greška: Nedovoljno memorije.\n"
+msgid "Location: %s"
+msgstr "Mjesto: %s"
 
-#: ogg123/format.c:82
+#: ogg123/oggvorbis_format.c:60
 #, c-format
-msgid "Error: Could not allocate memory in malloc_decoder_stats()\n"
-msgstr ""
+msgid "Copyright %s"
+msgstr "Autorska prava %s"
 
-#: ogg123/http_transport.c:144
-msgid "Error: Could not set signal mask."
-msgstr ""
-
-#: ogg123/http_transport.c:201
-msgid "Error: Unable to create input buffer.\n"
-msgstr ""
-
-#: ogg123/ogg123.c:82
-msgid "default output device"
-msgstr ""
-
-#: ogg123/ogg123.c:84
-msgid "shuffle playlist"
-msgstr ""
-
-#: ogg123/ogg123.c:86
-msgid "repeat playlist forever"
-msgstr ""
-
-#: ogg123/ogg123.c:232
+#: ogg123/oggvorbis_format.c:61
 #, c-format
-msgid "Could not skip to %f in audio stream."
-msgstr ""
+msgid "Comment: %s"
+msgstr "Komentar: %s"
 
-#: ogg123/ogg123.c:378
-#, c-format
-msgid ""
-"\n"
-"Audio Device:   %s"
-msgstr ""
-
-#: ogg123/ogg123.c:379
-#, c-format
-msgid "Author:   %s"
-msgstr "Autor:   %s"
-
-#: ogg123/ogg123.c:380
-#, fuzzy, c-format
-msgid "Comments: %s"
-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
-msgid "Error: Could not create audio buffer.\n"
-msgstr ""
-
-#: ogg123/ogg123.c:557
-#, c-format
-msgid "No module could be found to read from %s.\n"
-msgstr ""
-
-#: ogg123/ogg123.c:562
-#, c-format
-msgid "Cannot open %s.\n"
-msgstr "Ne mogu otvoriti %s.\n"
-
-#: ogg123/ogg123.c:568
-#, c-format
-msgid "The file format of %s is not supported.\n"
-msgstr ""
-
-#: ogg123/ogg123.c:578
-#, c-format
-msgid "Error opening %s using the %s module.  The file may be corrupted.\n"
-msgstr ""
-
-#: ogg123/ogg123.c:597
-#, c-format
-msgid "Playing: %s"
-msgstr "Reproduciram: %s"
-
-#: ogg123/ogg123.c:608
-#, c-format
-msgid "Could not skip %f seconds of audio."
-msgstr ""
-
-#: ogg123/ogg123.c:663
-msgid "Error: Decoding failure.\n"
-msgstr ""
-
-#: ogg123/ogg123.c:742
-msgid "Done."
-msgstr "Gotovo."
-
-#: ogg123/oggvorbis_format.c:157
+#: ogg123/oggvorbis_format.c:170
 msgid "--- Hole in the stream; probably harmless\n"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:163
+#: ogg123/oggvorbis_format.c:176
 msgid "=== Vorbis library reported a stream error.\n"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:310
+#: ogg123/oggvorbis_format.c:370
 #, c-format
-msgid "Ogg Vorbis stream: %d channel, %ld Hz"
-msgstr ""
+msgid "Version is %d"
+msgstr "Inačica je %d"
 
-#: ogg123/oggvorbis_format.c:315
+#: ogg123/oggvorbis_format.c:374
 #, c-format
-msgid "Vorbis format: Version %d"
+msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:319
+#: ogg123/oggvorbis_format.c:382
 #, c-format
-msgid "Bitrate hints: upper=%ld nominal=%ld lower=%ld window=%ld"
+msgid "Bitstream is %d channel, %ldHz"
 msgstr ""
 
-#: ogg123/oggvorbis_format.c:327
+#: ogg123/oggvorbis_format.c:387
 #, c-format
 msgid "Encoded by: %s"
 msgstr "Enkodirao: %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/status.c:47
 #, c-format
-msgid "Warning from playlist %s: Could not read directory %s.\n"
+msgid "%sPrebuf to %1.f%%"
 msgstr ""
 
-#: 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/status.c:52
 #, c-format
-msgid "%sPrebuf to %.1f%%"
-msgstr ""
-
-#: ogg123/status.c:65
-#, c-format
 msgid "%sPaused"
 msgstr ""
 
-#: 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 ""
 
-#: ogg123/status.c:211
+#: ogg123/status.c:198
 #, c-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
 
-#: ogg123/status.c:217
+#: ogg123/status.c:204
 #, c-format
 msgid "Time: %s"
 msgstr "Vrijeme: %s"
 
-#: ogg123/status.c:245
+#: ogg123/status.c:232
 #, c-format
 msgid "of %s"
 msgstr ""
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
 msgstr ""
 
-#: ogg123/status.c:271
+#: ogg123/status.c:258
 #, c-format
 msgid " Input Buffer %5.1f%%"
 msgstr ""
 
-#: ogg123/status.c:290
+#: ogg123/status.c:277
 #, c-format
 msgid " Output Buffer %5.1f%%"
 msgstr ""
 
-#: ogg123/transport.c:71
-#, c-format
+#: ogg123/transport.c:59
 msgid "Error: Could not allocate memory in malloc_data_source_stats()\n"
 msgstr ""
 
-#: oggdec/oggdec.c:50
-#, fuzzy, c-format
-msgid "oggdec from %s %s\n"
-msgstr "ogg123 iz %s %s\n"
-
-#: oggdec/oggdec.c:56 ogginfo/ogginfo2.c:964
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggenc/audio.c:47
+#: oggenc/audio.c:38
 msgid "WAV file reader"
 msgstr ""
 
-#: oggenc/audio.c:48
+#: oggenc/audio.c:39
 msgid "AIFF/AIFC file reader"
 msgstr ""
 
-#: oggenc/audio.c:50
-msgid "FLAC file reader"
-msgstr ""
-
-#: oggenc/audio.c:51
-msgid "Ogg FLAC file reader"
-msgstr ""
-
-#: oggenc/audio.c:128 oggenc/audio.c:421
-#, c-format
+#: oggenc/audio.c:112 oggenc/audio.c:374
 msgid "Warning: Unexpected EOF in reading WAV header\n"
 msgstr ""
 
-#: oggenc/audio.c:139
+#: oggenc/audio.c:123
 #, c-format
 msgid "Skipping chunk of type \"%s\", length %d\n"
 msgstr ""
 
-#: oggenc/audio.c:165
-#, c-format
+#: oggenc/audio.c:141
 msgid "Warning: Unexpected EOF in AIFF chunk\n"
 msgstr ""
 
-#: oggenc/audio.c:251
-#, c-format
+#: oggenc/audio.c:226
 msgid "Warning: No common chunk found in AIFF file\n"
 msgstr ""
 
-#: oggenc/audio.c:257
-#, c-format
+#: oggenc/audio.c:232
 msgid "Warning: Truncated common chunk in AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:265
-#, c-format
+#: oggenc/audio.c:240
 msgid "Warning: Unexpected EOF in reading AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:280
-#, c-format
+#: oggenc/audio.c:253
 msgid "Warning: AIFF-C header truncated.\n"
 msgstr ""
 
-#: oggenc/audio.c:294
-#, 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:301
-#, c-format
+#: oggenc/audio.c:265
 msgid "Warning: No SSND chunk found in AIFF file\n"
 msgstr ""
 
-#: oggenc/audio.c:307
-#, c-format
+#: oggenc/audio.c:271
 msgid "Warning: Corrupted SSND chunk in AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:313
-#, c-format
+#: oggenc/audio.c:277
 msgid "Warning: Unexpected EOF reading AIFF header\n"
 msgstr ""
 
-#: oggenc/audio.c:350
+#: 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:404
-#, c-format
+#: oggenc/audio.c:357
 msgid "Warning: Unrecognised format chunk in WAV header\n"
 msgstr ""
 
-#: oggenc/audio.c:416
-#, 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:453
-#, 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:462
-#, 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:524
+#: oggenc/audio.c:558
 #, c-format
 msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 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:600
-#, c-format
-msgid "Big endian 24 bit PCM data is not currently supported, aborting.\n"
-msgstr ""
-
-#: oggenc/audio.c:606
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:708
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-
-#: oggenc/audio.c:726
-#, c-format
-msgid "Couldn't initialise resampler\n"
-msgstr ""
-
-#: oggenc/encode.c:63
-#, c-format
-msgid "Setting advanced encoder option \"%s\" to %s\n"
-msgstr ""
-
-#: oggenc/encode.c:100
-#, c-format
-msgid "Changed lowpass frequency from %f kHz to %f kHz\n"
-msgstr ""
-
-#: oggenc/encode.c:103
-#, fuzzy, c-format
-msgid "Unrecognised advanced option \"%s\"\n"
-msgstr "%s: neprepoznata opcija `--%s'\n"
-
-#: oggenc/encode.c:170
-#, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
-msgstr ""
-
-#: oggenc/encode.c:178
-#, c-format
-msgid "Requesting a minimum or maximum bitrate requires --managed\n"
-msgstr ""
-
-#: oggenc/encode.c:196
-#, c-format
+#: oggenc/encode.c:59
 msgid "Mode initialisation failed: invalid parameters for quality\n"
 msgstr ""
 
-#: oggenc/encode.c:240
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:242
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:254
-#, c-format
+#: oggenc/encode.c:71
 msgid "Mode initialisation failed: invalid parameters for bitrate\n"
 msgstr ""
 
-#: oggenc/encode.c:319 oggenc/encode.c:341
+#: oggenc/encode.c:110
 msgid "Failed writing header to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:415
+#: oggenc/encode.c:178
 msgid "Failed writing data to output stream\n"
 msgstr ""
 
-#: oggenc/encode.c:461
+#: 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:471
+#: oggenc/encode.c:234
 #, c-format
-msgid "\tEncoding [%2dm%.2ds so far] %c "
+msgid "\tEncoding [%2dm%.2ds so far] %c"
 msgstr ""
 
-#: oggenc/encode.c:489
+#: oggenc/encode.c:252
 #, c-format
 msgid ""
 "\n"
@@ -869,245 +645,164 @@
 "Done encoding file \"%s\"\n"
 msgstr ""
 
-#: oggenc/encode.c:491
-#, c-format
+#: oggenc/encode.c:254
 msgid ""
 "\n"
 "\n"
 "Done encoding.\n"
 msgstr ""
 
-#: oggenc/encode.c:495
+#: oggenc/encode.c:258
 #, c-format
 msgid ""
 "\n"
 "\tFile length:  %dm %04.1fs\n"
 msgstr ""
 
-#: oggenc/encode.c:499
+#: oggenc/encode.c:262
 #, c-format
 msgid "\tElapsed time: %dm %04.1fs\n"
 msgstr ""
 
-#: oggenc/encode.c:502
+#: oggenc/encode.c:265
 #, c-format
 msgid "\tRate:         %.4f\n"
 msgstr ""
 
-#: oggenc/encode.c:503
+#: oggenc/encode.c:266
 #, c-format
 msgid ""
 "\tAverage bitrate: %.1f kb/s\n"
 "\n"
 msgstr ""
 
-#: oggenc/encode.c:540
+#: 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:542 oggenc/encode.c:549 oggenc/encode.c:557
-#: oggenc/encode.c:564 oggenc/encode.c:570
+#: oggenc/encode.c:291 oggenc/encode.c:298
 msgid "standard input"
 msgstr ""
 
-#: oggenc/encode.c:543 oggenc/encode.c:550 oggenc/encode.c:558
-#: oggenc/encode.c:565 oggenc/encode.c:571
+#: oggenc/encode.c:292 oggenc/encode.c:299
 msgid "standard output"
 msgstr ""
 
-#: oggenc/encode.c:548
+#: 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:556
+#: 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 "
-msgstr ""
-
-#: oggenc/encode.c:563
-#, c-format
-msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"at quality %2.2f\n"
-msgstr ""
-
-#: oggenc/encode.c:569
-#, c-format
-msgid ""
-"Encoding %s%s%s to \n"
-"         %s%s%s \n"
-"using bitrate management "
-msgstr ""
-
-#: oggenc/oggenc.c:103
-#, c-format
-msgid ""
 "%s%s\n"
 "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:184
+#: oggenc/oggenc.c:166
 #, c-format
 msgid "ERROR: Cannot open input file \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:200
-msgid "RAW file reader"
-msgstr ""
-
-#: oggenc/oggenc.c:217
+#: oggenc/oggenc.c:193
 #, c-format
 msgid "Opening with %s module: %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:226
+#: oggenc/oggenc.c:202
 #, c-format
 msgid "ERROR: Input file \"%s\" is not a supported format\n"
 msgstr ""
 
-#: oggenc/oggenc.c:277
-#, c-format
+#: oggenc/oggenc.c:249
 msgid "WARNING: No filename, defaulting to \"default.ogg\"\n"
 msgstr ""
 
-#: oggenc/oggenc.c:285
+#: 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:292
+#: oggenc/oggenc.c:268
 #, c-format
-msgid "ERROR: Input filename is the same as output filename \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:303
-#, c-format
 msgid "ERROR: Cannot open output file \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/oggenc.c:333
-#, c-format
-msgid "Resampling input from %d Hz to %d Hz\n"
+#: oggenc/oggenc.c:316
+msgid ""
+"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:340
+#: oggenc/oggenc.c:331
 #, c-format
-msgid "Downmixing stereo to mono\n"
-msgstr ""
-
-#: oggenc/oggenc.c:343
-#, c-format
-msgid "WARNING: Can't downmix except from stereo to mono\n"
-msgstr ""
-
-#: oggenc/oggenc.c:351
-#, c-format
-msgid "Scaling input to %f\n"
-msgstr ""
-
-#: oggenc/oggenc.c:394
-#, c-format
 msgid ""
 "%s%s\n"
-"Usage: oggenc [options] inputfile [...]\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"
-" -k, --skeleton       Outputs ogg skeleton metadata\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"
+"                      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"
-" --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"
+"                      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"
-" --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"
+"                      %%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"
+" -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"
 " -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"
 " -N, --tracknum       Track number for this track\n"
 " -t, --title          Title for this track\n"
@@ -1115,594 +810,247 @@
 " -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"
+"                      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"
 "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:584
+#: oggenc/oggenc.c:495
 #, c-format
 msgid "WARNING: Ignoring illegal escape character '%c' in name format\n"
 msgstr ""
 
-#: oggenc/oggenc.c:613 oggenc/oggenc.c:735 oggenc/oggenc.c:748
-#, c-format
+#: oggenc/oggenc.c:518
 msgid "Enabling bitrate management engine\n"
 msgstr ""
 
-#: oggenc/oggenc.c:622
-#, c-format
-msgid ""
-"WARNING: Raw endianness specified for non-raw data. Assuming input is raw.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:625
-#, c-format
-msgid "WARNING: Couldn't read endianness argument \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:632
-#, c-format
-msgid "WARNING: Couldn't read resampling frequency \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:638
-#, c-format
-msgid "Warning: Resample rate specified as %d Hz. Did you mean %d Hz?\n"
-msgstr ""
-
-#: oggenc/oggenc.c:648
-#, c-format
-msgid "Warning: Couldn't parse scaling factor \"%s\"\n"
-msgstr ""
-
-#: oggenc/oggenc.c:658
-#, c-format
-msgid "No value for advanced encoder option found\n"
-msgstr ""
-
-#: oggenc/oggenc.c:673
-#, c-format
+#: oggenc/oggenc.c:522
 msgid "Internal error parsing command line options\n"
 msgstr ""
 
-#: oggenc/oggenc.c:684
+#: oggenc/oggenc.c:569
 #, c-format
-msgid "Warning: Illegal comment used (\"%s\"), ignoring.\n"
-msgstr ""
-
-#: oggenc/oggenc.c:721
-#, c-format
 msgid "Warning: nominal bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:729
+#: oggenc/oggenc.c:582
 #, c-format
 msgid "Warning: minimum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:742
+#: oggenc/oggenc.c:594
 #, c-format
 msgid "Warning: maximum bitrate \"%s\" not recognised\n"
 msgstr ""
 
-#: oggenc/oggenc.c:754
+#: oggenc/oggenc.c:600
 #, c-format
 msgid "Quality option \"%s\" not recognised, ignoring\n"
 msgstr ""
 
-#: oggenc/oggenc.c:762
-#, c-format
+#: oggenc/oggenc.c:607
 msgid "WARNING: quality setting too high, setting to maximum quality.\n"
 msgstr ""
 
-#: oggenc/oggenc.c:768
-#, 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:777
-#, c-format
+#: oggenc/oggenc.c:627
 msgid "WARNING: Multiple name format filters specified, using final\n"
 msgstr ""
 
-#: oggenc/oggenc.c:786
-#, 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:794
-#, c-format
+#: oggenc/oggenc.c:644
 msgid "WARNING: Multiple output files specified, suggest using -n\n"
 msgstr ""
 
-#: oggenc/oggenc.c:813
-#, 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:818 oggenc/oggenc.c:822
-#, 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:829
-#, 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:834
-#, 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:845
-#, 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:850
-#, 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:857
-#, c-format
+#: oggenc/oggenc.c:704
 msgid "WARNING: Unknown option specified, ignoring->\n"
 msgstr ""
 
-#: oggenc/oggenc.c:879 vorbiscomment/vcomment.c:284
-#, c-format
+#: oggenc/oggenc.c:726
 msgid "Couldn't convert comment to UTF-8, cannot add\n"
 msgstr ""
 
-#: oggenc/oggenc.c:898
-#, c-format
+#: oggenc/oggenc.c:745
 msgid "WARNING: Insufficient titles specified, defaulting to final title.\n"
 msgstr ""
 
-#: oggenc/platform.c:150
+#: oggenc/platform.c:139
 #, c-format
 msgid "Couldn't create directory \"%s\": %s\n"
 msgstr ""
 
-#: oggenc/platform.c:157
+#: oggenc/platform.c:146
 #, c-format
 msgid "Error checking for existence of directory %s: %s\n"
 msgstr ""
 
-#: oggenc/platform.c:170
+#: oggenc/platform.c:157
 #, c-format
 msgid "Error: path segment \"%s\" is not a directory\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:186
+#: 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:194
+#: 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:225 ogginfo/ogginfo2.c:233
+#: 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:240
+#: 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:316
-#, 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:330
-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:355 ogginfo/ogginfo2.c:522
-#, c-format
-msgid "Warning: discontinuity in stream (%d)\n"
+#: ogginfo/ogginfo.c:81
+msgid "bitrate_nominal="
 msgstr ""
 
-#: ogginfo/ogginfo2.c:363
-#, 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:370
+#: 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:374
+#: 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:377
-#, fuzzy, c-format
-msgid "Version: %d.%d.%d\n"
-msgstr "Inačica: %s"
-
-#: ogginfo/ogginfo2.c:379 ogginfo/ogginfo2.c:557
-#, fuzzy, c-format
-msgid "Vendor: %s\n"
-msgstr "Žanr: %s"
-
-#: ogginfo/ogginfo2.c:380
+#: ogginfo/ogginfo.c:101
 #, c-format
-msgid "Width: %d\n"
+msgid "length=%f\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:381
-#, fuzzy, c-format
-msgid "Height: %d\n"
-msgstr "Inačica: %s"
-
-#: ogginfo/ogginfo2.c:382
+#: ogginfo/ogginfo.c:102
 #, c-format
-msgid "Total image: %d by %d, crop offset (%d, %d)\n"
+msgid "playtime=%ld:%02ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:385
-msgid "Frame offset/size invalid: width incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:387
-msgid "Frame offset/size invalid: height incorrect\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:390
-msgid "Invalid zero framerate\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:392
+#: ogginfo/ogginfo.c:300
 #, c-format
-msgid "Framerate %d/%d (%.02f fps)\n"
+msgid "Unable to open \"%s\": %s\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:396
-msgid "Aspect ratio undefined\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:401
+#: ogginfo/ogginfo.c:319
 #, c-format
-msgid "Pixel aspect ratio %d:%d (%f:1)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:403
-msgid "Frame aspect 4:3\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:405
-msgid "Frame aspect 16:9\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:407
-#, c-format
-msgid "Frame aspect %f:1\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:411
-msgid "Colourspace: Rec. ITU-R BT.470-6 System M (NTSC)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:413
-msgid "Colourspace: Rec. ITU-R BT.470-6 Systems B and G (PAL)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:415
-msgid "Colourspace unspecified\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:418
-msgid "Pixel format 4:2:0\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:420
-msgid "Pixel format 4:2:2\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:422
-msgid "Pixel format 4:4:4\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:424
-msgid "Pixel format invalid\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:426
-#, c-format
-msgid "Target bitrate: %d kbps\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:427
-#, c-format
-msgid "Nominal quality setting (0-63): %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:430 ogginfo/ogginfo2.c:580
-msgid "User comments section follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:451
-msgid "Warning: Expected frame %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:467 ogginfo/ogginfo2.c:595
-msgid "Warning: granulepos in stream %d decreases from %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:494
 msgid ""
-"Theora stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:531
-#, c-format
-msgid ""
-"Warning: Could not decode vorbis header packet %d - invalid vorbis stream (%"
-"d)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:539
-#, 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:543
-#, c-format
-msgid "Vorbis headers parsed for stream %d, information follows...\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:546
-#, fuzzy, c-format
-msgid "Version: %d\n"
-msgstr "Inačica: %s"
-
-#: ogginfo/ogginfo2.c:550
-#, c-format
-msgid "Vendor: %s (%s)\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:558
-#, c-format
-msgid "Channels: %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:559
-#, fuzzy, c-format
-msgid ""
-"Rate: %ld\n"
 "\n"
-msgstr "Nadnevak: %s"
-
-#: ogginfo/ogginfo2.c:562
-#, c-format
-msgid "Nominal bitrate: %f kb/s\n"
+"serial=%ld\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:565
-msgid "Nominal bitrate not set\n"
+#: ogginfo/ogginfo.c:320
+msgid "header_integrity=pass\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:568
-#, c-format
-msgid "Upper bitrate: %f kb/s\n"
+#: ogginfo/ogginfo.c:323
+msgid "header_integrity=fail\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:571
-msgid "Upper bitrate not set\n"
+#: ogginfo/ogginfo.c:328
+msgid "stream_integrity=pass\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:574
-#, c-format
-msgid "Lower bitrate: %f kb/s\n"
+#: ogginfo/ogginfo.c:331
+msgid "stream_integrity=fail\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:577
-msgid "Lower bitrate not set\n"
+#: ogginfo/ogginfo.c:334
+msgid "stream_truncated=false\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:604
-#, 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:625
-msgid ""
-"Vorbis stream %d:\n"
-"\tTotal data length: %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:659
+#: ogginfo/ogginfo.c:344
 #, c-format
-msgid "Warning: EOS not set on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:796
-msgid "Warning: Invalid header page, no packet found\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:814
-#, c-format
-msgid "Warning: Invalid header page in stream %d, contains multiple packets\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:828
-#, 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:845
-msgid "Warning: Hole in data (%d bytes) found at approximate offset %"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:869
-#, c-format
-msgid "Error opening input file \"%s\": %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:874
-#, c-format
-msgid ""
-"Processing file \"%s\"...\n"
 "\n"
+"total_length=%f\n"
 msgstr ""
 
-#: ogginfo/ogginfo2.c:883
-msgid "Could not find a processor for stream, bailing\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:891
-msgid "Page found for stream after EOS flag"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:894
-msgid ""
-"Ogg muxing constraints violated, new stream before EOS of all previous "
-"streams"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:898
-msgid "Error unknown."
-msgstr ""
-
-#: ogginfo/ogginfo2.c:901
+#: 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:913
-#, c-format
-msgid "New logical stream (#%d, serial: %08x): type %s\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:916
-#, c-format
-msgid "Warning: stream start flag not set on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:920
-#, c-format
-msgid "Warning: stream start flag found in mid-stream on stream %d\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:925
-#, 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:940
-#, c-format
-msgid "Logical stream %d ended\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:948
-#, c-format
-msgid ""
-"Error: No ogg data found in file \"%s\".\n"
-"Input probably not ogg.\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:959
-#, fuzzy, c-format
-msgid "ogginfo from %s %s\n"
-msgstr "ogg123 iz %s %s\n"
-
-#: ogginfo/ogginfo2.c:965
-#, c-format
-msgid ""
-"(c) 2003-2005 Michael Smith <msmith at xiph.org>\n"
-"\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"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:974
-#, c-format
-msgid "\t-V Output version information and exit\n"
-msgstr ""
-
-#: ogginfo/ogginfo2.c:987
-#, c-format
-msgid ""
-"Usage: ogginfo [flags] file1.ogg [file2.ogg ... fileN.ogg]\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:1019
-#, 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"
@@ -1723,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"
@@ -1743,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"
@@ -1758,397 +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:137
-#, c-format
+#: vcut/vcut.c:131
 msgid "Page error. Corrupt input.\n"
 msgstr ""
 
-#: vcut/vcut.c:154
-#, c-format
+#: vcut/vcut.c:148
 msgid "Bitstream error, continuing\n"
 msgstr ""
 
-#: vcut/vcut.c:179
-#, c-format
+#: vcut/vcut.c:173
 msgid "Found EOS before cut point.\n"
 msgstr ""
 
-#: vcut/vcut.c:188
-#, c-format
+#: vcut/vcut.c:182
 msgid "Setting eos: update sync returned 0\n"
 msgstr ""
 
-#: vcut/vcut.c:198
-#, c-format
+#: vcut/vcut.c:192
 msgid "Cutpoint not within stream. Second file will be empty\n"
 msgstr ""
 
-#: vcut/vcut.c:231
-#, c-format
+#: vcut/vcut.c:225
 msgid "Unhandled special case: first file too short?\n"
 msgstr ""
 
-#: vcut/vcut.c:290
-#, 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:303
-#, c-format
+#: vcut/vcut.c:297
 msgid "Recoverable bitstream error\n"
 msgstr ""
 
-#: vcut/vcut.c:313
-#, c-format
+#: vcut/vcut.c:307
 msgid "Bitstream error\n"
 msgstr ""
 
-#: vcut/vcut.c:336
-#, c-format
+#: vcut/vcut.c:330
 msgid "Update sync returned 0, setting eos\n"
 msgstr ""
 
-#: vcut/vcut.c:385
-#, c-format
+#: vcut/vcut.c:376
 msgid "Input not ogg.\n"
 msgstr ""
 
-#: vcut/vcut.c:395
-#, c-format
+#: vcut/vcut.c:386
 msgid "Error in first page\n"
 msgstr ""
 
-#: vcut/vcut.c:400
-#, c-format
+#: vcut/vcut.c:391
 msgid "error in first packet\n"
 msgstr ""
 
-#: vcut/vcut.c:406
-#, c-format
+#: vcut/vcut.c:397
 msgid "Error in primary header: not vorbis?\n"
 msgstr ""
 
-#: vcut/vcut.c:426
-#, c-format
+#: vcut/vcut.c:417
 msgid "Secondary header corrupt\n"
 msgstr ""
 
-#: vcut/vcut.c:439
-#, c-format
+#: vcut/vcut.c:430
 msgid "EOF in headers\n"
 msgstr ""
 
-#: vcut/vcut.c:472
-#, 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:476
-#, 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:481
+#: vcut/vcut.c:465
 #, c-format
 msgid "Couldn't open %s for reading\n"
 msgstr ""
 
-#: vcut/vcut.c:486 vcut/vcut.c:491
+#: vcut/vcut.c:470 vcut/vcut.c:475
 #, c-format
 msgid "Couldn't open %s for writing\n"
 msgstr ""
 
-#: vcut/vcut.c:497 vcut/vcut.c:502
+#: vcut/vcut.c:480
 #, c-format
 msgid "Couldn't parse cutpoint \"%s\"\n"
 msgstr ""
 
-#: vcut/vcut.c:507
+#: vcut/vcut.c:484
 #, c-format
-msgid "Processing: Cutting at %lld seconds\n"
+msgid "Processing: Cutting at %lld\n"
 msgstr ""
 
-#: vcut/vcut.c:509
-#, c-format
-msgid "Processing: Cutting at %lld samples\n"
-msgstr ""
-
-#: vcut/vcut.c:519
-#, c-format
+#: vcut/vcut.c:493
 msgid "Processing failed\n"
 msgstr ""
 
-#: vcut/vcut.c:541
-#, c-format
+#: vcut/vcut.c:514
 msgid "Error reading headers\n"
 msgstr ""
 
-#: vcut/vcut.c:564
-#, c-format
+#: vcut/vcut.c:537
 msgid "Error writing first output file\n"
 msgstr ""
 
-#: vcut/vcut.c:572
-#, c-format
+#: vcut/vcut.c:545
 msgid "Error writing second output file\n"
 msgstr ""
 
-#: vorbiscomment/vcedit.c:233
+#: vorbiscomment/vcedit.c:214
 msgid "Input truncated or empty."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:235
+#: vorbiscomment/vcedit.c:216
 msgid "Input is not an Ogg bitstream."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:253
+#: vorbiscomment/vcedit.c:232
 msgid "Error reading first page of Ogg bitstream."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:259
+#: vorbiscomment/vcedit.c:238
 msgid "Error reading initial header packet."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:265
+#: vorbiscomment/vcedit.c:244
 msgid "Ogg bitstream does not contain vorbis data."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:288
+#: vorbiscomment/vcedit.c:267
 msgid "Corrupt secondary header."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:309
+#: vorbiscomment/vcedit.c:288
 msgid "EOF before end of vorbis headers."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:462
+#: vorbiscomment/vcedit.c:444
 msgid "Corrupt or missing data, continuing..."
 msgstr ""
 
-#: vorbiscomment/vcedit.c:502
-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:120 vorbiscomment/vcomment.c:146
+#: vorbiscomment/vcomment.c:100 vorbiscomment/vcomment.c:122
 #, c-format
 msgid "Failed to open file as vorbis: %s\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:165
+#: vorbiscomment/vcomment.c:138
 #, c-format
 msgid "Bad comment: \"%s\"\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:177
+#: vorbiscomment/vcomment.c:150
 #, c-format
 msgid "bad comment: \"%s\"\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:187
+#: vorbiscomment/vcomment.c:160
 #, c-format
 msgid "Failed to write comments to output file: %s\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:204
-#, c-format
+#. should never reach this point
+#: vorbiscomment/vcomment.c:173
 msgid "no action specified\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:306
-#, 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:309
-#, c-format
-msgid "List or edit comments in Ogg Vorbis files.\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:312
-#, 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:318
-#, c-format
-msgid "Listing options\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:319
-#, c-format
-msgid ""
-"  -l, --list              List the comments (default if no options are "
-"given)\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:322
-#, fuzzy, c-format
-msgid "Editing options\n"
-msgstr "Neispravni tip u popisu opcija"
-
-#: vorbiscomment/vcomment.c:323
-#, c-format
-msgid "  -a, --append            Append comments\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:324
-#, c-format
-msgid ""
-"  -t \"name=value\", --tag \"name=value\"\n"
-"                          Specify a comment tag on the commandline\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:326
-#, c-format
-msgid "  -w, --write             Write comments, replacing the existing ones\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:330
-#, 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:333
-#, c-format
-msgid "  -R, --raw               Read and write comments in UTF-8\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:337
-#, c-format
-msgid "  -V, --version           Output version information and exit\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:340
-#, 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:345
-#, 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:352
-#, 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:357
-#, 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:419
-#, c-format
+#: vorbiscomment/vcomment.c:339
 msgid "Internal error parsing command options\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:505
+#: vorbiscomment/vcomment.c:422
 #, c-format
 msgid "Error opening input file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:514
+#: vorbiscomment/vcomment.c:438
 #, c-format
-msgid "Input filename may not be the same as output filename\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:525
-#, c-format
 msgid "Error opening output file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:540
+#: vorbiscomment/vcomment.c:453
 #, c-format
 msgid "Error opening comment file '%s'.\n"
 msgstr ""
 
-#: vorbiscomment/vcomment.c:557
+#: vorbiscomment/vcomment.c:470
 #, c-format
 msgid "Error opening comment file '%s'\n"
 msgstr ""
-
-#: vorbiscomment/vcomment.c:591
-#, c-format
-msgid "Error removing old file %s\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:593
-#, c-format
-msgid "Error renaming %s to %s\n"
-msgstr ""
-
-#: vorbiscomment/vcomment.c:603
-#, 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-06-22 21:07:32 UTC (rev 15057)
+++ trunk/vorbis-tools/po/hu.po	2008-06-23 21:40:34 UTC (rev 15058)
@@ -1,757 +1,599 @@
 # Hungarian translate of the GNU vorbis-tools.
 # Copyright (C) 2002 Free Software Foundation, Inc.
-# Gábor István  <stive at mezobereny.hu>, 2002.
+# Gábor István <stive at mezobereny.hu>, 2002.
 #
 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: 2007-12-30 13:57+0900\n"
-"PO-Revision-Date: 2002-08-05 11:38GMT\n"
+"Project-Id-Version: vorbis-tools 1.0\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.5\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"
+msgstr "Hiba: Elfogyott a memória a malloc_action()-ban.\n"
 
-#: ogg123/buffer.c:351
-#, 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ó a %s eszközön.\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"
+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"
+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"
+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"
+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 "Rendszer hiba"
+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 sorban a %d ban %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 "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 "dupla"
+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 "(NULLA)"
+msgstr "(NULL)"
 
-#: ogg123/cfgfile_options.c:200 oggenc/oggenc.c:554 oggenc/oggenc.c:559
-#: oggenc/oggenc.c:564 oggenc/oggenc.c:569 oggenc/oggenc.c:574
-#: oggenc/oggenc.c:579
+#: 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:426
+#: ogg123/cfgfile_options.c:422
 msgid "Success"
 msgstr "Sikerült"
 
-#: ogg123/cfgfile_options.c:430
+#: ogg123/cfgfile_options.c:426
 msgid "Key not found"
 msgstr "Kulcs nem található"
 
-#: ogg123/cfgfile_options.c:432
+#: ogg123/cfgfile_options.c:428
 msgid "No key"
 msgstr "Nincs kulcs"
 
-#: ogg123/cfgfile_options.c:434
+#: ogg123/cfgfile_options.c:430
 msgid "Bad value"
 msgstr "Rossz érték"
 
-#: ogg123/cfgfile_options.c:436
+#: 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:438
+#: ogg123/cfgfile_options.c:434
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: ogg123/cmdline_options.c:83
-#, fuzzy
+#: ogg123/cmdline_options.c:74
 msgid "Internal error parsing command line options.\n"
-msgstr "Belsõ hiba a parancs sori opció elemzése során\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 méret mint %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"
 "=== Option was: %s\n"
 msgstr ""
-"===Hiba \"%s\" a parancs sori opciók értelmezése közben\n"
-"===Opció %s volt\n"
+"===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 "=== Nem ilyen eszköz: %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ék érvénytelen. Érvényes tartomány: 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"
 msgstr ""
-"--- Nem lehet lejátszani a nulla csonkokat.\n"
-"--- A kódólás kipróbálásához használja a null kimeneti meghatjót.\n"
+"--- 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
-#, fuzzy, c-format
+#: ogg123/cmdline_options.c:206
+#, c-format
 msgid "--- Cannot open playlist file %s.  Skipped.\n"
-msgstr "HIBA: Nem lehet megnyitni a \"%s\":%s fájlt\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 állmá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 beállítás fájlban. Kilép.\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:329
-#, 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:336
-#, 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:214
-#: 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"
+msgstr "Hiba: Nem lehet lefoglalni memóriát a malloc_decoder_stats()-ban\n"
 
-#: ogg123/http_transport.c:144
+#: ogg123/http_transport.c:137
 msgid "Error: Could not set signal mask."
-msgstr "Hiba: Nem lehet beállítani a szignál maszkot."
+msgstr "Hiba: Nem lehet beállítani a szignálmaszkot."
 
-#: ogg123/http_transport.c:201
+#: 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 kimenet eszköz"
+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
-#, fuzzy, c-format
+#: ogg123/ogg123.c:261
+#, c-format
 msgid ""
 "\n"
 "Audio Device:   %s"
 msgstr ""
 "\n"
-"Eszköz:   %s"
+"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
-#, fuzzy, c-format
+#: ogg123/ogg123.c:307 ogg123/playlist.c:155
+#, c-format
 msgid "Warning: Could not read directory %s.\n"
-msgstr "Nem lehet létrehozni a könyvtárat \"%s\": %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 a audio puffert.\n"
+msgstr "Hiba: Nem lehet létrehozni az audiopuffert.\n"
 
-#: ogg123/ogg123.c:557
+#: ogg123/ogg123.c:429
 #, c-format
 msgid "No module could be found to read from %s.\n"
-msgstr "Nem találtam modult a %s belovasása során.\n"
+msgstr "Nem találtam modult a %s beolvasása során.\n"
 
-#: ogg123/ogg123.c:562
+#: ogg123/ogg123.c:434
 #, c-format
 msgid "Cannot open %s.\n"
-msgstr "Nem lehet megnyitni a %s-t.\n"
+msgstr "Nem lehet megnyitni %s-t.\n"
 
-#: ogg123/ogg123.c:568
+#: ogg123/ogg123.c:440
 #, c-format
 msgid "The file format of %s is not supported.\n"
-msgstr "A %s fájl formátum nem támogatott.\n"
+msgstr "A(z) %s fájl formátum nem támogatott.\n"
 
-#: ogg123/ogg123.c:578
+#: 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:597
+#: ogg123/ogg123.c:469
 #, c-format
 msgid "Playing: %s"
 msgstr "Lejátszás: %s"
 
-#: ogg123/ogg123.c:608
+#: ogg123/ogg123.c:474
 #, c-format
 msgid "Could not skip %f seconds of audio."
 msgstr "Nem lehet átugrani %f másodpercet ."
 
-#: ogg123/ogg123.c:663
+#: ogg123/ogg123.c:512
 msgid "Error: Decoding failure.\n"
-msgstr "Hiba: Visszakódólás nem sikerült.\n"
+msgstr "Hiba: Dekódolás nem sikerült.\n"
 
-#: ogg123/ogg123.c:742
+#. 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, lehet hogy ártalmatlan\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 adatfolyam hibát jelentett.\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 "Bitfolyam %d csatornán, %ldHz"
-
-#: 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-el"
+msgstr "Kódolva: %s módszerrel"
 
-#: ogg123/playlist.c:46 ogg123/playlist.c:57
-#, fuzzy, 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 new_status_message_arg() ban .\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
-#, fuzzy, 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 malloc_action() -ban.\n"
+msgstr "Hiba: Elfogyott a memória a playlist_to_array()-ben.\n"
 
-#: ogg123/status.c:60
-#, fuzzy, c-format
+#: 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ória kiosztás hiba a stats_init()-ban\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-é"
+msgstr "/ %s"
 
-#: ogg123/status.c:265
+#: ogg123/status.c:252
 #, c-format
 msgid "Avg bitrate: %5.1f"
-msgstr "Átl bitráta: %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 ogginfo/ogginfo2.c:964
-#, c-format
-msgid ""
-" by the Xiph.Org Foundation (http://www.xiph.org/)\n"
-"\n"
-msgstr ""
-
-#: oggenc/audio.c:47
+#: oggenc/audio.c:39
 msgid "WAV file reader"
-msgstr "WAV fájl olvasó"
+msgstr "WAV-fájl olvasó"
 
-#: oggenc/audio.c:48
+#: oggenc/audio.c:40
 msgid "AIFF/AIFC file reader"
-msgstr "AIFF/AIFC fájl olvasó"
+msgstr "AIFF/AIFC-fájl olvasó"
 
-#: oggenc/audio.c:50
-#, fuzzy
-msgid "FLAC file reader"
-msgstr "WAV fájl olvasó"
-
-#: oggenc/audio.c:51
-#, fuzzy
-msgid "Ogg FLAC file reader"
-msgstr "WAV fájl olvasó"
-
-#: oggenc/audio.c:128 oggenc/audio.c:421
-#, 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ájl vég a WAV fejlécben\n"
+msgstr "Figyelmeztetés: Váratlan fájlvég a WAV-fejlécben\n"
 
-#: oggenc/audio.c:139
+#: 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:165
-#, 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:251
-#, 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:257
-#, 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:265
-#, 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:280
-#, 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:294
-#, 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:301
-#, 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:307
-#, 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:313
-#, 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:350
-#, fuzzy, 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"
@@ -759,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:404
-#, 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:416
-#, c-format
+#: oggenc/audio.c:369
 msgid ""
 "Warning: INVALID format chunk in wav header.\n"
 " Trying to read anyway (may not work)...\n"
@@ -773,54 +613,31 @@
 "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:453
-#, 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:462
-#, 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:524
-#, fuzzy, c-format
-msgid ""
-"ERROR: Wav file is unsupported subformat (must be 8,16, or 24 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:600
-#, 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:606
-#, c-format
-msgid "Internal error: attempt to read unsupported bitdepth %d\n"
-msgstr ""
-
-#: oggenc/audio.c:708
-#, c-format
-msgid ""
-"BUG: Got zero samples from resampler: your file will be truncated. Please "
-"report this.\n"
-msgstr ""
-
-#: oggenc/audio.c:726
-#, c-format
+#: oggenc/audio.c:625
 msgid "Couldn't initialise resampler\n"
 msgstr ""
 
-#: oggenc/encode.c:63
+#: oggenc/encode.c:59
 #, c-format
 msgid "Setting advanced encoder option \"%s\" to %s\n"
 msgstr ""
@@ -835,59 +652,41 @@
 msgid "Unrecognised advanced option \"%s\"\n"
 msgstr "%s: a `--%s' kapcsoló ismeretlen\n"
 
-#: oggenc/encode.c:170
-#, c-format
-msgid ""
-"255 channels should be enough for anyone. (Sorry, but Vorbis doesn't support "
-"more)\n"
+#: oggenc/encode.c:133
+msgid "255 channels should be enough for anyone. (Sorry, vorbis doesn't support more)\n"
 msgstr ""
 
-#: oggenc/encode.c:178
-#, c-format
+#: oggenc/encode.c:141
 msgid "Requesting a minimum or maximum bitrate requires --managed\n"
 msgstr ""
 
-#: oggenc/encode.c:196
-#, 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:240
-#, c-format
-msgid "Set optional hard quality restrictions\n"
-msgstr ""
-
-#: oggenc/encode.c:242
-#, c-format
-msgid "Failed to set bitrate min/max in quality mode\n"
-msgstr ""
-
-#: oggenc/encode.c:254
-#, 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:319 oggenc/encode.c:341
+#: 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:415
+#: oggenc/encode.c:303
 msgid "Failed writing data to output stream\n"
 msgstr "Nem sikerült az adatfolyam írása\n"
 
-#: oggenc/encode.c:461
-#, fuzzy, c-format
-msgid "\t[%5.1f%%] [%2dm%.2ds remaining] %c "
-msgstr "\t[%5.1f%%] [%2dm%.2ds átnevezés] %c"
+#: oggenc/en