Jürgen Spitzmüller wrote:
> > - Font sizes (twice!) are not translated
> > - Font Styles are not translated
> > - "No language" is not translatable (but appears in *.po)
>
> will have a look at these.
The attached patch should fix those.
Jürgen
Index: src/frontends/qt4/QListings.cpp
===================================================================
--- src/frontends/qt4/QListings.cpp (Revision 18622)
+++ src/frontends/qt4/QListings.cpp (Arbeitskopie)
@@ -135,10 +135,10 @@
{ "IBM", "Simula", "IBM", false },
{ "tk", "tcl", "tk", false },
{ "AlLaTeX", "TeX", "AlLaTeX", false },
- { "common", "TeX", N_("common"), false },
+ { "common", "TeX", "common", false },
{ "LaTeX", "TeX", "LaTeX", false },
- { "plain", "TeX", N_("plain"), true },
- { "primitive", "TeX", N_("primitive"), false },
+ { "plain", "TeX", "plain", true },
+ { "primitive", "TeX", "primitive", false },
{ "AMS", "VHDL", "AMS", false },
{ "97", "VRML", "97", true }
};
@@ -193,13 +193,13 @@
connect(listingsED, SIGNAL(textChanged()), this, SLOT(validate_listings_params()));
for (int n = 0; languages[n][0]; ++n)
- languageCO->addItem(languages_gui[n]);
+ languageCO->addItem(qt_(languages_gui[n]));
for (int n = 0; font_styles[n][0]; ++n)
- fontstyleCO->addItem(font_styles_gui[n]);
+ fontstyleCO->addItem(qt_(font_styles_gui[n]));
for (int n = 0; font_sizes[n][0]; ++n) {
- QString font = toqstr(font_sizes_gui[n]);
+ QString font = qt_(font_sizes_gui[n]);
fontsizeCO->addItem(font);
numberFontSizeCO->addItem(font);
}
@@ -374,10 +374,10 @@
for (size_t i = 0; i < nr_dialects; ++i) {
if (language == dialects[i].language) {
- dialectCO->addItem(dialects[i].gui);
+ dialectCO->addItem(qt_(dialects[i].gui));
if (dialects[i].is_default)
default_dialect =
- dialectCO->findText(dialects[i].gui);
+ dialectCO->findText(qt_(dialects[i].gui));
}
}
dialectCO->setCurrentIndex(default_dialect);
@@ -495,7 +495,7 @@
break;
}
}
- n = dialog_->dialectCO->findText(toqstr(dialect_gui));
+ n = dialog_->dialectCO->findText(qt_(dialect_gui));
if (n >= 0)
dialog_->dialectCO->setCurrentIndex(n);
else
Index: src/frontends/qt4/QDocument.cpp
===================================================================
--- src/frontends/qt4/QDocument.cpp (Revision 18622)
+++ src/frontends/qt4/QDocument.cpp (Arbeitskopie)
@@ -267,19 +267,19 @@
this, SLOT(change_adaptor()));
for (int n = 0; tex_fonts_roman[n][0]; ++n) {
- QString font = toqstr(tex_fonts_roman_gui[n]);
+ QString font = qt_(tex_fonts_roman_gui[n]);
if (!form_->controller().isFontAvailable(tex_fonts_roman[n]))
font += qt_(" (not installed)");
fontModule->fontsRomanCO->addItem(font);
}
for (int n = 0; tex_fonts_sans[n][0]; ++n) {
- QString font = toqstr(tex_fonts_sans_gui[n]);
+ QString font = qt_(tex_fonts_sans_gui[n]);
if (!form_->controller().isFontAvailable(tex_fonts_sans[n]))
font += qt_(" (not installed)");
fontModule->fontsSansCO->addItem(font);
}
for (int n = 0; tex_fonts_monospaced[n][0]; ++n) {
- QString font = toqstr(tex_fonts_monospaced_gui[n]);
+ QString font = qt_(tex_fonts_monospaced_gui[n]);
if (!form_->controller().isFontAvailable(tex_fonts_monospaced[n]))
font += qt_(" (not installed)");
fontModule->fontsTypewriterCO->addItem(font);
