]> git.lyx.org Git - lyx.git/blobdiff - src/lyxrc.C
use anon namespace, somewhat better comp. handling of minipages, not quite there yet
[lyx.git] / src / lyxrc.C
index 58d2c92bc254374072011a9946328a49f8380d8d..0c0282ec235917a35ff7e6441e6b9a63cd3aa8ef 100644 (file)
@@ -37,16 +37,13 @@ using std::ofstream;
 using std::cout;
 using std::ios;
 using std::endl;
-
-// this is crappy... why are those colors command line arguments and
-// not in lyxrc?? (Matthias) 
-// Because nobody put them there. (Asger)
+using std::vector;
 
 extern LyXAction lyxaction;
-extern kb_keymap * toplevel_keymap;
+extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
 
+namespace {
 
-static
 keyword_item lyxrcTags[] = {
        { "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
        { "\\alternate_language", LyXRC::RC_ALT_LANG },
@@ -71,19 +68,21 @@ keyword_item lyxrcTags[] = {
        { "\\document_path", LyXRC::RC_DOCUMENTPATH },
        { "\\escape_chars", LyXRC::RC_ESC_CHARS },
        { "\\exit_confirmation", LyXRC::RC_EXIT_CONFIRMATION },
-       { "\\fax_command", LyXRC::RC_FAX_COMMAND },
-       { "\\fax_program", LyXRC::RC_FAXPROGRAM },
        { "\\font_encoding", LyXRC::RC_FONT_ENCODING },
        { "\\format", LyXRC::RC_FORMAT },
        { "\\input", LyXRC::RC_INPUT },
        { "\\kbmap", LyXRC::RC_KBMAP },
        { "\\kbmap_primary", LyXRC::RC_KBMAP_PRIMARY },
        { "\\kbmap_secondary", LyXRC::RC_KBMAP_SECONDARY },
+       { "\\label_init_length", LyXRC::RC_LABEL_INIT_LENGTH },
        { "\\language_auto_begin", LyXRC::RC_LANGUAGE_AUTO_BEGIN },
        { "\\language_auto_end", LyXRC::RC_LANGUAGE_AUTO_END },
        { "\\language_command_begin", LyXRC::RC_LANGUAGE_COMMAND_BEGIN },
        { "\\language_command_end", LyXRC::RC_LANGUAGE_COMMAND_END },
+       { "\\language_command_local", LyXRC::RC_LANGUAGE_COMMAND_LOCAL },
+       { "\\language_global_options", LyXRC::RC_LANGUAGE_GLOBAL_OPTIONS },
        { "\\language_package", LyXRC::RC_LANGUAGE_PACKAGE },
+       { "\\language_use_babel", LyXRC::RC_LANGUAGE_USE_BABEL },
        { "\\lastfiles", LyXRC::RC_LASTFILES },
        { "\\make_backup", LyXRC::RC_MAKE_BACKUP },
        { "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
@@ -91,7 +90,6 @@ keyword_item lyxrcTags[] = {
        { "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
        { "\\override_x_deadkeys", LyXRC::RC_OVERRIDE_X_DEADKEYS },
        { "\\personal_dictionary", LyXRC::RC_PERS_DICT },
-       { "\\phone_book", LyXRC::RC_PHONEBOOK },
        { "\\print_adapt_output", LyXRC::RC_PRINT_ADAPTOUTPUT },
        { "\\print_collcopies_flag", LyXRC::RC_PRINTCOLLCOPIESFLAG },
        { "\\print_command", LyXRC::RC_PRINT_COMMAND },
@@ -141,7 +139,9 @@ keyword_item lyxrcTags[] = {
 };
 
 /* Let the range depend of the size of lyxrcTags.  Alejandro 240596 */
-static const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
+const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
+
+} // namespace anon
 
 
 LyXRC::LyXRC() 
@@ -151,6 +151,8 @@ LyXRC::LyXRC()
 
 
 void LyXRC::setDefaults() {
+       bind_file = "cua";
+       hasBindFile = false;
        ui_file = "default";
        // Get printer from the environment. If fail, use default "",
        // assuming that everything is set up correctly.
@@ -200,7 +202,7 @@ void LyXRC::setDefaults() {
        menu_font_name = "-*-helvetica-bold-r";
        popup_font_name = "-*-helvetica-medium-r";
        font_norm = "iso8859-1";
-       font_norm_type = OTHER_ENCODING;
+       font_norm_type = ISO_8859_1;
        font_norm_menu = "";
        override_x_deadkeys = true;
        autosave = 300;
@@ -220,15 +222,17 @@ void LyXRC::setDefaults() {
        isp_use_pers_dict = false;
        isp_use_esc_chars = false;
        use_kbmap = false;
-       hasBindFile = false;
        rtl_support = false;
        auto_number = true;
        mark_foreign_language = true;
-       language_package = "\\usepackage{babel}";
        language_auto_begin = true;
        language_auto_end = true;
+       language_global_options = true;
+       language_use_babel = true;
+       language_package = "\\usepackage{babel}";
        language_command_begin = "\\selectlanguage{$$lang}";
        language_command_end = "\\selectlanguage{$$lang}";
+       language_command_local = "\\foreignlanguage{$$lang}{";
        default_language = "english";
        //
        new_ask_filename = false;
@@ -237,6 +241,7 @@ void LyXRC::setDefaults() {
        date_insert_format = "%A, %e %B %Y";
        show_banner = true;
        cursor_follows_scrollbar = false;
+       label_init_length = 3;
 
        /// These variables are not stored on disk (perhaps they
        // should be moved from the LyXRC class).
@@ -248,21 +253,23 @@ void LyXRC::setDefaults() {
 int LyXRC::ReadBindFile(string const & name)
 {
        hasBindFile = true;
-       string tmp = i18nLibFileSearch("bind", name, "bind");
+       string const tmp = i18nLibFileSearch("bind", name, "bind");
        lyxerr[Debug::LYXRC] << "Reading bindfile:" << tmp << endl;
-       int result = read(tmp);
+       int const result = read(tmp);
        if (result) {
                lyxerr << "Error reading bind file: " << tmp << endl;
        }
        return result;
 }
 
+void LyXRC::readBindFileIfNeeded()
+{
+       if (!hasBindFile)
+               ReadBindFile(bind_file);
+}
 
 int LyXRC::read(string const & filename)
-{
-       // Default bindfile.
-       string bindFile = "cua";
-       
+{      
        LyXLex lexrc(lyxrcTags, lyxrcCount);
        if (lyxerr.debugging(Debug::PARSER))
                lexrc.printTable(lyxerr);
@@ -281,7 +288,7 @@ int LyXRC::read(string const & filename)
                // compiler.
 
                int le = lexrc.lex();
-               switch(le) {
+               switch (le) {
                case LyXLex::LEX_UNDEF:
                        lexrc.printError("Unknown tag `$$Token'");
                        continue; 
@@ -303,13 +310,16 @@ int LyXRC::read(string const & filename)
                case RC_BINDFILE:                     // RVDK_PATCH_5
                        if (lexrc.next()) {
                                string tmp(lexrc.GetString());
-                               if (bind_file.empty()) {
-                                       // we only need the name of the first
-                                       // bind file since that (usually)
-                                       // includes several others.
+                               if (hasBindFile)
+                                       // We are already in the
+                                       // "actually read bind file"
+                                       // mode.
+                                       ReadBindFile(tmp);
+                               else
+                                       // We are still in the "just
+                                       // remember the name of the
+                                       // bind file" mode.
                                        bind_file = tmp;
-                               }
-                               ReadBindFile(tmp);
                        }
                        break;
                        
@@ -675,10 +685,8 @@ int LyXRC::read(string const & filename)
                        // we should not do an explicit binding before
                        // loading a bind file. So, in this case, load
                        // the default bind file.
-                       if (!hasBindFile) {
-                               ReadBindFile();
-                               bind_file = bindFile;
-                       }
+                       readBindFileIfNeeded();
+
                        // !!!chb, dynamic key binding...
                        int action, res = 0;
                        string seq, cmd;
@@ -731,23 +739,6 @@ int LyXRC::read(string const & filename)
                                cursor_follows_scrollbar = lexrc.GetBool();
                        break;
 
-               case RC_FAX_COMMAND:
-                       if (lexrc.next())
-                               fax_command = lexrc.GetString();
-                       break;
-               case RC_FAXPROGRAM:
-                       if (lexrc.next())
-                               fax_program = lexrc.GetString();
-                       break;
-               case RC_PHONEBOOK:
-                       if (lexrc.next()) {
-                               string s = lexrc.GetString();
-                               if (AbsolutePath(s))
-                                       phone_book = s;
-                               else
-                                       phone_book = user_lyxdir + s;
-                       }
-                       break;
                case RC_ASCIIROFF_COMMAND:
                        if (lexrc.next())
                                ascii_roff_command = lexrc.GetString();
@@ -817,6 +808,14 @@ int LyXRC::read(string const & filename)
                        if (lexrc.next())
                                language_auto_end = lexrc.GetBool();
                        break;
+               case RC_LANGUAGE_GLOBAL_OPTIONS:
+                       if (lexrc.next())
+                               language_global_options = lexrc.GetBool();
+                       break;
+               case RC_LANGUAGE_USE_BABEL:
+                       if (lexrc.next())
+                               language_use_babel = lexrc.GetBool();
+                       break;
                case RC_LANGUAGE_COMMAND_BEGIN:
                        if (lexrc.next())
                                language_command_begin = lexrc.GetString();
@@ -825,6 +824,10 @@ int LyXRC::read(string const & filename)
                        if (lexrc.next())
                                language_command_end = lexrc.GetString();
                        break;
+               case RC_LANGUAGE_COMMAND_LOCAL:
+                       if (lexrc.next())
+                               language_command_local = lexrc.GetString();
+                       break;
                case RC_RTL_SUPPORT:
                        if (lexrc.next())
                                rtl_support = lexrc.GetBool();
@@ -843,7 +846,7 @@ int LyXRC::read(string const & filename)
                        break;
                        
                case RC_NEW_ASK_FILENAME:
-                       if ( lexrc.next())
+                       if (lexrc.next())
                                new_ask_filename = lexrc.GetBool();
                        break;
                case RC_CONVERTER: {
@@ -856,7 +859,10 @@ int LyXRC::read(string const & filename)
                                command = lexrc.GetString();
                        if (lexrc.next())
                                flags = lexrc.GetString();
-                       Converter::Add(from, to, command, flags);
+                       if (command.empty() || command == "none")
+                               converters.Delete(from, to);
+                       else
+                               converters.Add(from, to, command, flags);
                        break;
                }
                case RC_VIEWER: {
@@ -865,7 +871,7 @@ int LyXRC::read(string const & filename)
                                format = lexrc.GetString();
                        if (lexrc.next())
                                command = lexrc.GetString();
-                       Formats::SetViewer(format, command);
+                       formats.SetViewer(format, command);
                        break;
                }
                case RC_FORMAT: {
@@ -878,18 +884,36 @@ int LyXRC::read(string const & filename)
                                prettyname = lexrc.GetString();
                        if (lexrc.next())
                                shortcut = lexrc.GetString();
-                       Formats::Add(format, extension, prettyname, shortcut);
+                       if (prettyname.empty()) {
+                               if (converters.FormatIsUsed(format))
+                                       lyxerr << "Can't delete format "
+                                              << format << endl;
+                               else
+                                       formats.Delete(format);
+
+                       } else
+                               formats.Add(format, extension, prettyname,
+                                           shortcut);
                        break;
                }
                case RC_DEFAULT_LANGUAGE:
-                       if ( lexrc.next())
+                       if (lexrc.next())
                                default_language = lexrc.GetString();
                        break;
 
+               case RC_LABEL_INIT_LENGTH:
+                       if (lexrc.next())
+                               label_init_length = lexrc.GetInteger();
+                       break;
+
                case RC_LAST: break; // this is just a dummy
                }
        }
 
+       /// Update converters data-structures
+       converters.Update(formats);
+       converters.BuildGraph();
+
        return 0;
 }
 
@@ -932,7 +956,7 @@ void LyXRC::output(ostream & os) const
        // The nice thing is that we will get a warning from the compiler
        // if we forget an element.
        LyXRCTags tag = RC_LAST;
-       switch(tag) {
+       switch (tag) {
        case RC_LAST:
        case RC_INPUT:
                // input/include files are not done here
@@ -1047,7 +1071,12 @@ void LyXRC::output(ostream & os) const
                        os << "\\date_insert_format \"" << date_insert_format
                           << "\"\n";
                }
-               
+       case RC_LABEL_INIT_LENGTH:
+               if (label_init_length != system_lyxrc.label_init_length) {
+                       os << "\\label_init_length " << label_init_length
+                          << "\n";
+               }
+
                os << "\n#\n"
                   << "# SCREEN & FONTS SECTION ############################\n"
                   << "#\n\n";
@@ -1129,23 +1158,35 @@ void LyXRC::output(ostream & os) const
                    != system_lyxrc.font_sizes[LyXFont::SIZE_HUGER]) {
                        os.setf(ios::fixed);
                        os.precision(2);
-                       os << "\\screen_font_sizes";
-                       os << " " << font_sizes[LyXFont::SIZE_TINY];
-                       os << " " << font_sizes[LyXFont::SIZE_SCRIPT];
-                       os << " " << font_sizes[LyXFont::SIZE_FOOTNOTE];
-                       os << " " << font_sizes[LyXFont::SIZE_SMALL];
-                       os << " " << font_sizes[LyXFont::SIZE_NORMAL];
-                       os << " " << font_sizes[LyXFont::SIZE_LARGE];
-                       os << " " << font_sizes[LyXFont::SIZE_LARGER];
-                       os << " " << font_sizes[LyXFont::SIZE_LARGEST];
-                       os << " " << font_sizes[LyXFont::SIZE_HUGE];
-                       os << " " << font_sizes[LyXFont::SIZE_HUGER];
-                       os << "\n";
-               }
-               
-       //case RC_SET_COLOR:
-               // color bindings not written to preference file.
-               // And we want to be warned about that. (Lgb)
+                       os << "\\screen_font_sizes"
+                          << " " << font_sizes[LyXFont::SIZE_TINY]
+                          << " " << font_sizes[LyXFont::SIZE_SCRIPT]
+                          << " " << font_sizes[LyXFont::SIZE_FOOTNOTE]
+                          << " " << font_sizes[LyXFont::SIZE_SMALL]
+                          << " " << font_sizes[LyXFont::SIZE_NORMAL]
+                          << " " << font_sizes[LyXFont::SIZE_LARGE]
+                          << " " << font_sizes[LyXFont::SIZE_LARGER]
+                          << " " << font_sizes[LyXFont::SIZE_LARGEST]
+                          << " " << font_sizes[LyXFont::SIZE_HUGE]
+                          << " " << font_sizes[LyXFont::SIZE_HUGER]
+                          << "\n";
+               }
+               
+               os << "\n#\n"
+                  << "# COLOR SECTION ###################################\n"
+                  << "#\n\n";
+               
+       case RC_SET_COLOR:
+               for (int i = 0; i < LColor::ignore; ++i ) {
+                       LColor::color lc = static_cast<LColor::color>(i);
+                       
+                       string const col(lcolor.getX11Name(lc));
+                       if (col != system_lcolor.getX11Name(lc)) {
+                               os << "\\set_color \""
+                                  << lcolor.getLyXName(lc) << "\" \""
+                                  << col << "\"\n";
+                       }
+               }
                
                os << "\n#\n"
                   << "# PRINTER SECTION ###################################\n"
@@ -1318,23 +1359,6 @@ void LyXRC::output(ostream & os) const
                        os << "\\backupdir_path \"" << backupdir_path << "\"\n";
                }
 
-               os << "\n#\n"
-                  << "# FAX SECTION #######################################\n"
-                  << "#\n\n";
-               
-       case RC_FAX_COMMAND:
-               if (fax_command != system_lyxrc.fax_command) {
-                       os << "\\fax_command \"" << fax_command << "\"\n";
-               }
-       case RC_PHONEBOOK:
-               if (phone_book != system_lyxrc.phone_book) {
-                       os << "\\phone_book \"" << phone_book << "\"\n";
-               }
-       case RC_FAXPROGRAM:
-               if (fax_program != system_lyxrc.fax_program) {
-                       os << "\\fax_program \"" << fax_program << "\"\n";
-               }
-
                os << "\n#\n"
                   << "# ASCII EXPORT SECTION ##############################\n"
                   << "#\n\n";
@@ -1409,6 +1433,19 @@ void LyXRC::output(ostream & os) const
                        os << "\\language_package \"" << language_package
                           << "\"\n";
                }
+       case RC_LANGUAGE_GLOBAL_OPTIONS:
+               if (language_global_options
+                   != system_lyxrc.language_global_options) {
+                       os << "\\language_global_options \""
+                          << tostr(language_global_options)
+                          << "\"\n";
+               }
+       case RC_LANGUAGE_USE_BABEL:
+               if (language_use_babel != system_lyxrc.language_use_babel) {
+                       os << "\\language_use_babel \""
+                          << tostr(language_use_babel)
+                          << "\"\n";
+               }
        case RC_LANGUAGE_COMMAND_BEGIN:
                if (language_command_begin
                    != system_lyxrc.language_command_begin) {
@@ -1422,6 +1459,13 @@ void LyXRC::output(ostream & os) const
                        os << "\\language_command_end \"" << language_command_end
                           << "\"\n";
                }
+       case RC_LANGUAGE_COMMAND_LOCAL:
+               if (language_command_local
+                   != system_lyxrc.language_command_local) {
+                       os << "\\language_command_local \""
+                          << language_command_local
+                          << "\"\n";
+               }
        case RC_LANGUAGE_AUTO_BEGIN:
                if (language_auto_begin != system_lyxrc.language_auto_begin) {
                        os << "\\language_auto_begin " 
@@ -1466,6 +1510,70 @@ void LyXRC::output(ostream & os) const
                if (default_language != system_lyxrc.default_language) {
                        os << "\\default_language " << default_language << "\n";
                }
+
+               os << "\n#\n"
+                  << "# FORMATS SECTION ##########################\n"
+                  << "#\n\n";
+
+       case RC_FORMAT:
+               // Look for deleted formats
+               for (Formats::const_iterator cit = formats.begin();
+                    cit != formats.end(); ++cit) {
+                       Format const * format =
+                               system_formats.GetFormat(cit->name());
+                       if (!format ||
+                           format->extension() != cit->extension() ||
+                           format->prettyname() != cit->prettyname() ||
+                           format->shortcut() != cit->shortcut())
+                               os << "\\format \"" << cit->name() << "\" \""
+                                  << cit->extension() << "\" \""
+                                  << cit->prettyname() << "\" \""
+                                  << cit->shortcut() << "\"\n";
+               }
+
+               // New/modifed formats
+               for (Formats::const_iterator cit = system_formats.begin();
+                    cit != system_formats.end(); ++cit)
+                       if (!formats.GetFormat(cit->name()))
+                               os << "\\format \"" << cit->name() 
+                                  << "\" \"\" \"\" \"\"\n";
+       case RC_VIEWER:
+               for (Formats::const_iterator cit = formats.begin();
+                    cit != formats.end(); ++cit) {
+                       Format const * format = 
+                               system_formats.GetFormat(cit->name());
+                       if ((!format || format->viewer() != cit->viewer()) &&
+                           (format || !cit->viewer().empty()))
+                               os << "\\viewer \"" << cit->name() << "\" \""
+                                  << cit->viewer() << "\"\n";
+               }
+
+               os << "\n#\n"
+                  << "# CONVERTERS SECTION ##########################\n"
+                  << "#\n\n";
+
+       case RC_CONVERTER:
+               // Look for new converters
+               for (Converters::const_iterator cit = converters.begin();
+                    cit != converters.end(); ++cit) {
+                       Converter const * converter =
+                               system_converters.GetConverter(cit->from,
+                                                              cit->to);
+                       if (!converter ||
+                           converter->command != cit->command ||
+                           converter->flags != cit->flags)
+                               os << "\\converter \"" << cit->from << "\" \""
+                                  << cit->to << "\" \""
+                                  << cit->command << "\" \""
+                                  << cit->flags << "\"\n";
+               }
+
+               // New/modifed converters
+               for (Converters::const_iterator cit = system_converters.begin();
+                    cit != system_converters.end(); ++cit)
+                       if (!converters.GetConverter(cit->from, cit->to))
+                               os << "\\converter \"" << cit->from 
+                                  << "\" \"" << cit->to << "\" \"\" \"\"\n";
        }
        os.flush();
 }
@@ -1484,33 +1592,58 @@ void LyXRC::set_font_norm_type()
                font_norm_type = OTHER_ENCODING;
 }
 
-string LyXRC::getFeedback(LyXRCTags tag)
+
+string const LyXRC::getDescription(LyXRCTags tag) 
 {
        string str;
        
-       switch( tag ) {
+       switch (tag) {
        case RC_FONT_ENCODING:
-               str = N_("The font encoding used for the LaTeX2e fontenc package.\nT1 is highly recommended for non-English languages.");
+               str = N_("The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages.");
                break;
                
        case RC_PRINTER:
-               str = N_("The default printer to print on. If none is specified, LyX will\nuse the environment variable PRINTER.");
+               str = N_("The default printer to print on. If none is specified, LyX will use the environment variable PRINTER.");
                break;
                
        case RC_PRINT_COMMAND:
-               str = N_("Your favorite print program, eg \"dvips\", \"dvilj4\"");
+               str = N_("Your favorite print program, e.g. \"dvips\", \"dvilj4\".");
                break;
                
        case RC_PRINTEVENPAGEFLAG:
+               str = N_("The option to print only even pages.");
+               break;
+
        case RC_PRINTODDPAGEFLAG:
+               str = N_("The option to print only odd pages.");
+               break;
+
        case RC_PRINTPAGERANGEFLAG:
+               str = N_("The option for specifying a comma-separated list of pages to print.");
+               break;
+
        case RC_PRINTCOPIESFLAG:
+               str = N_("The option for specifying the number of copies to print.");
+               break;
+
        case RC_PRINTCOLLCOPIESFLAG:
+               str = N_("The option for specifying whether the copies should be collated.");
+               break;
+
        case RC_PRINTREVERSEFLAG:
+               str = N_("The option to reverse the order of the pages printed.");
+               break;
+
        case RC_PRINTLANDSCAPEFLAG:
+               str = N_("The option to print out in landscape.");
+               break;
+
         case RC_PRINTPAPERFLAG:
+               str = N_("The option to specify paper type.");
+               break;
+
        case RC_PRINTPAPERDIMENSIONFLAG:
-               str = N_("Look at the man page for your favorite print program to learn\nwhich options to use.");
+               str = N_("Option to specify the dimensions of the print paper.");
                break;
                
        case RC_PRINTTOPRINTER:
@@ -1518,7 +1651,7 @@ string LyXRC::getFeedback(LyXRCTags tag)
                break;
                
        case RC_PRINT_ADAPTOUTPUT:
-               str = N_("Set to true for LyX to pass the name of the destination printer to your\nprint command.");
+               str = N_("Select for LyX to pass the name of the destination printer to your print command.");
                break;
                
        case RC_PRINTTOFILE:
@@ -1526,27 +1659,28 @@ string LyXRC::getFeedback(LyXRCTags tag)
                break;
                
        case RC_PRINTFILEEXTENSION:
-               str = N_("Extension of printer program output file. Usually .ps");
+               str = N_("Extension of printer program output file. Usually \".ps\".");
                break;
                
        case RC_PRINTEXSTRAOPTIONS:
-               str = N_("Extra options to pass to printing program after everything else,\nbut before the filename of the DVI file to be printed.");
+               str = N_("Extra options to pass to printing program after everything else, but before the filename of the DVI file to be printed.");
                break;
                
        case RC_PRINTSPOOL_COMMAND:
-               str = N_("When set, this printer option automatically prints to a file and then calls\na separate print spooling program on that file with the given name\nand arguments.");
+               str = N_("When set, this printer option automatically prints to a file and then calls a separate print spooling program on that file with the given name and arguments.");
                break;
                
        case RC_PRINTSPOOL_PRINTERPREFIX:
-               str = N_("If you specify a printer name in the print dialog, the following argument\nis prepended along with the printer name after the spool command.");
+               str = N_("If you specify a printer name in the print dialog, the following argument is prepended along with the printer name after the spool command.");
                break;
                
        case RC_SCREEN_DPI:
-               str = N_("DPI (dots per inch) of your monitor is auto-detected by LyX.\nIf that goes wrong, override the setting here.");
+               str = N_("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here.");
                break;
                
        case RC_SCREEN_ZOOM:
-               str = N_("The zoom percentage for screen fonts.\nA setting of 100% will make the fonts roughly the same size as on paper.");
+               //xgettext:no-c-format
+               str = N_("The zoom percentage for screen fonts. A setting of 100% will make the fonts roughly the same size as on paper.");
                break;
                
        case RC_SCREEN_FONT_SIZES:
@@ -1568,18 +1702,18 @@ string LyXRC::getFeedback(LyXRCTags tag)
                break;
                
        case RC_SCREEN_FONT_ENCODING:
-               str = N_("The norm for the screen fonts.");
+               str = N_("The encoding for the screen fonts.");
                break;
                
        case RC_SCREEN_FONT_ENCODING_MENU:
-               str = N_("The norm for the menu/popups fonts.");
+               str = N_("The encoding for the menu/popups fonts.");
                break;
                
        case RC_SET_COLOR:
                break;
                
        case RC_AUTOSAVE:
-               str = N_("The time interval between auto-saves (in seconds).\n0 means no auto-save");
+               str = N_("The time interval between auto-saves (in seconds). 0 means no auto-save.");
                break;
                
        case RC_DOCUMENTPATH:
@@ -1591,11 +1725,11 @@ string LyXRC::getFeedback(LyXRCTags tag)
                break;
                
        case RC_TEMPDIRPATH:
-               str = N_("The path that LyX will use to store temporary TeX output.");
+               str = N_("LyX will place its temporary directories in this path. They will be deleted when you quit LyX.");
                break;
                
        case RC_USETEMPDIR:
-               str = N_("Specify to use a temporary directory to store temporary TeX output.\nThis directory is deleted when you quit LyX.");
+               str = N_("Select if you wish to use a temporary directory structure to store temporary TeX output.");
                break;
                
        case RC_LASTFILES:
@@ -1603,47 +1737,38 @@ string LyXRC::getFeedback(LyXRCTags tag)
                break;
                
        case RC_AUTOREGIONDELETE:
-               str = N_("Set to false if you don't want the current selection to be replaced\nautomatically by what you type.");
+               str = N_("De-select if you don't want the current selection to be replaced automatically by what you type.");
                break;
                
        case RC_OVERRIDE_X_DEADKEYS:
-               str = N_("Set to true for LyX to take over the handling of the dead keys\n(a.k.a accent keys) that may be defined for your keyboard.");
+               str = N_("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 = N_("This starts the lyxserver. The pipes get an additional extension\n\".in\" and \".out\". Only for advanced users.");
+               str = N_("This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users.");
                break;
                
        case RC_BINDFILE:
-               str = N_("Keybindings file. Can either specify an absolute path,\nor LyX will look in its global and local bind/ directories.");
+               str = N_("Keybindings file. Can either specify an absolute path, or LyX will look in its global and local bind/ directories.");
                break;
                
        case RC_UIFILE:
-               str = N_("The  UI (user interface) file. Can either specify an absolute path,\nor LyX will look in its global and local ui/ directories.");
+               str = N_("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:
        case RC_KBMAP_PRIMARY:
        case RC_KBMAP_SECONDARY:
-               str = N_("Use this to set the correct mapping file for your keyboard.\nYou'll need this if you for instance want to type German documents\non an American keyboard.");
-               break;
-               
-       case RC_FAX_COMMAND:
-               break;
-               
-       case RC_PHONEBOOK:
+               str = N_("Use this to set the correct mapping file for your keyboard. You'll need this if you for instance want to type German documents on an American keyboard.");
                break;
-               
-       case RC_FAXPROGRAM:
-               break;
-               
+
        case RC_ASCIIROFF_COMMAND:
-               str = N_("Use to define an external program to render tables in the ASCII output.\nE.g. \"groff -t -Tlatin1 $$FName\"  where $$FName is the input file.\nIf \"none\" is specified, an internal routine is used.");
+               str = N_("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:
-               str = N_("This is the maximum line length of an exported ASCII file\n(LaTeX, SGML or plain text).");
+               str = N_("This is the maximum line length of an exported ASCII file (LaTeX, SGML or plain text).");
                break;
                
        case RC_NUMLASTFILES:
@@ -1651,7 +1776,7 @@ string LyXRC::getFeedback(LyXRCTags tag)
                break;
                
        case RC_CHECKLASTFILES:
-               str = N_("Specify to check whether the lastfiles still exist.");
+               str = N_("Select to check whether the lastfiles still exist.");
                break;
                
        case RC_VIEWDVI_PAPEROPTION:
@@ -1665,7 +1790,7 @@ string LyXRC::getFeedback(LyXRCTags tag)
                break;
                
        case RC_ACCEPT_COMPOUND:
-               str = N_("Consider run-together words, such as \"notthe\" for \"not the\",\nas legal words?");
+               str = N_("Consider run-together words, such as \"diskdrive\" for \"disk drive\", as legal words?");
                break;
                
        case RC_SPELL_COMMAND:
@@ -1673,17 +1798,17 @@ string LyXRC::getFeedback(LyXRCTags tag)
                break;
                
        case RC_USE_INP_ENC:
-               str = N_("Specify whether to pass the -T input encoding option to ispell.\nEnable this if you can't spellcheck words with international letters\nin them.\nThis may not work with all dictionaries.");
+               str = N_("Specify whether to pass the -T input encoding option to ispell. Enable this if you can't spellcheck words with international letters in them. This may not work with all dictionaries.");
                break;
                
        case RC_USE_ALT_LANG:
        case RC_ALT_LANG:
-               str = N_("Specify an alternate language.\nThe default is to use the language of the document.");
+               str = N_("Specify an alternate language. The default is to use the language of the document.");
                break;
                
        case RC_USE_PERS_DICT:
        case RC_PERS_DICT:
-               str = N_("Specify an alternate personal dictionary file.\nE.g. \".ispell_english\".");
+               str = N_("Specify an alternate personal dictionary file. E.g. \".ispell_english\".");
                break;
                
        case RC_USE_ESC_CHARS:
@@ -1692,71 +1817,84 @@ string LyXRC::getFeedback(LyXRCTags tag)
                break;
                
        case RC_SCREEN_FONT_SCALABLE:
-               str = N_("Allow the use of scalable screen fonts? If false, LyX will use the\nclosest existing size for a match. Use this if the scalable fonts\nlook bad and you have many fixed size fonts.");
+               str = N_("Allow the use of scalable screen fonts? If false, LyX will use the closest existing size for a match. Use this if the scalable fonts look bad and you have many fixed size fonts.");
                break;
                
        case RC_CHKTEX_COMMAND:
-               str = N_("Define how to run chktex.\nE.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\"\nRefer to the ChkTeX documentation.");
+               str = N_("Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\" Refer to the ChkTeX documentation.");
                break;
                
        case RC_CURSOR_FOLLOWS_SCROLLBAR:
-               str = N_("LyX normally doesn't update the cursor position if you move the scrollbar.\nSet to true if you'd prefer to always have the cursor on screen.");
+               str = N_("LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen.");
                break;
                
        case RC_EXIT_CONFIRMATION:
-               str = N_("Sets whether LyX asks for a second confirmation to exit when you have\nchanged documents.\n(LyX will still ask to save changed documents.)");
+               str = N_("Sets whether LyX asks for a second confirmation to exit when you have changed documents. (LyX will still ask to save changed documents.)");
                break;
                
        case RC_DISPLAY_SHORTCUTS:
-               str = N_("LyX continously displays names of last command executed,\nalong with a list of defined short-cuts for it in the minibuffer.\nSet to false if LyX seems slow.");
+               str = N_("LyX continously displays names of last command executed, along with a list of defined short-cuts for it in the minibuffer. Set to false if LyX seems slow.");
                break;
                
        case RC_MAKE_BACKUP:
-               str = N_("Set to false if you don't want LyX to create backup files.");
+               str = N_("De-select if you don't want LyX to create backup files.");
                break;
                
        case RC_BACKUPDIR_PATH:
-               str = N_("The path for storing backup files. If it is an empty string,\nLyX will store the backup file in the same directory as the original file.");
+               str = N_("The path for storing backup files. If it is an empty string, LyX will store the backup file in the same directory as the original file.");
                break;
 
        case RC_RTL_SUPPORT:
-               str = N_("Use to enable support of right-to-left languages (e.g. Hebrew, Arabic).");
+               str = N_("Select to enable support of right-to-left languages (e.g. Hebrew, Arabic).");
                break;
                
        case RC_MARK_FOREIGN_LANGUAGE:
-               str = N_("Use to control the highlighting of words with a language foreign to\nthat of the document.");
+               str = N_("Select to control the highlighting of words with a language foreign to that of the document.");
                break;
                
        case RC_LANGUAGE_PACKAGE:
-               str = N_("The latex command for loading the language package.\nE.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
+               str = N_("The latex command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
+               break;
+
+       case RC_LANGUAGE_GLOBAL_OPTIONS:
+               str = N_("De-select if you don't want the language(s) used as an argument to \\documentclass.");
+               break;
+
+       case RC_LANGUAGE_USE_BABEL:
+               str = N_("De-select if you don't want babel to be used when the language of the document is the default language.");
                break;
                
        case RC_LANGUAGE_AUTO_BEGIN:
-               str = N_("Use if a language switching command is needed at the beginning\nof the document.");
+               str = N_("Select if a language switching command is needed at the beginning of the document.");
                break;
                
        case RC_LANGUAGE_AUTO_END:
-               str = N_("Use if a language switching command is needed at the end\nof the document.");
+               str = N_("Select if a language switching command is needed at the end of the document.");
                break;
                
        case RC_LANGUAGE_COMMAND_BEGIN:
-               str = N_("The latex command for changing from the language of the document\nto another language.\nE.g. \\selectlanguage{$$lang} where $$lang is substituted by the name\nof the second language.");
+               str = N_("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 = N_("The latex command for changing back to the language of the document.");
                break;
-               
+
+       case RC_LANGUAGE_COMMAND_LOCAL:
+               str = N_("The latex command for local changing of the language.");
+               break;
+
        case RC_DATE_INSERT_FORMAT:
-               str = N_("This accepts the normal strftime formats; see man strftime for full details.\nE.g.\"%A, %e. %B %Y\".");
+               //xgettext:no-c-format
+               str = N_("This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\".");
                break;
                
        case RC_SHOW_BANNER:
-               str = N_("Set to false if you don't want the startup banner.");
+               str = N_("De-select if you don't want the startup banner.");
                break;
                
        case RC_WHEEL_JUMP:
-               str = N_("The wheel movement factor (for mice with wheels or five button mice)");
+               str = N_("The wheel movement factor (for mice with wheels or five button mice).");
                break;
                
        case RC_CONVERTER:
@@ -1769,12 +1907,16 @@ string LyXRC::getFeedback(LyXRCTags tag)
                break;
                
        case RC_NEW_ASK_FILENAME:
-               str = N_("This sets the behaviour if you want to be asked for a filename when\ncreating a new document or wait until you save it and be asked then.");
+               str = N_("This sets the behaviour if you want to be asked for a filename when creating a new document or wait until you save it and be asked then.");
                break;
                
        case RC_DEFAULT_LANGUAGE:
                str = N_("New documents will be assigned this language.");
                break;
+
+       case RC_LABEL_INIT_LENGTH:
+               str = N_("Maximum number of words in the initialization string for a new label");
+               break;
                
        default:
                break;