Author: cazfi
Date: Sun Aug  9 19:06:59 2015
New Revision: 29427

URL: http://svn.gna.org/viewcvs/freeciv?rev=29427&view=rev
Log:
Don't speak of "R&G" bonus when ruleset might have disabled either part of the 
bonus.

See bug #23760

Modified:
    trunk/client/gui-sdl/action_dialog.c
    trunk/client/gui-sdl/menu.c
    trunk/client/gui-sdl2/action_dialog.c
    trunk/client/gui-sdl2/menu.c

Modified: trunk/client/gui-sdl/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/action_dialog.c?rev=29427&r1=29426&r2=29427&view=diff
==============================================================================
--- trunk/client/gui-sdl/action_dialog.c        (original)
+++ trunk/client/gui-sdl/action_dialog.c        Sun Aug  9 19:06:59 2015
@@ -967,7 +967,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;
@@ -981,7 +981,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: trunk/client/gui-sdl/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/menu.c?rev=29427&r1=29426&r2=29427&view=diff
==============================================================================
--- trunk/client/gui-sdl/menu.c (original)
+++ trunk/client/gui-sdl/menu.c Sun Aug  9 19:06:59 2015
@@ -1146,14 +1146,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: trunk/client/gui-sdl2/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/action_dialog.c?rev=29427&r1=29426&r2=29427&view=diff
==============================================================================
--- trunk/client/gui-sdl2/action_dialog.c       (original)
+++ trunk/client/gui-sdl2/action_dialog.c       Sun Aug  9 19:06:59 2015
@@ -970,7 +970,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;
@@ -984,7 +984,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: trunk/client/gui-sdl2/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/menu.c?rev=29427&r1=29426&r2=29427&view=diff
==============================================================================
--- trunk/client/gui-sdl2/menu.c        (original)
+++ trunk/client/gui-sdl2/menu.c        Sun Aug  9 19:06:59 2015
@@ -1121,14 +1121,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

Reply via email to