Feature #1554 » 1554CorrectedS3_2.patch
| client/text.c | ||
|---|---|---|
|
/* TRANS: on own line immediately following \n, ... <city> */
|
||
|
astr_add_line(&str, _("from %s"), city_name_get(hcity));
|
||
|
}
|
||
|
if (punit->carrying
|
||
|
&& unit_can_do_action(punit, ACTION_TRADE_ROUTE)) {
|
||
|
/* TRANS: on own line immediately following \n, from ... */
|
||
|
astr_add_line(&str, _("carrying %s"),
|
||
|
goods_name_translation(punit->carrying));
|
||
|
}
|
||
|
} else if (NULL != owner) {
|
||
|
struct player_diplstate *ds = player_diplstate_get(client_player(),
|
||
|
owner);
|
||
| server/cityturn.c | ||
|---|---|---|
|
}
|
||
|
if (punit) {
|
||
|
notify_player(pplayer, city_tile(pcity), E_UNIT_BUILT, ftc_server,
|
||
|
/* TRANS: <city> is finished building <unit/building>. */
|
||
|
_("%s is finished building %s."),
|
||
|
city_link(pcity), utype_name_translation(utype));
|
||
|
if (punit->carrying
|
||
|
&& unit_can_do_action(punit, ACTION_TRADE_ROUTE)) {
|
||
|
notify_player(pplayer, city_tile(pcity), E_UNIT_BUILT, ftc_server,
|
||
|
/* TRANS: <city> is finished building <unit>, carrying <goods>. */
|
||
|
_("%s is finished building %s, carrying %s."),
|
||
|
city_link(pcity), utype_name_translation(utype),
|
||
|
goods_name_translation(punit->carrying));
|
||
|
} else {
|
||
|
notify_player(pplayer, city_tile(pcity), E_UNIT_BUILT, ftc_server,
|
||
|
/* TRANS: <city> is finished building <unit/building>. */
|
||
|
_("%s is finished building %s."),
|
||
|
city_link(pcity), utype_name_translation(utype));
|
||
|
}
|
||
|
}
|
||
|
/* After we created the unit remove the citizen. This will also
|
||