From: Richard Heck <rgheck@comcast.net>
Date: Thu, 16 Jun 2011 14:16:01 +0000 (+0000)
Subject: Recommit fix for #7620, since we are breaking string freeze due
X-Git-Tag: 2.0.1~180
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1211af5c0aee21d93582007c5ff562a68c7e0a1c;p=features.git

Recommit fix for #7620, since we are breaking string freeze due
to dead FTP.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39089 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 3db71ce031..3bc0f02d5d 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -353,15 +353,15 @@ ToolbarSet
 	Toolbar "frac-square" "Fractions"
 		Item "Standard	\\frac" "math-insert \frac"
 		Item "Nice fraction (3/4)	\\nicefrac" "math-insert \nicefrac"
-		Item "Unit (km)	\\unit" "math-insert \unitone"
-		Item "Unit (864 m)	\\unit" "math-insert \unittwo"
+		Item "Unit (km)	\\unitone" "math-insert \unitone"
+		Item "Unit (864 m)	\\unittwo" "math-insert \unittwo"
 		Item "Unit fraction (km/h)	\\unitfrac" "math-insert \unitfrac"
-		Item "Unit fraction (20 km/h)	\\unitfrac" "math-insert \unitfracthree"
+		Item "Unit fraction (20 km/h)	\\unitfracthree" "math-insert \unitfracthree"
 		Item "Text fraction	\\tfrac" "math-insert \tfrac"
 		Item "Display fraction	\\dfrac" "math-insert \dfrac"
 		Item "Continued fraction	\\cfrac" "math-insert \cfrac"
-		Item "Continued fraction (left)	\\cfrac" "math-insert \cfracleft"
-		Item "Continued fraction (right)	\\cfrac" "math-insert \cfracright"
+		Item "Continued fraction (left)	\\cfracleft" "math-insert \cfracleft"
+		Item "Continued fraction (right)	\\cfracright" "math-insert \cfracright"
 		Item "Binomial	\\binom" "math-insert \binom"
 		Item "Text binomial	\\tbinom" "math-insert \tbinom"
 		Item "Display binomial	\\dbinom" "math-insert \dbinom"
diff --git a/status.20x b/status.20x
index 68f44941be..b55983e1e7 100644
--- a/status.20x
+++ b/status.20x
@@ -159,6 +159,8 @@ What's new
 
 - Enable OK/Apply in Document>Settings dialog when bullet size is changed.
 
+- Display LyX's internal \unit equivalents in the math toolbar menu (bug 7620).
+
 
 * ADVANCED FIND AND REPLACE