[Pingus-CVS] CVS: Games/Pingus/src blitter.cxx,1.24,1.25 config.cxx,1.11,1.12 level_result.cxx,1.10,1.11 pingus_error.cxx,1.7,1.8 pingus_main.cxx,1.65,1.66 story.cxx,1.20,1.21

[torangan]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv23165/src

Modified Files:
        blitter.cxx config.cxx level_result.cxx pingus_error.cxx 
        pingus_main.cxx story.cxx 
Log Message:
- update to german translation
- fixed some typos


Index: blitter.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/blitter.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- blitter.cxx 25 Mar 2003 00:37:44 -0000      1.24
+++ blitter.cxx 8 Apr 2003 19:56:40 -0000       1.25
@@ -94,7 +94,7 @@
   if (!cl_palette)
     {
       char str[128];
-      snprintf(str, 128, _("Couldn't find palette: %d"), 
sprovider->get_depth());
+      snprintf(str, 128, "Couldn't find palette: %d", sprovider->get_depth());
       PingusError::raise(str);
     }
 

Index: config.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/config.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- config.cxx  18 Feb 2003 18:41:58 -0000      1.11
+++ config.cxx  8 Apr 2003 19:56:40 -0000       1.12
@@ -228,7 +228,7 @@
          return;
       }
     } 
-  syntax_error(std::string(_("jump_after(): Expected '")) + c + "', got '" + 
atom + "'" );
+  syntax_error(std::string("jump_after(): Expected '") + c + "', got '" + atom 
+ "'" );
 }
 
 void
@@ -253,7 +253,7 @@
 
   snprintf(tmp, 16, "%d\n", lineno);
   
-  error_str = std::string(_("PLF: Syntax Error at line ")) + tmp;
+  error_str = std::string("PLF: Syntax Error at line ") + tmp;
 
   if (error != "")
     error_str += "PLF:" + error + "\n";
@@ -380,7 +380,7 @@
     }
   else
     {
-      PingusError::raise(_("Config: Unknown valueid: ") + valueid);
+      PingusError::raise("Config: Unknown valueid: " + valueid);
     }
 }
 
@@ -397,7 +397,7 @@
     }
   else
     {
-      PingusError::raise(_("Config: value: ") + str + _(" is not of type 
bool."));
+      PingusError::raise("Config: value: " + str + " is not of type bool.");
     }
     
   return false; // never reached
@@ -410,7 +410,7 @@
 
   if (sscanf(str.c_str(), "%d", &ret_val) != 1) 
     {
-      PingusError::raise(_("Config: Couldn't convert std::string to integer: 
") + str);
+      PingusError::raise("Config: Couldn't convert std::string to integer: " + 
str);
     }
 
   return ret_val;

Index: level_result.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/level_result.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- level_result.cxx    19 Feb 2003 11:33:00 -0000      1.10
+++ level_result.cxx    8 Apr 2003 19:56:40 -0000       1.11
@@ -97,7 +97,7 @@
 PingusLevelResult::get_message (int saved)
 {
   if (saved == 100) {
-    return _("As many Pingus escaped as entered the level. Thats going to be 
hard to beat.... unless this game becomes pornographic.");
+    return _("As many Pingus escaped as entered the level. That's going to be 
hard to beat.... unless this game becomes pornographic.");
   } else if (saved > 90) {
     return _("Very impressive indeed.");
   } else if (saved > 80) {
@@ -109,7 +109,7 @@
   } else if (saved > 55) {
     return _("Maybe this level calls for a different strategy.");
   } else if (saved > 50) {
-    return _("Exactly half. Are you saving only the female ones, you kinky 
sod!?");
+    return _("Exactly half. Are you saving only the female ones?");
   } else if (saved > 40) {
     return _("If I were a Pingu, I never would have left that entrance.");
   } else if (saved > 30) {

Index: pingus_error.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_error.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pingus_error.cxx    18 Feb 2003 18:41:59 -0000      1.7
+++ pingus_error.cxx    8 Apr 2003 19:56:40 -0000       1.8
@@ -42,7 +42,7 @@
 }
 
 
-PingusBug::PingusBug (const std::string& mes) : PingusException(_("PingusBug: 
") + mes)
+PingusBug::PingusBug (const std::string& mes) : PingusException("PingusBug: " 
+ mes)
 {
 }
 
@@ -73,7 +73,7 @@
   return message;
 }
 
-PingusError::PingusError (const std::string& mes) : 
PingusException(_("PingusError: ") + mes)
+PingusError::PingusError (const std::string& mes) : 
PingusException("PingusError: " + mes)
 {
 }
 

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- pingus_main.cxx     5 Apr 2003 20:24:16 -0000       1.65
+++ pingus_main.cxx     8 Apr 2003 19:56:40 -0000       1.66
@@ -349,12 +349,11 @@
 #endif
                << std::endl;
       
-      std::cout << _("\n\
-Copyright (C) 2003 Ingo Ruhnke <address@hidden>\n\
-There is NO warranty.  You may redistribute this software\n\
-under the terms of the GN General Public License.\n\
-For more information about these matters, see the files named COPYING.\
-") << std::endl;
+      std::cout << _("\n"
+                     "Copyright (C) 2003 Ingo Ruhnke <address@hidden>\n"
+                     "There is NO warranty.  You may redistribute this 
software\n"
+                     "under the terms of the GNU General Public License.\n"
+                     "For more information about these matters, see the files 
named COPYING.") << std::endl;
 
       exit(EXIT_SUCCESS);
       break;
@@ -511,7 +510,7 @@
        _("\n"
          "Options:\n"
           "   -g, --geometry {width}x{height}\n"
-          "                            Set the resolution for pingus (default: 
640x480)\n"
+          "                            Set the resolution for pingus (default: 
800x600)\n"
           "   -h, --help               Displays this screen\n"
           "   --disable-intro          Disable intro\n")
                << std::endl;
@@ -521,8 +520,8 @@
                 << std::endl;
 #endif
       std::cout <<
-       _("   -F, --disable-fullscreen Disable Fullscreen\n"
-          "   -f, --enable-fullscreen  Enable Fullscreen (default)\n"
+       _("   -F, --disable-fullscreen Disable Fullscreen (default)\n"
+          "   -f, --enable-fullscreen  Enable Fullscreen\n"
           "   -d, --datadir PATH       Set the path to load the data files to 
`path'\n"
           "   --use-datafile           Use the pre-compiled datafile 
(default)\n"
           "   --use-scriptfile         Use the scriptfile and read all data 
from files\n"
@@ -702,7 +701,7 @@
     std::cout << _("music support:          disabled") << std::endl;
 
   std::cout << _("resolution set to:       ") << screen_width << "x" << 
screen_height << std::endl;
-  std::cout << _("fullcscreen:            ")
+  std::cout << _("fullscreen:              ")
             << (fullscreen_enabled ? _(" enabled") : _("disabled"))
             << std::endl;
 

Index: story.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/story.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- story.cxx   7 Apr 2003 12:14:03 -0000       1.20
+++ story.cxx   8 Apr 2003 19:56:40 -0000       1.21
@@ -50,8 +50,8 @@
      (ResDescriptor("Story/credits2", "story"), 
       _("But as the eldest have said, the Tutorial Island provides not\n"
         "only a way to practive, but it is also the starting point into\n"
-        "the world, cause the wood if the large tree at the end of the\n"
-        "island is brings good wood to construct a float.\n")));
+        "the world, cause the wood of the large tree at the end of the\n"
+        "island brings good wood to construct a float.\n")));
      
   credits.pages.push_back
     (StoryPage