update no.po

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 19ebfb0c531f258beb316d53c30859d95b288b27..4db42ebe7e7ae55b8f7b1de09e675e9d6686d09a 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -89,7 +89,6 @@ keyword_item lyxrcTags[] = {
        { "\\make_backup", LyXRC::RC_MAKE_BACKUP },
        { "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
        { "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
-       { "\\override_x_deadkeys", LyXRC::RC_OVERRIDE_X_DEADKEYS },
        { "\\personal_dictionary", LyXRC::RC_PERS_DICT },
        { "\\popup_bold_font", LyXRC::RC_POPUP_BOLD_FONT },
        { "\\popup_font_encoding", LyXRC::RC_POPUP_FONT_ENCODING },
@@ -198,7 +197,7 @@ void LyXRC::setDefaults() {
        dpi = 75;
        // Because a screen typically is wider than a piece of paper:
        zoom = 150;
-       wheel_jump = 100;
+       wheel_jump = 5;
        // Default LaTeX font size:
        font_sizes[LyXFont::SIZE_TINY] = 5.0;
        font_sizes[LyXFont::SIZE_SCRIPT] = 7.0;
@@ -219,7 +218,6 @@ void LyXRC::setDefaults() {
        font_norm = "iso8859-1";
        font_norm_type = ISO_8859_1;
        popup_font_encoding.erase();
-       override_x_deadkeys = true;
        autosave = 300;
        auto_region_delete = true;
        auto_reset_options = false;
@@ -781,7 +779,7 @@ int LyXRC::read(string const & filename)
                        if (lexrc.next()) {
                                x11_name = lexrc.getString();
                        } else {
-                               lexrc.printError("Missing color name for color : `$$Token'");
+                               lexrc.printError("Missing color name for color: `$$Token'");
                                break;
                        }
 
@@ -846,12 +844,6 @@ int LyXRC::read(string const & filename)
                        }
                        break;
                }
-               case RC_OVERRIDE_X_DEADKEYS:
-                       if (lexrc.next()) {
-                               override_x_deadkeys = lexrc.getBool();
-                       }
-                       break;
-
                case RC_SERVERPIPE:
                        if (lexrc.next()) {
                                lyxpipes = ExpandPath(lexrc.getString());
@@ -1734,11 +1726,6 @@ void LyXRC::output(ostream & os) const
                   << "# 2nd MISC SUPPORT SECTION ##########################\n"
                   << "#\n\n";
 
-       case RC_OVERRIDE_X_DEADKEYS:
-               if (override_x_deadkeys != system_lyxrc.override_x_deadkeys) {
-                       os << "\\override_x_deadkeys "
-                          << tostr(override_x_deadkeys) << '\n';
-               }
        case RC_AUTO_NUMBER:
                if (auto_number != system_lyxrc.auto_number) {
                        os << "\\auto_number " << tostr(auto_number) << '\n';
@@ -1960,11 +1947,11 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_DOCUMENTPATH:
-               str = _("The default path for your documents.  An empty value selects the directory LyX was started from.");
+               str = _("The default path for your documents. An empty value selects the directory LyX was started from.");
                break;
 
        case RC_TEMPLATEPATH:
-               str = _("The path that LyX will set when offering to choose a template.  An empty value selects the directory LyX was started from.");
+               str = _("The path that LyX will set when offering to choose a template. An empty value selects the directory LyX was started from.");
                break;
 
        case RC_TEMPDIRPATH:
@@ -1987,11 +1974,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("De-select if you don't want the class options to be reset to defaults after class change.");
                break;
 
-       case RC_OVERRIDE_X_DEADKEYS:
-               str = _("Select if LyX is to take over the handling of the dead keys (a.k.a. accent keys) that may be defined for your keyboard.");
-               break;
-
-
        case RC_SERVERPIPE:
                str = _("This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users.");
                break;
@@ -2001,7 +1983,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_UIFILE:
-               str = _("The  UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories.");
+               str = _("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories.");
                break;
 
        case RC_KBMAP:
@@ -2011,7 +1993,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_ASCIIROFF_COMMAND:
-               str = _("Use to define an external program to render tables in the ASCII output. E.g. \"groff -t -Tlatin1 $$FName\"  where $$FName is the input file. If \"none\" is specified, an internal routine is used.");
+               str = _("Use to define an external program to render tables in the ASCII output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used.");
                break;
 
        case RC_ASCII_LINELEN:
@@ -2101,7 +2083,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_LANGUAGE_PACKAGE:
-               str = _("The latex command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
+               str = _("The LaTeX command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
                break;
 
        case RC_LANGUAGE_GLOBAL_OPTIONS:
@@ -2121,15 +2103,15 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_LANGUAGE_COMMAND_BEGIN:
-               str = _("The latex command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language.");
+               str = _("The LaTeX command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language.");
                break;
 
        case RC_LANGUAGE_COMMAND_END:
-               str = _("The latex command for changing back to the language of the document.");
+               str = _("The LaTeX command for changing back to the language of the document.");
                break;
 
        case RC_LANGUAGE_COMMAND_LOCAL:
-               str = _("The latex command for local changing of the language.");
+               str = _("The LaTeX command for local changing of the language.");
                break;
 
        case RC_DATE_INSERT_FORMAT:
@@ -2142,7 +2124,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_WHEEL_JUMP:
-               str = _("The wheel movement factor (for mice with wheels or five button mice).");
+               str = _("The number of lines that are scrolled by mice with wheels or five button mice.");
                break;
 
        case RC_CONVERTER: