Author: cazfi
Date: Sun Aug 9 19:07:07 2015
New Revision: 29428
URL: http://svn.gna.org/viewcvs/freeciv?rev=29428&view=rev
Log:
Don't speak of "R&G" bonus when ruleset might have disabled either part of the
bonus.
See bug #23760
Modified:
branches/S2_6/client/gui-sdl/action_dialog.c
branches/S2_6/client/gui-sdl/menu.c
branches/S2_6/client/gui-sdl2/action_dialog.c
branches/S2_6/client/gui-sdl2/menu.c
Modified: branches/S2_6/client/gui-sdl/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/action_dialog.c?rev=29428&r1=29427&r2=29428&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/action_dialog.c (original)
+++ branches/S2_6/client/gui-sdl/action_dialog.c Sun Aug 9 19:07:07 2015
@@ -810,7 +810,7 @@
astr_set(&custom,
/* TRANS: Estimated one time bonus and recurring revenue for
* the Establish Trade _Route action. */
- _("%d R&G + %d trade"),
+ _("%d one time bonus + %d trade"),
revenue,
trade_between_cities(actor_homecity, target_city));
break;
@@ -824,7 +824,7 @@
astr_set(&custom,
/* TRANS: Estimated one time bonus for the Enter Marketplace
* action. */
- _("%d R&G bonus"), revenue);
+ _("%d one time bonus"), revenue);
break;
}
default:
Modified: branches/S2_6/client/gui-sdl/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/menu.c?rev=29428&r1=29427&r2=29428&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/menu.c (original)
+++ branches/S2_6/client/gui-sdl/menu.c Sun Aug 9 19:07:07 2015
@@ -1145,14 +1145,14 @@
if (can_establish_trade_route(pHomecity, pCity)) {
fc_snprintf(cBuf, sizeof(cBuf),
- _("Establish Trade Route With %s ( %d R&G + %d trade )
(R)"),
+ _("Establish Trade Route With %s ( %d one time bonus +
%d trade ) (R)"),
city_name(pHomecity),
revenue,
trade_between_cities(pHomecity, pCity));
} else {
revenue = (revenue + 2) / 3;
fc_snprintf(cBuf, sizeof(cBuf),
- _("Trade With %s ( %d R&G bonus ) (R)"),
+ _("Trade With %s ( %d one time bonus ) (R)"),
city_name(pHomecity),
revenue);
}
Modified: branches/S2_6/client/gui-sdl2/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/action_dialog.c?rev=29428&r1=29427&r2=29428&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/action_dialog.c (original)
+++ branches/S2_6/client/gui-sdl2/action_dialog.c Sun Aug 9 19:07:07 2015
@@ -813,7 +813,7 @@
astr_set(&custom,
/* TRANS: Estimated one time bonus and recurring revenue for
* the Establish Trade _Route action. */
- _("%d R&G + %d trade"),
+ _("%d one time bonus + %d trade"),
revenue,
trade_between_cities(actor_homecity, target_city));
break;
@@ -827,7 +827,7 @@
astr_set(&custom,
/* TRANS: Estimated one time bonus for the Enter Marketplace
* action. */
- _("%d R&G bonus"), revenue);
+ _("%d one time bonus"), revenue);
break;
}
default:
Modified: branches/S2_6/client/gui-sdl2/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/menu.c?rev=29428&r1=29427&r2=29428&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/menu.c (original)
+++ branches/S2_6/client/gui-sdl2/menu.c Sun Aug 9 19:07:07 2015
@@ -1120,14 +1120,14 @@
if (can_establish_trade_route(pHomecity, pCity)) {
fc_snprintf(cBuf, sizeof(cBuf),
- _("Establish Trade Route With %s ( %d R&G + %d trade )
(R)"),
+ _("Establish Trade Route With %s ( %d one time bonus +
%d trade ) (R)"),
city_name(pHomecity),
revenue,
trade_between_cities(pHomecity, pCity));
} else {
revenue = (revenue + 2) / 3;
fc_snprintf(cBuf, sizeof(cBuf),
- _("Trade With %s ( %d R&G bonus ) (R)"),
+ _("Trade With %s ( %d one time bonus ) (R)"),
city_name(pHomecity),
revenue);
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
