[Pingus-CVS] rev 2251 - in branches/pingus_0_6: data/data data/images data/images/groundpieces/ground/jungle data/levels/playable po

[address@hidden]

Author: torangan
Date: 2004-04-11 15:51:56 +0200 (Sun, 11 Apr 2004)
New Revision: 2251

Added:
   branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone1.png
   branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone2.png
   branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone3.png
   branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone4.png
   branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone5.png
Modified:
   branches/pingus_0_6/data/data/groundpieces-ground.scr
   branches/pingus_0_6/data/images/Makefile.am
   branches/pingus_0_6/data/levels/playable/jungle-13-rz+eriksoe.pingus
   branches/pingus_0_6/po/de.po
   branches/pingus_0_6/po/fr.po
Log:
updates


Modified: branches/pingus_0_6/data/data/groundpieces-ground.scr
===================================================================
--- branches/pingus_0_6/data/data/groundpieces-ground.scr       2004-04-11 
09:23:04 UTC (rev 2250)
+++ branches/pingus_0_6/data/data/groundpieces-ground.scr       2004-04-11 
13:51:56 UTC (rev 2251)
@@ -111,6 +111,11 @@
         stick3 = ../images/groundpieces/ground/jungle/stick3.png 
(type=surface);
         stick4 = ../images/groundpieces/ground/jungle/stick4.png 
(type=surface);
         stick5 = ../images/groundpieces/ground/jungle/stick5.png 
(type=surface);
+        stone1 = ../images/groundpieces/ground/jungle/stone1.png 
(type=surface);
+        stone2 = ../images/groundpieces/ground/jungle/stone2.png 
(type=surface);
+        stone3 = ../images/groundpieces/ground/jungle/stone3.png 
(type=surface);
+        stone4 = ../images/groundpieces/ground/jungle/stone4.png 
(type=surface);
+        stone5 = ../images/groundpieces/ground/jungle/stone5.png 
(type=surface);
         twist = ../images/groundpieces/ground/jungle/twist.png (type=surface);
         twistsmooth = ../images/groundpieces/ground/jungle/twistsmooth.png 
(type=surface);
 }

Modified: branches/pingus_0_6/data/images/Makefile.am
===================================================================
--- branches/pingus_0_6/data/images/Makefile.am 2004-04-11 09:23:04 UTC (rev 
2250)
+++ branches/pingus_0_6/data/images/Makefile.am 2004-04-11 13:51:56 UTC (rev 
2251)
@@ -264,6 +264,11 @@
 groundpieces/ground/jungle/stick3.png \
 groundpieces/ground/jungle/stick4.png \
 groundpieces/ground/jungle/stick5.png \
+groundpieces/ground/jungle/stone1.png \
+groundpieces/ground/jungle/stone2.png \
+groundpieces/ground/jungle/stone3.png \
+groundpieces/ground/jungle/stone4.png \
+groundpieces/ground/jungle/stone5.png \
 groundpieces/ground/jungle/twist.png \
 groundpieces/ground/jungle/twistsmooth.png \
 groundpieces/ground/misc/bpiece1.png \

Added: branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone1.png
===================================================================
(Binary files differ)


Property changes on: 
branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone1.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone2.png
===================================================================
(Binary files differ)


Property changes on: 
branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone3.png
===================================================================
(Binary files differ)


Property changes on: 
branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone3.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone4.png
===================================================================
(Binary files differ)


Property changes on: 
branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone4.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone5.png
===================================================================
(Binary files differ)


Property changes on: 
branches/pingus_0_6/data/images/groundpieces/ground/jungle/stone5.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/pingus_0_6/data/levels/playable/jungle-13-rz+eriksoe.pingus
===================================================================
--- branches/pingus_0_6/data/levels/playable/jungle-13-rz+eriksoe.pingus        
2004-04-11 09:23:04 UTC (rev 2250)
+++ branches/pingus_0_6/data/levels/playable/jungle-13-rz+eriksoe.pingus        
2004-04-11 13:51:56 UTC (rev 2251)
@@ -9,7 +9,7 @@
     <number-of-pingus>3</number-of-pingus>
     <number-to-save>3</number-to-save>
     <time>4500</time>
-    <width>1450</width>
+    <width>1490</width>
     <height>760</height>
     <difficulty>95</difficulty>
     <playable>1</playable>
@@ -26,42 +26,30 @@
     <miner count="1"/>
   </action-list>
 
-<background type="surface">
+<worldobj type="groundpiece">
+  <type>ground</type>
   <surface><resource type="datafile">
-    <resource-datafile>textures</resource-datafile>
-  <resource-ident>textures/darkjungle</resource-ident>
+    <resource-datafile>groundpieces-ground</resource-datafile>
+  <resource-ident>jungle/stone2</resource-ident>
     <modifier>ROT0</modifier>
   </resource></surface>
-  <color>
-    <red>0</red>
-    <green>0</green>
-    <blue>0</blue>
-    <alpha>0.3</alpha>
-  </color>
-  <scroll-x>0</scroll-x>
-  <scroll-y>0</scroll-y>
-  <para-x>0.5</para-x>
-  <para-y>0.5</para-y>
-  <stretch-x>0</stretch-x>
-  <stretch-y>0</stretch-y>
-  <keep-aspect>0</keep-aspect>
   <position>
-    <x-pos>32</x-pos>
-    <y-pos>0</y-pos>
-    <z-pos>-150</z-pos>
+    <x-pos>843</x-pos>
+    <y-pos>200</y-pos>
+    <z-pos>0</z-pos>
   </position>
-</background>
+</worldobj>
 
 <worldobj type="groundpiece">
   <type>ground</type>
   <surface><resource type="datafile">
     <resource-datafile>groundpieces-ground</resource-datafile>
-  <resource-ident>misc/stoneblock6</resource-ident>
+  <resource-ident>jungle/stone1</resource-ident>
     <modifier>ROT0</modifier>
   </resource></surface>
   <position>
-    <x-pos>850</x-pos>
-    <y-pos>97</y-pos>
+    <x-pos>843</x-pos>
+    <y-pos>136</y-pos>
     <z-pos>0</z-pos>
   </position>
 </worldobj>
@@ -70,29 +58,41 @@
   <type>ground</type>
   <surface><resource type="datafile">
     <resource-datafile>groundpieces-ground</resource-datafile>
-  <resource-ident>misc/stoneblock5</resource-ident>
+  <resource-ident>jungle/stone4</resource-ident>
     <modifier>ROT0</modifier>
   </resource></surface>
   <position>
-    <x-pos>850</x-pos>
-    <y-pos>161</y-pos>
+    <x-pos>843</x-pos>
+    <y-pos>73</y-pos>
     <z-pos>0</z-pos>
   </position>
 </worldobj>
 
-<worldobj type="groundpiece">
-  <type>ground</type>
+<background type="surface">
   <surface><resource type="datafile">
-    <resource-datafile>groundpieces-ground</resource-datafile>
-  <resource-ident>misc/stoneblock3</resource-ident>
+    <resource-datafile>textures</resource-datafile>
+  <resource-ident>textures/darkjungle</resource-ident>
     <modifier>ROT0</modifier>
   </resource></surface>
+  <color>
+    <red>0</red>
+    <green>0</green>
+    <blue>0</blue>
+    <alpha>0.3</alpha>
+  </color>
+  <scroll-x>0</scroll-x>
+  <scroll-y>0</scroll-y>
+  <para-x>0.5</para-x>
+  <para-y>0.5</para-y>
+  <stretch-x>0</stretch-x>
+  <stretch-y>0</stretch-y>
+  <keep-aspect>0</keep-aspect>
   <position>
-    <x-pos>850</x-pos>
-    <y-pos>225</y-pos>
-    <z-pos>0</z-pos>
+    <x-pos>32</x-pos>
+    <y-pos>0</y-pos>
+    <z-pos>-150</z-pos>
   </position>
-</worldobj>
+</background>
 
 <worldobj type="groundpiece">
   <type>ground</type>
@@ -116,7 +116,7 @@
     <modifier>ROT0</modifier>
   </resource></surface>
   <position>
-    <x-pos>936</x-pos>
+    <x-pos>929</x-pos>
     <y-pos>90</y-pos>
     <z-pos>0</z-pos>
   </position>
@@ -136,6 +136,20 @@
   </position>
 </worldobj>
 
+<worldobj type="groundpiece">
+  <type>ground</type>
+  <surface><resource type="datafile">
+    <resource-datafile>groundpieces-ground</resource-datafile>
+  <resource-ident>jungle/stone4</resource-ident>
+    <modifier>ROT0</modifier>
+  </resource></surface>
+  <position>
+    <x-pos>843</x-pos>
+    <y-pos>264</y-pos>
+    <z-pos>0</z-pos>
+  </position>
+</worldobj>
+
 <entrance>
   <position>
     <x-pos>334</x-pos>
@@ -226,8 +240,8 @@
     <modifier>ROT0</modifier>
   </resource></surface>
   <position>
-    <x-pos>877</x-pos>
-    <y-pos>81</y-pos>
+    <x-pos>862</x-pos>
+    <y-pos>75</y-pos>
     <z-pos>0</z-pos>
   </position>
 </worldobj>

Modified: branches/pingus_0_6/po/de.po
===================================================================
--- branches/pingus_0_6/po/de.po        2004-04-11 09:23:04 UTC (rev 2250)
+++ branches/pingus_0_6/po/de.po        2004-04-11 13:51:56 UTC (rev 2251)
@@ -126,11 +126,11 @@
 
 #: src/editor/editor_help_screen.cxx:50
 msgid "F5 - load a level"
-msgstr "Level Laden (F5)"
+msgstr "F5 - Level Laden"
 
 #: src/editor/editor_help_screen.cxx:51
 msgid "F6 - save this level"
-msgstr "Level Speichern (F6)"
+msgstr "F6 - Level Speichern"
 
 #: src/editor/editor_help_screen.cxx:52
 msgid "F7 - [unset]"
@@ -842,7 +842,7 @@
 
 #: src/pingus_main.cxx:515
 msgid "FILE      "
-msgstr "Datei     "
+msgstr "DATEI     "
 
 #: src/pingus_main.cxx:515
 msgid "Load a custom level from FILE"
@@ -850,11 +850,11 @@
 
 #: src/pingus_main.cxx:516
 msgid "FILE        "
-msgstr "Datei      "
+msgstr "DATEI      "
 
 #: src/pingus_main.cxx:516
 msgid "Load a custom worldmap from FILE"
-msgstr "Eine Weltkarte aus DATEI laden"
+msgstr " Eine Weltkarte aus DATEI laden"
 
 #: src/pingus_main.cxx:517
 msgid "Print some more messages to stdout, can be set"

Modified: branches/pingus_0_6/po/fr.po
===================================================================
--- branches/pingus_0_6/po/fr.po        2004-04-11 09:23:04 UTC (rev 2250)
+++ branches/pingus_0_6/po/fr.po        2004-04-11 13:51:56 UTC (rev 2251)
@@ -142,7 +142,7 @@
 
 #: src/editor/editor_help_screen.cxx:54
 msgid "F9 - change level width and height"
-msgstr "F9 - change la hauteur et la largeur du niveau"
+msgstr "F9 - changer la hauteur et la largeur du niveau"
 
 #: src/editor/editor_help_screen.cxx:55
 msgid "F10 - [unset]"
@@ -206,7 +206,7 @@
 
 #: src/editor/editor_help_screen.cxx:73
 msgid "leftmouseclick - select object"
-msgstr "clique gauche - s�lectionner un objet"
+msgstr "click gauche - s�lectionner un objet"
 
 #: src/editor/editor_help_screen.cxx:74
 msgid "Insert - insert new object"
@@ -506,7 +506,7 @@
 #: src/level_desc.cxx:77
 #, c-format
 msgid "Pingus to Save: %d"
-msgstr "Pingus a sauver: %d"
+msgstr "Pingus � sauver: %d"
 
 #: src/level_desc.cxx:79
 #, c-format
@@ -545,7 +545,7 @@
 "As many Pingus escaped as entered the level. That's going to be hard to "
 "beat.... unless this game becomes pornographic."
 msgstr ""
-"Autant de Pingus en sont sortis qu'il n'y en a d'entr�s. Cela ve �tre "
+"Autant de Pingus en sont sortis qu'il n'y en a d'entr�. Cela ve �tre "
 "vraiment dur � battre... � moins que le jeu ne devienne pornographique."
 
 #: src/level_result.cxx:101
@@ -565,8 +565,8 @@
 "That was OK, but Pingu life insurance premiums have just gotten more "
 "expensive."
 msgstr ""
-"C'est acceptable, par contre les primes d'assurance vie Pingu sont maintant "
-"plus dispendieuses."
+"C'est acceptable, par contre les primes d'assurance vie Pingu sont "
+"maintenant plus dispendieuses."
 
 #: src/level_result.cxx:109
 msgid "Maybe this level calls for a different strategy."
@@ -682,7 +682,7 @@
 
 #: src/pingu_enums.cxx:37
 msgid "Boarder"
-msgstr ""
+msgstr "Planchiste"
 
 #: src/pingu_enums.cxx:38
 msgid "Bomber"