From 4086115bb7c31167586c6285fc4c5a04f3ba2ba9 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 6 Aug 2022 03:57:44 +0300 Subject: [PATCH 19/19] Change occurrences of "FirePower" to "Firepower" See osdn #43081 Signed-off-by: Marko Lindqvist --- client/gui-gtk-2.0/helpdlg.c | 10 +++++----- client/gui-gtk-3.0/helpdlg.c | 10 +++++----- client/gui-gtk-3.22/helpdlg.c | 10 +++++----- client/gui-qt/citydlg.cpp | 2 +- client/gui-sdl2/helpdlg.c | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/client/gui-gtk-2.0/helpdlg.c b/client/gui-gtk-2.0/helpdlg.c index 5dc811903c..4121441a93 100644 --- a/client/gui-gtk-2.0/helpdlg.c +++ b/client/gui-gtk-2.0/helpdlg.c @@ -102,11 +102,11 @@ static const char *help_wlabel_name[6] = static const char *help_ulabel_name[5][5] = { - { N_("Cost:"), NULL, NULL, N_("Attack:"), NULL }, - { N_("Defense:"), NULL, NULL, N_("Move:") , NULL }, - { N_("FirePower:"), NULL, NULL, N_("Hitpoints:"), NULL }, - { N_("Basic Upkeep:"), NULL, NULL, N_("Vision:"), NULL }, - { N_("Requirement:"), NULL, NULL, N_("Obsolete by:"), NULL } + { N_("Cost:"), NULL, NULL, N_("Attack:"), NULL }, + { N_("Defense:"), NULL, NULL, N_("Move:"), NULL }, + { N_("Firepower:"), NULL, NULL, N_("Hitpoints:"), NULL }, + { N_("Basic Upkeep:"), NULL, NULL, N_("Vision:"), NULL }, + { N_("Requirement:"), NULL, NULL, N_("Obsolete by:"), NULL } }; static const char *help_tlabel_name[2][5] = diff --git a/client/gui-gtk-3.0/helpdlg.c b/client/gui-gtk-3.0/helpdlg.c index 016f79a318..0570c036ef 100644 --- a/client/gui-gtk-3.0/helpdlg.c +++ b/client/gui-gtk-3.0/helpdlg.c @@ -103,11 +103,11 @@ static const char *help_wlabel_name[6] = static const char *help_ulabel_name[5][5] = { - { N_("Cost:"), NULL, NULL, N_("Attack:"), NULL }, - { N_("Defense:"), NULL, NULL, N_("Move:") , NULL }, - { N_("FirePower:"), NULL, NULL, N_("Hitpoints:"), NULL }, - { N_("Basic Upkeep:"), NULL, NULL, N_("Vision:"), NULL }, - { N_("Requirement:"), NULL, NULL, N_("Obsolete by:"), NULL } + { N_("Cost:"), NULL, NULL, N_("Attack:"), NULL }, + { N_("Defense:"), NULL, NULL, N_("Move:"), NULL }, + { N_("Firepower:"), NULL, NULL, N_("Hitpoints:"), NULL }, + { N_("Basic Upkeep:"), NULL, NULL, N_("Vision:"), NULL }, + { N_("Requirement:"), NULL, NULL, N_("Obsolete by:"), NULL } }; static const char *help_tlabel_name[2][5] = diff --git a/client/gui-gtk-3.22/helpdlg.c b/client/gui-gtk-3.22/helpdlg.c index c8b3520ade..5bc981fcce 100644 --- a/client/gui-gtk-3.22/helpdlg.c +++ b/client/gui-gtk-3.22/helpdlg.c @@ -103,11 +103,11 @@ static const char *help_wlabel_name[6] = static const char *help_ulabel_name[5][5] = { - { N_("Cost:"), NULL, NULL, N_("Attack:"), NULL }, - { N_("Defense:"), NULL, NULL, N_("Move:") , NULL }, - { N_("FirePower:"), NULL, NULL, N_("Hitpoints:"), NULL }, - { N_("Basic Upkeep:"), NULL, NULL, N_("Vision:"), NULL }, - { N_("Requirement:"), NULL, NULL, N_("Obsolete by:"), NULL } + { N_("Cost:"), NULL, NULL, N_("Attack:"), NULL }, + { N_("Defense:"), NULL, NULL, N_("Move:"), NULL }, + { N_("Firepower:"), NULL, NULL, N_("Hitpoints:"), NULL }, + { N_("Basic Upkeep:"), NULL, NULL, N_("Vision:"), NULL }, + { N_("Requirement:"), NULL, NULL, N_("Obsolete by:"), NULL } }; static const char *help_tlabel_name[2][5] = diff --git a/client/gui-qt/citydlg.cpp b/client/gui-qt/citydlg.cpp index bd40ff4071..78a723fef4 100644 --- a/client/gui-qt/citydlg.cpp +++ b/client/gui-qt/citydlg.cpp @@ -3886,7 +3886,7 @@ QString get_tooltip_unit(struct unit_type *unit, bool ext) + QString("") + bold(QString(_("Hitpoints:"))) + " " + QString::number(unit->hp).toHtmlEscaped() - + QString("") + bold(QString(_("FirePower:"))) + " " + + QString("") + bold(QString(_("Firepower:"))) + " " + QString::number(unit->firepower).toHtmlEscaped() + QString("") + bold(QString(_("Vision:"))) + " " + QString::number((int) sqrt((double) unit->vision_radius_sq)) diff --git a/client/gui-sdl2/helpdlg.c b/client/gui-sdl2/helpdlg.c index 034462727b..364acda750 100644 --- a/client/gui-sdl2/helpdlg.c +++ b/client/gui-sdl2/helpdlg.c @@ -831,7 +831,7 @@ void popup_unit_info(Unit_type_id type_id) _("Defense:"), pUnitType->defense_strength, _("Move:"), move_points_text(pUnitType->move_rate, TRUE), _("Vision:"), pUnitType->vision_radius_sq, - _("FirePower:"), pUnitType->firepower, + _("Firepower:"), pUnitType->firepower, _("Hitpoints:"), pUnitType->hp); pUnitInfoLabel = create_iconlabel_from_chars(NULL, pWindow->dst, buf, -- 2.35.1