[Ufo2000-svn] SF.net SVN: ufo2000:[1158] trunk/src

[<ufo...@li...>]

Revision: 1158
          http://ufo2000.svn.sourceforge.net/ufo2000/?rev=1158&view=rev
Author:   ssvb
Date:     2011-07-31 22:25:46 +0000 (Sun, 31 Jul 2011)

Log Message:
-----------
Partial fix for issue #617, corrected typos and errors

Fixed mistakes with types 1, 2, 3 and 6 from the issue description.
1) factual mistake, editor screen. "Equipment cost" -> "Soldier cost"
   because the cost value is not zero for a soldier without equipment.
2) overlapping message, main menu screen. 
   "connect to internet server" -> "connect to server". Overlap occured
   in 640x480 resolution.
3) duplicating messages, scenario descriptions. Eliminated difference
   in duplicating messages "Leader can have ..."/"Leader can use ..."
   and "Leader can't have ..."/"Leader can't use ..."
6) typo, scenario description for Search and Destroy. "ennemy" -> "enemy"

From: Fomka <ste...@gm...>

Modified Paths:
--------------
    trunk/src/editor.cpp
    trunk/src/mainmenu.cpp
    trunk/src/scenario.cpp

Modified: trunk/src/editor.cpp
===================================================================
--- trunk/src/editor.cpp	2011-07-07 00:33:10 UTC (rev 1157)
+++ trunk/src/editor.cpp	2011-07-31 22:25:46 UTC (rev 1158)
@@ -380,7 +380,7 @@
             char str1[64]; // to adjust position of translated string
           //int x1 = 120;
             int x2 = 236;
-            sprintf(str1, "%s: %4d", _("Equipment cost"), man->calc_full_ammunition_cost() );
+            sprintf(str1, "%s: %4d", _("Soldier cost"), man->calc_full_ammunition_cost() );
             int w1 = text_length(g_small_font, str1);  // right-justify string
             textprintf(screen2, g_small_font, x2-w1, 20, COLOR_GRAY02, "%s", str1);
 

Modified: trunk/src/mainmenu.cpp
===================================================================
--- trunk/src/mainmenu.cpp	2011-07-07 00:33:10 UTC (rev 1157)
+++ trunk/src/mainmenu.cpp	2011-07-31 22:25:46 UTC (rev 1158)
@@ -240,7 +240,7 @@
     
     the_dialog[MAINMENU_BACKGROUND].proc = d_mainmenu_background_proc;
 
-    the_dialog[MAINMENU_INTERNET].dp    = (void *) _("connect to internet server");
+    the_dialog[MAINMENU_INTERNET].dp    = (void *) _("connect to server");
     the_dialog[MAINMENU_HOTSEAT].dp     = (void *) _("start hotseat game");
     the_dialog[MAINMENU_GEOSCAPE].dp    = (void *) _("show geoscape demo");
     the_dialog[MAINMENU_LOADGAME].dp    = (void *) _("load saved game");

Modified: trunk/src/scenario.cpp
===================================================================
--- trunk/src/scenario.cpp	2011-07-07 00:33:10 UTC (rev 1157)
+++ trunk/src/scenario.cpp	2011-07-31 22:25:46 UTC (rev 1158)
@@ -196,7 +196,7 @@
     briefing_right[SC_CAPTURE][1] = _("from capturing by enemy. He is always visible on ");
     briefing_right[SC_CAPTURE][2] = _("your opponent's minimap.                         ");
 
-    options[SC_CAPTURE][0] = new Option(OPT_SWITCH, 0, _("Leader can have two-handed weapons"), _("Leader can't have two-handed weapons"), false);
+    options[SC_CAPTURE][0] = new Option(OPT_SWITCH, 0, _("Leader can use two-handed weapons"), _("Leader can't use two-handed weapons"), false);
     options[SC_CAPTURE][1] = new Option(OPT_NONE);
     options[SC_CAPTURE][2] = new Option(OPT_NONE);
 }
@@ -206,7 +206,7 @@
     name[SC_SEARCH] = ("Search and destroy");
 
     briefing_left[SC_SEARCH][0] = briefing_right[SC_SEARCH][0] = _("You can deploy your units anywhere on the map.   ");
-    briefing_left[SC_SEARCH][1] = briefing_right[SC_SEARCH][1] = _("Find and kill the ennemy. All units will face    ");
+    briefing_left[SC_SEARCH][1] = briefing_right[SC_SEARCH][1] = _("Find and kill the enemy. All units will face    ");
     briefing_left[SC_SEARCH][2] = briefing_right[SC_SEARCH][2] = _("away from the center and the outside of the map, ");
     briefing_left[SC_SEARCH][3] = briefing_right[SC_SEARCH][3] = _("depending on the closest map feature.            ");
     briefing_left[SC_SEARCH][4] = briefing_right[SC_SEARCH][4] = _("                                                 ");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.