Author: sveinung
Date: Tue Oct 18 14:10:47 2016
New Revision: 34166
URL: http://svn.gna.org/viewcvs/freeciv?rev=34166&view=rev
Log:
Fix conquer city ui name typos.
Have the rulesets set ui_name_conquer_city rather than the non existing
ui_conquer_city.
Fix mnemonic insertion.
Reported by Marko Lindqvist <cazfi>
See bug #25190
Modified:
trunk/data/alien/game.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2civ3/game.ruleset
trunk/data/classic/game.ruleset
trunk/data/experimental/game.ruleset
trunk/data/multiplayer/game.ruleset
trunk/data/sandbox/game.ruleset
trunk/data/webperimental/game.ruleset
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=34166&r1=34165&r2=34166&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Tue Oct 18 14:10:47 2016
@@ -289,7 +289,7 @@
ui_name_attack = _("%sAttack%s")
; /* TRANS: _Conquer City (100% chance of success). */
-ui_conquer_city = _("%Conquer City%s")
+ui_name_conquer_city = _("%sConquer City%s")
; Suppress automatic help text generation about what enables and/or
; disables the following actions.
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=34166&r1=34165&r2=34166&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset (original)
+++ trunk/data/civ1/game.ruleset Tue Oct 18 14:10:47 2016
@@ -261,7 +261,7 @@
ui_name_attack = _("%sAttack%s")
; /* TRANS: _Conquer City (100% chance of success). */
-ui_conquer_city = _("%Conquer City%s")
+ui_name_conquer_city = _("%sConquer City%s")
; Suppress automatic help text generation about what enables and/or
; disables the following actions.
Modified: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=34166&r1=34165&r2=34166&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset (original)
+++ trunk/data/civ2/game.ruleset Tue Oct 18 14:10:47 2016
@@ -293,7 +293,7 @@
ui_name_attack = _("%sAttack%s")
; /* TRANS: _Conquer City (100% chance of success). */
-ui_conquer_city = _("%Conquer City%s")
+ui_name_conquer_city = _("%sConquer City%s")
; Suppress automatic help text generation about what enables and/or
; disables the following actions.
Modified: trunk/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=34166&r1=34165&r2=34166&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset (original)
+++ trunk/data/civ2civ3/game.ruleset Tue Oct 18 14:10:47 2016
@@ -305,7 +305,7 @@
ui_name_attack = _("%sAttack%s")
; /* TRANS: _Conquer City (100% chance of success). */
-ui_conquer_city = _("%Conquer City%s")
+ui_name_conquer_city = _("%sConquer City%s")
; Suppress automatic help text generation about what enables and/or
; disables the following actions.
Modified: trunk/data/classic/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=34166&r1=34165&r2=34166&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset (original)
+++ trunk/data/classic/game.ruleset Tue Oct 18 14:10:47 2016
@@ -294,7 +294,7 @@
ui_name_attack = _("%sAttack%s")
; /* TRANS: _Conquer City (100% chance of success). */
-ui_conquer_city = _("%Conquer City%s")
+ui_name_conquer_city = _("%sConquer City%s")
; Suppress automatic help text generation about what enables and/or
; disables the following actions.
Modified: trunk/data/experimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=34166&r1=34165&r2=34166&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset (original)
+++ trunk/data/experimental/game.ruleset Tue Oct 18 14:10:47 2016
@@ -297,7 +297,7 @@
ui_name_attack = _("%sAttack%s")
; /* TRANS: _Conquer City (100% chance of success). */
-ui_conquer_city = _("%Conquer City%s")
+ui_name_conquer_city = _("%sConquer City%s")
; Suppress automatic help text generation about what enables and/or
; disables the following actions.
Modified: trunk/data/multiplayer/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=34166&r1=34165&r2=34166&view=diff
==============================================================================
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Tue Oct 18 14:10:47 2016
@@ -291,7 +291,7 @@
ui_name_attack = _("%sAttack%s")
; /* TRANS: _Conquer City (100% chance of success). */
-ui_conquer_city = _("%Conquer City%s")
+ui_name_conquer_city = _("%sConquer City%s")
; Suppress automatic help text generation about what enables and/or
; disables the following actions.
Modified: trunk/data/sandbox/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=34166&r1=34165&r2=34166&view=diff
==============================================================================
--- trunk/data/sandbox/game.ruleset (original)
+++ trunk/data/sandbox/game.ruleset Tue Oct 18 14:10:47 2016
@@ -308,7 +308,7 @@
ui_name_attack = _("%sAttack%s")
; /* TRANS: _Conquer City (100% chance of success). */
-ui_conquer_city = _("%Conquer City%s")
+ui_name_conquer_city = _("%sConquer City%s")
; Suppress automatic help text generation about what enables and/or
; disables the following actions.
Modified: trunk/data/webperimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/webperimental/game.ruleset?rev=34166&r1=34165&r2=34166&view=diff
==============================================================================
--- trunk/data/webperimental/game.ruleset (original)
+++ trunk/data/webperimental/game.ruleset Tue Oct 18 14:10:47 2016
@@ -352,7 +352,7 @@
ui_name_attack = _("%sAttack%s")
; /* TRANS: _Conquer City (100% chance of success). */
-ui_conquer_city = _("%Conquer City%s")
+ui_name_conquer_city = _("%sConquer City%s")
; Suppress automatic help text generation about what enables and/or
; disables the following actions.
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
