Re: Diff of possible English changes

[Andy Balaam]

Hi David,

Sorry for the mess-ups.  Hopefully this is OK.

(I wasn't expecting so much activity on the CVS tree - I only checked 
out a few hours ago!)

Andy

David Philippi wrote:

> Am Die, 2003-04-22 um 18.29 schrieb Andy Balaam:
>  
>
> > Hi, sorry, I had a little bug in that diff.  Here is the correct one.
> >    
>
> Your diff is still flawed - it doesn't apply cleanly but so I noticed
> that you try to patch the xy.po files. Not a good idea. Could you please
> make a diff only over /src and /data/levels/tutorial? I'll then run make
> update-po to get them up to date.
> BTW make sure that your CVS tree is up-to-date, I got quite a lot of
> error messages trying to apply it...
>
> Bye David
>
>
>
>
> _______________________________________________
> Pingus-Devel mailing list
> address@hidden
> http://mail.nongnu.org/mailman/listinfo/pingus-devel
>
>
>  
Index: data/levels/tutorial/bomber-tutorial2-grumbel.xml
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/data/levels/tutorial/bomber-tutorial2-grumbel.xml,v
retrieving revision 1.16
diff -u -r1.16 bomber-tutorial2-grumbel.xml
--- data/levels/tutorial/bomber-tutorial2-grumbel.xml   22 Apr 2003 10:22:51 
-0000      1.16
+++ data/levels/tutorial/bomber-tutorial2-grumbel.xml   22 Apr 2003 22:51:38 
-0000
@@ -3,7 +3,7 @@
 <pingus-level>
   <global>
     <levelname lang="en">Sacrifice a few and save the rest</levelname>
-    <levelname lang="en">Sacrificane alcuni, ma salva gli altri</levelname>
+    <levelname lang="it">Sacrificane alcuni, ma salva gli altri</levelname>
     <levelname lang="de">Opfere einige und rette den Rest</levelname>
     <levelname lang="cs">Par obetuj a zachran ostatni</levelname>
     <levelname lang="tr">Çoðunluk için birkaçýný feda etmek gerek</levelname>
@@ -11,7 +11,7 @@
     <levelname lang="sr">Zrtvuj nekoliko da spases ostale</levelname>
 
     <description lang="en">Sometimes no other actions are available, so you 
have to bomb your
-                           way through the ground. The Pingus can do this by 
actually self
+                           way through the ground. The Pingus can do this by 
actually self-
                            destructing. This will kill them, but it is 
sometimes
                            necessary to sacrifice a few to save the rest.
     </description>
Index: data/levels/tutorial/digger-tutorial2-grumbel.xml
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/data/levels/tutorial/digger-tutorial2-grumbel.xml,v
retrieving revision 1.14
diff -u -r1.14 digger-tutorial2-grumbel.xml
--- data/levels/tutorial/digger-tutorial2-grumbel.xml   22 Apr 2003 10:22:51 
-0000      1.14
+++ data/levels/tutorial/digger-tutorial2-grumbel.xml   22 Apr 2003 22:51:45 
-0000
@@ -12,8 +12,8 @@
 
     <description lang="en">This is your first mission. As always, it's pretty 
easy. All you
                            have to do is to give a Pingu the command to dig a 
hole into the
-                           ground so that they can reach the exit. This can be 
acomplished by
-                           simply clicking on a Pingu.
+                           ground so that they can reach the exit. This can be 
accomplished
+                           simply by clicking on a Pingu.
     </description>
     <description lang="it">Questa è la tua prima missione. Come sempre, è 
abbastanza facile.
                            Tutto ciò che devi fare è ordinare ad un Pingus di 
scavare un buco
Index: data/levels/tutorial/miner-tutorial2-grumbel.xml
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/data/levels/tutorial/miner-tutorial2-grumbel.xml,v
retrieving revision 1.14
diff -u -r1.14 miner-tutorial2-grumbel.xml
--- data/levels/tutorial/miner-tutorial2-grumbel.xml    22 Apr 2003 10:22:51 
-0000      1.14
+++ data/levels/tutorial/miner-tutorial2-grumbel.xml    22 Apr 2003 22:52:09 
-0000
@@ -10,8 +10,8 @@
     <levelname lang="fr">Paradis des mineurs</levelname>
     <levelname lang="sr">Rudarski raj</levelname>
 
-    <description lang="en">And another action hits the street, another digging 
action, this
-                           time a diagonal one, and it allows a Pingu to dig 
diagonally through
+    <description lang="en">Another action hits the street - another digging 
action, this
+                           time a diagonal one. It allows a Pingu to dig 
diagonally through
                            ground, thus creating a path for following Pingus. 
The action is called Miner.
     </description>
     <description lang="it">Ed ecco un'altra nuova abilità che permette di 
scavare: questa volta in
Index: data/levels/tutorial/snow14-grumbel.xml
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/data/levels/tutorial/snow14-grumbel.xml,v
retrieving revision 1.14
diff -u -r1.14 snow14-grumbel.xml
--- data/levels/tutorial/snow14-grumbel.xml     22 Apr 2003 10:22:51 -0000      
1.14
+++ data/levels/tutorial/snow14-grumbel.xml     22 Apr 2003 22:52:25 -0000
@@ -10,9 +10,9 @@
     <levelname lang="fr">Bloque la route</levelname>
     <levelname lang="sr">Blok i stena</levelname>
 
-    <description lang="en">Again it's time to combine the stuff you have 
learned in your
+    <description lang="en">Once again it's time to combine the stuff you have 
learned in your
                            previous levels. Blast your way free and make sure 
you also keep the
-                           rest of the Pingus in control. The Blocker action 
will be of help.
+                           rest of the Pingus under control. The Blocker 
action will be helpful.
     </description>
     <description lang="it">E' di nuovo il momento di combinare quanto appreso 
nei livelli
                            precedenti. Scavati una strada, ma cerca di 
mantenere gli altri
Index: data/levels/tutorial/snow22-grumbel.xml
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/data/levels/tutorial/snow22-grumbel.xml,v
retrieving revision 1.14
diff -u -r1.14 snow22-grumbel.xml
--- data/levels/tutorial/snow22-grumbel.xml     22 Apr 2003 10:22:51 -0000      
1.14
+++ data/levels/tutorial/snow22-grumbel.xml     22 Apr 2003 22:52:37 -0000
@@ -11,7 +11,7 @@
     <levelname lang="sr">Ulaz visoko, izlaz nisko</levelname>
 
     <description lang="en">If you don't have enough floaters to bring all the 
Pingus down to
-                           the exit, you have to find other ways to guide them 
down. You
+                           the exit - you have to find other ways to guide 
them down. You
                           should have learned all the stuff you need for this 
level
                            in previous levels, so this shouldn't be too much 
of a
                            problem for you.
Index: data/levels/tutorial/solid-tutorial-grumbel.xml
===================================================================
RCS file: 
/var/lib/cvs/Games/Pingus/data/levels/tutorial/solid-tutorial-grumbel.xml,v
retrieving revision 1.12
diff -u -r1.12 solid-tutorial-grumbel.xml
--- data/levels/tutorial/solid-tutorial-grumbel.xml     22 Apr 2003 10:22:51 
-0000      1.12
+++ data/levels/tutorial/solid-tutorial-grumbel.xml     22 Apr 2003 22:52:52 
-0000
@@ -12,8 +12,8 @@
 
     <description lang="en">As you have learned in earlier levels your Pingus 
can dig through
                            basically any terrain, but there is one material 
which they can't
-                           penetrate and that is steal. These regions are 
marked
-                           dark grey on the levelmap and cannot be destroyed, 
so
+                           penetrate: steel. These regions are marked
+                           dark grey on the level map and cannot be destroyed, 
so
                           you must find a way around them.
     </description>
     <description lang="it">Come avrai appreso nei livelli precedenti, i Pingus 
possono
Index: src/result_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/result_screen.cxx,v
retrieving revision 1.15
diff -u -r1.15 result_screen.cxx
--- src/result_screen.cxx       19 Apr 2003 10:23:17 -0000      1.15
+++ src/result_screen.cxx       22 Apr 2003 22:53:10 -0000
@@ -186,30 +186,30 @@
   if (result.success())
     {
       if (result.killed == 0 && result.saved == result.total)
-        message = _("Perfect! You saved everybody possibly, great!");
+        message = _("Perfect! You saved everyone possible - great!");
       else if (result.killed == 0)
-        message = _("None got killed, pretty good work");
+        message = _("No-one got killed, pretty good work.");
       else if (result.saved == result.needed)
-        message = _("You saved just what you needed, you made it, but\n"
+        message = _("You saved exactly what you needed - you made it, but\n"
                     "maybe you can do better?");
       else if (result.killed >= 5)
-        message = _("Not everybody could get saved, but still good work!");
+        message = _("Not everybody was saved, but still good work!");
       else
-        message = _("What can I say, you made it, congratulations!");
+        message = _("What can I say, you made it - congratulations!");
     }
   else
     {
       if (result.killed == result.total)
         message = _("You killed everybody, not good.");
       else if (result.saved == 0)
-        message = _("None got saved, I know you can do better.");
+        message = _("No-one got saved - I know you can do better.");
       else if (result.saved > 0)
-        message = _("You didn't saved enough, but still saved a few, next\n"
-                    "time you might be better.");
+        message = _("You didn't save enough, but you saved a few.  Next\n"
+                    "time you might do better.");
       else if (result.saved + 1 >= result.needed)
-        message = _("Only one more and you would have made it, try again!");
+        message = _("Only one more and you would have made it - try again!");
       else if (result.saved + 5 >= result.needed)
-        message = _("Only a handfull more and you would have made it, try 
again!");
+        message = _("Only a handful more and you would have made it - try 
again!");
       else
         message = _("Better luck next time!");
     }
Index: src/screenshot.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/screenshot.cxx,v
retrieving revision 1.12
diff -u -r1.12 screenshot.cxx
--- src/screenshot.cxx  19 Apr 2003 10:23:17 -0000      1.12
+++ src/screenshot.cxx  22 Apr 2003 22:53:11 -0000
@@ -42,7 +42,7 @@
 
       std::cout << _("Screenshot: Saving screenshot to: ") << filename << 
std::endl;
       save_target_to_file(target, filename);
-      std::cout << _("Screnshot: Screenshot is done.") << std::endl;
+      std::cout << _("Screenshot: Screenshot is done.") << std::endl;
 
       return filename;
     }
Index: src/story.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/story.cxx,v
retrieving revision 1.27
diff -u -r1.27 story.cxx
--- src/story.cxx       21 Apr 2003 18:07:21 -0000      1.27
+++ src/story.cxx       22 Apr 2003 22:53:12 -0000
@@ -64,9 +64,9 @@
     (StoryPage
      (ResDescriptor("Story/credits3", "story"),
       StringFormat::break_line(
-      _("So the Pingus set out and constructed some large floats, enough\n"
+      _("So the Pingus set out and constructed some large rafts, enough\n"
         "to carry them all. After also packing a bunch of provisions\n"
-        "they were prepared to start of their journey and leave\n"
+        "they were prepared to start their journey and leave\n"
         "their familiar ground and enter the unknown parts of the world.\n"), 
570, Fonts::chalk_normal)
         ));
 
@@ -74,7 +74,7 @@
     (StoryPage
      (ResDescriptor("Story/credits4", "story"),
       StringFormat::break_line(
-      _("So the Pingus sat on their float, worrying about what's to come and\n"
+      _("So the Pingus sit on their raft, worrying about what's to come and\n"
         "where to go, while floating into the sunset.\n"
         "\n"
         "To be continued..."), 570, Fonts::chalk_normal)
@@ -94,14 +94,14 @@
       _("For a long time, the Pingus have lived happily in peace on the\n"
         "South Pole along with all the other animals. Everything was in\n"
         "balance and it seemed like nothing could disrupt their peace.  The\n"
-        "Pingus where happy and it seemed like this could never end.\n"), 570, 
Fonts::chalk_normal)
+        "Pingus were happy and it seemed like this could never end.\n"), 570, 
Fonts::chalk_normal)
        ));
 
   intro.pages.push_back
     (StoryPage
      (ResDescriptor("Story/story1", "story"),
       StringFormat::break_line(
-      _("But then one day, things began to change slowly, the sky got darker\n"
+      _("But then one day, things began to change slowly: the sky got darker\n"
         "and the earth got warmer. Firstly, they thought this was just a\n"
         "normal fluctuation in the world's climate, but things seemed to get\n"
         "worse and worse with every year."), 570, Fonts::chalk_normal)
@@ -114,8 +114,8 @@
       StringFormat::break_line(
       _("The snow began to melt away in a few areas and food became an\n"
         "issue. Other animals tried to leave the region to search\n"
-        "for colder areas, but the Pingus knew that this wouldn't help,\n"
-        "they knew that they had to do something about this."), 570, 
Fonts::chalk_normal)
+        "for colder areas, but the Pingus knew that this wouldn't help:\n"
+        "they knew that they had to do something about it."), 570, 
Fonts::chalk_normal)
        ));
 
   intro.pages.push_back
@@ -124,8 +124,8 @@
       StringFormat::break_line(
       _("So the circle of the eldest came together to decide what to do\n"
         "about it. They decided to send out an expedition around the world\n"
-        "to find the cause for this warming. The expedition consisted of\n"
-        "hundreds of the bravest Pingus around on the South Pole."), 570, 
Fonts::chalk_normal)
+        "to find the cause of this warming. The expedition consisted of\n"
+        "hundreds of the bravest Pingus on the South Pole."), 570, 
Fonts::chalk_normal)
        ));
 
   intro.pages.push_back
@@ -136,25 +136,25 @@
         "world. Since the journey will be dangerous and difficult, your\n"
         "first goal is the Island of Mogorok, also known as the Tutorial\n"
         "Island. According to the eldest, this island has always been the\n"
-        "first stop of Pingus that were send out into the world."), 570, 
Fonts::chalk_normal)
+        "first stop of Pingus that were sent out into the world."), 570, 
Fonts::chalk_normal)
        ));
 
   intro.pages.push_back
     (StoryPage
      (ResDescriptor("Story/story5", "story"),
       StringFormat::break_line(
-      _("The island consists of many areas which are ideal to train the\n"
-        "abilities of the Pingus. The Pingus can train their ability\n"
-        "to build bridges, climb, bash and all the rest of their talents\n"
-        "which they will need on their long and dangerous journey."), 570, 
Fonts::chalk_normal)
+      _("The island consists of many areas that are ideal to teach the\n"
+        "Pingus their abilities. The Pingus can learn to build\n"
+        "bridges, climb, bash and use many other talents which they\n"
+        "will need on their long and dangerous journey."), 570, 
Fonts::chalk_normal)
        ));
 
   intro.pages.push_back
     (StoryPage
      (ResDescriptor("Story/story6", "story"),
       StringFormat::break_line(
-      _("You may, on the other hand, practice there your ability to\n"
-        "command and guide the Pingus. You can also get familiar with\n"
+      _("While there, you can practice your abilities in commanding\n"
+        "and guiding the Pingus. You can also get familiar with\n"
         "all the abilities the Pingus provide and learn to master them,\n"
         "since you will need all of them on your journey around the\n"
         "world."), 570, Fonts::chalk_normal)