Disentangle various "in"s

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36613 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 7524fd481b1a4d5efe93e251140b1306ed09fa1d..cfd66dfedd58bbabc787e03e463a54bbdab9fa6a 100644 (file)
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -514,7 +514,7 @@ ToolbarSet
                Item "sqsupseteq" "math-insert \sqsupseteq"
                Item "doteq" "math-insert \doteq"
                Item "neq" "math-insert \neq"
-               Item "in" "math-insert \in"
+               Item "in[[math relation]]" "math-insert \in"
                Item "ni" "math-insert \ni"
                Item "propto" "math-insert \propto"
                Item "notin" "math-insert \notin"

diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp
index 02a179c0572202710ee40aca4c255f9db91f132b..054b9bb891cb8a76eeb332471ae948c155923422 100644 (file)
--- a/src/frontends/qt4/GuiGraphics.cpp
+++ b/src/frontends/qt4/GuiGraphics.cpp
@@ -472,7 +472,7 @@ void GuiGraphics::on_angle_textChanged(const QString & filename)
 void GuiGraphics::paramsToDialog(InsetGraphicsParams const & igp)
 {
        static char const * const bb_units[] = { "bp", "cm", "mm", "in" };
-       static char const * const bb_units_gui[] = { N_("bp"), N_("cm"), N_("mm"), N_("in") };
+       static char const * const bb_units_gui[] = { N_("bp"), N_("cm"), N_("mm"), N_("in[[unit of measure]]") };
        size_t const bb_size = sizeof(bb_units) / sizeof(bb_units[0]);
 
        lbXunit->clear();

diff --git a/src/lengthcommon.cpp b/src/lengthcommon.cpp
index c1360915f51578fa6dfa83c4e45db341fc31f887..0fa43359d66766e7078e2818cc78e085498af7a3 100644 (file)
--- a/src/lengthcommon.cpp
+++ b/src/lengthcommon.cpp
@@ -35,7 +35,7 @@ int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
 // the LyX gui units
 char const * const unit_name_gui[] = {
        N_("bp"), N_("cc[[unit of measure]]"), N_("cm"), N_("dd"), N_("em"),
-       N_("ex"), N_("in"), N_("mm"), N_("mu[[unit of measure]]"), N_("pc"),
+       N_("ex"), N_("in[[unit of measure]]"), N_("mm"), N_("mu[[unit of measure]]"), N_("pc"),
        N_("pt"), N_("sp"), N_("Text Width %"),
        N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
        N_("Text Height %"), N_("Page Height %"), "" };