Author: sveinung
Date: Mon Dec 29 12:45:09 2014
New Revision: 27437

URL: http://svn.gna.org/viewcvs/freeciv?rev=27437&view=rev
Log:
Rulesets: Use old mnemonics for actions that won't appear at the same time

to be friendly to the muscle memory of players from older versions.

The bundled rulesets won't show sabotage unit at the same time as sabotage
city, bribe unit at the same time as help wonder or incite city at the same
time as establish trade route. They can therefore use the old mnemonics that
players already have in their muscle memory.

The targeted version of sabotage city and steal tech still need a mnemonic
that is different from the untargeted version.

See patch #5615

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

Modified: trunk/data/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=27437&r1=27436&r2=27437&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset       (original)
+++ trunk/data/alien/game.ruleset       Mon Dec 29 12:45:09 2014
@@ -174,11 +174,11 @@
 ; /* TRANS: _Poison City (3% chance of success). */
 ui_name_posion_city = _("%sPoison City%s")
 
-; /* TRANS: S_abotage Enemy Unit (3% chance of success). */
-ui_name_sabotage_unit = _("S%sabotage Enemy Unit%s")
-
-; /* TRANS: Bribe Enemy _Unit (3% chance of success). */
-ui_name_bribe_unit = _("Bribe Enemy %sUnit%s")
+; /* TRANS: _Sabotage Enemy Unit (3% chance of success). */
+ui_name_sabotage_unit = _("%sSabotage Enemy Unit%s")
+
+; /* TRANS: _Bribe Enemy Unit (3% chance of success). */
+ui_name_bribe_unit = _("%sBribe Enemy Unit%s")
 
 ; /* TRANS: _Sabotage City (3% chance of success). */
 ui_name_sabotage_city = _("%sSabotage City%s")
@@ -186,8 +186,8 @@
 ; /* TRANS: Industria_l Sabotage (3% chance of success). */
 ui_name_targeted_sabotage_city = _("Industria%sl Sabotage%s")
 
-; /* TRANS: Incite a Re_volt (3% chance of success). */
-ui_name_incite_city = _("Incite a Re%svolt%s")
+; /* TRANS: Incite a _Revolt (3% chance of success). */
+ui_name_incite_city = _("Incite a %sRevolt%s")
 
 ; /* TRANS: Establish _Embassy (100% chance of success). */
 ui_name_establish_embassy = _("Establish %sEmbassy%s")

Modified: trunk/data/civ1/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=27437&r1=27436&r2=27437&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset        (original)
+++ trunk/data/civ1/game.ruleset        Mon Dec 29 12:45:09 2014
@@ -160,11 +160,11 @@
 ; /* TRANS: _Poison City (3% chance of success). */
 ui_name_posion_city = _("%sPoison City%s")
 
-; /* TRANS: S_abotage Enemy Unit (3% chance of success). */
-ui_name_sabotage_unit = _("S%sabotage Enemy Unit%s")
-
-; /* TRANS: Bribe Enemy _Unit (3% chance of success). */
-ui_name_bribe_unit = _("Bribe Enemy %sUnit%s")
+; /* TRANS: _Sabotage Enemy Unit (3% chance of success). */
+ui_name_sabotage_unit = _("%sSabotage Enemy Unit%s")
+
+; /* TRANS: _Bribe Enemy Unit (3% chance of success). */
+ui_name_bribe_unit = _("%sBribe Enemy Unit%s")
 
 ; /* TRANS: _Sabotage City (3% chance of success). */
 ui_name_sabotage_city = _("%sSabotage City%s")
@@ -172,8 +172,8 @@
 ; /* TRANS: Industria_l Sabotage (3% chance of success). */
 ui_name_targeted_sabotage_city = _("Industria%sl Sabotage%s")
 
-; /* TRANS: Incite a Re_volt (3% chance of success). */
-ui_name_incite_city = _("Incite a Re%svolt%s")
+; /* TRANS: Incite a _Revolt (3% chance of success). */
+ui_name_incite_city = _("Incite a %sRevolt%s")
 
 ; /* TRANS: Establish _Embassy (100% chance of success). */
 ui_name_establish_embassy = _("Establish %sEmbassy%s")

Modified: trunk/data/civ2/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=27437&r1=27436&r2=27437&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset        (original)
+++ trunk/data/civ2/game.ruleset        Mon Dec 29 12:45:09 2014
@@ -154,11 +154,11 @@
 ; /* TRANS: _Poison City (3% chance of success). */
 ui_name_posion_city = _("%sPoison City%s")
 
-; /* TRANS: S_abotage Enemy Unit (3% chance of success). */
-ui_name_sabotage_unit = _("S%sabotage Enemy Unit%s")
-
-; /* TRANS: Bribe Enemy _Unit (3% chance of success). */
-ui_name_bribe_unit = _("Bribe Enemy %sUnit%s")
+; /* TRANS: _Sabotage Enemy Unit (3% chance of success). */
+ui_name_sabotage_unit = _("%sSabotage Enemy Unit%s")
+
+; /* TRANS: _Bribe Enemy Unit (3% chance of success). */
+ui_name_bribe_unit = _("%sBribe Enemy Unit%s")
 
 ; /* TRANS: _Sabotage City (3% chance of success). */
 ui_name_sabotage_city = _("%sSabotage City%s")
@@ -166,8 +166,8 @@
 ; /* TRANS: Industria_l Sabotage (3% chance of success). */
 ui_name_targeted_sabotage_city = _("Industria%sl Sabotage%s")
 
-; /* TRANS: Incite a Re_volt (3% chance of success). */
-ui_name_incite_city = _("Incite a Re%svolt%s")
+; /* TRANS: Incite a _Revolt (3% chance of success). */
+ui_name_incite_city = _("Incite a %sRevolt%s")
 
 ; /* TRANS: Establish _Embassy (100% chance of success). */
 ui_name_establish_embassy = _("Establish %sEmbassy%s")

Modified: trunk/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=27437&r1=27436&r2=27437&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset    (original)
+++ trunk/data/civ2civ3/game.ruleset    Mon Dec 29 12:45:09 2014
@@ -187,11 +187,11 @@
 ; /* TRANS: _Poison City (3% chance of success). */
 ui_name_posion_city = _("%sPoison City%s")
 
-; /* TRANS: S_abotage Enemy Unit (3% chance of success). */
-ui_name_sabotage_unit = _("S%sabotage Enemy Unit%s")
-
-; /* TRANS: Bribe Enemy _Unit (3% chance of success). */
-ui_name_bribe_unit = _("Bribe Enemy %sUnit%s")
+; /* TRANS: _Sabotage Enemy Unit (3% chance of success). */
+ui_name_sabotage_unit = _("%sSabotage Enemy Unit%s")
+
+; /* TRANS: _Bribe Enemy Unit (3% chance of success). */
+ui_name_bribe_unit = _("%sBribe Enemy Unit%s")
 
 ; /* TRANS: _Sabotage City (3% chance of success). */
 ui_name_sabotage_city = _("%sSabotage City%s")
@@ -199,8 +199,8 @@
 ; /* TRANS: Industria_l Sabotage (3% chance of success). */
 ui_name_targeted_sabotage_city = _("Industria%sl Sabotage%s")
 
-; /* TRANS: Incite a Re_volt (3% chance of success). */
-ui_name_incite_city = _("Incite a Re%svolt%s")
+; /* TRANS: Incite a _Revolt (3% chance of success). */
+ui_name_incite_city = _("Incite a %sRevolt%s")
 
 ; /* TRANS: Establish _Embassy (100% chance of success). */
 ui_name_establish_embassy = _("Establish %sEmbassy%s")

Modified: trunk/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=27437&r1=27436&r2=27437&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset     (original)
+++ trunk/data/classic/game.ruleset     Mon Dec 29 12:45:09 2014
@@ -179,11 +179,11 @@
 ; /* TRANS: _Poison City (3% chance of success). */
 ui_name_posion_city = _("%sPoison City%s")
 
-; /* TRANS: S_abotage Enemy Unit (3% chance of success). */
-ui_name_sabotage_unit = _("S%sabotage Enemy Unit%s")
-
-; /* TRANS: Bribe Enemy _Unit (3% chance of success). */
-ui_name_bribe_unit = _("Bribe Enemy %sUnit%s")
+; /* TRANS: _Sabotage Enemy Unit (3% chance of success). */
+ui_name_sabotage_unit = _("%sSabotage Enemy Unit%s")
+
+; /* TRANS: _Bribe Enemy Unit (3% chance of success). */
+ui_name_bribe_unit = _("%sBribe Enemy Unit%s")
 
 ; /* TRANS: _Sabotage City (3% chance of success). */
 ui_name_sabotage_city = _("%sSabotage City%s")
@@ -191,8 +191,8 @@
 ; /* TRANS: Industria_l Sabotage (3% chance of success). */
 ui_name_targeted_sabotage_city = _("Industria%sl Sabotage%s")
 
-; /* TRANS: Incite a Re_volt (3% chance of success). */
-ui_name_incite_city = _("Incite a Re%svolt%s")
+; /* TRANS: Incite a _Revolt (3% chance of success). */
+ui_name_incite_city = _("Incite a %sRevolt%s")
 
 ; /* TRANS: Establish _Embassy (100% chance of success). */
 ui_name_establish_embassy = _("Establish %sEmbassy%s")

Modified: trunk/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=27437&r1=27436&r2=27437&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset        (original)
+++ trunk/data/experimental/game.ruleset        Mon Dec 29 12:45:09 2014
@@ -185,11 +185,11 @@
 ; /* TRANS: _Poison City (3% chance of success). */
 ui_name_posion_city = _("%sPoison City%s")
 
-; /* TRANS: S_abotage Enemy Unit (3% chance of success). */
-ui_name_sabotage_unit = _("S%sabotage Enemy Unit%s")
-
-; /* TRANS: Bribe Enemy _Unit (3% chance of success). */
-ui_name_bribe_unit = _("Bribe Enemy %sUnit%s")
+; /* TRANS: _Sabotage Enemy Unit (3% chance of success). */
+ui_name_sabotage_unit = _("%sSabotage Enemy Unit%s")
+
+; /* TRANS: _Bribe Enemy Unit (3% chance of success). */
+ui_name_bribe_unit = _("%sBribe Enemy Unit%s")
 
 ; /* TRANS: _Sabotage City (3% chance of success). */
 ui_name_sabotage_city = _("%sSabotage City%s")
@@ -197,8 +197,8 @@
 ; /* TRANS: Industria_l Sabotage (3% chance of success). */
 ui_name_targeted_sabotage_city = _("Industria%sl Sabotage%s")
 
-; /* TRANS: Incite a Re_volt (3% chance of success). */
-ui_name_incite_city = _("Incite a Re%svolt%s")
+; /* TRANS: Incite a _Revolt (3% chance of success). */
+ui_name_incite_city = _("Incite a %sRevolt%s")
 
 ; /* TRANS: Establish _Embassy (100% chance of success). */
 ui_name_establish_embassy = _("Establish %sEmbassy%s")

Modified: trunk/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=27437&r1=27436&r2=27437&view=diff
==============================================================================
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Mon Dec 29 12:45:09 2014
@@ -183,11 +183,11 @@
 ; /* TRANS: _Poison City (3% chance of success). */
 ui_name_posion_city = _("%sPoison City%s")
 
-; /* TRANS: S_abotage Enemy Unit (3% chance of success). */
-ui_name_sabotage_unit = _("S%sabotage Enemy Unit%s")
-
-; /* TRANS: Bribe Enemy _Unit (3% chance of success). */
-ui_name_bribe_unit = _("Bribe Enemy %sUnit%s")
+; /* TRANS: _Sabotage Enemy Unit (3% chance of success). */
+ui_name_sabotage_unit = _("%sSabotage Enemy Unit%s")
+
+; /* TRANS: _Bribe Enemy Unit (3% chance of success). */
+ui_name_bribe_unit = _("%sBribe Enemy Unit%s")
 
 ; /* TRANS: _Sabotage City (3% chance of success). */
 ui_name_sabotage_city = _("%sSabotage City%s")
@@ -195,8 +195,8 @@
 ; /* TRANS: Industria_l Sabotage (3% chance of success). */
 ui_name_targeted_sabotage_city = _("Industria%sl Sabotage%s")
 
-; /* TRANS: Incite a Re_volt (3% chance of success). */
-ui_name_incite_city = _("Incite a Re%svolt%s")
+; /* TRANS: Incite a _Revolt (3% chance of success). */
+ui_name_incite_city = _("Incite a %sRevolt%s")
 
 ; /* TRANS: Establish _Embassy (100% chance of success). */
 ui_name_establish_embassy = _("Establish %sEmbassy%s")


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to