From bfff783d1e18ca46aa04cda42e9b579ce69ce35f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 22 Mar 2012 13:59:52 +0530
Subject: [PATCH] ...

---
 src/calibre/gui2/viewer/main.py | 3 +++
 src/calibre/gui2/viewer/main.ui | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index 413916fb81..df4d146581 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -268,6 +268,9 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         self.connect(self.action_full_screen, SIGNAL('triggered(bool)'),
                      self.toggle_fullscreen)
         self.action_full_screen.setShortcuts([Qt.Key_F11, Qt.CTRL+Qt.SHIFT+Qt.Key_F])
+        self.action_full_screen.setToolTip(_('Toggle full screen (%s)') %
+                _(' or ').join([unicode(x.toString(x.NativeText)) for x in
+                    self.action_full_screen.shortcuts()]))
         self.connect(self.action_back, SIGNAL('triggered(bool)'), self.back)
         self.connect(self.action_bookmark, SIGNAL('triggered(bool)'), self.bookmark)
         self.connect(self.action_forward, SIGNAL('triggered(bool)'), self.forward)
diff --git a/src/calibre/gui2/viewer/main.ui b/src/calibre/gui2/viewer/main.ui
index 659a534fa8..3137ad2e07 100644
--- a/src/calibre/gui2/viewer/main.ui
+++ b/src/calibre/gui2/viewer/main.ui
@@ -284,9 +284,6 @@
    <property name="text">
     <string>Toggle full screen</string>
    </property>
-   <property name="toolTip">
-    <string>Toggle full screen (F11)</string>
-   </property>
   </action>
   <action name="action_print">
    <property name="icon">