From 04ba27ba95ce2dd92d37f2651397b65721202d0c Mon Sep 17 00:00:00 2001
From: ptt <ptt@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 8 Oct 2009 10:18:19 +0000
Subject: Updated to help_mp-en.h r29742

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29757 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 help/help_mp-it.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'help')

diff --git a/help/help_mp-it.h b/help/help_mp-it.h
index a7bb02bfbc..802461dbc4 100644
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@@ -2,7 +2,7 @@
 // Updated by: Roberto Togni <see AUTHORS for email address>
 // Updated by: PaulTT <see AUTHORS for email address>
 
-// Updated to help_mp-en.h r29209
+// Updated to help_mp-en.h r29742
 
 
 // ========================= MPlayer help ===========================
@@ -1274,9 +1274,7 @@ static const char help_text[]=
 #define MSGTR_AO_ALSA_UnableToSetSamplerate2 "[AO_ALSA] Impossibile impostare samplerate-2: %s\n"
 // TODO::
 //#define MSGTR_AO_ALSA_UnableToSetBufferTimeNear "[AO_ALSA] Unable to set buffer time near: %s\n"
-#define MSGTR_AO_ALSA_UnableToSetPeriodTime "[AO_ALSA] Impossibile impostare il tempo del periodo: %s\n"
 #define MSGTR_AO_ALSA_UnableToGetPeriodSize "[AO ALSA] Impossibile ricavare la dimensione periodo: %s\n"
-#define MSGTR_AO_ALSA_UnableToSetPeriodSize "[AO ALSA] Impossibile impostare la dimensione periodo(%ld): %s\n"
 #define MSGTR_AO_ALSA_UnableToSetPeriods "[AO_ALSA] Impossibile impostare i periodi: %s\n"
 #define MSGTR_AO_ALSA_UnableToSetHwParameters "[AO_ALSA] Impossibile impostare hw-parameters: %s\n"
 #define MSGTR_AO_ALSA_UnableToGetBufferSize "[AO_ALSA] Impossibile ricavare buffersize: %s\n"
-- 
cgit v1.2.3


From b411278fbb00767b8013604157a43e0203f66f4c Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 14 Nov 2009 12:46:14 +0000
Subject: Show OSD message when enabling/disabling de-interlacing.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29912 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 command.c         | 2 ++
 help/help_mp-en.h | 1 +
 2 files changed, 3 insertions(+)

(limited to 'help')

diff --git a/command.c b/command.c
index 779296dc98..1edcc42bcb 100644
--- a/command.c
+++ b/command.c
@@ -1020,6 +1020,8 @@ static int mp_property_deinterlace(m_option_t * prop, int action,
 	vf->control(vf, VFCTRL_GET_DEINTERLACE, &deinterlace);
 	deinterlace = !deinterlace;
 	vf->control(vf, VFCTRL_SET_DEINTERLACE, &deinterlace);
+	set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDDeinterlace,
+	    deinterlace ? MSGTR_Enabled : MSGTR_Disabled);
 	return M_PROPERTY_OK;
     }
     return M_PROPERTY_NOT_IMPLEMENTED;
diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index 47cf6ae12b..52d0484c93 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -211,6 +211,7 @@ static const char help_text[]=
 #define MSGTR_OSDosd "OSD: %s"
 #define MSGTR_OSDChapter "Chapter: (%d) %s"
 #define MSGTR_OSDAngle "Angle: %d/%d"
+#define MSGTR_OSDDeinterlace "Deinterlace: %s"
 
 // property values
 #define MSGTR_Enabled "enabled"
-- 
cgit v1.2.3