totem r5549 - in trunk: . data

[hadess svn gnome org]

Author: hadess
Date: Wed Aug 13 13:10:19 2008
New Revision: 5549
URL: http://svn.gnome.org/viewvc/totem?rev=5549&view=rev

Log:
2008-08-13  Bastien Nocera  <hadess hadess net>

	* README:
	* data/totem.ui: Fix "Fit window to movie" and "Zoom reset"
	keyboard shortcuts (Closes: #546281)



Modified:
   trunk/ChangeLog
   trunk/README
   trunk/data/totem.ui

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Wed Aug 13 13:10:19 2008
@@ -42,7 +42,7 @@
 	Switch to windowed mode
 Ctrl+F:
 	Toggle full screen
-Ctr+0/Â, Ctrl+1, Ctrl+2:
+0/Â, 1, 2:
 	Zoom respectively to 50%, 100% and 200% of the video's original size
 Left arrow:
 	Go back 15 seconds
@@ -76,6 +76,8 @@
 	Quit
 Ctrl+R, Ctrl+T:
 	Zoom in and zoom out, respectively
+Ctrl+0:
+	Reset the zoom level
 Ctrl+K:
 	Show the "Skip to" dialog
 Ctrl+D:

Modified: trunk/data/totem.ui
==============================================================================
--- trunk/data/totem.ui	(original)
+++ trunk/data/totem.ui	Wed Aug 13 13:10:19 2008
@@ -124,7 +124,7 @@
                <property name="tooltip" translatable="yes">Resize to half the original video size</property>
                <signal name="activate" handler="zoom_1_2_action_callback"/>
             </object>
-            <accelerator key="0" modifiers="GDK_CONTROL_MASK"/>
+            <accelerator key="0"/>
          </child>
          <child>
             <object class="GtkAction" id="zoom-1-1">
@@ -132,7 +132,7 @@
                <property name="tooltip" translatable="yes">Resize to the original video size</property>
                <signal name="activate" handler="zoom_1_1_action_callback"/>
             </object>
-            <accelerator key="1" modifiers="GDK_CONTROL_MASK"/>
+            <accelerator key="1"/>
          </child>
          <child>
             <object class="GtkAction" id="zoom-2-1">
@@ -140,7 +140,7 @@
                <property name="tooltip" translatable="yes">Resize to double the original video size</property>
                <signal name="activate" handler="zoom_2_1_action_callback"/>
             </object>
-            <accelerator key="2" modifiers="GDK_CONTROL_MASK"/>
+            <accelerator key="2"/>
          </child>
          <child>
             <object class="GtkAction" id="aspect-ratio-menu">
@@ -388,6 +388,7 @@
                <property name="tooltip" translatable="yes">Zoom reset</property>
                <signal name="activate" handler="zoom_reset_action_callback"/>
             </object>
+            <accelerator key="0" modifiers="GDK_CONTROL_MASK"/>
          </child>
          <child>
             <object class="GtkAction" id="zoom-out">