Author: sveinung Date: Fri May 12 14:57:21 2017 New Revision: 35523 URL: http://svn.gna.org/viewcvs/freeciv?rev=35523&view=rev Log: Change "Establish Embassy Stay"'s UI name.
Change the default UI name of the action "Establish Embassy Stay" from "Establish embassy (and stay)" to "Become Ambassador". See hrm Feature #659189 Modified: branches/S3_0/client/gui-qt/menu.cpp branches/S3_0/data/civ1/game.ruleset branches/S3_0/data/civ2/game.ruleset branches/S3_0/data/civ2civ3/game.ruleset branches/S3_0/data/classic/game.ruleset branches/S3_0/data/experimental/game.ruleset branches/S3_0/data/multiplayer/game.ruleset branches/S3_0/data/sandbox/game.ruleset branches/S3_0/data/webperimental/game.ruleset branches/S3_0/server/ruleset.c Modified: branches/S3_0/client/gui-qt/menu.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/client/gui-qt/menu.cpp?rev=35523&r1=35522&r2=35523&view=diff ============================================================================== --- branches/S3_0/client/gui-qt/menu.cpp (original) +++ branches/S3_0/client/gui-qt/menu.cpp Fri May 12 14:57:21 2017 @@ -1435,7 +1435,7 @@ action_vs_city->addAction(act); connect(act, SIGNAL(triggered()), this, SLOT(slot_action_vs_city())); - act = action_city_menu->addAction(_("Establish embassy (and stay)")); + act = action_city_menu->addAction(_("Become Ambassador")); act->setCheckable(true); act->setChecked(false); act->setData(ACTION_ESTABLISH_EMBASSY_STAY); Modified: branches/S3_0/data/civ1/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ1/game.ruleset?rev=35523&r1=35522&r2=35523&view=diff ============================================================================== --- branches/S3_0/data/civ1/game.ruleset (original) +++ branches/S3_0/data/civ1/game.ruleset Fri May 12 14:57:21 2017 @@ -224,8 +224,8 @@ ; /* TRANS: Incite a _Revolt (3% chance of success). */ ui_name_incite_city = _("Incite a %sRevolt%s") -; /* TRANS: Establish _Embassy (and stay) (100% chance of success). */ -ui_name_establish_embassy_stay = _("Establish %sEmbassy (and stay)%s") +; /* TRANS: Becom_e Ambassador (100% chance of success). */ +ui_name_establish_embassy_stay = _("Becom%se Ambassador%s") ; /* TRANS: Steal _Technology (3% chance of success). */ ui_name_steal_tech = _("Steal %sTechnology%s") Modified: branches/S3_0/data/civ2/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ2/game.ruleset?rev=35523&r1=35522&r2=35523&view=diff ============================================================================== --- branches/S3_0/data/civ2/game.ruleset (original) +++ branches/S3_0/data/civ2/game.ruleset Fri May 12 14:57:21 2017 @@ -253,8 +253,8 @@ ; /* TRANS: Establish _Embassy (100% chance of success). */ ui_name_establish_embassy = _("Establish %sEmbassy%s") -; /* TRANS: Establish _Embassy (and stay) (100% chance of success). */ -ui_name_establish_embassy_stay = _("Establish %sEmbassy (and stay)%s") +; /* TRANS: Becom_e Ambassador (100% chance of success). */ +ui_name_establish_embassy_stay = _("Becom%se Ambassador%s") ; /* TRANS: Steal _Technology (3% chance of success). */ ui_name_steal_tech = _("Steal %sTechnology%s") Modified: branches/S3_0/data/civ2civ3/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/civ2civ3/game.ruleset?rev=35523&r1=35522&r2=35523&view=diff ============================================================================== --- branches/S3_0/data/civ2civ3/game.ruleset (original) +++ branches/S3_0/data/civ2civ3/game.ruleset Fri May 12 14:57:21 2017 @@ -259,8 +259,8 @@ ; /* TRANS: Establish _Embassy (100% chance of success). */ ui_name_establish_embassy = _("Establish %sEmbassy%s") -; /* TRANS: Establish _Embassy (and stay) (100% chance of success). */ -ui_name_establish_embassy_stay = _("Establish %sEmbassy (and stay)%s") +; /* TRANS: Becom_e Ambassador (100% chance of success). */ +ui_name_establish_embassy_stay = _("Becom%se Ambassador%s") ; /* TRANS: Steal _Technology (3% chance of success). */ ui_name_steal_tech = _("Steal %sTechnology%s") Modified: branches/S3_0/data/classic/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/classic/game.ruleset?rev=35523&r1=35522&r2=35523&view=diff ============================================================================== --- branches/S3_0/data/classic/game.ruleset (original) +++ branches/S3_0/data/classic/game.ruleset Fri May 12 14:57:21 2017 @@ -254,8 +254,8 @@ ; /* TRANS: Establish _Embassy (100% chance of success). */ ui_name_establish_embassy = _("Establish %sEmbassy%s") -; /* TRANS: Establish _Embassy (and stay) (100% chance of success). */ -ui_name_establish_embassy_stay = _("Establish %sEmbassy (and stay)%s") +; /* TRANS: Becom_e Ambassador (100% chance of success). */ +ui_name_establish_embassy_stay = _("Becom%se Ambassador%s") ; /* TRANS: Steal _Technology (3% chance of success). */ ui_name_steal_tech = _("Steal %sTechnology%s") Modified: branches/S3_0/data/experimental/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/experimental/game.ruleset?rev=35523&r1=35522&r2=35523&view=diff ============================================================================== --- branches/S3_0/data/experimental/game.ruleset (original) +++ branches/S3_0/data/experimental/game.ruleset Fri May 12 14:57:21 2017 @@ -257,8 +257,8 @@ ; /* TRANS: Establish _Embassy (100% chance of success). */ ui_name_establish_embassy = _("Establish %sEmbassy%s") -; /* TRANS: Establish _Embassy (and stay) (100% chance of success). */ -ui_name_establish_embassy_stay = _("Establish %sEmbassy (and stay)%s") +; /* TRANS: Becom_e Ambassador (100% chance of success). */ +ui_name_establish_embassy_stay = _("Becom%se Ambassador%s") ; /* TRANS: Steal _Technology (3% chance of success). */ ui_name_steal_tech = _("Steal %sTechnology%s") Modified: branches/S3_0/data/multiplayer/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/multiplayer/game.ruleset?rev=35523&r1=35522&r2=35523&view=diff ============================================================================== --- branches/S3_0/data/multiplayer/game.ruleset (original) +++ branches/S3_0/data/multiplayer/game.ruleset Fri May 12 14:57:21 2017 @@ -257,8 +257,8 @@ ; /* TRANS: Establish _Embassy (100% chance of success). */ ui_name_establish_embassy = _("Establish %sEmbassy%s") -; /* TRANS: Establish _Embassy (and stay) (100% chance of success). */ -ui_name_establish_embassy_stay = _("Establish %sEmbassy (and stay)%s") +; /* TRANS: Becom_e Ambassador (100% chance of success). */ +ui_name_establish_embassy_stay = _("Becom%se Ambassador%s") ; /* TRANS: Steal _Technology (3% chance of success). */ ui_name_steal_tech = _("Steal %sTechnology%s") Modified: branches/S3_0/data/sandbox/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/sandbox/game.ruleset?rev=35523&r1=35522&r2=35523&view=diff ============================================================================== --- branches/S3_0/data/sandbox/game.ruleset (original) +++ branches/S3_0/data/sandbox/game.ruleset Fri May 12 14:57:21 2017 @@ -256,8 +256,8 @@ ; /* TRANS: Establish _Embassy (100% chance of success). */ ui_name_establish_embassy = _("Establish %sEmbassy%s") -; /* TRANS: Establish _Embassy (and stay) (100% chance of success). */ -ui_name_establish_embassy_stay = _("Establish %sEmbassy (and stay)%s") +; /* TRANS: Becom_e Ambassador (100% chance of success). */ +ui_name_establish_embassy_stay = _("Becom%se Ambassador%s") ; /* TRANS: Steal _Technology (3% chance of success). */ ui_name_steal_tech = _("Steal %sTechnology%s") Modified: branches/S3_0/data/webperimental/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/data/webperimental/game.ruleset?rev=35523&r1=35522&r2=35523&view=diff ============================================================================== --- branches/S3_0/data/webperimental/game.ruleset (original) +++ branches/S3_0/data/webperimental/game.ruleset Fri May 12 14:57:21 2017 @@ -327,8 +327,8 @@ ; /* TRANS: Establish _Embassy (100% chance of success). */ ui_name_establish_embassy = _("Establish %sEmbassy%s") -; /* TRANS: Establish _Embassy (and stay) (100% chance of success). */ -ui_name_establish_embassy_stay = _("Establish %sEmbassy (and stay)%s") +; /* TRANS: Becom_e Ambassador (100% chance of success). */ +ui_name_establish_embassy_stay = _("Becom%se Ambassador%s") ; /* TRANS: Steal _Technology (3% chance of success). */ ui_name_steal_tech = _("Steal %sTechnology%s") Modified: branches/S3_0/server/ruleset.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/ruleset.c?rev=35523&r1=35522&r2=35523&view=diff ============================================================================== --- branches/S3_0/server/ruleset.c (original) +++ branches/S3_0/server/ruleset.c Fri May 12 14:57:21 2017 @@ -6052,8 +6052,8 @@ text); text = secfile_lookup_str_default(file, - /* TRANS: Establish _Embassy (and stay) (100% chance of success). */ - N_("Establish %sEmbassy (and stay)%s"), + /* TRANS: Becom_e Ambassador (100% chance of success). */ + N_("Becom%se Ambassador%s"), "actions.ui_name_establish_embassy_stay"); sz_strlcpy(action_by_number(ACTION_ESTABLISH_EMBASSY_STAY)->ui_name, text); _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits