Menu
▾
▴
[xine-cvs] CVS: gnome-xine/src gtkvideo.c,1.92,1.93 key_events.c,1.87,1.88 mediamarks.c,1.61,1.62 menu.c,1.65,1.66 player.c,1.53,1.54 script_engine.c,1.60,1.61 snapshot.c,1.16,1.17
|
From: Darren S. <ds...@us...> - 2005-10-19 19:18:06
|
Update of /cvsroot/xine/gnome-xine/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv436/src Modified Files: gtkvideo.c key_events.c mediamarks.c menu.c player.c script_engine.c snapshot.c Log Message: Minor tweaks: s/: error,/: error:/ and update of the FSF address. Index: gtkvideo.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/gtkvideo.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- gtkvideo.c 14 Oct 2005 18:04:22 -0000 1.92 +++ gtkvideo.c 19 Oct 2005 19:17:57 -0000 1.93 @@ -552,7 +552,7 @@ if (video_port) return video_port; else - fprintf (stderr, _("gtkxine: video driver %s failed.\n"), + fprintf (stderr, _("gtkvideo: video driver %s failed.\n"), video_driver_id); /* => auto-detect */ } Index: key_events.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/key_events.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- key_events.c 13 Oct 2005 23:58:53 -0000 1.87 +++ key_events.c 19 Oct 2005 19:17:57 -0000 1.88 @@ -316,7 +316,7 @@ l += strlen (text_mod4); if (kb->keyval == GDK_VoidSymbol) - key = _("undef"); + key = _("undef"); /* undefined */ else if (!(key = gdk_keyval_name (kb->keyval))) key = _("unknown"); @@ -615,12 +615,12 @@ if (!strcasecmp (node->name, "KEYBINDING")) xml2kb (node->child, version); } else { - fprintf (stderr, _("key_events: error, %s is not a valid gxine keybindings file\n"), + fprintf (stderr, _("key_events: error: %s is not a valid gxine keybindings file\n"), fname); load_default_kb(); } } else { - fprintf (stderr, _("key_events: error, cannot load keybindings file %s (xml parsing failed)\n"), + fprintf (stderr, _("key_events: error: cannot load keybindings file %s (xml parsing failed)\n"), fname); load_default_kb(); } @@ -628,7 +628,7 @@ free (kbfile); } else { if (errno != ENOENT) - fprintf (stderr, _("key_events: error, cannot open keybindings file %s\n"), + fprintf (stderr, _("key_events: error: cannot open keybindings file %s\n"), fname); load_default_kb(); } Index: mediamarks.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/mediamarks.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- mediamarks.c 5 Oct 2005 21:01:24 -0000 1.61 +++ mediamarks.c 19 Oct 2005 19:17:57 -0000 1.62 @@ -212,7 +212,7 @@ play_item->mrl, 2, play_item, -1); } else { - fprintf (stderr, _("mediamarks: error, unknown node type %s\n"), node->name); + fprintf (stderr, _("mediamarks: error: unknown node type %s\n"), node->name); } } @@ -222,7 +222,7 @@ get_items (node->child, 0, NULL); } else { - fprintf (stderr, _("mediamarks: ERROR, root node must be GXINEMM\n")); + fprintf (stderr, _("mediamarks: error: root node must be GXINEMM\n")); } } Index: menu.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/menu.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- menu.c 14 Oct 2005 17:54:42 -0000 1.65 +++ menu.c 19 Oct 2005 19:17:57 -0000 1.66 @@ -331,6 +331,7 @@ #define CB(name, stock, label, key) \ { #name, (stock), (label), (key), NULL, G_CALLBACK(js_##name##_cb) } static const GtkActionEntry main_actions[] = { + /* Menu entry text */ { "FileMenu", NULL, N_("_File") }, CB(Open, GTK_STOCK_OPEN, N_("_Open..."), "<control>O"), CB(MRL, GTK_STOCK_OPEN, N_("Open _MRL..."), "<control>M"), @@ -419,6 +420,7 @@ { "WindowDynamic", NULL, "", NULL, NULL, -1 }, }, aspect_actions[] = { + /* Aspect ratio menu text */ { "AspectAuto", NULL, N_("_Auto"), NULL, NULL, XINE_VO_ASPECT_AUTO }, { "AspectSquare", NULL, N_("_Square"), NULL, NULL, XINE_VO_ASPECT_SQUARE }, { "Aspect4_3", NULL, N_("_4:3"), NULL, NULL, XINE_VO_ASPECT_4_3 }, @@ -430,6 +432,7 @@ }, subtitle_actions[] = { { "SubtitlesOther", NULL, "", NULL, NULL, -3 }, + /* Subtitles menu text */ { "SubtitlesNone", NULL, N_("_None"), NULL, NULL, -2 }, { "SubtitlesAuto", NULL, N_("_Auto"), NULL, NULL, -1 }, { "Subtitles0", NULL, N_("Channel _0"), NULL, NULL, 0 }, Index: player.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/player.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- player.c 17 Oct 2005 18:14:22 -0000 1.53 +++ player.c 19 Oct 2005 19:17:57 -0000 1.54 @@ -1071,6 +1071,11 @@ { static const ui_property_t int_props[] = { + /* Text is help for the commands. Format is: + * To the left of the semicolon, a comma-separated list of + * VARIABLE[=TYPE] or METHOD([PARAMETER TYPE,...]) + * To the right, descriptive text + */ { "av_speed", N_("v=int, min, max; playback speed"), XINE_PARAM_SPEED, NULL, NULL, XINE_SPEED_PAUSE, XINE_SPEED_FAST_4 }, { "vo_aspect", N_("v=int; aspect ratio"), XINE_PARAM_VO_ASPECT_RATIO, NULL, set_aspect, 0, XINE_VO_ASPECT_NUM_RATIOS - 1, TRUE }, { "vo_subtitle", N_("v=int, min, max; subtitle channel"), XINE_PARAM_SPU_CHANNEL, NULL, set_subtitles, -2, GXINE_MAX_SPU_CHANNEL }, @@ -1105,6 +1110,7 @@ { static const se_f_def_t defs[] = { { "play", controls_play, 0, 0, + /* help text describes function parameters */ SE_GROUP_ENGINE, N_("[mrl] [, pos, time]"), N_("time in milliseconds") }, { "get_time", get_time, 0, 0, Index: script_engine.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/script_engine.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- script_engine.c 22 Sep 2005 18:20:52 -0000 1.60 +++ script_engine.c 19 Oct 2005 19:17:57 -0000 1.61 @@ -281,6 +281,7 @@ "copyright", _("© 2002-2005 the xine project team"), "comments", _("A GTK media player front end for xine-lib"), "license", /* roughly formatted for a typical variable-width font */ + /* Translators: rewrap this as required */ _("This program is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public Licence\n" "as published by the Free Software Foundation; either version\n" @@ -294,8 +295,8 @@ "\n" "You should have received a copy of the GNU General Public\n" "Licence along with this program; if not, write to the Free\n" - "Software Foundation, Inc., 59 Temple Place, Suite 330,\n" - "Boston, MA 02111-1307 USA\n"), + "Software Foundation, Inc., 51 Franklin St, Fifth Floor,\n" + "Boston, MA 02110-1301 USA\n"), "website", "http://xinehq.de/", "authors", authors, "documenters", documenters, Index: snapshot.c =================================================================== RCS file: /cvsroot/xine/gnome-xine/src/snapshot.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- snapshot.c 5 Oct 2005 21:01:25 -0000 1.16 +++ snapshot.c 19 Oct 2005 19:17:57 -0000 1.17 @@ -129,6 +129,7 @@ } static const char *const blends[] = { + /* Snapshot processing options. I *think* that "Hyper" is trilinear */ N_("Nearest"), N_("Tiles"), N_("Bilinear"), N_("Hyper"), NULL }; |