diff -Nur -Xruler/diff_ignore ../cvs/freeciv/server/cityturn.c ruler/server/cityturn.c --- ../cvs/freeciv/server/cityturn.c Tue Jul 30 11:02:29 2002 +++ ruler/server/cityturn.c Thu Aug 1 17:52:49 2002 @@ -1270,18 +1270,18 @@ pcity->rapture++; if (pcity->rapture == 1) notify_player_ex(pplayer, pcity->x, pcity->y, E_CITY_LOVE, - _("Game: We Love The %s Day celebrated in %s."), + _("Game: We Love The %s %s Day celebrated in %s."), get_ruler_title(pplayer->government, pplayer->is_male, pplayer->nation), - pcity->name); + pplayer->name, pcity->name); } else { if (pcity->rapture != 0) notify_player_ex(pplayer, pcity->x, pcity->y, E_CITY_NORMAL, - _("Game: We Love The %s Day canceled in %s."), + _("Game: We Love The %s %s Day canceled in %s."), get_ruler_title(pplayer->government, pplayer->is_male, pplayer->nation), - pcity->name); + pplayer->name, pcity->name); pcity->rapture=0; } pcity->was_happy=city_happy(pcity);