Index: src/MapGenerator.cpp
===================================================================
--- src/MapGenerator.cpp	(revision 1789)
+++ src/MapGenerator.cpp	(working copy)
@@ -40,8 +40,8 @@
 #include "armysetlist.h"
 #include "army.h"
 
-//#define debug(x) {std::cerr<<__FILE__<<": "<<__LINE__<<": "<<x<<std::endl<<std::flush;}
-#define debug(x)
+#define debug(x) {std::cerr<<__FILE__<<": "<<__LINE__<<": "<<x<<std::endl<<std::flush;}
+//#define debug(x)
 #define offmap(bx,by) (by<0)||(by>=d_height)||(bx<0)||(bx>=d_width)
 
 using namespace std;
@@ -154,65 +154,66 @@
         for (int j = 0; j < width; j++)
             d_building[i*width + j] = Maptile::NONE;
 
-    cout <<_("Making random map") <<endl;
+    debug("Making random map:");
    
     // create the terrain
-    cout <<_("Flatening Plains  ... 10%") <<endl;
+    debug("flatening plains");
     progress.emit(.090, _("flattening plains..."));
     makePlains();
-    cout <<_("Raining Water     ... 30%") <<endl;
+    debug("raining water");
     progress.emit(.180, _("raining water..."));
     makeTerrain(Tile::WATER, d_pwater, true);  
     makeStreamer(Tile::WATER, d_pwater/3, 3);
     rescueLoneTiles(Tile::WATER,Tile::GRASS,true);
     makeRivers();
     verifyIslands();
-    cout <<_("Raising Hills     ... 20%") <<endl;
+    debug("raising hills");
     progress.emit(.270, _("raising hills..."));
     makeTerrain(Tile::HILLS, d_phills, false);
-    cout <<_("Raising Mountains ... 30%") <<endl;
+    debug("raising mountains");
     progress.emit(.360, _("raising mountains..."));
     makeTerrain(Tile::MOUNTAIN, d_pmountains, false);
     makeStreamer(Tile::MOUNTAIN, d_pmountains/3, 3);
     rescueLoneTiles(Tile::MOUNTAIN,Tile::GRASS,false);
     surroundMountains(0, d_width, 0, d_height);
-    cout <<_("Planting Forest   ... 40%") <<endl;
+    debug("planting forest");
     progress.emit(.450, _("planting forests..."));
     makeTerrain(Tile::FOREST, d_pforest, false);
-    cout <<_("Watering Swamps   ... 50%") <<endl;
+    debug("watering swamps");
     progress.emit(.540, _("watering swamps..."));
     makeTerrain(Tile::SWAMP, d_pswamp, false);
-    cout <<_("Normalizing       ... 60%") <<endl;
+    debug("normalizing terrain");
     progress.emit(.630, _("normalizing terrain..."));
     normalize();
 
     // place buildings
-    cout <<_("Building Cities   ... 70%") <<endl;
+    debug("building cities");
     progress.emit(.720, _("building cities..."));
     makeCities(d_nocities);
 
     if (roads)
       {
-	cout <<_("Paving Roads      ... 75%") <<endl;
+	debug("paving roads");
 	progress.emit(.810, _("paving roads..."));
 	makeRoads();
       }
     rescueLoneTiles(Tile::MOUNTAIN,Tile::HILLS,false);
 
-    cout <<_("Ruining Ruins     ... 80%") <<endl;
+    debug("ruining ruins");
     progress.emit(.810, _("ruining ruins..."));
     makeBuildings(Maptile::RUIN,d_noruins);
-    cout <<_("Raising Signs     ... 88%") <<endl;
+    debug("raising signs");
     progress.emit(.900, _("raising signs..."));
     makeBuildings(Maptile::SIGNPOST,d_nosignposts);
-    cout <<_("Spawning temples  ... 90%") <<endl;
+    debug("spawning temples");
     progress.emit(.950, _("spawning temples..."));
     makeBuildings(Maptile::TEMPLE,d_notemples);
-    cout <<_("Building bridges  ... 95%") <<endl;
+    debug("building bridges");
     progress.emit(.990, _("building bridges..."));
     makeBridges();
-    cout <<_("Done making map   ... 100%") <<endl;
 
+    debug("Done making map.");
+
 //    printMap();
 }
         
Index: src/main.cpp
===================================================================
--- src/main.cpp	(revision 1789)
+++ src/main.cpp	(working copy)
@@ -70,7 +70,7 @@
 	      long size = strtol(argv[i-1], &error, 10);
 	      if (error && (*error != '\0'))
 		{
-		  cerr <<_("non-numerical value for cache size\n");
+		  cerr <<_("non-numerical value for cache size") <<endl;
 		  exit(-1);
 		}
 	      Configuration::s_cacheSize = size;
@@ -83,7 +83,7 @@
 	      long seed = strtol(argv[i-1], &error, 10);
 	      if (error && (*error != '\0'))
 		{
-		  cerr <<_("non-numerical value for seed value\n");
+		  cerr <<_("non-numerical value for seed value") <<endl;
 		  exit(-1);
 		}
 	      srand(seed);
@@ -113,19 +113,19 @@
 	  else if (parameter == "--help" || parameter == "-h")
 	    {
 	      cout << argv[0] << " [OPTION]... [FILE]" << endl << endl;
-	      cout << "LordsAWar! version " << VERSION << endl << endl;
+	      cout << "LordsAWar! " << _("version") << " " << VERSION << endl << endl;
 	      cout << _("Options:") << endl << endl; 
-	      cout << _("  -h, --help                 Shows this help screen") <<endl;
-	      cout << _("  -c <size>                  Set the cache size for imagery to SIZE bytes") <<endl;
-	      cout << _("  -t, --test                 Start with a test-scenario") << endl;
-	      cout << _("  -S, --seed <number>        Seed the random number generator with NUMBER") << endl;
-	      cout << _("  -s, --stress-test          Non-interactive stress test") << endl;
-	      cout << _("  -r, --robots               Non-interactive network stress test") << endl;
-	      cout << _("  -R, --record FILE          Record gameplay to FILE") << endl;
+	      cout << "  -h, --help                 " << _("Shows this help screen") <<endl;
+	      cout << "  -c <size>                  " << _("Set the cache size for imagery to SIZE bytes") <<endl;
+	      cout << "  -t, --test                 " << _("Start with a test-scenario") << endl;
+	      cout << "  -S, --seed <number>        " << _("Seed the random number generator with NUMBER") << endl;
+	      cout << "  -s, --stress-test          " << _("Non-interactive stress test") << endl;
+	      cout << "  -r, --robots               " << _("Non-interactive network stress test") << endl;
+	      cout << "  -R, --record FILE          " << _("Record gameplay to FILE") << endl;
 	      cout << endl;
-	      cout << "FILE can be a saved game file (.sav), or a map (.map) file." << endl;
+	      cout << _("FILE can be a saved game file (.sav), or a map (.map) file.") << endl;
 	      cout << endl;
-	      cout << "Report bugs to <" << PACKAGE_BUGREPORT ">." << endl;
+	      cout << _("Report bugs to") << " <" << PACKAGE_BUGREPORT ">." << endl;
 	      exit(0);
 	    }
 	  else
@@ -135,25 +135,25 @@
 
   if (kit.load_filename != "" && kit.start_test_scenario)
     {
-      cerr <<"Error: Cannot specify -t and have a file specified." << endl;
+      cerr <<_("Error: Cannot specify -t and have a file specified.") << endl;
       exit (1);
     }
 
   if (kit.load_filename != "" && kit.start_stress_test)
     {
-      cerr <<"Error: Cannot specify -s and have a file specified." << endl;
+      cerr <<_("Error: Cannot specify -s and have a file specified.") << endl;
       exit (1);
     }
 
   if (kit.start_stress_test && kit.start_test_scenario)
     {
-      cerr <<"Error: Cannot specify -s and -t simultaneously." << endl;
+      cerr <<_("Error: Cannot specify -s and -t simultaneously.") << endl;
       exit (1);
     }
 
   if (kit.turn_filename != "" && kit.load_filename == "")
     {
-      cerr <<"Error: Must specify a file to load when specifying --turn." << endl;
+      cerr <<_("Error: Must specify a file to load when specifying --turn.") << endl;
       exit (1);
     }
 