summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-10-01 14:17:01 +0200
committerKoen Kooi <koen@openembedded.org>2009-10-01 14:17:01 +0200
commit6f509a1bd1e3901a1efe0b9f63457ea210aaecd4 (patch)
treee0c59b120c7ca7f4e79058176d947cd8cc93061b
parent095a13636458f0f4154e618dc7dbe76178942f7c (diff)
gnome-mplayer: add fixes for gtk 2.18 from svn, update svn recipe, clean up patches
-rw-r--r--recipes/gnome-mplayer/files/1.patch37
-rw-r--r--recipes/gnome-mplayer/files/ac-gthread.patch12
-rw-r--r--recipes/gnome-mplayer/files/gnome-mplayer-svn.diff28566
-rw-r--r--recipes/gnome-mplayer/files/non-utf8-id3-fallback.patch22
-rw-r--r--recipes/gnome-mplayer/files/uchar-for-utf8-check.patch22
-rw-r--r--recipes/gnome-mplayer/gnome-mplayer.inc8
-rw-r--r--recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb4
-rw-r--r--recipes/gnome-mplayer/gnome-mplayer_svn.bb15
8 files changed, 28581 insertions, 105 deletions
diff --git a/recipes/gnome-mplayer/files/1.patch b/recipes/gnome-mplayer/files/1.patch
deleted file mode 100644
index 77e03365f4..0000000000
--- a/recipes/gnome-mplayer/files/1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# HG changeset patch
-# User "Paul Sokolovsky <pfalcon@users.sourceforge.net>"
-# Date 1199174323 -7200
-# Node ID d630a2e72d3fa094a330f5bd6351b0cf7c9690a6
-# Parent 4b4820fa6fff9dbb8c6c8e1bd23eed54faf10982
-gui.c: Add vertical pane layout for main i/f vs playlist.
-Decision which layout to use is based on screen aspect.
-This change will allow sane layout on PDA devices, many
-of which have vertical layout by default. Possible
-improvements:
-1. Add menu check item for users to be able to select layout
-as they see fit.
-
-diff -r 4b4820fa6fff -r d630a2e72d3f src/gui.c
---- a/src/gui.c Tue Jan 01 09:29:28 2008 +0200
-+++ b/src/gui.c Tue Jan 01 09:58:43 2008 +0200
-@@ -3071,8 +3071,20 @@ GtkWidget *create_window(gint windowid)
-
- gtk_widget_show(menubar);
- gtk_widget_show(drawing_area);
-+ if (gdk_screen_width() > gdk_screen_height()) {
- pane = gtk_hpaned_new();
- gtk_paned_pack1(GTK_PANED(pane),vbox,TRUE,TRUE);
-+ } else {
-+ GtkRequisition menu_size;
-+ GtkRequisition vbox_size;
-+ pane = gtk_vpaned_new();
-+ gtk_paned_pack1(GTK_PANED(pane),vbox,TRUE,FALSE); /* No shrink beyond size request*/
-+
-+ gtk_widget_size_request(menubar, &menu_size);
-+ gtk_widget_size_request(vbox, &vbox_size);
-+ /* 5 is adhox compensation for layout issues ;-( */
-+ gtk_widget_set_size_request(vbox, -1, menu_size.height + vbox_size.height - 5);
-+ }
-
- gtk_container_add(GTK_CONTAINER(window), pane);
-
diff --git a/recipes/gnome-mplayer/files/ac-gthread.patch b/recipes/gnome-mplayer/files/ac-gthread.patch
deleted file mode 100644
index ea4abf143d..0000000000
--- a/recipes/gnome-mplayer/files/ac-gthread.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r d630a2e72d3f configure.in
---- a/configure.in Tue Jan 01 09:58:43 2008 +0200
-+++ b/configure.in Tue Jan 01 10:16:44 2008 +0200
-@@ -32,7 +32,7 @@ AM_PROG_LIBTOOL
- #AC_SUBST(GNOME_CFLAGS)
- #AC_SUBST(GNOME_LIBS)
-
--PKG_CHECK_MODULES(GTK, [gtk+-2.0 glib-2.0])
-+PKG_CHECK_MODULES(GTK, [gtk+-2.0 glib-2.0 gthread-2.0])
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
-
diff --git a/recipes/gnome-mplayer/files/gnome-mplayer-svn.diff b/recipes/gnome-mplayer/files/gnome-mplayer-svn.diff
new file mode 100644
index 0000000000..2da120c3d4
--- /dev/null
+++ b/recipes/gnome-mplayer/files/gnome-mplayer-svn.diff
@@ -0,0 +1,28566 @@
+Index: configure
+===================================================================
+--- configure (revision 1559)
++++ configure (revision 1569)
+@@ -6901,7 +6901,7 @@
+ _ACEOF
+
+
+-ALL_LINGUAS="bg cs de el en en_GB es fr it ja ko lt nl pl pt_BR ro ru sr sr@latin sv tr zh_CN zh_HK zh_TW"
++ALL_LINGUAS="bg cs de el en en_GB es fr hu it ja ko lt nl pl pt_BR ro ru sr sr@latin sv tr zh_CN zh_HK zh_TW"
+
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+Index: src/libgmlib/gm_parse.h
+===================================================================
+--- src/libgmlib/gm_parse.h (revision 1559)
++++ src/libgmlib/gm_parse.h (revision 1569)
+@@ -29,6 +29,7 @@
+ #else
+ #include <stdio.h>
+ #endif
++#include <string.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+Index: src/libgmlib/gm_parse.c
+===================================================================
+--- src/libgmlib/gm_parse.c (revision 1559)
++++ src/libgmlib/gm_parse.c (revision 1569)
+@@ -159,6 +159,7 @@
+
+ #else
+ FILE *fp;
++ gchar **parse;
+ gchar *file = NULL;
+
+ file = g_strndup(uri, 4);
+Index: src/thread.c
+===================================================================
+--- src/thread.c (revision 1559)
++++ src/thread.c (revision 1569)
+@@ -1019,6 +1019,7 @@
+ argv[arg++] = g_strdup_printf("-mouse-movements");
+ argv[arg++] = g_strdup_printf("-nocache");
+ } else {
++ // argv[arg++] = g_strdup_printf("-nograbpointer");
+ if (g_ascii_strncasecmp(threaddata->filename, "dvd://", strlen("dvd://")) == 0) {
+ // argv[arg++] = g_strdup_printf("-nocache");
+ } else {
+Index: src/support.c
+===================================================================
+--- src/support.c (revision 1559)
++++ src/support.c (revision 1569)
+@@ -39,6 +39,7 @@
+ gchar *coltitle;
+ gint count;
+ gchar *path = NULL;
++ gchar *lower;
+ #ifdef GIO_ENABLED
+ GFile *file;
+ GFileInputStream *input;
+@@ -75,40 +76,37 @@
+ memset(buffer, 0, sizeof(buffer));
+ g_input_stream_read((GInputStream *) input, buffer, sizeof(buffer), NULL, NULL);
+ output = g_strsplit(buffer, "\n", 0);
+- if (output[0] != NULL) {
+- g_strchomp(output[0]);
+- g_strchug(output[0]);
+- }
++ lower = g_ascii_strdown(buffer, -1);
+ // printf("buffer=%s\n",buffer);
+- if (strstr(g_strdown(buffer), "[playlist]") != 0) {
++ if (strstr(lower, "[playlist]") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "[reference]") != 0) {
++ if (strstr(lower, "[reference]") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "<asx") != 0) {
++ if (strstr(lower, "<asx") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "<smil>") != 0) {
++ if (strstr(lower, "<smil>") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "#extm3u") != 0) {
++ if (strstr(lower, "#extm3u") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "http://") != 0) {
++ if (strstr(lower, "http://") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "rtsp://") != 0) {
++ if (strstr(lower, "rtsp://") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "pnm://") != 0) {
++ if (strstr(lower, "pnm://") != 0) {
+ playlist = 1;
+ }
+
+@@ -129,6 +127,7 @@
+ }
+ g_free(newuri);
+ }
++ g_free(lower);
+ g_strfreev(output);
+
+ g_input_stream_close((GInputStream *) input, NULL, NULL);
+@@ -150,16 +149,13 @@
+ memset(buffer, 0, sizeof(buffer));
+ size = fread(buffer, 1, sizeof(buffer) - 1, fp);
+ output = g_strsplit(buffer, "\n", 0);
+- if (output[0] != NULL) {
+- g_strchomp(output[0]);
+- g_strchug(output[0]);
+- }
++ lower = g_ascii_strdown(buffer, -1);
+ //printf("buffer=%s\n",buffer);
+- if (strstr(g_strdown(buffer), "[playlist]") != 0) {
++ if (strstr(lower, "[playlist]") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "[reference]") != 0) {
++ if (strstr(lower, "[reference]") != 0) {
+ playlist = 1;
+ }
+
+@@ -167,19 +163,19 @@
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "<asx") != 0) {
++ if (strstr(lower, "<asx") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "http://") != 0) {
++ if (strstr(lower, "http://") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "rtsp://") != 0) {
++ if (strstr(lower, "rtsp://") != 0) {
+ playlist = 1;
+ }
+
+- if (strstr(g_strdown(buffer), "pnm://") != 0) {
++ if (strstr(lower, "pnm://") != 0) {
+ playlist = 1;
+ }
+ if (output[0] != NULL && g_file_test(output[0], G_FILE_TEST_EXISTS)) {
+@@ -193,7 +189,7 @@
+ }
+ g_free(file);
+ }
+-
++ g_free(lower);
+ g_strfreev(output);
+ }
+ fclose(fp);
+@@ -1431,7 +1427,7 @@
+ if (strstr(lower, "=title") != NULL || strstr(lower, "=name") != NULL) {
+ localtitle = strstr(output[ac + 1], "=") + 1;
+ if (localtitle)
+- title = g_strstrip(metadata_to_utf8(localtitle));
++ title = metadata_to_utf8(localtitle);
+ else
+ title = NULL;
+
+Index: src/gui.c
+===================================================================
+--- src/gui.c (revision 1559)
++++ src/gui.c (revision 1569)
+@@ -94,7 +94,9 @@
+ * onwards, requesting the native window in a thread causes a BadWindowID,
+ * so we need to request it now. We could call gdk_window_ensure_native(),
+ * but that would mean we require GTK+ 2.18, so instead we call this */
++#ifdef GTK2_14_ENABLED
+ GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(widget)));
++#endif
+ }
+
+ gint get_player_window()
+@@ -3106,10 +3108,10 @@
+ "Chinese (Hong Kong) - Hialan Liu\n"
+ "Chinese (Taiwan) - Hailan Liu\n"
+ "Dutch - Mark Huijgen\n"
+- "German - tim__b\n"
+- "Greek - Γεώργιος Γεωργάς\n"
+ "French - Alexandre Bedot\n"
+ "German - Tim Buening\n"
++ "Greek - Γεώργιος Γεωργάς\n"
++ "Hungarian - Kulcsár Kázmér\n"
+ "Italian - Cesare Tirabassi\n"
+ "Japanese - Munehiro Yamamoto\n"
+ "Korean - ByeongSik Jeon\n"
+@@ -3671,6 +3673,8 @@
+ !(gboolean) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_embeddedfonts));
+ disable_pause_on_click =
+ !(gboolean) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_pause_on_click));
++ disable_animation =
++ (gboolean) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_disable_animation));
+ oldosd = osdlevel;
+ osdlevel = (gint) gtk_range_get_value(GTK_RANGE(config_osdlevel));
+ pplevel = (gint) gtk_range_get_value(GTK_RANGE(config_pplevel));
+@@ -3774,6 +3778,7 @@
+ gm_pref_store_set_boolean(gm_store, DISABLEDEINTERLACE, disable_deinterlace);
+ gm_pref_store_set_boolean(gm_store, DISABLEFRAMEDROP, disable_framedrop);
+ gm_pref_store_set_boolean(gm_store, DISABLEPAUSEONCLICK, disable_pause_on_click);
++ gm_pref_store_set_boolean(gm_store, DISABLEPAUSEONCLICK, disable_animation);
+ gm_pref_store_set_boolean(gm_store, SHOWPLAYLIST, playlist_visible);
+ gm_pref_store_set_boolean(gm_store, SHOWDETAILS, details_visible);
+ gm_pref_store_set_boolean(gm_store, USE_MEDIAKEYS, use_mediakeys);
+@@ -5311,6 +5316,12 @@
+ GTK_SHRINK, 0, 0);
+ i++;
+
++ config_disable_animation = gtk_check_button_new_with_label(_("Disable Fullscreen Control Bar Animation"));
++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_disable_animation), disable_animation);
++ gtk_table_attach(GTK_TABLE(conf_table), config_disable_animation, 0, 2, i, i + 1, GTK_FILL,
++ GTK_SHRINK, 0, 0);
++ i++;
++
+ config_verbose = gtk_check_button_new_with_label(_("Verbose Debug Enabled"));
+ tooltip = gtk_tooltips_new();
+ gtk_tooltips_set_tip(tooltip, config_verbose,
+Index: src/gui.h
+===================================================================
+--- src/gui.h (revision 1559)
++++ src/gui.h (revision 1569)
+@@ -253,6 +253,7 @@
+ GtkWidget *config_thumb_position;
+ GtkWidget *config_use_mediakeys;
+ GtkWidget *config_use_defaultpl;
++GtkWidget *config_disable_animation;
+
+ GtkWidget *config_alang;
+ GtkWidget *config_slang;
+Index: po/en.po
+===================================================================
+--- po/en.po (revision 1559)
++++ po/en.po (revision 1569)
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: 0.3\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2009-09-18 07:26-0600\n"
++"POT-Creation-Date: 2009-09-21 08:33-0600\n"
+ "PO-Revision-Date: 2007-05-18 06:35-0600\n"
+ "Last-Translator: <>\n"
+ "Language-Team: \n"
+@@ -133,7 +133,7 @@
+ msgid "Start with playlist open"
+ msgstr ""
+
+-#: src/main.c:104 src/gui.c:5209
++#: src/main.c:104 src/gui.c:5214
+ msgid "Start with details visible"
+ msgstr ""
+
+@@ -209,7 +209,7 @@
+ msgid "Don't fetch new cover art images"
+ msgstr ""
+
+-#: src/main.c:326 src/gui.c:554 src/gui.c:2070
++#: src/main.c:326 src/gui.c:556 src/gui.c:2072
+ #, c-format
+ msgid "Playing"
+ msgstr "Playing"
+@@ -230,51 +230,51 @@
+ "options.\n"
+ msgstr ""
+
+-#: src/gui.c:277 src/gui.c:313
++#: src/gui.c:279 src/gui.c:315
+ #, c-format
+ msgid "%s - GNOME MPlayer"
+ msgstr "%s - GNOME MPlayer"
+
+-#: src/gui.c:308
++#: src/gui.c:310
+ #, c-format
+ msgid "%s - (%i/%i) - GNOME MPlayer"
+ msgstr ""
+
+-#: src/gui.c:311 src/gui.c:3090 src/gui.c:5739
++#: src/gui.c:313 src/gui.c:3092 src/gui.c:5750
+ #, c-format
+ msgid "GNOME MPlayer"
+ msgstr "GNOME MPlayer"
+
+-#: src/gui.c:368
++#: src/gui.c:370
+ msgid "Media Change"
+ msgstr ""
+
+-#: src/gui.c:425
++#: src/gui.c:427
+ #, c-format
+ msgid "Buffering: %2i%%"
+ msgstr ""
+
+-#: src/gui.c:438
++#: src/gui.c:440
+ #, c-format
+ msgid "Paused | %2i%% ▼"
+ msgstr ""
+
+-#: src/gui.c:556 src/gui.c:2088
++#: src/gui.c:558 src/gui.c:2090
+ #, c-format
+ msgid "Paused"
+ msgstr "Paused"
+
+-#: src/gui.c:558 src/gui.c:926
++#: src/gui.c:560 src/gui.c:928
+ #, c-format
+ msgid "Idle"
+ msgstr ""
+
+-#: src/gui.c:724 src/support.c:266 src/playlist.c:530 src/playlist.c:834
++#: src/gui.c:726 src/support.c:266 src/playlist.c:530 src/playlist.c:834
+ #, c-format
+ msgid "%s items"
+ msgstr ""
+
+-#: src/gui.c:726 src/gui.c:2546 src/gui.c:2887 src/support.c:215
++#: src/gui.c:728 src/gui.c:2548 src/gui.c:2889 src/support.c:215
+ #: src/support.c:281 src/playlist.c:532
+ #, c-format
+ msgid "Item to Play"
+@@ -282,81 +282,81 @@
+ msgstr[0] "Item to Play"
+ msgstr[1] "Items to Play"
+
+-#: src/gui.c:744 src/gui.c:2069
++#: src/gui.c:746 src/gui.c:2071
+ msgid "Pause"
+ msgstr "Pause"
+
+-#: src/gui.c:757 src/gui.c:769 src/gui.c:2087 src/gui.c:2142 src/gui.c:2147
+-#: src/gui.c:6453
++#: src/gui.c:759 src/gui.c:771 src/gui.c:2089 src/gui.c:2144 src/gui.c:2149
++#: src/gui.c:6464
+ msgid "Play"
+ msgstr "Play"
+
+-#: src/gui.c:899
++#: src/gui.c:901
+ #, c-format
+ msgid "Adding %s to playlist"
+ msgstr ""
+
+-#: src/gui.c:922
++#: src/gui.c:924
+ #, fuzzy, c-format
+ msgid "Playing %s"
+ msgstr "Playing"
+
+-#: src/gui.c:924
++#: src/gui.c:926
+ #, fuzzy, c-format
+ msgid "Paused %s"
+ msgstr "Paused"
+
+-#: src/gui.c:1267 src/gui.c:1277 src/gui.c:2321 src/gui.c:2362
++#: src/gui.c:1269 src/gui.c:1279 src/gui.c:2323 src/gui.c:2364
+ #, c-format
+ msgid "Volume %i%%"
+ msgstr "Volume %i%%"
+
+-#: src/gui.c:2153
++#: src/gui.c:2155
+ msgid "Stopped"
+ msgstr "Stopped"
+
+-#: src/gui.c:2498 src/playlist.c:494
++#: src/gui.c:2500 src/playlist.c:494
+ msgid "Open File"
+ msgstr "Open File"
+
+-#: src/gui.c:2602
++#: src/gui.c:2604
+ msgid "Open Location"
+ msgstr ""
+
+-#: src/gui.c:2604
++#: src/gui.c:2606
+ msgid "Location:"
+ msgstr ""
+
+-#: src/gui.c:2654 src/gui.c:2744
++#: src/gui.c:2656 src/gui.c:2746
+ msgid "Choose Disk Directory"
+ msgstr ""
+
+-#: src/gui.c:2690 src/gui.c:2782
++#: src/gui.c:2692 src/gui.c:2784
+ msgid "Choose Disk Image"
+ msgstr ""
+
+-#: src/gui.c:2704 src/gui.c:2796
++#: src/gui.c:2706 src/gui.c:2798
+ msgid "Disk Image (*.iso)"
+ msgstr ""
+
+-#: src/gui.c:3001
++#: src/gui.c:3003
+ msgid "Save As..."
+ msgstr ""
+
+-#: src/gui.c:3036
++#: src/gui.c:3038
+ #, c-format
+ msgid "Unable to save '%s'"
+ msgstr ""
+
+-#: src/gui.c:3039 src/support.c:812 src/support.c:904 src/thread.c:253
++#: src/gui.c:3041 src/support.c:812 src/support.c:904 src/thread.c:253
+ msgid "GNOME MPlayer Error"
+ msgstr ""
+
+-#: src/gui.c:3092
++#: src/gui.c:3094
+ msgid "A media player for GNOME that uses MPlayer"
+ msgstr "A media player for GNOME that uses MPlayer"
+
+-#: src/gui.c:3095
++#: src/gui.c:3097
+ msgid ""
+ "Gnome MPlayer is free software; you can redistribute it and/or modify it "
+ "under\n"
+@@ -379,191 +379,191 @@
+ "Boston, MA 02110-1301 USA"
+ msgstr ""
+
+-#: src/gui.c:3367 src/playlist.c:137
++#: src/gui.c:3369 src/playlist.c:137
+ msgid "Set Subtitle"
+ msgstr ""
+
+-#: src/gui.c:3490
++#: src/gui.c:3492
+ msgid "Gnome MPlayer Fullscreen"
+ msgstr ""
+
+-#: src/gui.c:3995 src/nautilus_property_page.c:342
++#: src/gui.c:4000 src/nautilus_property_page.c:342
+ msgid "<span weight=\"bold\">Video Details</span>"
+ msgstr "<span weight=\"bold\">Video Details</span>"
+
+-#: src/gui.c:4002 src/nautilus_property_page.c:349
++#: src/gui.c:4007 src/nautilus_property_page.c:349
+ msgid "Video Size:"
+ msgstr "Video Size:"
+
+-#: src/gui.c:4015
++#: src/gui.c:4020
+ msgid "Video Format:"
+ msgstr "Video Format:"
+
+-#: src/gui.c:4026 src/nautilus_property_page.c:360
++#: src/gui.c:4031 src/nautilus_property_page.c:360
+ msgid "Video Codec:"
+ msgstr "Video Codec:"
+
+-#: src/gui.c:4037
++#: src/gui.c:4042
+ msgid "Video FPS:"
+ msgstr "Video FPS:"
+
+-#: src/gui.c:4046 src/nautilus_property_page.c:371
++#: src/gui.c:4051 src/nautilus_property_page.c:371
+ msgid "Video Bitrate:"
+ msgstr "Video Bitrate:"
+
+-#: src/gui.c:4057
++#: src/gui.c:4062
+ #, fuzzy
+ msgid "Video Chapters:"
+ msgstr "Video Bitrate:"
+
+-#: src/gui.c:4073 src/nautilus_property_page.c:398
++#: src/gui.c:4078 src/nautilus_property_page.c:398
+ msgid "<span weight=\"bold\">Audio Details</span>"
+ msgstr "<span weight=\"bold\">Audio Details</span>"
+
+-#: src/gui.c:4080 src/nautilus_property_page.c:405
++#: src/gui.c:4085 src/nautilus_property_page.c:405
+ msgid "Audio Codec:"
+ msgstr "Audio Codec:"
+
+-#: src/gui.c:4093 src/nautilus_property_page.c:428
++#: src/gui.c:4098 src/nautilus_property_page.c:428
+ msgid "Audio Channels:"
+ msgstr "Audio Channels:"
+
+-#: src/gui.c:4106 src/nautilus_property_page.c:416
++#: src/gui.c:4111 src/nautilus_property_page.c:416
+ msgid "Audio Bitrate:"
+ msgstr "Audio Bitrate:"
+
+-#: src/gui.c:4119
++#: src/gui.c:4124
+ msgid "Audio Sample Rate:"
+ msgstr "Audio Sample Rate:"
+
+-#: src/gui.c:4150
++#: src/gui.c:4155
+ msgid "Video Picture Adjustments"
+ msgstr ""
+
+-#: src/gui.c:4163
++#: src/gui.c:4168
+ #, fuzzy
+ msgid "<span weight=\"bold\">Video Picture Adjustments</span>"
+ msgstr "<span weight=\"bold\">Video Details</span>"
+
+-#: src/gui.c:4170
++#: src/gui.c:4175
+ msgid "Brightness"
+ msgstr "Brightness"
+
+-#: src/gui.c:4180
++#: src/gui.c:4185
+ msgid "Contrast"
+ msgstr "Contrast"
+
+-#: src/gui.c:4190
++#: src/gui.c:4195
+ msgid "Gamma"
+ msgstr "Gamma"
+
+-#: src/gui.c:4200
++#: src/gui.c:4205
+ msgid "Hue"
+ msgstr "Hue"
+
+-#: src/gui.c:4210
++#: src/gui.c:4215
+ msgid "Saturation"
+ msgstr "Saturation"
+
+-#: src/gui.c:4229
++#: src/gui.c:4234
+ msgid "_Reset"
+ msgstr ""
+
+-#: src/gui.c:4412
++#: src/gui.c:4417
+ msgid "No Display"
+ msgstr ""
+
+-#: src/gui.c:4415
++#: src/gui.c:4420
+ msgid "Minimal"
+ msgstr ""
+
+-#: src/gui.c:4418
++#: src/gui.c:4423
+ msgid "Timer"
+ msgstr ""
+
+-#: src/gui.c:4421
++#: src/gui.c:4426
+ msgid "Timer/Total"
+ msgstr ""
+
+-#: src/gui.c:4437
++#: src/gui.c:4442
+ msgid "No Postprocessing"
+ msgstr ""
+
+-#: src/gui.c:4441
++#: src/gui.c:4446
+ msgid "Minimal Postprocessing"
+ msgstr ""
+
+-#: src/gui.c:4445
++#: src/gui.c:4450
+ msgid "More Postprocessing"
+ msgstr ""
+
+-#: src/gui.c:4449
++#: src/gui.c:4454
+ msgid "Maximum Postprocessing"
+ msgstr ""
+
+-#: src/gui.c:4574
++#: src/gui.c:4579
+ msgid "Player"
+ msgstr "Player"
+
+-#: src/gui.c:4576
++#: src/gui.c:4581
+ msgid "Language Settings"
+ msgstr ""
+
+-#: src/gui.c:4578
++#: src/gui.c:4583
+ msgid "Subtitles"
+ msgstr ""
+
+-#: src/gui.c:4580
++#: src/gui.c:4585
+ msgid "Interface"
+ msgstr ""
+
+-#: src/gui.c:4582
++#: src/gui.c:4587
+ #, fuzzy
+ msgid "MPlayer"
+ msgstr "Player"
+
+-#: src/gui.c:4584
++#: src/gui.c:4589
+ msgid "Plugin"
+ msgstr "Plugin"
+
+-#: src/gui.c:4590
++#: src/gui.c:4595
+ msgid "GNOME MPlayer Configuration"
+ msgstr "GNOME MPlayer Configuration"
+
+-#: src/gui.c:4605
++#: src/gui.c:4610
+ msgid ""
+ "mplayer video output device\n"
+ "x11 should always work, try xv or gl for better performance"
+ msgstr ""
+
+-#: src/gui.c:4636
++#: src/gui.c:4641
+ msgid "Enable AC3/DTS pass-through to S/PDIF"
+ msgstr ""
+
+-#: src/gui.c:4700
++#: src/gui.c:4705
+ msgid ""
+ "mplayer audio output device\n"
+ "alsa or oss should always work, try esd in gnome, arts in kde, or pulse on "
+ "newer distributions"
+ msgstr ""
+
+-#: src/gui.c:4801
++#: src/gui.c:4806
+ msgid "<span weight=\"bold\">Adjust Output Settings</span>"
+ msgstr "<span weight=\"bold\">Adjust Output Settings</span>"
+
+-#: src/gui.c:4809
++#: src/gui.c:4814
+ msgid "Video Output:"
+ msgstr "Video Output:"
+
+-#: src/gui.c:4819
++#: src/gui.c:4824
+ msgid "Audio Output:"
+ msgstr "Audio Output:"
+
+-#: src/gui.c:4831
++#: src/gui.c:4836
+ msgid "Default Mixer:"
+ msgstr ""
+
+-#: src/gui.c:4842
++#: src/gui.c:4847
+ #, fuzzy
+ msgid "Audio Channels to Output"
+ msgstr "Audio Channels:"
+@@ -571,27 +571,27 @@
+ #. conf_table = gtk_table_new(20, 2, FALSE);
+ #. gtk_container_add(GTK_CONTAINER(conf_page1), conf_table);
+ #. i = 0;
+-#: src/gui.c:4872
++#: src/gui.c:4877
+ msgid "<span weight=\"bold\">Adjust Configuration Settings</span>"
+ msgstr "<span weight=\"bold\">Adjust Configuration Settings</span>"
+
+-#: src/gui.c:4881
++#: src/gui.c:4886
+ msgid "Default Volume Level:"
+ msgstr ""
+
+-#: src/gui.c:4888
++#: src/gui.c:4893
+ msgid "Default volume for playback"
+ msgstr ""
+
+-#: src/gui.c:4903
++#: src/gui.c:4908
+ msgid "On Screen Display Level:"
+ msgstr ""
+
+-#: src/gui.c:4918
++#: src/gui.c:4923
+ msgid "Post-processing level:"
+ msgstr ""
+
+-#: src/gui.c:4934
++#: src/gui.c:4939
+ msgid ""
+ "<span weight=\"bold\">Adjust Plugin Emulation Settings</span>\n"
+ "\n"
+@@ -601,473 +601,477 @@
+ "NPRuntime compatible browsers (Firefox, Konqueror, etc)."
+ msgstr ""
+
+-#: src/gui.c:4946
++#: src/gui.c:4951
+ msgid "QuickTime Emulation"
+ msgstr ""
+
+-#: src/gui.c:4951
++#: src/gui.c:4956
+ msgid "RealPlayer Emulation"
+ msgstr ""
+
+-#: src/gui.c:4957
++#: src/gui.c:4962
+ msgid "Windows Media Player Emulation"
+ msgstr ""
+
+-#: src/gui.c:4962
++#: src/gui.c:4967
+ msgid "DiVX Player Emulation"
+ msgstr ""
+
+-#: src/gui.c:4967
++#: src/gui.c:4972
+ msgid "MIDI Support (requires MPlayer support)"
+ msgstr ""
+
+-#: src/gui.c:4973
++#: src/gui.c:4978
+ msgid "Disable Player Embedding"
+ msgstr ""
+
+-#: src/gui.c:4979 src/gui.c:5374
++#: src/gui.c:4984 src/gui.c:5385
+ #, fuzzy
+ msgid "Cache Size (KB):"
+ msgstr "Minimum·Cache·Size (KB):"
+
+-#: src/gui.c:4988
++#: src/gui.c:4993
+ msgid ""
+ "Amount of data to cache when playing media from network, use higher values "
+ "for slow networks."
+ msgstr ""
+
+-#: src/gui.c:5006
++#: src/gui.c:5011
+ msgid "<span weight=\"bold\">Adjust Language Settings</span>"
+ msgstr "<span weight=\"bold\">Adjust Language Settings</span>"
+
+-#: src/gui.c:5014
++#: src/gui.c:5019
+ msgid "Default Audio Language"
+ msgstr ""
+
+-#: src/gui.c:5024
++#: src/gui.c:5029
+ msgid "Default Subtitle Language:"
+ msgstr ""
+
+-#: src/gui.c:5036
++#: src/gui.c:5041
+ msgid "File Metadata Encoding:"
+ msgstr ""
+
+-#: src/gui.c:5052
++#: src/gui.c:5057
+ msgid "<span weight=\"bold\">Subtitle Settings</span>"
+ msgstr "<span weight=\"bold\">Subtitle Settings</span>"
+
+-#: src/gui.c:5062
++#: src/gui.c:5067
+ msgid "Enable _Advanced Substation Alpha (ASS) Subtitle Support"
+ msgstr ""
+
+-#: src/gui.c:5069
++#: src/gui.c:5074
+ msgid "Use _Embedded Fonts (MKV only)"
+ msgstr ""
+
+-#: src/gui.c:5079
++#: src/gui.c:5084
+ msgid "Subtitle Font:"
+ msgstr ""
+
+-#: src/gui.c:5097
++#: src/gui.c:5102
+ msgid "Subtitle Font Selection"
+ msgstr ""
+
+-#: src/gui.c:5102
++#: src/gui.c:5107
+ msgid "Subtitle Color:"
+ msgstr ""
+
+-#: src/gui.c:5127
++#: src/gui.c:5132
+ msgid "Subtitle Color Selection"
+ msgstr ""
+
+-#: src/gui.c:5133
++#: src/gui.c:5138
+ msgid "Outline Subtitle Font"
+ msgstr ""
+
+-#: src/gui.c:5140
++#: src/gui.c:5145
+ msgid "Shadow Subtitle Font"
+ msgstr ""
+
+-#: src/gui.c:5147
++#: src/gui.c:5152
+ msgid "Subtitle Font Scaling:"
+ msgstr ""
+
+-#: src/gui.c:5160
++#: src/gui.c:5165
+ msgid "Subtitle File Encoding:"
+ msgstr ""
+
+-#: src/gui.c:5172
++#: src/gui.c:5177
+ msgid "Subtitle Lower Margin (X11/XV Only):"
+ msgstr ""
+
+-#: src/gui.c:5185
++#: src/gui.c:5190
+ msgid "Show Subtitles by Default"
+ msgstr ""
+
+-#: src/gui.c:5195
++#: src/gui.c:5200
+ #, fuzzy
+ msgid "<span weight=\"bold\">Application Preferences</span>"
+ msgstr "<span weight=\"bold\">Audio Details</span>"
+
+-#: src/gui.c:5203
++#: src/gui.c:5208
+ msgid "Start with playlist visible"
+ msgstr ""
+
+-#: src/gui.c:5215
++#: src/gui.c:5220
+ msgid "Respond to Keyboard Media Keys"
+ msgstr ""
+
+-#: src/gui.c:5221
++#: src/gui.c:5226
+ msgid "Use default playlist"
+ msgstr ""
+
+-#: src/gui.c:5228
++#: src/gui.c:5233
+ msgid "Show notification popup"
+ msgstr ""
+
+-#: src/gui.c:5236
++#: src/gui.c:5241
+ msgid "Show status icon"
+ msgstr ""
+
+-#: src/gui.c:5245
++#: src/gui.c:5250
+ msgid "Place playlist below media (requires application restart)"
+ msgstr ""
+
+-#: src/gui.c:5252
++#: src/gui.c:5257
+ msgid "Only allow one instance of Gnome MPlayer"
+ msgstr ""
+
+-#: src/gui.c:5266
++#: src/gui.c:5271
+ msgid "When opening in single instance mode, replace existing file"
+ msgstr ""
+
+-#: src/gui.c:5279
++#: src/gui.c:5284
+ msgid "When opening file, bring main window to front"
+ msgstr ""
+
+-#: src/gui.c:5288
++#: src/gui.c:5293
+ msgid "Remember Window Location and Size"
+ msgstr ""
+
+-#: src/gui.c:5295
++#: src/gui.c:5300
+ msgid "Resize window when new video is loaded"
+ msgstr ""
+
+-#: src/gui.c:5302
++#: src/gui.c:5307
+ msgid "Keep window above other windows"
+ msgstr ""
+
+-#: src/gui.c:5308
++#: src/gui.c:5313
+ msgid "Pause playback on mouse click"
+ msgstr ""
+
+-#: src/gui.c:5314
++#: src/gui.c:5319
++msgid "Disable Fullscreen Control Bar Animation"
++msgstr ""
++
++#: src/gui.c:5325
+ msgid "Verbose Debug Enabled"
+ msgstr ""
+
+-#: src/gui.c:5318
++#: src/gui.c:5329
+ msgid ""
+ "When this option is set, extra debug information is sent to the terminal or "
+ "into ~/.xsession-errors"
+ msgstr ""
+
+-#: src/gui.c:5329
++#: src/gui.c:5340
+ #, fuzzy
+ msgid "<span weight=\"bold\">Advanced Settings for MPlayer</span>"
+ msgstr "<span weight=\"bold\">Advanced Settings</span>"
+
+-#: src/gui.c:5337
++#: src/gui.c:5348
+ msgid "Mplayer Software Volume Control Enabled"
+ msgstr ""
+
+-#: src/gui.c:5341
++#: src/gui.c:5352
+ msgid ""
+ "Set this option if changing the volume in Gnome MPlayer changes the master "
+ "volume"
+ msgstr ""
+
+-#: src/gui.c:5348
++#: src/gui.c:5359
+ msgid "De_interlace Video"
+ msgstr ""
+
+-#: src/gui.c:5350
++#: src/gui.c:5361
+ msgid "Set this option if video looks striped"
+ msgstr ""
+
+-#: src/gui.c:5357
++#: src/gui.c:5368
+ msgid "_Drop frames"
+ msgstr ""
+
+-#: src/gui.c:5360
++#: src/gui.c:5371
+ msgid "Set this option if video is well behind the audio"
+ msgstr ""
+
+-#: src/gui.c:5366
++#: src/gui.c:5377
+ msgid "Enable mplayer cache"
+ msgstr ""
+
+-#: src/gui.c:5383
++#: src/gui.c:5394
+ msgid ""
+ "Amount of data to cache when playing media, use higher values for slow "
+ "devices and sites."
+ msgstr ""
+
+-#: src/gui.c:5402
++#: src/gui.c:5413
+ msgid "MPlayer Executable:"
+ msgstr ""
+
+-#: src/gui.c:5407
++#: src/gui.c:5418
+ msgid ""
+ "Use this option to specify a mplayer application that is not in the path"
+ msgstr ""
+
+-#: src/gui.c:5423
++#: src/gui.c:5434
+ msgid "Extra Options to MPlayer:"
+ msgstr ""
+
+-#: src/gui.c:5427
++#: src/gui.c:5438
+ msgid "Add any extra mplayer options here (filters etc)"
+ msgstr ""
+
+-#: src/gui.c:5792
++#: src/gui.c:5803
+ msgid "S_how Controls"
+ msgstr "S_how Controls"
+
+-#: src/gui.c:5796 src/gui.c:6082
++#: src/gui.c:5807 src/gui.c:6093
+ msgid "_Full Screen"
+ msgstr "_Full Screen"
+
+-#: src/gui.c:5801
++#: src/gui.c:5812
+ msgid "_Copy Location"
+ msgstr ""
+
+ #. File Menu
+-#: src/gui.c:5872
++#: src/gui.c:5883
+ msgid "_File"
+ msgstr "_File"
+
+-#: src/gui.c:5881
++#: src/gui.c:5892
+ msgid "Open _Location"
+ msgstr ""
+
+-#: src/gui.c:5884
++#: src/gui.c:5895
+ msgid "_Disc"
+ msgstr ""
+
+-#: src/gui.c:5891
++#: src/gui.c:5902
+ msgid "Open _Audio CD"
+ msgstr "Open _Audio CD"
+
+-#: src/gui.c:5896
++#: src/gui.c:5907
+ msgid "Open _DVD"
+ msgstr ""
+
+-#: src/gui.c:5899
++#: src/gui.c:5910
+ msgid "Open DVD with _Menus"
+ msgstr ""
+
+-#: src/gui.c:5902
++#: src/gui.c:5913
+ msgid "Open DVD from _Folder"
+ msgstr ""
+
+-#: src/gui.c:5905
++#: src/gui.c:5916
+ msgid "Open DVD from Folder with M_enus"
+ msgstr ""
+
+-#: src/gui.c:5908
++#: src/gui.c:5919
+ msgid "Open DVD from _ISO"
+ msgstr ""
+
+-#: src/gui.c:5911
++#: src/gui.c:5922
+ msgid "Open DVD from ISO with Me_nus"
+ msgstr ""
+
+-#: src/gui.c:5916
++#: src/gui.c:5927
+ #, fuzzy
+ msgid "Open _VCD"
+ msgstr "Open _Audio CD"
+
+-#: src/gui.c:5919
++#: src/gui.c:5930
+ msgid "_TV"
+ msgstr ""
+
+-#: src/gui.c:5926
++#: src/gui.c:5937
+ msgid "Open _Analog TV"
+ msgstr ""
+