# HG changeset patch
# User ib
# Date 1410207421 0
# Node ID 2208a16cc56282826627447fba558643815446fd
# Parent  ba344b4947c568a296adc819f9c7b364d36be876
Remove GTK+ and GLib versions 1 relatedness from the GUI.

This isn't really a cut-back, because although it seemed
that compiling with GTK+ and GLib versions 1 were possible,
compiling actually hadn't been possible for quite some time.

diff -r ba344b4947c5 -r 2208a16cc562 Changelog
--- a/Changelog	Sun Sep 07 23:25:33 2014 +0000
+++ b/Changelog	Mon Sep 08 20:17:01 2014 +0000
@@ -24,6 +24,8 @@
     * Danish messages header file renamed from help_mp-dk.h to help_mp-da.h
       in order to comply with ISO 639 language code (configure language
       options will now require da instead of dk)
+    * configure: options --enable-gtk1, --with-glib-config= and
+      --with-gtk-config= removed
 
     Ports:
     * Windows: support file names as UTF-8 in slave mode and passing
@@ -48,6 +50,8 @@
       slim, softgrip, standard, trium, tvisor, xanim)
     * Video can be rotated
     * New GUI message: evSetRotation
+    * GUI now officially needs GTK+ and GLib versions 2 (it hadn't compiled
+      with versions 1 for quite some time)
 
   1.1: "We gave up on 1.0"
 
diff -r ba344b4947c5 -r 2208a16cc562 configure
--- a/configure	Sun Sep 07 23:25:33 2014 +0000
+++ b/configure	Mon Sep 08 20:17:01 2014 +0000
@@ -328,7 +328,6 @@
   --disable-mencoder     disable MEncoder (A/V encoder) compilation [enable]
   --disable-mplayer      disable MPlayer compilation [enable]
   --enable-gui           enable GMPlayer compilation (GTK+ GUI) [disable]
-  --enable-gtk1          force using GTK+ 1.2 for the GUI [disable]
   --enable-termcap       use termcap database for key codes [autodetect]
   --enable-termios       use termios database for key codes [autodetect]
   --disable-iconv        disable iconv for encoding conversion [autodetect]
@@ -604,8 +603,6 @@
   --with-xvmclib=NAME         adapter-specific library name (e.g. XvMCNVIDIA)
 
   --with-freetype-config=PATH path to freetype-config
-  --with-glib-config=PATH     path to glib*-config
-  --with-gtk-config=PATH      path to gtk*-config
   --with-sdl-config=PATH      path to sdl*-config
   --with-dvdnav-config=PATH   path to dvdnav-config, also disables internal dvdread and dvdnav
   --with-dvdread-config=PATH  path to dvdread-config, also disables internal dvdread and dvdnav
@@ -809,7 +806,6 @@
 _apple_remote=auto
 _apple_ir=auto
 _gui=no
-_gtk1=no
 _termcap=auto
 _termios=auto
 _3dfx=no
@@ -919,12 +915,6 @@
   --with-freetype-config=*)
     _freetypeconfig=$(option_value $ac_option)
     ;;
-  --with-gtk-config=*)
-    _gtkconfig=$(option_value $ac_option)
-    ;;
-  --with-glib-config=*)
-    _glibconfig=$(option_value $ac_option)
-    ;;
   --with-dvdnav-config=*)
     _dvdnavconfig=$(option_value $ac_option)
     _dvdread_internal=no
@@ -1299,8 +1289,6 @@
   --disable-apple-ir)   _apple_ir=no    ;;
   --enable-gui)         _gui=yes        ;;
   --disable-gui)        _gui=no         ;;
-  --enable-gtk1)        _gtk1=yes       ;;
-  --disable-gtk1)       _gtk1=no        ;;
   --enable-termcap)     _termcap=yes    ;;
   --disable-termcap)    _termcap=no     ;;
   --enable-termios)     _termios=yes    ;;
@@ -7885,7 +7873,6 @@
     echores "$_xshape"
 
     # Check for GTK2
-    if test "$_gtk1" = no ; then
       echocheck "GTK+ version"
 
       if $_pkg_config gtk+-2.0 --exists ; then
@@ -7902,64 +7889,21 @@
           echores "$_glib"
 
           def_gui='#define CONFIG_GUI 1'
-          def_gtk2='#define CONFIG_GTK2 1'
         else
-          _gtk1=yes
-          echores "GLib 2 devel packages were not found, trying GTK+ 1.2"
+          die "GLib 2 devel packages were not found."
         fi
       else
-        _gtk1=yes
-        echores "GTK+ 2 devel packages were not found, trying GTK+ 1.2"
-      fi
-    fi
-
-    # Check for (old) GTK1
-    if test "$_gtk1" = yes ; then
-      echocheck "GTK+ version"
-
-      if test -z "$_gtkconfig" ; then
-        if ( gtk-config --version ) >/dev/null 2>&1 ; then
-          _gtkconfig="gtk-config"
-        elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
-          _gtkconfig="gtk12-config"
-        else
-          die "The GUI requires GTK+ devel packages (which were not found)."
-        fi
+        die "GTK+ 2 devel packages were not found."
       fi
-      _gtk=$($_gtkconfig --version 2>&1)
-      extra_cflags="$extra_cflags $($_gtkconfig --cflags 2>&1)"
-      libs_mplayer="$libs_mplayer $($_gtkconfig --libs 2>&1)"
-      echores "$_gtk (using $_gtkconfig)"
-
-      # Check for (old) GLIB1
-      echocheck "GLib version"
-      if test -z "$_glibconfig" ; then
-        if ( glib-config --version ) >/dev/null 2>&1 ; then
-          _glibconfig="glib-config"
-        elif ( glib12-config --version ) >/dev/null 2>&1 ; then
-          _glibconfig="glib12-config"
-        else
-          die "The GUI requires GLib devel packages (which were not found)"
-        fi
-      fi
-      _glib=$($_glibconfig --version 2>&1)
-      libs_mplayer="$libs_mplayer $($_glibconfig --libs 2>&1)"
-      echores "$_glib (using $_glibconfig)"
-
-      def_gui='#define CONFIG_GUI 1'
-      def_gtk2='#undef CONFIG_GTK2'
-    fi
 
   else #if ! win32
     _gui_win32=yes
     libs_mplayer="$libs_mplayer -lcomdlg32 -lcomctl32 -lshell32 -lkernel32"
     def_gui='#define CONFIG_GUI 1'
-    def_gtk2='#undef CONFIG_GTK2'
   fi #if ! win32
 
 else #if test "$_gui"
   def_gui='#undef CONFIG_GUI'
-  def_gtk2='#undef CONFIG_GTK2'
 fi #if test "$_gui"
 # --------------- GUI specific tests end -------------------
 
@@ -8996,7 +8940,6 @@
 
 /* GUI */
 $def_gui
-$def_gtk2
 $def_xshape
 
 
diff -r ba344b4947c5 -r 2208a16cc562 gui/dialog/about.c
--- a/gui/dialog/about.c	Sun Sep 07 23:25:33 2014 +0000
+++ b/gui/dialog/about.c	Mon Sep 08 20:17:01 2014 +0000
@@ -47,10 +47,8 @@
   GtkWidget     * AboutText;
   GtkWidget     * Ok;
 
-#ifdef CONFIG_GTK2
   GtkTextBuffer * AboutTextBuffer;
   GtkTextIter   iter;
-#endif /* CONFIG_GTK2 */
 
   GtkStyle      * pixmapstyle;
   GdkPixmap     * pixmapwid;
@@ -89,26 +87,16 @@
   gtk_box_pack_start( GTK_BOX( vbox ),scrolledwindow1,TRUE,TRUE,0 );
   gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC );
 
-#ifdef CONFIG_GTK2
   AboutText = gtk_text_view_new();
   gtk_text_view_set_editable(GTK_TEXT_VIEW(AboutText), FALSE);
   gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(AboutText), FALSE);
   AboutTextBuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (AboutText));
   gtk_text_buffer_get_iter_at_offset (AboutTextBuffer, &iter, 0);
-#else
-  AboutText=gtk_text_new( NULL,NULL );
-  gtk_text_set_editable(GTK_TEXT(AboutText), FALSE);
-#endif
   gtk_widget_show( AboutText );
   gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
   snprintf(title, sizeof(title), MP_TITLE, MPlayer);
-#ifdef CONFIG_GTK2
   gtk_text_buffer_insert (AboutTextBuffer, &iter, title, -1);
   gtk_text_buffer_insert (AboutTextBuffer, &iter,
-#else
-  gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL, title, -1 );
-  gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
-#endif
     "\n"
     MSGTR_GUI_Sponsored":\n"
     "       http://www.uhulinux.hu/\n"
diff -r ba344b4947c5 -r 2208a16cc562 gui/dialog/dialog.c
--- a/gui/dialog/dialog.c	Sun Sep 07 23:25:33 2014 +0000
+++ b/gui/dialog/dialog.c	Mon Sep 08 20:17:01 2014 +0000
@@ -113,9 +113,7 @@
 {
     int argc = 0;
     char *arg[3], **argv = arg;
-#ifdef CONFIG_GTK2
     char *env;
-#endif
     GtkIconTheme *theme;
     GdkPixmap *gdkIcon;
     GdkBitmap *gdkIconMask;
@@ -129,14 +127,12 @@
         arg[argc++] = display_name; // to open the requested display for the GUI, too.
     }
 
-#ifdef CONFIG_GTK2
     gtk_disable_setlocale();
 
     env = getenv("G_FILENAME_ENCODING");
 
     if ((!env && getenv("G_BROKEN_FILENAMES")) || (gstrncmp(env, "@locale", 7) == 0))
         mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_GUI_MSG_LocaleEncoding);
-#endif
 
     gtk_init(&argc, &argv);
     wsSetErrorHandler();      // GDK has just set its own handler
diff -r ba344b4947c5 -r 2208a16cc562 gui/dialog/preferences.c
--- a/gui/dialog/preferences.c	Sun Sep 07 23:25:33 2014 +0000
+++ b/gui/dialog/preferences.c	Mon Sep 08 20:17:01 2014 +0000
@@ -551,10 +551,6 @@
              !strncmp( ao_driver[0],"esd",3 ) ||
              !strncmp( ao_driver[0],"sdl",3 ) )
           gtk_widget_set_sensitive( AConfig,TRUE );
-#ifndef CONFIG_GTK2
-        if ( !strncmp( ao_driver[0],"arts",4 ) )
-          gtkMessageBox(MSGBOX_WARNING, MSGTR_GUI_MSG_aRtsBroken);
-#endif
         break;
    case 1: // video driver
         gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,(char **)&vo_driver );
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-cs.h
--- a/help/help_mp-cs.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-cs.h	Mon Sep 08 20:17:01 2014 +0000
@@ -598,7 +598,6 @@
 #define MSGTR_GUI_Mixer "Mixér"
 #define MSGTR_GUI_MixerChannel "Kanál mixéru"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Přidávám video filtr: %s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Novější verze aRts jsou nekompatibilní s GTK 1.x a zhavarují GMPlayer!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Promiňte, ale barevná hloubka je příliš malá.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Nic se nevrátilo!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "Bohužel nelze přehrávat ne-MPEG s kartou DXR3/H+ bez přeenkódování.\nProsím, zapněte lavc v konfiguraci DXR3/H+."
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-de.h
--- a/help/help_mp-de.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-de.h	Mon Sep 08 20:17:01 2014 +0000
@@ -896,7 +896,6 @@
 #define MSGTR_GUI_Mixer "Mixer"
 #define MSGTR_GUI_MixerChannel "Mixer-Kanal"
 #define MSGTR_GUI_MSG_AddingVideoFilter "Videofilter '%s' wird hinzugefügt.\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Neuere Versionen von aRts sind zu GTK 1.x nicht kompatibel und bringen GMPlayer zum Absturz!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Die Farbtiefe des Displays ist zu niedrig!\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "Drag & Drop: Es wurde nichts zurückgeliefert!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "Nicht-MPEG-Dateien können ohne erneute Encodierung mit einer DXR3/H+ nicht abgespielt werden.\nBitte lavc in der DXR3/H+-Konfiguration aktivieren.\n"
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-en.h
--- a/help/help_mp-en.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-en.h	Mon Sep 08 20:17:01 2014 +0000
@@ -687,7 +687,6 @@
 #define MSGTR_GUI_Mixer "Mixer"
 #define MSGTR_GUI_MixerChannel "Mixer channel"
 #define MSGTR_GUI_MSG_AddingVideoFilter "Adding video filter '%s'.\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Newer aRts versions are incompatible with GTK 1.x and will crash GMPlayer!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "The color depth of the display is too low!\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "Drag and drop: Nothing returned!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "You cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc in the DXR3/H+ configuration box.\n"
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-es.h
--- a/help/help_mp-es.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-es.h	Mon Sep 08 20:17:01 2014 +0000
@@ -630,7 +630,6 @@
 #define MSGTR_GUI_Mixer "Mezclador"
 #define MSGTR_GUI_MixerChannel "Canal del Mezclador"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Agregando filtro de video: %s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Las versiones nuevas de aRts no son compatibles con GTK 1.x y botan GMPlayer!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Lo lamento, la profundidad de color es demasiado baja.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: ¡No retorno nada!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "No puede reproducir archivos no MPEG con su DXR3/H+ sin recodificación. Activa lavc en la configuración del DXR3/H+."
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-fr.h
--- a/help/help_mp-fr.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-fr.h	Mon Sep 08 20:17:01 2014 +0000
@@ -753,7 +753,6 @@
 #define MSGTR_GUI_Mixer "Mixeur "
 #define MSGTR_GUI_MixerChannel "Canal de mixeur "
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Ajout de filtre vidéo : %s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Versions aRts plus récentes sont incompatibles avec GTK 1.x et feront planter GMPlayer!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Désolé, la profondeur d'échantillonnage est trop basse.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D : Rien de retourné !\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "Désolé, vous ne pouvez pas lire de fichiers non-MPEG avec le périphérique DXR3/H+ sans réencoder.\nActivez plutôt lavc dans la boîte de configuration DXR3/H+."
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-hu.h
--- a/help/help_mp-hu.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-hu.h	Mon Sep 08 20:17:01 2014 +0000
@@ -611,7 +611,6 @@
 #define MSGTR_GUI_Mixer "Mixer"
 #define MSGTR_GUI_MixerChannel "Mixer csatorna"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Videó szűrő hozzáadása: %s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Az újabb aRts verziók inkompatibilisek a GTK 1.x-szel és összeomlasztják a GMPlayert!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Bocs, a szín mélység túl kicsi.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Semmi sem jött vissza!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "Nem MPEG fájl lejátszása nem lehetséges a DXR3/H+ hardverrel újrakódolás nélkül.\nKapcsold be a lavc opciót a DXR3/H+ konfigurációs panelen."
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-it.h
--- a/help/help_mp-it.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-it.h	Mon Sep 08 20:17:01 2014 +0000
@@ -611,7 +611,6 @@
 #define MSGTR_GUI_Mixer "Mixer"
 #define MSGTR_GUI_MixerChannel "Canale mixer"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Aggiungo filtro video: %s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Le nuove versioni di aRts sono incompatibili con GTK 1.x e GMPlayer crasherà!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Spiacente, la profondità colore è troppo bassa.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Nessun valore di ritorno!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "Mi dispiace, non puoi riprodurre file non-MPEG con il tuo dispositivo DXR3/H+\nsenza ricodificarli.\nAbilita lavc nella finestra di configurazione DXR3/H+."
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-pl.h
--- a/help/help_mp-pl.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-pl.h	Mon Sep 08 20:17:01 2014 +0000
@@ -716,7 +716,6 @@
 #define MSGTR_GUI_Mixer "Mixer"
 #define MSGTR_GUI_MixerChannel "Kanał Mixera"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Dodaję filtr video: %s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Nowsze wersje aRts nie są kompatybilne z GTK 1.x i spowodują błąd GMPlayer!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Niestety paleta kolorów jest za mała.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Nic nie zwrócono!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "Niestety, nie można odtwarzać plików innych niż MPEG przy użyciu urządzenia DXR3/H+ bez kowersji.\nProszę włączyć lavc w polu sterowania DXR3/H+."
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-ru.h
--- a/help/help_mp-ru.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-ru.h	Mon Sep 08 20:17:01 2014 +0000
@@ -599,7 +599,6 @@
 #define MSGTR_GUI_Mixer "Микшер"
 #define MSGTR_GUI_MixerChannel "Канал микшера"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Добавляю видеофильтр: %s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Новые версии aRts несовместимы с GTK 1.x и приведут к фатальной ошибке GMPlayer!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Извините, глубина цвета слишком мала.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Ничего не возвращено!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "Извините, Вы не можете проигрывать не-MPEG файлы на Вашем DXR3/H+ устройстве\nбез перекодирования. Пожалуйста, включите lavc при конфигурации DXR3/H+."
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-sk.h
--- a/help/help_mp-sk.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-sk.h	Mon Sep 08 20:17:01 2014 +0000
@@ -698,7 +698,6 @@
 #define MSGTR_GUI_Miscellaneous "Rôzne"
 #define MSGTR_GUI_Mixer "Mixér"
 #define MSGTR_GUI_MixerChannel "Kanál mixéru"
-#define MSGTR_GUI_MSG_aRtsBroken "Novšie verze aRts sú nekompatibilné s GTK 1.x a zhavarujú GMPlayer!"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "Žiaľ, nemôžete prehrávať nie mpeg súbory s DXR3/H+ zariadením bez prekódovania.\nProsím zapnite lavc v DXR3/H+ konfig. okne."
 #define MSGTR_GUI_MSG_MemoryErrorWindow "Žiaľ, nedostatok pamäte pre buffer na kreslenie."
 #define MSGTR_GUI_MSG_NoFileLoaded "Nenahraný žiaden súbor"
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-tr.h
--- a/help/help_mp-tr.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-tr.h	Mon Sep 08 20:17:01 2014 +0000
@@ -761,7 +761,6 @@
 #define MSGTR_GUI_Mixer "Karıştırıcı"
 #define MSGTR_GUI_MixerChannel "Karıştırıcı kanalı"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Video filtresi ekleniyor: %s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Daha yeni aRts sürümleri GTK 1.x ile bağdaşmıyor. Gmplayer bu durumda çalışmaz!!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Üzgünüm, renk derinliği çok düşük.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Hiçbirşey geri dönmedi!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "Üzgünüm, MPEG olmayan dosyaları DXR3/H+ aygıtınızla oynatamazsınız. \nLütfen DXR3/H+ ayarlarından lavc seçeneğini etkinleştirin."
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-uk.h
--- a/help/help_mp-uk.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-uk.h	Mon Sep 08 20:17:01 2014 +0000
@@ -593,7 +593,6 @@
 #define MSGTR_GUI_Mixer "Мікшер"
 #define MSGTR_GUI_MixerChannel "Канал мікшеру"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] Додаю відео фільтр: %s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "Новіші версії aRts не сумісніз GTK 1.x та спричинять помилку GMPlayer!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "Вибачте, глибина кольору занизька.\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: Нічого не повернено!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "Вибачте, ви не можете програвати не MPEG файли з вашим DXR3/H+ пристроєм без перекодування.\nВключіть lavc у нашалтунки DXR3/H+."
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-zh_CN.h
--- a/help/help_mp-zh_CN.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-zh_CN.h	Mon Sep 08 20:17:01 2014 +0000
@@ -687,7 +687,6 @@
 #define MSGTR_GUI_Mixer "混音器"
 #define MSGTR_GUI_MixerChannel "混音器声道"
 #define MSGTR_GUI_MSG_AddingVideoFilter "添加视频滤镜：%s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "新版 aRts 与 GTK 1.x 不兼容，并会使 GMPlayer 崩溃！"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "显示器支持的色彩深度太低！\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "拖曳操作：未返回任何东西！\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "无法不重新编码而使用 DXR3/H+ 设备播放非 MPEG 的文件。\n请在 DXR3/H+ 的配置对话框中启用 lavc。\n"
diff -r ba344b4947c5 -r 2208a16cc562 help/help_mp-zh_TW.h
--- a/help/help_mp-zh_TW.h	Sun Sep 07 23:25:33 2014 +0000
+++ b/help/help_mp-zh_TW.h	Mon Sep 08 20:17:01 2014 +0000
@@ -733,7 +733,6 @@
 #define MSGTR_GUI_Mixer "混音器"
 #define MSGTR_GUI_MixerChannel "混音通道"
 #define MSGTR_GUI_MSG_AddingVideoFilter "[GUI] 添加視頻過濾器: %s\n"
-#define MSGTR_GUI_MSG_aRtsBroken "新版 aRts 與 GTK 1.x 不兼容, 會使 GMPlayer 崩潰!"
 #define MSGTR_GUI_MSG_ColorDepthTooLow "抱歉, 色彩深度太低。\n"
 #define MSGTR_GUI_MSG_DragAndDropNothing "D&D: 没有任何東西返回!\n"
 #define MSGTR_GUI_MSG_DXR3NeedsLavc "抱歉, 不能用没有重編碼的 DXR3/H+ 設備播放 non-MPEG 文件\n請啟用 DXR3/H+ 配置盒中的 lavc。"