* languages: use nb_NO instead of no_NO for norwegian (bug 2850).

[lyx.git] / src / lengthcommon.C

diff --git a/src/lengthcommon.C b/src/lengthcommon.C
index 89ff7e1a555a7101a3564995924286f43cea56aa..dde8d54c169c5440bd11972b6683fa774217f08b 100644 (file)
--- a/src/lengthcommon.C
+++ b/src/lengthcommon.C
@@ -16,47 +16,28 @@
 
 #include "gettext.h"
 
+
+namespace lyx {
+
 using std::string;
 
 // I am not sure if "mu" should be possible to select (Lgb)
 
-// unit_name is for compatibility. Can be deleted when all works well.
-// means, when we have full language support for the lengths
-// in all gui's                                (Herbert 2002-11-01)
+// the latex units
 char const * const unit_name[] = {
        "sp", "pt", "bp", "dd", "mm", "pc",
        "cc", "cm", "in", "ex", "em", "mu",
        "text%",  "col%", "page%", "line%",
        "theight%", "pheight%", "" };
 
-int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]));
-
-// the latex units
-char const * const unit_name_ltx[] = {
-       "sp", "pt", "bp", "dd", "mm", "pc",
-       "cc", "cm", "in", "ex", "em", "mu",
-       // in 1.4 the following names should be used. then no
-       // translation into the latex ones are needed
-//     "textheight",  "columnwidth", "pagewidth", "linewidth",
-//     "textheight", "pageheight" };
-       "text%",  "col%", "page%", "line%",
-       "theight%", "pheight%", "" };
+int const num_units = int(sizeof(unit_name) / sizeof(unit_name[0]) - 1);
 
 // the LyX gui units
 char const * const unit_name_gui[] = {
        N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"),
        N_("cc"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
-       N_("text%"), N_("col%"), N_("page%"), N_("line%"),
-       N_("theight%"), N_("pheight%"), "" };
-
-       // this one maybe better ???? but there can be problems with
-       // xforms (Herbert)
-//     N_("textwidth%"), N_("columnwidth%"), N_("pagewidth%"), N_("linewidth%"),
-//     N_("textheight%"), N_("pageheight%") };
-
-       // or altenative this ones
-//     N_("twidth%"), N_("cwidth%"), N_("pwidth%"), N_("lwidth%"),
-//     N_("theight%"), N_("pheight%") };
+       N_("Text Width %"), N_("Column Width %"), N_("Page Width %"), N_("Line Width %"),
+       N_("Text Height %"), N_("Page Height %"), "" };
 
 LyXLength::UNIT unitFromString(string const & data)
 {
@@ -65,3 +46,6 @@ LyXLength::UNIT unitFromString(string const & data)
                ++i;
        return static_cast<LyXLength::UNIT>(i);
 }
+
+
+} // namespace lyx