Author: cazfi
Date: Sun Jan 24 13:48:07 2016
New Revision: 31569
URL: http://svn.gna.org/viewcvs/freeciv?rev=31569&view=rev
Log:
Translate Qt-client strings that previously were only collected for translation.
See bug #24339
Modified:
branches/S2_5/client/gui-qt/citydlg.cpp
branches/S2_5/client/gui-qt/plrdlg.cpp
branches/S2_5/client/gui-qt/ratesdlg.cpp
Modified: branches/S2_5/client/gui-qt/citydlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/citydlg.cpp?rev=31569&r1=31568&r2=31569&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/citydlg.cpp (original)
+++ branches/S2_5/client/gui-qt/citydlg.cpp Sun Jan 24 13:48:07 2016
@@ -964,8 +964,8 @@
nationality_table->horizontalHeader()->setStretchLastSection(true);
info_list.clear();
- info_list << N_("Cities:") << N_("Luxuries:") << N_("Buildings:")
- << N_("Nationality:") << N_("Units:") << N_("Wonders:");
+ info_list << _("Cities:") << _("Luxuries:") << _("Buildings:")
+ << _("Nationality:") << _("Units:") << _("Wonders:");
info_nr = info_list.count();
for (int i = 0; i < info_list.count(); i++) {
lab_table[i] = new city_label(1 + i, this);
@@ -1764,7 +1764,7 @@
nationality_table->clear();
nationality_table->setRowCount(0);
info_list.clear();
- info_list << N_("#") << N_("Flag") << N_("Nation");
+ info_list << _("#") << _("Flag") << _("Nation");
nationality_table->setHorizontalHeaderLabels(info_list);
citizens_iterate(pcity, pslot, nationality) {
@@ -2670,7 +2670,7 @@
def_str = "<p style='white-space:pre'><b>"
+ QString(improvement_name_translation(building))
+ "</b>\n";
- def_str += QString(N_("Cost: %1, Upkeep: %2\n\n"))
+ def_str += QString(_("Cost: %1, Upkeep: %2\n\n"))
.arg(impr_build_shield_cost(building))
.arg(building->upkeep);
return def_str;
Modified: branches/S2_5/client/gui-qt/plrdlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/plrdlg.cpp?rev=31569&r1=31568&r2=31569&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/plrdlg.cpp (original)
+++ branches/S2_5/client/gui-qt/plrdlg.cpp Sun Jan 24 13:48:07 2016
@@ -410,22 +410,22 @@
intel_str =
QString("<table><tr><td><b>") + _("Nation") + QString("</b></td><td>")
+ QString(nation_adjective_for_player(pplayer))
- + QString("</td><tr><td><b>") + N_("Ruler:") + QString("</b></td><td>")
+ + QString("</td><tr><td><b>") + _("Ruler:") + QString("</b></td><td>")
+ QString(ruler_title_for_player(pplayer, tbuf, sizeof(tbuf)))
- + QString("</td></tr><tr><td><b>") + N_("Government:")
+ + QString("</td></tr><tr><td><b>") + _("Government:")
+ QString("</b></td><td>") + QString(government_name_for_player(pplayer))
- + QString("</td></tr><tr><td><b>") + N_("Capital:")
+ + QString("</td></tr><tr><td><b>") + _("Capital:")
+ QString("</b></td><td>")
+ QString(((!pcity) ? _("(unknown)") : city_name(pcity)))
- + QString("</td></tr><tr><td><b>") + N_("Gold:")
+ + QString("</td></tr><tr><td><b>") + _("Gold:")
+ QString("</b></td><td>") + QString::number(pplayer->economic.gold)
- + QString("</td></tr><tr><td><b>") + N_("Tax:")
+ + QString("</td></tr><tr><td><b>") + _("Tax:")
+ QString("</b></td><td>") + QString::number(pplayer->economic.tax)
- + QString("%</td></tr><tr><td><b>") + N_("Science:")
+ + QString("%</td></tr><tr><td><b>") + _("Science:")
+ QString("</b></td><td>") + QString::number(pplayer->economic.science)
- + QString("%</td></tr><tr><td><b>") + N_("Luxury:")
+ + QString("%</td></tr><tr><td><b>") + _("Luxury:")
+ QString("</b></td><td>") + QString::number(pplayer->economic.luxury)
- + QString("%</td></tr><tr><td><b>") + N_("Researching:")
+ + QString("%</td></tr><tr><td><b>") + _("Researching:")
+ QString("</b></td><td>") + res + QString("</td></table>");
for (int i = 0; i < static_cast<int>(DS_LAST); i++) {
Modified: branches/S2_5/client/gui-qt/ratesdlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/ratesdlg.cpp?rev=31569&r1=31568&r2=31569&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/ratesdlg.cpp (original)
+++ branches/S2_5/client/gui-qt/ratesdlg.cpp Sun Jan 24 13:48:07 2016
@@ -68,7 +68,7 @@
main_layout->addSpacing(20);
// tax
- QGroupBox* group_box = new QGroupBox("Tax");
+ QGroupBox* group_box = new QGroupBox(_("Tax"));
QHBoxLayout *group_box_layout = new QHBoxLayout;
QHBoxLayout *some_layout = new QHBoxLayout;
tax_slider->setMaximum(max / 10);
@@ -91,7 +91,7 @@
main_layout->addWidget(group_box);
// sci
- group_box = new QGroupBox("Science");
+ group_box = new QGroupBox(_("Science"));
group_box_layout = new QHBoxLayout;
some_layout = new QHBoxLayout;
sci_slider->setMaximum(max / 10);
@@ -114,7 +114,7 @@
main_layout->addWidget(group_box);
// lux
- group_box = new QGroupBox("Luxury");
+ group_box = new QGroupBox(_("Luxury"));
group_box_layout = new QHBoxLayout;
some_layout = new QHBoxLayout;
lux_slider->setMaximum(max / 10);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
