[Freeciv-Dev] (PR#7330) More i18n in diplomats.c

["mateusz stefek" <matusik_s@xxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=7330 >

This patch changes i18n in diplomats.c to be more correct. (Yes, it helps in 
some languages)

     Mateusz
--
"otwarcie kodu spowoduje wyciek danych z systemu" - Minister Łybacka


--- freeorig/server/diplomats.c 2004-01-13 09:18:59.000000000 +0100
+++ freeciv/server/diplomats.c  2004-01-25 11:01:59.000000000 +0100
@@ -1189,20 +1189,40 @@
                           " by a defending %s."),
                         unit_name(pdiplomat->type), unit_name(punit->type));
        if (vet) {
-         notify_player_ex(cplayer, x, y,
-                          E_ENEMY_DIPLOMAT_FAILED,
-                          _("Game: Eliminated %s %s while infiltrating %s. "
-                            "The defender became more experienced"),
-                          get_nation_name(pplayer->nation),
-                          unit_name(pdiplomat->type),
-                          (pcity ? pcity->name : _("our troops")));
+         if (pcity) {
+           notify_player_ex(cplayer, x, y,
+                            E_ENEMY_DIPLOMAT_FAILED,
+                            _("Game: Eliminated %s %s while infiltrating %s. "
+                              "The defender became more experienced."),
+                           get_nation_name(pplayer->nation),
+                           unit_name(pdiplomat->type),
+                           pcity->name);
+         } else {
+           notify_player_ex(cplayer, x, y,
+                            E_ENEMY_DIPLOMAT_FAILED,
+                            _("Game: Eliminated %s %s while infiltrating "
+                              "our troops. "
+                              "The defender became more experienced."),
+                           get_nation_name(pplayer->nation),
+                           unit_name(pdiplomat->type));
+         }
         } else {
-         notify_player_ex(cplayer, x, y,
-                          E_ENEMY_DIPLOMAT_FAILED,
-                          _("Game: Eliminated %s %s while infiltrating %s."),
-                          get_nation_name(pplayer->nation),
-                          unit_name(pdiplomat->type),
-                          (pcity ? pcity->name : _("our troops")));
+         if (pcity) {
+           notify_player_ex(cplayer, x, y,
+                            E_ENEMY_DIPLOMAT_FAILED,
+                            _("Game: Eliminated %s %s while "
+                              "infiltrating %s. "),
+                           get_nation_name(pplayer->nation),
+                           unit_name(pdiplomat->type),
+                           pcity->name);
+         } else {
+           notify_player_ex(cplayer, x, y,
+                            E_ENEMY_DIPLOMAT_FAILED,
+                            _("Game: Eliminated %s %s while infiltrating "
+                              "our troops. "),
+                           get_nation_name(pplayer->nation),
+                           unit_name(pdiplomat->type));
+         }
        }
        wipe_unit(pdiplomat);
        return FALSE;