From 05347e5ac1da17cc1936ece27ec48f91f1cbcb23 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 6 Aug 2022 03:51:24 +0300 Subject: [PATCH 38/38] Change occurrences of "FirePower" to "Firepower" See osdn #43081 Signed-off-by: Marko Lindqvist --- client/gui-gtk-3.22/helpdlg.c | 10 +++++----- client/gui-gtk-4.0/helpdlg.c | 10 +++++----- client/gui-qt/citydlg.cpp | 2 +- client/gui-sdl2/helpdlg.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/gui-gtk-3.22/helpdlg.c b/client/gui-gtk-3.22/helpdlg.c index 4761c8effa..38381a9529 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-gtk-4.0/helpdlg.c b/client/gui-gtk-4.0/helpdlg.c index 8568c3937b..2a9d7483ef 100644 --- a/client/gui-gtk-4.0/helpdlg.c +++ b/client/gui-gtk-4.0/helpdlg.c @@ -104,11 +104,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 c7e13b9885..7f1481b597 100644 --- a/client/gui-qt/citydlg.cpp +++ b/client/gui-qt/citydlg.cpp @@ -3958,7 +3958,7 @@ QString get_tooltip_unit(const struct unit_type *utype, bool ext) + QString("") + bold(QString(_("Hitpoints:"))) + " " + QString::number(utype->hp).toHtmlEscaped() - + QString("") + bold(QString(_("FirePower:"))) + " " + + QString("") + bold(QString(_("Firepower:"))) + " " + QString::number(utype->firepower).toHtmlEscaped() + QString("") + bold(QString(_("Vision:"))) + " " + QString::number((int) sqrt((double) utype->vision_radius_sq)) diff --git a/client/gui-sdl2/helpdlg.c b/client/gui-sdl2/helpdlg.c index 76e2a13553..0bebc63893 100644 --- a/client/gui-sdl2/helpdlg.c +++ b/client/gui-sdl2/helpdlg.c @@ -834,7 +834,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); unit_info_label = create_iconlabel_from_chars(NULL, pwindow->dst, buf, -- 2.35.1