diff --git a/help/help_mp-bg.h b/help/help_mp-bg.h
index a30b8b57de..c99adf2bbf 100644
--- a/help/help_mp-bg.h
+++ b/help/help_mp-bg.h
@@ -129,8 +129,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "������ ��� ��������/������� �� ����� �������� (-vo)!\n"
 #define MSGTR_ForcedVideoCodec "������� ����� �������: %s\n"
 #define MSGTR_ForcedAudioCodec "������� ����� �������: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: ��������: %s\nAO: �����: %s\n"
-#define MSGTR_AOComment "AO: ��������: %s\n"
 #define MSGTR_Video_NoVideo "�����: ���� �����!!!\n"
 #define MSGTR_NotInitializeVOPorVO "\n�������: �� ���� �� ����� ����� �������� (-vf) ��� ����� ������ (-vo)!\n"
 #define MSGTR_Paused "\n  =====  �����  =====\r"
diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h
index 3ef616aeff..2463335bf0 100644
--- a/help/help_mp-cs.h
+++ b/help/help_mp-cs.h
@@ -118,8 +118,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Chyba p�i otev�r�n�/inicializaci vybran�ho video_out (-vo) za��zen�.\n"
 #define MSGTR_ForcedVideoCodec "Vynucen video kodek: %s\n"
 #define MSGTR_ForcedAudioCodec "Vynucen audio kodek: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Popis: %s\nAO: Autor: %s\n"
-#define MSGTR_AOComment "AO: Pozn�mka: %s\n"
 #define MSGTR_Video_NoVideo "Video: ��dn� video\n"
 #define MSGTR_NotInitializeVOPorVO "\nKritick� chyba: Nemohu inicializovat video filtry (-vf) nebo video ovlada� (-vo)!\n"
 #define MSGTR_Paused "\n===== POZASTAVENO =====\r"
@@ -291,7 +289,6 @@ static char help_text[]=
 #define MSGTR_LavcAudioCodecNotFound "Audio LAVC, nemohu naj�t enkod�r pro kodek %s\n"
 #define MSGTR_CouldntAllocateLavcContext "Audio LAVC, nemohu alokovat kontext!\n"
 #define MSGTR_CouldntOpenCodec "nemohu otev��t kodek %s, br=%d\n"
-#define MSGTR_FramesizeBufsizeTag "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n"
 
 // cfg-mencoder.h:
 
diff --git a/help/help_mp-de.h b/help/help_mp-de.h
index 94e989328d..9628fa7b57 100644
--- a/help/help_mp-de.h
+++ b/help/help_mp-de.h
@@ -126,8 +126,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Fehler beim �ffnen/Initialisieren des ausgew�hlten Videoausgabetreibers (-vo).\n"
 #define MSGTR_ForcedVideoCodec "Erzwungener Videocodec: %s\n"
 #define MSGTR_ForcedAudioCodec "Erzwungener Audiocodec: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Beschreibung: %s\nAO: Autor: %s\n"
-#define MSGTR_AOComment "AO: Kommentar: %s\n"
 #define MSGTR_Video_NoVideo "Video: kein Video\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: Konnte Videofilter (-vf) oder -ausgabetreiber (-vo) nicht initialisieren.\n"
 #define MSGTR_Paused "\n  =====  PAUSE  =====\r"
@@ -319,7 +317,6 @@ static char help_text[]=
 #define MSGTR_LavcAudioCodecNotFound "Audio LAVC, konnte Encoder f�r Codec %s nicht finden.\n"
 #define MSGTR_CouldntAllocateLavcContext "Audio LAVC, konnte Kontext nicht zuordnen!\n"
 #define MSGTR_CouldntOpenCodec "Konnte Codec %s nicht �ffnen, br=%d\n"
-#define MSGTR_FramesizeBufsizeTag "FRAME_GR�SSE: %d, BUFFER_GR�SSE: %d, TAG: 0x%x\n"
 
 // cfg-mencoder.h:
 
diff --git a/help/help_mp-dk.h b/help/help_mp-dk.h
index 0ed9c01018..3ed3db235b 100644
--- a/help/help_mp-dk.h
+++ b/help/help_mp-dk.h
@@ -120,8 +120,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Fejl under �bning/initialisering af den valgte videodriver (-vo)!\n"
 #define MSGTR_ForcedVideoCodec "Gennemtvunget video-codec: %s\n"
 #define MSGTR_ForcedAudioCodec "Gennemtvunget lyd-codec: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Beskrivelse: %s\nAO: forfatter: %s\n"
-#define MSGTR_AOComment "AO: Kommentar: %s\n"
 #define MSGTR_Video_NoVideo "Video: ingen video\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATALT: Kunne ikke initialisere videofiltre (-vf) eller videodriver (-vo)!\n"
 #define MSGTR_Paused "\n  =====  PAUSE  =====\r"
diff --git a/help/help_mp-el.h b/help/help_mp-el.h
index ac30d207c9..963983d8ba 100644
--- a/help/help_mp-el.h
+++ b/help/help_mp-el.h
@@ -119,8 +119,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "������ ���� �� �������/������������ ��� ����������� video_out (-vo) �������!\n"
 #define MSGTR_ForcedVideoCodec "������������ ������ ��� ������ codec: %s\n"
 #define MSGTR_ForcedAudioCodec "������������ ������ ��� codec ����: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: ���������: %s\n AO: ����������: %s\n"
-#define MSGTR_AOComment "AO: ������: %s\n"
 #define MSGTR_Video_NoVideo "������: ��� ������� ������!!!\n"
 #define MSGTR_NotInitializeVOPorVO "\n ������: ������� � ������������ ��� ������� ������ (-vf) � ��� ������ ������ (-vo)!\n"
 #define MSGTR_Paused "\n  =====  �����  =====\r"
diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index 9e44d92c1f..dcf46386ae 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -125,8 +125,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Error opening/initializing the selected video_out (-vo) device.\n"
 #define MSGTR_ForcedVideoCodec "Forced video codec: %s\n"
 #define MSGTR_ForcedAudioCodec "Forced audio codec: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Description: %s\nAO: Author: %s\n"
-#define MSGTR_AOComment "AO: Comment: %s\n"
 #define MSGTR_Video_NoVideo "Video: no video\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: Could not initialize video filters (-vf) or video output (-vo).\n"
 #define MSGTR_Paused "\n  =====  PAUSE  =====\r" // no more than 23 characters (status line for audio files)
@@ -150,6 +148,44 @@ static char help_text[]=
 "  gcc version. If you think it's MPlayer's fault, please read\n"\
 "  DOCS/HTML/en/bugreports.html and follow the instructions there. We can't and\n"\
 "  won't help unless you provide this information when reporting a possible bug.\n"
+#define MSGTR_LoadingConfig "Loading config '%s'\n"
+#define MSGTR_AddedSubtitleFile "SUB: added subtitle file (%d): %s\n"
+#define MSGTR_ErrorOpeningOutputFile "Error opening file [%s] for writing!\n"
+#define MSGTR_CommandLine "CommandLine:"
+#define MSGTR_RTCDeviceNotOpenable "Failed to open %s: %s (it should be readable by the user.)\n"
+#define MSGTR_LinuxRTCInitErrorIrqpSet "Linux RTC init error in ioctl (rtc_irqp_set %lu): %s\n"
+#define MSGTR_IncreaseRTCMaxUserFreq "Try adding \"echo %lu > /proc/sys/dev/rtc/max-user-freq\" to your system startup scripts.\n"
+#define MSGTR_LinuxRTCInitErrorPieOn "Linux RTC init error in ioctl (rtc_pie_on): %s\n"
+#define MSGTR_UsingTimingType "Using %s timing.\n"
+#define MSGTR_MenuInitialized "Menu inited: %s\n"
+#define MSGTR_MenuInitFailed "Menu init failed.\n"
+#define MSGTR_Getch2InitializedTwice "WARNING: getch2_init called twice!\n"
+#define MSGTR_DumpstreamFdUnavailable "Cannot dump this stream - no 'fd' available.\n"
+#define MSGTR_FallingBackOnPlaylist "Falling back on trying to parse playlist %s...\n"
+#define MSGTR_CantOpenLibmenuFilterWithThisRootMenu "Can't open libmenu video filter with root menu %s.\n"
+#define MSGTR_AudioFilterChainPreinitError "Error at audio filter chain pre-init!\n"
+#define MSGTR_LinuxRTCReadError "Linux RTC read error: %s\n"
+#define MSGTR_SoftsleepUnderflow "Warning! Softsleep underflow!\n"
+#define MSGTR_EDLSKIPStartStopLength "\nEDL_SKIP: start [%f], stop [%f], length [%f]\n"
+#define MSGTR_AnsSubVisibility "ANS_SUB_VISIBILITY=%ld\n"
+#define MSGTR_AnsLength "ANS_LENGTH=%ld\n"
+#define MSGTR_AnsVoFullscreen "ANS_VO_FULLSCREEN=%ld\n"
+#define MSGTR_AnsPercentPos "ANS_PERCENT_POSITION=%ld\n"
+#define MSGTR_DvdnavNullEvent "DVDNAV Event NULL?!\n"
+#define MSGTR_DvdnavHighlightEventBroken "DVDNAV Event: Highlight event broken\n"
+#define MSGTR_DvdnavEvent "DVDNAV Event: %s\n"
+#define MSGTR_DvdnavHighlightHide "DVDNAV Event: Highlight Hide\n"
+#define MSGTR_DvdnavStillFrame "######################################## DVDNAV Event: Still Frame: %d sec(s)\n"
+#define MSGTR_DvdnavNavStop "DVDNAV Event: Nav Stop\n"
+#define MSGTR_DvdnavNavNOP "DVDNAV Event: Nav NOP\n"
+#define MSGTR_DvdnavNavSpuStreamChangeVerbose "DVDNAV Event: Nav SPU Stream Change: phys: %d/%d/%d logical: %d\n"
+#define MSGTR_DvdnavNavSpuStreamChange "DVDNAV Event: Nav SPU Stream Change: phys: %d logical: %d\n"
+#define MSGTR_DvdnavNavAudioStreamChange "DVDNAV Event: Nav Audio Stream Change: phys: %d logical: %d\n"
+#define MSGTR_DvdnavNavVTSChange "DVDNAV Event: Nav VTS Change\n"
+#define MSGTR_DvdnavNavCellChange "DVDNAV Event: Nav Cell Change\n"
+#define MSGTR_DvdnavNavSpuClutChange "DVDNAV Event: Nav SPU CLUT Change\n"
+#define MSGTR_DvdnavNavSeekDone "DVDNAV Event: Nav Seek Done\n"
+#define MSGTR_MenuCall "Menu call\n"
 
 #define MSGTR_EdlCantUseBothModes "Can't use -edl and -edlout at the same time.\n"
 #define MSGTR_EdlOutOfMem "Can't allocate enough memory to hold EDL data.\n"
@@ -313,7 +349,6 @@ static char help_text[]=
 #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"
-#define MSGTR_FramesizeBufsizeTag "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n"
 
 // cfg-mencoder.h:
 
diff --git a/help/help_mp-es.h b/help/help_mp-es.h
index de2bace410..9f6c4d1f16 100644
--- a/help/help_mp-es.h
+++ b/help/help_mp-es.h
@@ -127,8 +127,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Error abriendo/inicializando el dispositivo de la salida de v�deo (-vo)!\n"
 #define MSGTR_ForcedVideoCodec "Forzado el codec de v�deo: %s.\n"
 #define MSGTR_ForcedAudioCodec "Forzado el codec de audio: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Descripci�n: %s\nAO: Autor: %s.\n"
-#define MSGTR_AOComment "AO: Comentario: %s.\n"
 #define MSGTR_Video_NoVideo "V�deo: no hay v�deo!\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: No se pudieron inicializar los filtros de v�deo (-vf) o de salida de v�deo (-vo)!\n"
 #define MSGTR_Paused "\n  =====  PAUSA  =====\r"
@@ -323,7 +321,6 @@ static char help_text[]=
 #define MSGTR_LavcAudioCodecNotFound "LAVC Audio, no se encuentra el codificador para el codec %s\n"
 #define MSGTR_CouldntAllocateLavcContext "LAVC Audio, �no se puede asignar contexto!\n"
 #define MSGTR_CouldntOpenCodec "No se puede abrir el codec %s, br=%d\n"
-#define MSGTR_FramesizeBufsizeTag "TAMA�O_DEL_CUADRO: %d, TAMA�O_DEL_BUFFER: %d, ETIQUETA: 0x%x\n"
 
 // cfg-mencoder.h
 
diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h
index 3e6e98cdee..7244bf16c7 100644
--- a/help/help_mp-fr.h
+++ b/help/help_mp-fr.h
@@ -120,8 +120,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Erreur � l'ouverture/initialisation de la sortie vid�o choisie (-vo).\n"
 #define MSGTR_ForcedVideoCodec "Codec vid�o forc�: %s\n"
 #define MSGTR_ForcedAudioCodec "Codec audio forc�: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Description: %s\nAO: Auteur: %s\n"
-#define MSGTR_AOComment "AO: Commentaire: %s\n"
 #define MSGTR_Video_NoVideo "Vid�o: pas de vid�o\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: impossible d'initialiser les filtres vid�o (-vf) ou la sortie vid�o (-vo).\n"
 #define MSGTR_Paused "\n  =====  PAUSE  =====\r" // no more than 23 characters (status line for audio files)
diff --git a/help/help_mp-hu.h b/help/help_mp-hu.h
index b13b78bf2d..15b661306d 100644
--- a/help/help_mp-hu.h
+++ b/help/help_mp-hu.h
@@ -121,8 +121,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Hiba a kiv�lasztott video_out (-vo) egys�g inicializ�sakor!\n"
 #define MSGTR_ForcedVideoCodec "K�nyszer�tett video codec: %s\n"
 #define MSGTR_ForcedAudioCodec "K�nyszer�tett audio codec: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Le�r�s: %s\nAO: K�sz�t�: %s\n"
-#define MSGTR_AOComment "AO: Komment: %s\n"
 #define MSGTR_Video_NoVideo "Video: nincs video!!!\n"
 #define MSGTR_NotInitializeVOPorVO "\nHIBA: Nem siker�lt a video filterek (-vf) vagy a video kimenet (-vo) inicializ�l�sa!\n"
 #define MSGTR_Paused "\n  =====  SZ�NET  =====\r"
diff --git a/help/help_mp-it.h b/help/help_mp-it.h
index 3061bad4be..f0c9956b21 100644
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@@ -115,8 +115,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Errore aprendo/inizializzando il dispositivo di output video (-vo) selezionato!\n"
 #define MSGTR_ForcedVideoCodec "Codec video forzato: %s\n"
 #define MSGTR_ForcedAudioCodec "Codec audio forzato: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Descrizione: %s\nAO: Autore: %s\n"
-#define MSGTR_AOComment "AO: Commento: %s\n"
 #define MSGTR_Video_NoVideo "Video: no video!!!\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: Impossibile inizializzare i filtri video (-vf) o l'output video (-vo)!\n"
 #define MSGTR_Paused "\n  =====  PAUSA  =====\r"
diff --git a/help/help_mp-ja.h b/help/help_mp-ja.h
index 246f3234e5..bb29da64cb 100644
--- a/help/help_mp-ja.h
+++ b/help/help_mp-ja.h
@@ -116,8 +116,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "���򤵤줿��������(-vo)�ǥХ����򳫤���������ޤ���Ǥ���.\n"
 #define MSGTR_ForcedVideoCodec "���ꤵ�줿���������ǥå�: %s\n"
 #define MSGTR_ForcedAudioCodec "���ꤵ�줿���������ǥå�: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: �ܺ�: %s\nAO: ����: %s\n"
-#define MSGTR_AOComment "AO: ������: %s\n"
 #define MSGTR_Video_NoVideo "Video: ����������ޤ���\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: �����ե��륿��(-vf)����������(-vo)�ν�����˼��Ԥ��ޤ���.\n"
 #define MSGTR_Paused "\n  =====  ���  =====\r" // no more than 23 characters (status line for audio files)
diff --git a/help/help_mp-ko.h b/help/help_mp-ko.h
index f2ca714eb3..3dbb06569d 100644
--- a/help/help_mp-ko.h
+++ b/help/help_mp-ko.h
@@ -118,8 +118,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "선택한 비디오 출력 (-vo) 장치를 열거나 초기화할 수 없습니다.\n"
 #define MSGTR_ForcedVideoCodec "강제로 사용된 비디오 코덱: %s\n"
 #define MSGTR_ForcedAudioCodec "강제로 사용된 오디오 코덱: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: 설명: %s\nAO: 만든이: %s\n"
-#define MSGTR_AOComment "AO: 덧말: %s\n"
 #define MSGTR_Video_NoVideo "비디오: 비디오 없음\n"
 #define MSGTR_NotInitializeVOPorVO "\n치명적 오류: 비디오 필터(-vf) 또는 비디오 출력(-vo)을 초기화할 수 없습니다.\n"
 #define MSGTR_Paused "\n  =====  잠시멈춤  =====\r"
diff --git a/help/help_mp-mk.h b/help/help_mp-mk.h
index 8267f63204..44799b9e69 100644
--- a/help/help_mp-mk.h
+++ b/help/help_mp-mk.h
@@ -119,8 +119,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Грешка при отварањето/иницијализирањето на избраниот излезен видео (-vo) уред.\n"
 #define MSGTR_ForcedVideoCodec "Присилен видео кодек: %s\n"
 #define MSGTR_ForcedAudioCodec "Присилен аудио кодек: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Опис: %s\nAO: Автор: %s\n"
-#define MSGTR_AOComment "AO: Коментар: %s\n"
 #define MSGTR_Video_NoVideo "Видео: нема слика\n"
 #define MSGTR_NotInitializeVOPorVO "\nФАТАЛНО: Не може да ги иницијализира видео филтерите (-vf) или видео излезот (-vo).\n"
 #define MSGTR_Paused "\n  =====  ПАУЗА =====\r" // не повеќе од 23 карактери (статус линија за аудио датотеките)
diff --git a/help/help_mp-nl.h b/help/help_mp-nl.h
index 9c2ca25e56..b3d28fcfa6 100644
--- a/help/help_mp-nl.h
+++ b/help/help_mp-nl.h
@@ -117,8 +117,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Fout bij het openen/initialiseren van het gekozen video_out (-vo) apparaat!\n"
 #define MSGTR_ForcedVideoCodec "Gedwongen video codec: %s\n"
 #define MSGTR_ForcedAudioCodec "Gedwongen audio codec: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Beschrijving: %s\nAO: Auteur: %s\n"
-#define MSGTR_AOComment "AO: Commentaar: %s\n"
 #define MSGTR_Video_NoVideo "Video: geen video!!!\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAAL: Kon de video filters (-vf) of de video uitvoer (-vo) niet initialiseren!\n"
 #define MSGTR_Paused "\n------ GEPAUZEERD -------\r"
diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h
index 7bb6405f90..c730f7d63b 100644
--- a/help/help_mp-pl.h
+++ b/help/help_mp-pl.h
@@ -119,8 +119,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "B��d przy otwieraniu/inicjalizacji wybranego urz�dzenia video (-vo).\n"
 #define MSGTR_ForcedVideoCodec "Wymuszony kodek video: %s\n"
 #define MSGTR_ForcedAudioCodec "Wymuszony kodek audio: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Opis: %s\nAO: Autor: %s\n"
-#define MSGTR_AOComment "AO: Komentarz: %s\n"
 #define MSGTR_Video_NoVideo "Video: brak video\n"
 #define MSGTR_NotInitializeVOPorVO "\nB��D KRYTYCZNY: Nie mog� zainicjalizowa� filtra video (-vf) lub wyj�cia video (-vo).\n"
 #define MSGTR_Paused "\n  =====  PAUZA  =====\r" // no more than 23 characters (status line for audio files)
@@ -305,7 +303,6 @@ static char help_text[]=
 #define MSGTR_LavcAudioCodecNotFound "Audio LAVC - nie mog� znale�� kodeka dla %s\n"
 #define MSGTR_CouldntAllocateLavcContext "Audio LAVC - nie mog� zaalokowa� tre�ci!\n"
 #define MSGTR_CouldntOpenCodec "Nie mog� otworzy� kodeka %s, br=%d\n"
-#define MSGTR_FramesizeBufsizeTag "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n"
 // cfg-mencoder.h:
 
 #define MSGTR_MEncoderMP3LameHelp "\n\n"\
@@ -894,4 +891,4 @@ static char help_text[]=
 
 // ao_plugin.c
 
-#define MSGTR_AO_PLUGIN_InvalidPlugin "[AO PLUGIN] nieprawid�owa wtyczka: %s\n"
\ No newline at end of file
+#define MSGTR_AO_PLUGIN_InvalidPlugin "[AO PLUGIN] nieprawid�owa wtyczka: %s\n"
diff --git a/help/help_mp-pt_BR.h b/help/help_mp-pt_BR.h
index dc37e030ac..35b3869ab5 100644
--- a/help/help_mp-pt_BR.h
+++ b/help/help_mp-pt_BR.h
@@ -126,8 +126,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Erro abrindo/inicializando o dispositivo da sa�da de v�deo (-vo)!\n"
 #define MSGTR_ForcedVideoCodec "Codec de v�deo for�ado: %s\n"
 #define MSGTR_ForcedAudioCodec "Codec de audio for�ado: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Descri��o: %s\nAO: Autor: %s\n"
-#define MSGTR_AOComment "AO: Coment�rio: %s\n"
 #define MSGTR_Video_NoVideo "V�deo: sem v�deo\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: Imposs�vel inicializar os filtros de v�deo (-vf) ou a sa�da de v�deo (-vo)!\n"
 #define MSGTR_Paused "\n================= PAUSADO =================\r"
diff --git a/help/help_mp-ro.h b/help/help_mp-ro.h
index 29172e4f88..1520549d77 100644
--- a/help/help_mp-ro.h
+++ b/help/help_mp-ro.h
@@ -123,8 +123,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Eroare la activarea ie�irii video (-vo) aleas�.\n"
 #define MSGTR_ForcedVideoCodec "Codec video for�at: %s\n"
 #define MSGTR_ForcedAudioCodec "Codec audio for�at: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Descriere: %s\nAO: Autor: %s\n"
-#define MSGTR_AOComment "AO: Comentariu: %s\n"
 #define MSGTR_Video_NoVideo "Video: nu exist� video\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: Nu pot ini�ializa filtrele video (-vf) sau ie�irea video (-vo).\n"
 #define MSGTR_Paused "\n  =====  PAUZ�  =====\r" // no more than 23 characters (status line for audio files)
diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h
index 5849d1be14..6fe7393388 100644
--- a/help/help_mp-ru.h
+++ b/help/help_mp-ru.h
@@ -117,8 +117,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "������ ��� ��������/������������� ���������� ���������� ����� ������ (-vo).\n"
 #define MSGTR_ForcedVideoCodec "���������� ����� �����: %s\n"
 #define MSGTR_ForcedAudioCodec "���������� ����� �����: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: ��������: %s\nAO: �����: %s\n"
-#define MSGTR_AOComment "AO: �����������: %s\n"
 #define MSGTR_Video_NoVideo "�����: ��� �����\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: �� ���� ���������������� ����� ������� (-vf) ��� ����� ����� (-vo).\n"
 #define MSGTR_Paused "\n====��������������====\r" // no more than 23 characters (status line for audio files)
diff --git a/help/help_mp-sk.h b/help/help_mp-sk.h
index 8f216296b5..04225d95e2 100644
--- a/help/help_mp-sk.h
+++ b/help/help_mp-sk.h
@@ -112,8 +112,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Chyba pri otv�ran�/inicializ�cii vybran�ch video_out (-vo) zariaden�!\n"
 #define MSGTR_ForcedVideoCodec "Vn�ten� video kodek: %s\n"
 #define MSGTR_ForcedAudioCodec "Vn�ten� video kodek: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: Popis: %s\nAO: Autor: %s\n"
-#define MSGTR_AOComment "AO: Koment�r: %s\n"
 #define MSGTR_Video_NoVideo "Video: �iadne video!!!\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: Nem��em inicializova� video filtre (-vf) alebo video v�stup (-vo)!\n"
 #define MSGTR_Paused "\n  =====  PAUZA  =====\r"
diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h
index f7e61a01af..70b24ced48 100644
--- a/help/help_mp-tr.h
+++ b/help/help_mp-tr.h
@@ -111,8 +111,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "Video ��k�� (-vo) s�r�c�s�n� a�arken/y�klerken hata!\n"
 #define MSGTR_ForcedVideoCodec "Video codecine zorland�: %s\n"
 #define MSGTR_ForcedAudioCodec "Ses codecine zorland�: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: A��klama: %s\nAO: Yapan: %s\n"
-#define MSGTR_AOComment "AO: Yorum: %s\n"
 #define MSGTR_Video_NoVideo "Video: video yok!!!\n"
 #define MSGTR_NotInitializeVOPorVO "\n�L�MC�L: Video Filtreleri (-vf) veya video ��k��� (-vo) y�klenemedi!\n"
 #define MSGTR_Paused "\n------ DURAKLADI -------\r"
diff --git a/help/help_mp-uk.h b/help/help_mp-uk.h
index d1d6e3d784..cf63dbe303 100644
--- a/help/help_mp-uk.h
+++ b/help/help_mp-uk.h
@@ -119,8 +119,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "������� צ�������/�Φæ�̦��æ� ��������� video_out (-vo) ��������.\n"
 #define MSGTR_ForcedVideoCodec "���������� צ��� �����: %s\n"
 #define MSGTR_ForcedAudioCodec "���������� ��Ħ� �����: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: ����: %s\nAO: �����: %s\n"
-#define MSGTR_AOComment "AO: �������Ҧ�: %s\n"
 #define MSGTR_Video_NoVideo "�����: ��� צ���\n"
 #define MSGTR_NotInitializeVOPorVO "\nFATAL: ��������� �Φæ�̦������ צ��� Ʀ����� (-vf) ��� צ��� ��צ� (-vo).\n"
 #define MSGTR_Paused "\n  =====  �����  =====\r"
diff --git a/help/help_mp-zh_CN.h b/help/help_mp-zh_CN.h
index b2d7793fb0..b8ec674d06 100644
--- a/help/help_mp-zh_CN.h
+++ b/help/help_mp-zh_CN.h
@@ -118,8 +118,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "��/��ʼ����ѡ����Ƶ���(-vo)�豸�dz���!\n"
 #define MSGTR_ForcedVideoCodec "ָ������Ƶ������: %s\n"
 #define MSGTR_ForcedAudioCodec "ָ������Ƶ������: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: ����: %s\nAO: ����: %s\n"
-#define MSGTR_AOComment "AO: ��ע: %s\n"
 #define MSGTR_Video_NoVideo "��Ƶ: no video\n"
 #define MSGTR_NotInitializeVOPorVO "\n��������: �޷���ʼ����Ƶ���(-vf)����Ƶ���(-vo)!\n"
 #define MSGTR_Paused "\n  =====  ��ͣ  =====\r"
diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h
index bb39c22bf7..64b58ee40c 100644
--- a/help/help_mp-zh_TW.h
+++ b/help/help_mp-zh_TW.h
@@ -120,8 +120,6 @@ static char help_text[]=
 #define MSGTR_ErrorInitializingVODevice "�}��/��l�Ʃҿ�ܪ����T��X (-vo) �˸m�ɵo�Ϳ��~�C\n"
 #define MSGTR_ForcedVideoCodec "�j��ϥΪ����T codec: %s\n"
 #define MSGTR_ForcedAudioCodec "�j��ϥΪ����� codec: %s\n"
-#define MSGTR_AODescription_AOAuthor "AO: �y�z: %s\nAO: �@��: %s\n"
-#define MSGTR_AOComment "AO: ����: %s\n"
 #define MSGTR_Video_NoVideo "���T: �S���v��\n"
 #define MSGTR_NotInitializeVOPorVO "\n�P�R���~: �L�k��l�Ƽv���L�o�� (-vf) �� �v����X (-vo)�C\n"
 #define MSGTR_Paused "\n  ====== �Ȱ� ======\r"
diff --git a/mencoder.c b/mencoder.c
index 30f19d51c1..5cdc5104fc 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -989,7 +989,7 @@ case ACODEC_LAVC:
 	exit(1);
     }
 
-    mp_msg(MSGT_MENCODER, MSGL_V, MSGTR_FramesizeBufsizeTag, lavc_actx->frame_size, lavc_actx->frame_size * 2 * lavc_actx->channels, mux_a->wf->wFormatTag);
+    mp_msg(MSGT_MENCODER, MSGL_V, "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n", lavc_actx->frame_size, lavc_actx->frame_size * 2 * lavc_actx->channels, mux_a->wf->wFormatTag);
 
     break;
 #endif
diff --git a/mplayer.c b/mplayer.c
index fb986be38b..eea2022871 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -601,7 +601,7 @@ void load_per_file_config (m_config_t* conf, const char *const file)
     
     if (!stat (cfg, &st))
     {
-	mp_msg(MSGT_CPLAYER,MSGL_INFO,"Loading config '%s'\n", cfg);
+	mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, cfg);
 	m_config_parse_config_file (conf, cfg);
 	return;
     }
@@ -615,7 +615,7 @@ void load_per_file_config (m_config_t* conf, const char *const file)
     {
 	if (!stat (confpath, &st))
 	{
-	    mp_msg(MSGT_CPLAYER,MSGL_INFO,"Loading config '%s'\n", confpath);
+	    mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, confpath);
 	    m_config_parse_config_file (conf, confpath);
 	}
 
@@ -722,7 +722,7 @@ void add_subtitles(char *filename, float fps, int silent)
     if (subd == NULL || set_of_sub_size >= MAX_SUBTITLE_FILES) return;
     set_of_subtitles[set_of_sub_size] = subd;
     ++set_of_sub_size;
-    printf("SUB: added subtitle file (%d): %s\n", set_of_sub_size, filename);
+    mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_AddedSubtitleFile, set_of_sub_size, filename);
 }
 
 // FIXME: if/when the GUI calls this, global sub numbering gets (potentially) broken.
@@ -960,29 +960,29 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
 	int i;
 	video_codec=video_codec_list[0];
 	for(i=0;video_codec_list[i];i++)
-	    printf("vc#%d: '%s'\n",i,video_codec_list[i]);
+	    mp_msg(MSGT_FIXME,MSGL_FIXME,"vc#%d: '%s'\n",i,video_codec_list[i]);
     }
 #endif
     if(audio_codec_list && strcmp(audio_codec_list[0],"help")==0){
       mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs);
       list_codecs(1);
-      printf("\n");
+      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
       exit_player_with_rc(NULL, 0);
     }
     if(video_codec_list && strcmp(video_codec_list[0],"help")==0){
       mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs);
       list_codecs(0);
-      printf("\n");
+      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
       exit_player_with_rc(NULL, 0);
     }
     if(video_fm_list && strcmp(video_fm_list[0],"help")==0){
       vfm_help();
-      printf("\n");
+      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
       exit_player_with_rc(NULL, 0);
     }
     if(audio_fm_list && strcmp(audio_fm_list[0],"help")==0){
       afm_help();
-      printf("\n");
+      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
       exit_player_with_rc(NULL, 0);
     }
     if(af_cfg.list && strcmp(af_cfg.list[0],"help")==0){
@@ -993,7 +993,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
 #ifdef HAVE_X11
     if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){
       fstype_help();
-      printf("\n");
+      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
       exit_player_with_rc(NULL, 0);
     }
 #endif
@@ -1050,9 +1050,9 @@ if (edl_check_mode() == EDL_ERROR && edl_filename)
 
     // Many users forget to include command line in bugreports...
     if(verbose>0){
-      mp_msg(MSGT_CPLAYER, MSGL_INFO, "CommandLine:");
-      for(i=1;i<argc;i++)printf(" '%s'",argv[i]);
-      printf("\n");
+      mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine);
+      for(i=1;i<argc;i++)mp_msg(MSGT_FIXME, MSGL_FIXME," '%s'",argv[i]);
+      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
     }
 
     mp_msg_set_level(verbose+MSGL_STATUS);
@@ -1089,19 +1089,19 @@ if (edl_check_mode() == EDL_ERROR && edl_filename)
   {
     // seteuid(0); /* Can't hurt to try to get root here */
     if ((rtc_fd = open(rtc_device ? rtc_device : "/dev/rtc", O_RDONLY)) < 0)
-	mp_msg(MSGT_CPLAYER, MSGL_WARN, "Failed to open %s: %s (it should be readable by the user.)\n",
+	mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_RTCDeviceNotOpenable,
 	    rtc_device ? rtc_device : "/dev/rtc", strerror(errno));
      else {
 	unsigned long irqp = 1024; /* 512 seemed OK. 128 is jerky. */
 
 	if (ioctl(rtc_fd, RTC_IRQP_SET, irqp) < 0) {
-    	    mp_msg(MSGT_CPLAYER, MSGL_WARN, "Linux RTC init error in ioctl (rtc_irqp_set %lu): %s\n", irqp, strerror(errno));
-	    mp_msg(MSGT_CPLAYER, MSGL_HINT, "Try adding \"echo %lu > /proc/sys/dev/rtc/max-user-freq\" to your system startup scripts.\n", irqp);
+    	    mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_LinuxRTCInitErrorIrqpSet, irqp, strerror(errno));
+    	    mp_msg(MSGT_CPLAYER, MSGL_HINT, MSGTR_IncreaseRTCMaxUserFreq, irqp);
    	    close (rtc_fd);
     	    rtc_fd = -1;
 	} else if (ioctl(rtc_fd, RTC_PIE_ON, 0) < 0) {
 	    /* variable only by the root */
-    	    mp_msg(MSGT_CPLAYER, MSGL_ERR, "Linux RTC init error in ioctl (rtc_pie_on): %s\n", strerror(errno));
+    	    mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCInitErrorPieOn, strerror(errno));
     	    close (rtc_fd);
 	    rtc_fd = -1;
 	} else
@@ -1154,16 +1154,16 @@ current_module = NULL;
 #ifdef HAVE_MENU
  if(use_menu) {
    if(menu_cfg && menu_init(menu_cfg))
-     mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", menu_cfg);
+     mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg);
    else {
      menu_cfg = get_path("menu.conf");
      if(menu_init(menu_cfg))
-       mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", menu_cfg);
+       mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg);
      else {
        if(menu_init(MPLAYER_CONFDIR "/menu.conf"))
-         mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", MPLAYER_CONFDIR"/menu.conf");
+         mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, MPLAYER_CONFDIR"/menu.conf");
        else {
-         mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu init failed\n");
+         mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitFailed);
          use_menu = 0;
        }
      }
@@ -1216,7 +1216,7 @@ play_next_file:
 // or cache filling
 if(!noconsolecontrols && !slave_mode){
   if(inited_flags&INITED_GETCH2)
-    mp_msg(MSGT_CPLAYER,MSGL_WARN,"WARNING: getch2_init called twice!\n");
+    mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_Getch2InitializedTwice);
   else
     getch2_enable();  // prepare stdin for hotkeys...
   inited_flags|=INITED_GETCH2;
@@ -1335,7 +1335,7 @@ if(stream_dump_type==5){
   FILE *f;
   current_module="dumpstream";
   if(stream->type==STREAMTYPE_STREAM && stream->fd<0){
-    mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Cannot dump this stream - no 'fd' available\n");
+    mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_DumpstreamFdUnavailable);
     exit_player(MSGTR_Exit_error);
   }
   stream_reset(stream);
@@ -1405,7 +1405,7 @@ if (demuxer && demuxer->type==DEMUXER_TYPE_PLAYLIST)
   {	 
     char *temp, *bname;
     
-    mp_msg(MSGT_CPLAYER,MSGL_V,"Adding file %s to element entry\n",playlist_entry);
+    mp_msg(MSGT_CPLAYER,MSGL_V,"Adding file %s to element entry.\n",playlist_entry);
 
     bname=mp_basename(playlist_entry);
     if ((strlen(bname)>10) && !strncmp(bname,"qt",2) && !strncmp(bname+3,"gateQT",6))
@@ -1425,7 +1425,7 @@ if (demuxer && demuxer->type==DEMUXER_TYPE_PLAYLIST)
 	temp[strlen(filename)-strlen(mp_basename(filename))]='\0';
 	strcat(temp, playlist_entry);
 	play_tree_add_file(entry,temp);
-	mp_msg(MSGT_CPLAYER,MSGL_V,"Resolving reference to %s\n",temp);
+	mp_msg(MSGT_CPLAYER,MSGL_V,"Resolving reference to %s.\n",temp);
 	free(temp);
       }
     }
@@ -1464,7 +1464,7 @@ if(!demuxer)
     // don't try to parse raw media as playlist, it's unlikely
     goto goto_next_file;
   }
-  mp_msg(MSGT_CPLAYER,MSGL_INFO,"Falling back on trying to parse playlist %s...\n",filename);
+  mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FallingBackOnPlaylist,filename);
   stream_reset(stream);
   stream_seek(stream,stream->start_pos);
   entry = parse_playtree(stream,0);
@@ -1782,7 +1782,7 @@ if(use_menu) {
   char* vf_arg[] = { "_oldargs_", menu_root, NULL };
   vf_menu = vf_open_plugin(libmenu_vfs,sh_video->vfilter,"menu",vf_arg);
   if(!vf_menu) {
-    mp_msg(MSGT_CPLAYER,MSGL_ERR,"Can't open libmenu video filter with root menu %s\n",menu_root);
+    mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantOpenLibmenuFilterWithThisRootMenu,menu_root);
     use_menu = 0;
   }
 }
@@ -1812,7 +1812,7 @@ if(auto_quality>0){
     output_quality=get_video_quality_max(sh_video);
     if(auto_quality>output_quality) auto_quality=output_quality;
     else output_quality=auto_quality;
-    mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d\n",output_quality);
+    mp_msg(MSGT_CPLAYER,MSGL_V,"AutoQ: setting quality to %d.\n",output_quality);
     set_video_quality(sh_video,output_quality);
 }
 
@@ -1895,7 +1895,7 @@ if(sh_audio){
 	// output:
 	&ao_data.samplerate, &ao_data.channels, &ao_data.format,
 	audio_out_format_bits(ao_data.format)/8)){
-      mp_msg(MSGT_CPLAYER,MSGL_ERR,"Error at audio filter chain pre-init!\n");
+      mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_AudioFilterChainPreinitError);
   } else {
     mp_msg(MSGT_CPLAYER,MSGL_INFO,"AF_pre: %dHz %dch %s\n",
       ao_data.samplerate, ao_data.channels,
@@ -1920,10 +1920,10 @@ if(sh_audio){
       ao_data.samplerate, ao_data.channels,
       audio_out_format_name(ao_data.format),
       audio_out_format_bits(ao_data.format)/8 );
-    mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_AODescription_AOAuthor,
+    mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Description: %s\nAO: Author: %s\n",
       audio_out->info->name, audio_out->info->author);
     if(strlen(audio_out->info->comment) > 0)
-      mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_AOComment, audio_out->info->comment);
+      mp_msg(MSGT_CPLAYER,MSGL_V,"AO: Comment: %s\n", audio_out->info->comment);
     // init audio filters:
 #if 1
     current_module="af_init";
@@ -1933,7 +1933,7 @@ if(sh_audio){
 	ao_data.samplerate, ao_data.channels, ao_data.format,
 	audio_out_format_bits(ao_data.format)/8, /* ao_data.bps, */
 	ao_data.outburst*4, ao_data.buffersize)){
-      mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format!\n");
+      mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter);
 //      mp_msg(MSGT_CPLAYER,MSGL_ERR,"Couldn't find matching filter / ao format! -> NOSOUND\n");
 //      uninit_player(INITED_ACODEC|INITED_AO); // close codec & ao
 //      sh_audio=d_audio->sh=NULL; // -> nosound
@@ -1952,14 +1952,14 @@ if(sh_audio) sh_audio->delay=-audio_delay;
 
 if(!sh_audio){
   mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound);
-  mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks\n",d_audio->packs);
+  mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %s unused audio chunks.\n",d_audio->packs);
   ds_free_packs(d_audio); // free buffered chunks
   d_audio->id=-2;         // do not read audio chunks
   //uninit_player(INITED_AO); // close device
 }
 if(!sh_video){
    mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Video_NoVideo);
-   mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused video chunks\n",d_video->packs);
+   mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %s unused video chunks.\n",d_video->packs);
    ds_free_packs(d_video);
    d_video->id=-2;
    //if(!fixed_vo) uninit_player(INITED_VO);
@@ -2250,7 +2250,7 @@ if(time_frame>0.001 && !(vo_flags&256)){
         while (time_frame > 0.000) {
 	    unsigned long rtc_ts;
 	    if (read (rtc_fd, &rtc_ts, sizeof(rtc_ts)) <= 0)
-		    mp_msg(MSGT_CPLAYER, MSGL_ERR, "Linux RTC read error: %s\n", strerror(errno));
+		    mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_LinuxRTCReadError, strerror(errno));
     	    time_frame-=GetRelativeTime();
 	}
     } else
@@ -2268,7 +2268,7 @@ if(time_frame>0.001 && !(vo_flags&256)){
         }
 	if(softsleep){
 	    current_module="sleep_soft";
-	    if(time_frame<0) mp_msg(MSGT_AVSYNC, MSGL_WARN, "Warning! Softsleep underflow!\n");
+	    if(time_frame<0) mp_msg(MSGT_AVSYNC, MSGL_WARN, MSGTR_SoftsleepUnderflow);
 	    while(time_frame>0) time_frame-=GetRelativeTime(); // burn the CPU
 	}
     }
@@ -2357,7 +2357,7 @@ if(time_frame>0.001 && !(vo_flags&256)){
       a_pts=d_audio->pts;
       if(!delay_corrected) if(a_pts) delay_corrected=1;
 #if 0
-      printf("\n#X# pts=%5.3f ds_pts=%5.3f buff=%5.3f total=%5.3f\n",
+      mp_msg(MSGT_FIXME, MSGL_FIXME, "\n#X# pts=%5.3f ds_pts=%5.3f buff=%5.3f total=%5.3f\n",
           a_pts,
 	  ds_tell_pts(d_audio)/(float)sh_audio->i_bps,
 	  -sh_audio->a_in_buffer_len/(float)sh_audio->i_bps,
@@ -2524,14 +2524,14 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
        abs_seek_pos = 0;
        rel_seek_secs = next_edl_record->length_sec;
 #ifdef DEBUG_EDL
-       printf( "\nEDL_SKIP: start [%f], stop [%f], length [%f]\n", next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec );
+       mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_EDLSKIPStartStopLength, next_edl_record->start_sec, next_edl_record->stop_sec, next_edl_record->length_sec );
 #endif
        edl_decision = 1;
      } else if( next_edl_record->action == EDL_MUTE ) {
        mixer_mute(&mixer);
        edl_mute_count++; // new EDL seek behavior needs this
 #ifdef DEBUG_EDL
-       printf( "\nEDL_MUTE: [%f]\n", next_edl_record->start_sec );
+       mp_msg(MSGT_FIXME, MSGL_FIXME, "\nEDL_MUTE: [%f]\n", next_edl_record->start_sec );
 #endif
        edl_decision = 1;
      }
@@ -3154,7 +3154,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
 	{
 #ifdef USE_SUB
 	if (sh_video) {
-		mp_msg(MSGT_GLOBAL,MSGL_INFO,"ANS_SUB_VISIBILITY=%ld\n", sub_visibility);
+		mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsSubVisibility, sub_visibility);
 	}
 #endif
 	} break;
@@ -3265,16 +3265,16 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
 	break;
 	
     case MP_CMD_GET_TIME_LENGTH : {
-	mp_msg(MSGT_GLOBAL,MSGL_INFO,"ANS_LENGTH=%ld\n", demuxer_get_time_length(demuxer));
+	mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsLength, demuxer_get_time_length(demuxer));
     } break;
 
 	case MP_CMD_GET_VO_FULLSCREEN : {
 	if(video_out && vo_config_count)
-		mp_msg(MSGT_GLOBAL,MSGL_INFO,"ANS_VO_FULLSCREEN=%ld\n", vo_fs);
+		mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsVoFullscreen, vo_fs);
 	} break;
     
     case MP_CMD_GET_PERCENT_POS : {
-	mp_msg(MSGT_GLOBAL,MSGL_INFO,"ANS_PERCENT_POSITION=%ld\n", demuxer_get_percent_pos(demuxer));
+	mp_msg(MSGT_GLOBAL,MSGL_INFO,MSGTR_AnsPercentPos, demuxer_get_percent_pos(demuxer));
     } break;
 #ifdef HAVE_MENU
     case MP_CMD_CRUN : {
@@ -3296,7 +3296,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
       if (stream->type != STREAMTYPE_DVDNAV) break;
 
       if (!dvdnav_event) {
-        printf("DVDNAV Event NULL?!\n");
+        mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNullEvent);
         break;
       }
 
@@ -3310,7 +3310,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
       case DVDNAV_HIGHLIGHT: {
           dvdnav_highlight_event_t *hevent = (dvdnav_highlight_event_t*)(dvdnav_event->details);
           if (!hevent) {
-                printf("DVDNAV Event: Highlight event broken\n");
+                mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavHighlightEventBroken);
                 break;
           }
 
@@ -3322,7 +3322,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
                      hevent->sx,hevent->sy,
                      hevent->ex,hevent->ey,
                      hevent->pts, d_video->pts);
-                printf("DVDNAV Event: %s\n",dvd_nav_text);
+                mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavEvent,dvd_nav_text);
                 //osd_show_dvd_nav_delay = 60;
 
                 osd_show_dvd_nav_highlight=1;
@@ -3333,14 +3333,14 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
           }
           else {
                   osd_show_dvd_nav_highlight=0;
-                  printf("DVDNAV Event: Highlight Hide\n");
+                  mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavHighlightHide);
           }
         break;
         }
       case DVDNAV_STILL_FRAME: {
           dvdnav_still_event_t *still_event = (dvdnav_still_event_t*)(dvdnav_event->details);
 
-          printf( "######################################## DVDNAV Event: Still Frame: %d sec(s)\n", still_event->length );
+          mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavStillFrame, still_event->length );
           while (dvdnav_stream_sleeping(dvdnav_priv)) {
             usec_sleep(1000); /* 1ms */
           }
@@ -3348,18 +3348,18 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
         break;
         }
       case DVDNAV_STOP: {
-          printf( "DVDNAV Event: Nav Stop\n" );
+          mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavStop );
         break;
         }
       case DVDNAV_NOP: {
-        printf("DVDNAV Event: Nav NOP\n");
+        mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavNOP);
         break;
         }
       case DVDNAV_SPU_STREAM_CHANGE: {
 #if DVDNAVVERSION > 012
         dvdnav_spu_stream_change_event_t *stream_change = (dvdnav_spu_stream_change_event_t*)(dvdnav_event->details);
 
-        printf("DVDNAV Event: Nav SPU Stream Change: phys: %d/%d/%d logical: %d\n",
+        mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSpuStreamChangeVerbose,
                 stream_change->physical_wide,
                 stream_change->physical_letterbox,
                 stream_change->physical_pan_scan,
@@ -3375,7 +3375,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
 #else
         dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details);
 
-        printf("DVDNAV Event: Nav SPU Stream Change: phys: %d logical: %d\n",
+        mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSpuStreamChange,
                 stream_change->physical,
                 stream_change->logical);
 
@@ -3397,7 +3397,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
         dvdnav_stream_change_event_t *stream_change = (dvdnav_stream_change_event_t*)(dvdnav_event->details);
 #endif
 
-        printf("DVDNAV Event: Nav Audio Stream Change: phys: %d logical: %d\n",
+        mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavAudioStreamChange,
                 stream_change->physical,
                 stream_change->logical);
 
@@ -3414,14 +3414,14 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
         break;
       }
       case DVDNAV_VTS_CHANGE: {
-        printf("DVDNAV Event: Nav VTS Change\n");
+        mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavVTSChange);
         break;
         }
       case DVDNAV_CELL_CHANGE: {
         dvdnav_cell_change_event_t *cell_change = (dvdnav_cell_change_event_t*)(dvdnav_event->details);
         cell_playback_t * cell_playback = cell_change->new_cell;
 
-        printf("DVDNAV Event: Nav Cell Change\n");
+        mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavCellChange);
         osd_show_dvd_nav_highlight=0; /* screen changed, disable menu */
         /*
         printf("new still time: %d\n",cell_playback->still_time);
@@ -3444,14 +3444,14 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
       case DVDNAV_SPU_CLUT_CHANGE: {
         uint32_t * new_clut = (uint32_t *)(dvdnav_event->details);
 
-        printf("DVDNAV Event: Nav SPU CLUT Change\n");
+        mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSpuClutChange);
         // send new palette to SPU decoder
         if (vo_spudec) spudec_update_palette(vo_spudec,new_clut);
 
         break;
         }
       case DVDNAV_SEEK_DONE: {
-        printf("DVDNAV Event: Nav Seek Done\n");
+        mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_DvdnavNavSeekDone);
         break;
         }
       }
@@ -3481,7 +3481,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
           dvdnav_right_button_select(dvdnav_priv->dvdnav);
           break;
         case MP_CMD_DVDNAV_MENU:
-          printf("Menu call\n");
+          mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_MenuCall);
           dvdnav_menu_call(dvdnav_priv->dvdnav,DVD_MENU_Root);
           break;
         case MP_CMD_DVDNAV_SELECT: