r40861 - in lyx-devel/branches/BRANCH_2_0_X: . src/frontends/qt4/ui

[rgheck]

Author: rgheck
Date: Mon Mar  5 23:30:19 2012
New Revision: 40861
URL: http://www.lyx.org/trac/changeset/40861

Log:
Backport fix for #7787.

Modified:
   lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FontUi.ui
   lyx-devel/branches/BRANCH_2_0_X/status.20x

Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FontUi.ui
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FontUi.ui      Mon Mar 
 5 23:04:22 2012        (r40860)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/ui/FontUi.ui      Mon Mar 
 5 23:30:19 2012        (r40861)
@@ -16,7 +16,7 @@
    <item row="0" column="0" colspan="2">
     <widget class="QCheckBox" name="osFontsCB">
      <property name="toolTip">
-      <string>Use OpenType and TrueType fonts directly (requires XeTeX or 
LuaTeX)</string>
+      <string>Use OpenType and TrueType fonts with the fontspec package 
(requires XeTeX or LuaTeX)</string>
      </property>
      <property name="text">
       <string>&amp;Use non-TeX fonts (via XeTeX/LuaTeX)</string>

Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x  Mon Mar  5 23:04:22 2012        
(r40860)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x  Mon Mar  5 23:30:19 2012        
(r40861)
@@ -73,6 +73,8 @@
 - Allow the <Enter> key to add a new branch in document settings.
   Only <Ctrl+Enter> and numpad-<Enter> will also close the dialog.
 
+- Fix tooltip for "Use Non-TeX Fonts" (bug 7787).
+
 
 * DOCUMENTATION AND LOCALIZATION