--- main/help/help_mp-bg.h	2003-12-08 20:54:45.000000000 -0500
+++ main.working/help/help_mp-bg.h	2004-08-07 00:21:40.000000000 -0400
@@ -58,7 +58,8 @@
 
 // mplayer.c: 
 
-#define MSGTR_Exiting "\n�������... (%s)\n"
+#define MSGTR_Exiting "\n�������...\n"
+#define MSGTR_ExitingHow "\n�������... (%s)\n"
 #define MSGTR_Exit_quit "����"
 #define MSGTR_Exit_eof "���� �� �����"
 #define MSGTR_Exit_error "������� ������"
--- main/help/help_mp-cz.h	2003-12-08 20:54:45.000000000 -0500
+++ main.working/help/help_mp-cz.h	2004-08-07 00:21:58.000000000 -0400
@@ -49,7 +49,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\nKon��m... (%s)\n"
+#define MSGTR_Exiting "\nKon��m...\n"
+#define MSGTR_ExitingHow "\nKon��m... (%s)\n"
 #define MSGTR_Exit_quit "Konec"
 #define MSGTR_Exit_eof "Konec souboru"
 #define MSGTR_Exit_error "Z�va�n� chyba"
--- main/help/help_mp-de.h	2004-07-24 18:37:47.000000000 -0400
+++ main.working/help/help_mp-de.h	2004-08-07 00:22:13.000000000 -0400
@@ -54,7 +54,8 @@
 // ========================= MPlayer Ausgaben ===========================
 
 // mplayer.c: 
-#define MSGTR_Exiting "\nBeenden... (%s)\n"
+#define MSGTR_Exiting "\nBeenden...\n"
+#define MSGTR_ExitingHow "\nBeenden... (%s)\n"
 #define MSGTR_Exit_quit "Ende"
 #define MSGTR_Exit_eof "Dateiende erreicht."
 #define MSGTR_Exit_error "Fataler Fehler"
--- main/help/help_mp-dk.h	2003-12-08 20:54:45.000000000 -0500
+++ main.working/help/help_mp-dk.h	2004-08-07 00:22:29.000000000 -0400
@@ -52,7 +52,8 @@
 
 // mplayer.c: 
 
-#define MSGTR_Exiting "\n Afslutter... (%s)\n"
+#define MSGTR_Exiting "\n Afslutter...\n"
+#define MSGTR_ExitingHow "\n Afslutter... (%s)\n"
 #define MSGTR_Exit_quit "Afslut"
 #define MSGTR_Exit_eof "Slut p� filen"
 #define MSGTR_Exit_error "Fatal fejl"
--- main/help/help_mp-el.h	2004-07-24 18:37:47.000000000 -0400
+++ main.working/help/help_mp-el.h	2004-08-07 00:22:52.000000000 -0400
@@ -50,7 +50,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\n ������... (%s)\n"
+#define MSGTR_Exiting "\n ������...\n"
+#define MSGTR_ExitingHow "\n ������... (%s)\n"
 #define MSGTR_Exit_quit "��������"
 #define MSGTR_Exit_eof "����� ��� �������"
 #define MSGTR_Exit_error "������� ������"
--- main/help/help_mp-en.h	2004-08-01 13:04:40.000000000 -0400
+++ main.working/help/help_mp-en.h	2004-08-07 00:08:01.000000000 -0400
@@ -57,7 +57,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\nExiting... (%s)\n"
+#define MSGTR_Exiting "\nExiting...\n"
+#define MSGTR_ExitingHow "\nExiting... (%s)\n"
 #define MSGTR_Exit_quit "Quit"
 #define MSGTR_Exit_eof "End of file"
 #define MSGTR_Exit_error "Fatal error"
@@ -182,6 +183,135 @@
 #define MSGTR_RecommendedVideoBitrate "Recommended video bitrate for %s CD: %d\n"
 #define MSGTR_VideoStreamResult "\nVideo stream: %8.3f kbit/s  (%d bps)  size: %d bytes  %5.3f secs  %d frames\n"
 #define MSGTR_AudioStreamResult "\nAudio stream: %8.3f kbit/s  (%d bps)  size: %d bytes  %5.3f secs\n"
+#define MSGTR_OpenedStream "success: format: %d  data: 0x%X - 0x%x\n"
+#define MSGTR_VCodecFramecopy "videocodec: framecopy (%dx%d %dbpp fourcc=%x)\n"
+#define MSGTR_ACodecFramecopy "audiocodec: framecopy (format=%x chans=%d rate=%ld bits=%d bps=%ld sample-%ld)\n"
+#define MSGTR_CBRPCMAudioSelected "CBR PCM audio selected\n"
+#define MSGTR_MP3AudioSelected "MP3 audio selected\n"
+#define MSGTR_CannotAllocateBytes "Couldn't allocate %d bytes\n"
+#define MSGTR_SettingAudioDelay "Setting AUDIO DELAY to %5.3f\n"
+#define MSGTR_SettingAudioInputGain "Setting audio input gain to %f\n"
+#define MSGTR_LamePresetEquals "\npreset=%s\n\n"
+#define MSGTR_LimitingAudioPreload "Limiting audio preload to 0.4s\n"
+#define MSGTR_IncreasingAudioDensity "Increasing audio density to 4\n"
+#define MSGTR_ZeroingAudioPreloadAndMaxPtsCorrection "Forcing audio preload to 0, max pts correction to 0\n"
+#define MSGTR_CBRAudioByterate "\n\nCBR audio: %ld bytes/sec, %d bytes/block\n"
+#define MSGTR_LameVersion "LAME version %s (%s)\n\n"
+#define MSGTR_InvalidBitrateForLamePreset "Error: The bitrate specified is out of the valid range for this preset\n"\
+"\n"\
+"When using this mode you must enter a value between \"8\" and \"320\"\n"\
+"\n"\
+"For further information try: \"-lameopts preset=help\"\n"
+#define MSGTR_InvalidLamePresetOptions "Error: You did not enter a valid profile and/or options with preset\n"\
+"\n"\
+"Available profiles are:\n"\
+"\n"\
+"   <fast>        standard\n"\
+"   <fast>        extreme\n"\
+"                 insane\n"\
+"   <cbr> (ABR Mode) - The ABR Mode is implied. To use it,\n"\
+"                      simply specify a bitrate. For example:\n"\
+"                      \"preset=185\" activates this\n"\
+"                      preset and uses 185 as an average kbps.\n"\
+"\n"\
+"    Some examples:\n"\
+"\n"\
+"    \"-lameopts fast:preset=standard  \"\n"\
+" or \"-lameopts  cbr:preset=192       \"\n"\
+" or \"-lameopts      preset=172       \"\n"\
+" or \"-lameopts      preset=extreme   \"\n"\
+"\n"\
+"For further information try: \"-lameopts preset=help\"\n"
+#define MSGTR_LamePresetsLongInfo "\n"\
+"The preset switches are designed to provide the highest possible quality.\n"\
+"\n"\
+"They have for the most part been subject to and tuned via rigorous double blind\n"\
+"listening tests to verify and achieve this objective.\n"\
+"\n"\
+"These are continually updated to coincide with the latest developments that\n"\
+"occur and as a result should provide you with nearly the best quality\n"\
+"currently possible from LAME.\n"\
+"\n"\
+"To activate these presets:\n"\
+"\n"\
+"   For VBR modes (generally highest quality):\n"\
+"\n"\
+"     \"preset=standard\" This preset should generally be transparent\n"\
+"                             to most people on most music and is already\n"\
+"                             quite high in quality.\n"\
+"\n"\
+"     \"preset=extreme\" If you have extremely good hearing and similar\n"\
+"                             equipment, this preset will generally provide\n"\
+"                             slightly higher quality than the \"standard\"\n"\
+"                             mode.\n"\
+"\n"\
+"   For CBR 320kbps (highest quality possible from the preset switches):\n"\
+"\n"\
+"     \"preset=insane\"  This preset will usually be overkill for most\n"\
+"                             people and most situations, but if you must\n"\
+"                             have the absolute highest quality with no\n"\
+"                             regard to filesize, this is the way to go.\n"\
+"\n"\
+"   For ABR modes (high quality per given bitrate but not as high as VBR):\n"\
+"\n"\
+"     \"preset=<kbps>\"  Using this preset will usually give you good\n"\
+"                             quality at a specified bitrate. Depending on the\n"\
+"                             bitrate entered, this preset will determine the\n"\
+"                             optimal settings for that particular situation.\n"\
+"                             While this approach works, it is not nearly as\n"\
+"                             flexible as VBR, and usually will not attain the\n"\
+"                             same level of quality as VBR at higher bitrates.\n"\
+"\n"\
+"The following options are also available for the corresponding profiles:\n"\
+"\n"\
+"   <fast>        standard\n"\
+"   <fast>        extreme\n"\
+"                 insane\n"\
+"   <cbr> (ABR Mode) - The ABR Mode is implied. To use it,\n"\
+"                      simply specify a bitrate. For example:\n"\
+"                      \"preset=185\" activates this\n"\
+"                      preset and uses 185 as an average kbps.\n"\
+"\n"\
+"   \"fast\" - Enables the new fast VBR for a particular profile. The\n"\
+"            disadvantage to the speed switch is that often times the\n"\
+"            bitrate will be slightly higher than with the normal mode\n"\
+"            and quality may be slightly lower also.\n"\
+"   Warning: with the current version fast presets might result in too\n"\
+"            high bitrate compared to regular presets.\n"\
+"\n"\
+"   \"cbr\"  - If you use the ABR mode (read above) with a significant\n"\
+"            bitrate such as 80, 96, 112, 128, 160, 192, 224, 256, 320,\n"\
+"            you can use the \"cbr\" option to force CBR mode encoding\n"\
+"            instead of the standard abr mode. ABR does provide higher\n"\
+"            quality but CBR may be useful in situations such as when\n"\
+"            streaming an mp3 over the internet may be important.\n"\
+"\n"\
+"    For example:\n"\
+"\n"\
+"    \"-lameopts fast:preset=standard  \"\n"\
+" or \"-lameopts  cbr:preset=192       \"\n"\
+" or \"-lameopts      preset=172       \"\n"\
+" or \"-lameopts      preset=extreme   \"\n"\
+"\n"\
+"\n"\
+"A few aliases are available for ABR mode:\n"\
+"phone => 16kbps/mono        phon+/lw/mw-eu/sw => 24kbps/mono\n"\
+"mw-us => 40kbps/mono        voice => 56kbps/mono\n"\
+"fm/radio/tape => 112kbps    hifi => 160kbps\n"\
+"cd => 192kbps               studio => 256kbps"
+#define MSGTR_ConfigfileError "configfile error"
+#define MSGTR_ErrorParsingCommandLine "error parsing cmdline"
+#define MSGTR_VideoStreamRequired "Video stream is mandatory!\n"
+#define MSGTR_ForcingInputFPS "input fps will be interpreted as %5.2f instead\n"
+#define MSGTR_RawvideoDoesNotSupportAudio "Output file format RAWVIDEO does not support audio - disabling audio\n"
+#define MSGTR_DemuxerDoesntSupportNosound "This demuxer doesn't support -nosound yet.\n"
+#define MSGTR_MemAllocFailed "memory allocation failed"
+#define MSGTR_NoMatchingFilter "Couldn't find matching filter/ao format!\n"
+#define MSGTR_MP3WaveFormatSizeNot30 "sizeof(MPEGLAYER3WAVEFORMAT)==%d!=30, maybe broken C compiler?\n"
+#define MSGTR_NoLavcAudioCodecName "Audio LAVC, Missing codec name!\n"
+#define MSGTR_LavcAudioCodecNotFound "Audio LAVC, couldn't find encoder for codec %s\n"
+#define MSGTR_CouldntAllocateLavcContext "Audio LAVC, couldn't allocate context!\n"
+#define MSGTR_CouldntOpenCodec "Couldn't open codec %s, br=%d\n"
 
 // cfg-mencoder.h:
 
--- main/help/help_mp-es.h	2004-06-30 11:52:09.000000000 -0400
+++ main.working/help/help_mp-es.h	2004-08-07 00:25:11.000000000 -0400
@@ -56,7 +56,8 @@
 
 // mplayer.c: 
 
-#define MSGTR_Exiting "\nSaliendo... (%s)\n"
+#define MSGTR_Exiting "\nSaliendo...\n"
+#define MSGTR_ExitingHow "\nSaliendo... (%s)\n"
 #define MSGTR_Exit_quit "Salida."
 #define MSGTR_Exit_eof "Fin del archivo."
 #define MSGTR_Exit_error "Error fatal."
--- main/help/help_mp-fr.h	2004-07-24 18:37:47.000000000 -0400
+++ main.working/help/help_mp-fr.h	2004-08-07 00:25:26.000000000 -0400
@@ -50,7 +50,8 @@
 
 // mplayer.c: 
 
-#define MSGTR_Exiting "\nSortie... (%s)\n"
+#define MSGTR_Exiting "\nSortie...\n"
+#define MSGTR_ExitingHow "\nSortie... (%s)\n"
 #define MSGTR_Exit_quit "Fin"
 #define MSGTR_Exit_eof "Fin du fichier"
 #define MSGTR_Exit_error "Erreur fatale"
--- main/help/help_mp-hu.h	2004-07-03 12:09:37.000000000 -0400
+++ main.working/help/help_mp-hu.h	2004-08-07 00:25:42.000000000 -0400
@@ -51,7 +51,8 @@
 
 // mplayer.c: 
 
-#define MSGTR_Exiting "\nKil�pek... (%s)\n"
+#define MSGTR_Exiting "\nKil�pek...\n"
+#define MSGTR_ExitingHow "\nKil�pek... (%s)\n"
 #define MSGTR_Exit_quit "Kil�p�s"
 #define MSGTR_Exit_eof "V�ge a file-nak"
 #define MSGTR_Exit_error "V�gzetes hiba"
--- main/help/help_mp-it.h	2004-07-24 18:37:47.000000000 -0400
+++ main.working/help/help_mp-it.h	2004-08-07 00:26:02.000000000 -0400
@@ -51,7 +51,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\nIn uscita... (%s)\n"
+#define MSGTR_Exiting "\nIn uscita...\n"
+#define MSGTR_ExitingHow "\nIn uscita... (%s)\n"
 #define MSGTR_Exit_quit "Uscita"
 #define MSGTR_Exit_eof "Fine del file"
 #define MSGTR_Exit_error "Errore fatale"
--- main/help/help_mp-ja.h	2004-07-24 18:37:47.000000000 -0400
+++ main.working/help/help_mp-ja.h	2004-08-07 00:26:21.000000000 -0400
@@ -51,7 +51,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\n��λ���Ƥ��ޤ�... (%s)\n"
+#define MSGTR_Exiting "\n��λ���Ƥ��ޤ�\n"
+#define MSGTR_ExitingHow "\n��λ���Ƥ��ޤ�... (%s)\n"
 #define MSGTR_Exit_quit "��λ"
 #define MSGTR_Exit_eof "�ե��������ü�Ǥ�"
 #define MSGTR_Exit_error "��̿Ū���顼"
--- main/help/help_mp-ko.h	2004-07-13 17:56:14.000000000 -0400
+++ main.working/help/help_mp-ko.h	2004-08-07 00:26:38.000000000 -0400
@@ -49,7 +49,8 @@
 
 // mplayer.c: 
 
-#define MSGTR_Exiting "\n종료합니다... (%s)\n"
+#define MSGTR_Exiting "\n종료합니다.\n"
+#define MSGTR_ExitingHow "\n종료합니다... (%s)\n"
 #define MSGTR_Exit_quit "종료"
 #define MSGTR_Exit_eof "파일의 끝"
 #define MSGTR_Exit_error "치명적 오류"
--- main/help/help_mp-mk.h	2003-12-08 20:54:45.000000000 -0500
+++ main.working/help/help_mp-mk.h	2004-08-07 00:26:59.000000000 -0400
@@ -50,7 +50,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\nИзлегува... (%s)\n"
+#define MSGTR_Exiting "\nИзлегу�\n"
+#define MSGTR_ExitingHow "\nИзлегува... (%s)\n"
 #define MSGTR_Exit_quit "Откажи"
 #define MSGTR_Exit_eof "Крај на датотеката"
 #define MSGTR_Exit_error "Фатална грешка"
--- main/help/help_mp-nl.h	2004-08-05 15:22:33.000000000 -0400
+++ main.working/help/help_mp-nl.h	2004-08-07 00:27:17.000000000 -0400
@@ -48,7 +48,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\nBezig met afsluiten... (%s)\n"
+#define MSGTR_Exiting "\nBezig met afsluiten...\n"
+#define MSGTR_ExitingHow "\nBezig met afsluiten... (%s)\n"
 #define MSGTR_Exit_quit "Stop"
 #define MSGTR_Exit_eof "Einde van bestand"
 #define MSGTR_Exit_error "Fatale fout"
--- main/help/help_mp-no.h	2003-12-08 20:54:45.000000000 -0500
+++ main.working/help/help_mp-no.h	2004-08-07 00:27:31.000000000 -0400
@@ -49,7 +49,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\nAvslutter... (%s)\n"
+#define MSGTR_Exiting "\nAvslutter...\n"
+#define MSGTR_ExitingHow "\nAvslutter... (%s)\n"
 #define MSGTR_Exit_quit "Avslutt"
 #define MSGTR_Exit_eof "Slutt p� filen"
 #define MSGTR_Exit_error "Fatal feil"
--- main/help/help_mp-pl.h	2004-07-24 18:37:47.000000000 -0400
+++ main.working/help/help_mp-pl.h	2004-08-07 00:27:46.000000000 -0400
@@ -51,7 +51,8 @@
 
 // MPlayer.c:
 
-#define MSGTR_Exiting "\nWychodz�...(%s)\n"
+#define MSGTR_Exiting "\nWychodz�...\n"
+#define MSGTR_ExitingHow "\nWychodz�...(%s)\n"
 #define MSGTR_Exit_quit "Wyj�cie"
 #define MSGTR_Exit_eof "Koniec pliku"
 #define MSGTR_Exit_error "Krytyczny b��d"
--- main/help/help_mp-pt_BR.h	2003-12-08 20:54:45.000000000 -0500
+++ main.working/help/help_mp-pt_BR.h	2004-08-07 00:28:00.000000000 -0400
@@ -58,7 +58,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\nSaindo... (%s)\n"
+#define MSGTR_Exiting "\nSaindo...\n"
+#define MSGTR_ExitingHow "\nSaindo... (%s)\n"
 #define MSGTR_Exit_quit "Sair"
 #define MSGTR_Exit_eof "Fim do arquivo"
 #define MSGTR_Exit_error "Erro fatal"
--- main/help/help_mp-ro.h	2004-08-01 13:04:40.000000000 -0400
+++ main.working/help/help_mp-ro.h	2004-08-07 00:28:18.000000000 -0400
@@ -59,7 +59,8 @@
 // ========================= MPlayer messages ===========================
 
 // mplayer.c:
-#define MSGTR_Exiting "\nIe�ire... (%s)\n"
+#define MSGTR_Exiting "\nIe�ire...\n"
+#define MSGTR_ExitingHow "\nIe�ire... (%s)\n"
 #define MSGTR_Exit_quit "Ie�ire"
 #define MSGTR_Exit_eof "Sf�r�it fi�ier"
 #define MSGTR_Exit_error "Eroare fatal�"
--- main/help/help_mp-ru.h	2004-08-01 13:04:40.000000000 -0400
+++ main.working/help/help_mp-ru.h	2004-08-07 00:28:31.000000000 -0400
@@ -49,7 +49,8 @@
 
 // mplayer.c: 
 
-#define MSGTR_Exiting "\n�������... (%s)\n"
+#define MSGTR_Exiting "\n�������...\n"
+#define MSGTR_ExitingHow "\n�������... (%s)\n"
 #define MSGTR_Exit_quit "�����"
 #define MSGTR_Exit_eof "����� �����"
 #define MSGTR_Exit_error "��������� ������"
--- main/help/help_mp-sk.h	2003-12-08 20:54:45.000000000 -0500
+++ main.working/help/help_mp-sk.h	2004-08-07 00:28:48.000000000 -0400
@@ -50,7 +50,8 @@
 // ========================= MPlayer messages ===========================
 // mplayer.c:
 
-#define MSGTR_Exiting "\nKon��m... (%s)\n"
+#define MSGTR_Exiting "\nKon��m...\n"
+#define MSGTR_ExitingHow "\nKon��m... (%s)\n"
 #define MSGTR_Exit_quit "Koniec"
 #define MSGTR_Exit_eof "Koniec s�boru"
 #define MSGTR_Exit_error "Z�va�n� chyba"
--- main/help/help_mp-tr.h	2003-12-08 20:54:45.000000000 -0500
+++ main.working/help/help_mp-tr.h	2004-08-07 00:29:02.000000000 -0400
@@ -49,7 +49,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\n��k�l�yor... (%s)\n"
+#define MSGTR_Exiting "\n��k�l�yor...\n"
+#define MSGTR_ExitingHow "\n��k�l�yor... (%s)\n"
 #define MSGTR_Exit_quit "��k��"
 #define MSGTR_Exit_eof "Dosyan�n Sonu"
 #define MSGTR_Exit_error "�l�mc�l Hata"
--- main/help/help_mp-uk.h	2003-12-08 20:54:45.000000000 -0500
+++ main.working/help/help_mp-uk.h	2004-08-07 00:29:17.000000000 -0400
@@ -53,7 +53,8 @@
 
 // mplayer.c: 
 
-#define MSGTR_Exiting "\n��������... (%s)\n"
+#define MSGTR_Exiting "\n��������...\n"
+#define MSGTR_ExitingHow "\n��������... (%s)\n"
 #define MSGTR_Exit_quit "��Ȧ�"
 #define MSGTR_Exit_eof "����� �����"
 #define MSGTR_Exit_error "�������� �������"
--- main/help/help_mp-zh_CN.h	2004-07-24 18:37:47.000000000 -0400
+++ main.working/help/help_mp-zh_CN.h	2004-08-07 00:29:33.000000000 -0400
@@ -49,7 +49,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\n�����˳�... (%s)\n"
+#define MSGTR_Exiting "\n�����˳�..\n"
+#define MSGTR_ExitingHow "\n�����˳�... (%s)\n"
 #define MSGTR_Exit_quit "�˳�"
 #define MSGTR_Exit_eof "�ļ�����"
 #define MSGTR_Exit_error "��������"
--- main/help/help_mp-zh_TW.h	2004-07-13 17:56:14.000000000 -0400
+++ main.working/help/help_mp-zh_TW.h	2004-08-07 00:29:45.000000000 -0400
@@ -51,7 +51,8 @@
 
 // mplayer.c:
 
-#define MSGTR_Exiting "\n���b�h�X... (%s)\n"
+#define MSGTR_Exiting "\n���b�h�X...\n"
+#define MSGTR_ExitingHow "\n���b�h�X... (%s)\n"
 #define MSGTR_Exit_quit "���}"
 #define MSGTR_Exit_eof "�ɮץ���"
 #define MSGTR_Exit_error "�P�R���~"