totem r5787 - in trunk: . data help help/C src

[pwithnall svn gnome org]

Author: pwithnall
Date: Sun Oct 26 12:22:33 2008
New Revision: 5787
URL: http://svn.gnome.org/viewvc/totem?rev=5787&view=rev

Log:
2008-10-26  Philip Withnall  <philip tecnocode co uk>

	* data/playlist.ui:
	* src/totem-uri.c (totem_add_subtitle): Rename the
	"Select text subtitle..." entry in the playlist popup menu to
	"Select Text Subtitles..." for consistency with the Subtitles 
menu and
	the HIG.
	* help/C/totem.xml: Mention about loading a custom subtitles 
file if one
	isn't found automatically. (Closes: #554929)



Modified:
   trunk/ChangeLog
   trunk/data/playlist.ui
   trunk/help/C/totem.xml
   trunk/help/ChangeLog
   trunk/src/totem-uri.c

Modified: trunk/data/playlist.ui
==============================================================================
--- trunk/data/playlist.ui	(original)
+++ trunk/data/playlist.ui	Sun Oct 26 12:22:33 2008
@@ -24,7 +24,7 @@
          </child>
          <child>
             <object class="GtkAction" id="select-subtitle">
-               <property name="label" translatable="yes">_Select text subtitle...</property>
+               <property name="label" translatable="yes">_Select Text Subtitles...</property>
                <property name="tooltip" translatable="yes">Select a file to use for text subtitles</property>
                <property name="stock-id">gtk-open</property>
                <signal name="activate" handler="playlist_select_subtitle_action_callback"/>

Modified: trunk/help/C/totem.xml
==============================================================================
--- trunk/help/C/totem.xml	(original)
+++ trunk/help/C/totem.xml	Sun Oct 26 12:22:33 2008
@@ -742,7 +742,10 @@
 	  <tip><para>&app; will automatically load and display subtitles if the file which contains them has the same
 	  name as the video file played and the extension <filename>asc</filename>, <filename>txt</filename>,
 	  <filename>sub</filename>, <filename>smi</filename>, or <filename>ssa</filename>.
-	  </para></tip>
+	  </para>
+	  <para>If the file containing the subtitles has a different name to the video being played, you can
+	  right-click on the video in the playlist and choose <menuchoice><guimenuitem>Select Text Subtitles...</guimenuitem></menuchoice>
+	  from the popup menu to load the correct subtitle file.</para></tip>
 	</sect2>
 
     <sect2 id="totem-usage-take-screenshot">

Modified: trunk/src/totem-uri.c
==============================================================================
--- trunk/src/totem-uri.c	(original)
+++ trunk/src/totem-uri.c	Sun Oct 26 12:22:33 2008
@@ -502,7 +502,7 @@
 	char *subtitle = NULL;
 	gboolean set_folder;
 
-	fs = gtk_file_chooser_dialog_new (_("Select text subtitle"), 
+	fs = gtk_file_chooser_dialog_new (_("Select Text Subtitles"), 
 					  parent,
 					  GTK_FILE_CHOOSER_ACTION_OPEN,
 					  GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,