From: Daniel Ramöller <d.lyx@web.de>
Date: Sun, 30 Oct 2016 16:19:29 +0000 (+0100)
Subject: In Color Preferences "frame of button" should be "button frame"
X-Git-Tag: 2.2.3~159
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3372c0cf553888266bbd40ae0f4b2aa880a196ef;p=features.git

In Color Preferences "frame of button" should be "button frame"

Fixes #10135.
(cherry picked from commit f054721410c87a1f014ebd9d705395b9646a3fc0)
---

diff --git a/src/Color.cpp b/src/Color.cpp
index f08c9fbf53..5eda83442e 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -292,7 +292,7 @@ ColorSet::ColorSet()
 	{ Color_bottomarea, N_("bottom area"), "bottomarea", grey40, "bottomarea" },
 	{ Color_newpage, N_("new page"), "newpage", "Blue", "newpage" },
 	{ Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" },
-	{ Color_buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" },
+	{ Color_buttonframe, N_("button frame"), "buttonframe", "#dcd2c8", "buttonframe" },
 	{ Color_buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" },
 	{ Color_buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" },
 	{ Color_paragraphmarker, N_("paragraph marker"), "paragraphmarker", grey80, "paragraphmarker"},
diff --git a/status.22x b/status.22x
index d426142cae..49b351d26d 100644
--- a/status.22x
+++ b/status.22x
@@ -120,6 +120,8 @@ What's new
 
 - Allow using colors supported by xcolor inside mathed (bug 10417).
 
+- Change description of "frame of button" color to "button frame" (bug 10135).
+
 
 * INTERNALS