Merge svn changes up to r27399

Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c

21 files changed, 21 insertions, 21 deletions

diff --git a/help/help_mp-bg.h b/help/help_mp-bg.h
index 5cadb0b45e..47e393b1be 100644
--- a/help/help_mp-bg.h
+++ b/help/help_mp-bg.h
@@ -565,7 +565,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Информация"
diff --git a/help/help_mp-cs.h b/help/help_mp-cs.h
index c6772f6a49..635173d71a 100644
--- a/help/help_mp-cs.h
+++ b/help/help_mp-cs.h
@@ -705,7 +705,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "O aplikaci"
diff --git a/help/help_mp-dk.h b/help/help_mp-dk.h
index fae973d53c..a3b5472153 100644
--- a/help/help_mp-dk.h
+++ b/help/help_mp-dk.h
@@ -332,7 +332,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Om"
diff --git a/help/help_mp-el.h b/help/help_mp-el.h
index b3f05b8a20..e7a3a3fcb2 100644
--- a/help/help_mp-el.h
+++ b/help/help_mp-el.h
@@ -342,7 +342,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Περί"
diff --git a/help/help_mp-es.h b/help/help_mp-es.h
index d4cb70fd81..f0303fa3a5 100644
--- a/help/help_mp-es.h
+++ b/help/help_mp-es.h
@@ -711,7 +711,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Acerca de"
diff --git a/help/help_mp-fr.h b/help/help_mp-fr.h
index fd0369bf18..7389a82b7d 100644
--- a/help/help_mp-fr.h
+++ b/help/help_mp-fr.h
@@ -709,7 +709,7 @@ static char help_text[]=
 
 // ====================== messages/boutons GUI ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "À propos..."
diff --git a/help/help_mp-it.h b/help/help_mp-it.h
index dda7a009b8..9bdd4195f2 100644
--- a/help/help_mp-it.h
+++ b/help/help_mp-it.h
@@ -717,7 +717,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Informazioni su"
diff --git a/help/help_mp-ja.h b/help/help_mp-ja.h
index 7c9cfd3aee..f7355685a3 100644
--- a/help/help_mp-ja.h
+++ b/help/help_mp-ja.h
@@ -273,7 +273,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "アバウト"
diff --git a/help/help_mp-ko.h b/help/help_mp-ko.h
index 878c985f68..0fb904e0a8 100644
--- a/help/help_mp-ko.h
+++ b/help/help_mp-ko.h
@@ -336,7 +336,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "정보"
diff --git a/help/help_mp-mk.h b/help/help_mp-mk.h
index 7913d64090..8d590ec552 100644
--- a/help/help_mp-mk.h
+++ b/help/help_mp-mk.h
@@ -333,7 +333,7 @@ static char help_text[]=
 
 // ====================== GUI пораки/копчиња ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- лабели ---
 #define MSGTR_About "За"
diff --git a/help/help_mp-nb.h b/help/help_mp-nb.h
index 0c9d866865..9e6c860c12 100644
--- a/help/help_mp-nb.h
+++ b/help/help_mp-nb.h
@@ -164,7 +164,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Om"
diff --git a/help/help_mp-nl.h b/help/help_mp-nl.h
index 7c40863786..003b0fb65e 100644
--- a/help/help_mp-nl.h
+++ b/help/help_mp-nl.h
@@ -550,7 +550,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Info over"
diff --git a/help/help_mp-pl.h b/help/help_mp-pl.h
index 16938f2789..2c1f9ef2b3 100644
--- a/help/help_mp-pl.h
+++ b/help/help_mp-pl.h
@@ -673,7 +673,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "O programie"
diff --git a/help/help_mp-pt_BR.h b/help/help_mp-pt_BR.h
index a133e6cd69..9d3481c16a 100644
--- a/help/help_mp-pt_BR.h
+++ b/help/help_mp-pt_BR.h
@@ -337,7 +337,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Sobre"
diff --git a/help/help_mp-ro.h b/help/help_mp-ro.h
index 1912c0525b..61641ebf9e 100644
--- a/help/help_mp-ro.h
+++ b/help/help_mp-ro.h
@@ -291,7 +291,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Despre MPlayer"
diff --git a/help/help_mp-ru.h b/help/help_mp-ru.h
index c91dd9294e..ff6f6f960f 100644
--- a/help/help_mp-ru.h
+++ b/help/help_mp-ru.h
@@ -715,7 +715,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "О себе"
diff --git a/help/help_mp-sk.h b/help/help_mp-sk.h
index 46e9f4be0c..64b0bd8e81 100644
--- a/help/help_mp-sk.h
+++ b/help/help_mp-sk.h
@@ -656,7 +656,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "O aplikácii"
diff --git a/help/help_mp-sv.h b/help/help_mp-sv.h
index 8ea80bacae..94d1f192c2 100644
--- a/help/help_mp-sv.h
+++ b/help/help_mp-sv.h
@@ -563,7 +563,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Om"
diff --git a/help/help_mp-tr.h b/help/help_mp-tr.h
index 9bf05d4ef8..22a58bcd66 100644
--- a/help/help_mp-tr.h
+++ b/help/help_mp-tr.h
@@ -719,7 +719,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Hakkında"
diff --git a/help/help_mp-uk.h b/help/help_mp-uk.h
index 837668806a..9481918d12 100644
--- a/help/help_mp-uk.h
+++ b/help/help_mp-uk.h
@@ -323,7 +323,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "Про програму"
diff --git a/help/help_mp-zh_TW.h b/help/help_mp-zh_TW.h
index 59fabaa60b..a1050cf5fa 100644
--- a/help/help_mp-zh_TW.h
+++ b/help/help_mp-zh_TW.h
@@ -692,7 +692,7 @@ static char help_text[]=
 
 // ====================== GUI messages/buttons ========================
 
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
 
 // --- labels ---
 #define MSGTR_About "關于"