merging to lirria

leveldesign/game_element/sitem/handled_item/klum_fruit.sitem

@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.7 $" State="modified">
+  <STRUCT>
+    <STRUCT Name="basics">
+      <ATOM Name="name" Value="klum"/>
+      <ATOM Name="origin" Value="common"/>
+      <ATOM Name="family" Value="handled item"/>
+      <ATOM Name="Bulk" Value="1"/>
+      <STRUCT Name="EquipmentInfo">
+        <ARRAY Name="EquipmentSlots">
+          <ATOM Name="right_hand" Value="Right Hand"/>
+          <ATOM Name="left_hand" Value="Left Hand"/>
+        </ARRAY>
+        <ATOM Name="WearEquipmentMalus" Value="0.1"/>
+      </STRUCT>
+      <ATOM Name="Price" Value="10"/>
+      <ATOM Name="Time to Equip In Ticks" Value="1"/>
+    </STRUCT>
+    <STRUCT Name="3d">
+      <ATOM Name="shape" Value="pendo_toy.shape"/>
+      <ATOM Name="shape_female" Value="klum.shape"/>
+      <ATOM Name="icon" Value="ico_klum.tga"/>
+      <ATOM Name="icon background" Value="bk_matis_brick.tga"/>
+      <ATOM Name="anim_set" Value="Dagger"/>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>

leveldesign/game_element/sitem/handled_item/pendo_toy1.sitem

@@ -21,7 +21,7 @@
       <ATOM Name="shape_female" Value="pendo_toy_f.shape"/>
       <ATOM Name="map_variant" Value="Low Quality"/>
       <ATOM Name="icon" Value="ico_pendo_pet.tga"/>
-      <ATOM Name="icon background" Value="cp_back.tga"/>
+      <ATOM Name="icon background" Value="bk_matis_brick.tga"/>
       <ATOM Name="anim_set" Value="Dagger"/>
     </STRUCT>
   </STRUCT>

leveldesign/game_element/sitem/melee_weapon/refugee/icrm1pd.sitem

@@ -23,20 +23,5 @@
   <STRUCT/>
   <STRUCT/>
   <STRUCT/>
-  <LOG>Thu Aug 08 09:26:59 2002 (mauduit) .3d.map_variant = Low Quality
-Tue Sep 16 22:09:39 2003 (coutelas) .basics.origin = zorai
-Tue Sep 16 22:09:39 2003 (coutelas) .faber.Create.MP 1 Family = Resin
-Tue Sep 16 22:09:39 2003 (coutelas) .faber.Skill = zorai dagger craft
-Tue Sep 16 22:09:39 2003 (coutelas) .melee weapon.skill = dagger zorai
-Fri Sep 19 14:29:32 2003 (coutelas) .AsBrick.Client.IconBack = BK_zorai_brick.tga
-Fri Sep 19 14:29:32 2003 (coutelas) .basics.name = zorai dagger
-Mon Dec 22 11:08:53 2003 (gatto) .3d.fx.Trail = Zo_Wea_Dague_trail_00.shape
-Mon Mar 15 16:19:21 2004 (tran) .3d.shape = GE_Wea_Dague.shape
-Mon Mar 15 16:19:21 2004 (tran) .3d.shape_female = GE_Wea_Dague.shape
-Mon Mar 15 16:22:26 2004 (tran) .3d.fx.Trail = GE_Wea_Dague_trail_00.shape
-Fri Sep 03 10:05:11 2004 (coutelas) .basics.CraftPlan = bcrmea06.sbrick
-Fri Sep 03 10:05:11 2004 (coutelas) .basics.name = refugee dagger
-Fri Sep 03 10:05:11 2004 (coutelas) .basics.origin = refugee
-Tue Sep 07 15:43:06 2004 (coutelas) .basics.Drop or Sell = false
-Tue Sep 07 15:43:06 2004 (coutelas) .basics.Saleable = false</LOG>
+  <LOG></LOG>
 </FORM>

translation/translated/fr.uxt

@@ -14090,19 +14090,19 @@ uiAnimalSelectNotInVision	[Vous ne pouvez pas choisir cet animal, il est trop lo
 
 // HASH_VALUE 68D8144030082494
 // INDEX 3312
-uiPATitlePacker1	[Mektoub 1]
+uiPATitlePacker1	[Animal 1]
 
 // HASH_VALUE 68D8144030082494
 // INDEX 3313
-uiPATitlePacker2	[Mektoub 2]
+uiPATitlePacker2	[Animal 2]
 
 // HASH_VALUE 68D8144030082494
 // INDEX 3314
-uiPATitlePacker3	[Mektoub 3]
+uiPATitlePacker3	[Animal 3]
 
 // HASH_VALUE 68D8144034082494
 // INDEX 3315
-uiPATitlePacker4	[Mektoub 4]
+uiPATitlePacker4	[Animal 4]
 
 // HASH_VALUE 0C861C9F26343612
 // INDEX 3316
@@ -14138,19 +14138,19 @@ uiPATitleDemon4	[Démon 4]
 
 // HASH_VALUE 48D0144030082414
 // INDEX 3324
-uiPABagTitlePacker0	[MEKTOUB 1]
+uiPABagTitlePacker0	[ANIMAL 1]
 
 // HASH_VALUE 48D0144030082414
 // INDEX 3325
-uiPABagTitlePacker1	[MEKTOUB 2]
+uiPABagTitlePacker1	[ANIMAL 2]
 
 // HASH_VALUE 48D0144030082414
 // INDEX 3326
-uiPABagTitlePacker2	[MEKTOUB 3]
+uiPABagTitlePacker2	[ANIMAL 3]
 
 // HASH_VALUE 48D0144034082414
 // INDEX 3327
-uiPABagTitlePacker3	[MEKTOUB 4]
+uiPABagTitlePacker3	[ANIMAL 4]
 
 // HASH_VALUE FC801C3F0E30B6F2
 // INDEX 3328
@@ -14198,19 +14198,19 @@ uiAnimalTooFar	[Votre animal est trop loin]
 
 // HASH_VALUE 48D0144030082414
 // INDEX 3339
-uimMtPaPacker0	[MEKTOUB 1]
+uimMtPaPacker0	[ANIMAL 1]
 
 // HASH_VALUE 48D0144030082414
 // INDEX 3340
-uimMtPaPacker1	[MEKTOUB 2]
+uimMtPaPacker1	[ANIMAL 2]
 
 // HASH_VALUE 48D0144030082414
 // INDEX 3341
-uimMtPaPacker2	[MEKTOUB 3]
+uimMtPaPacker2	[ANIMAL 3]
 
 // HASH_VALUE 48D0144034082414
 // INDEX 3342
-uimMtPaPacker3	[MEKTOUB 4]
+uimMtPaPacker3	[ANIMAL 4]
 
 // HASH_VALUE FC801C3F0E30B6F2
 // INDEX 3343
@@ -14258,19 +14258,19 @@ uittLmSteed	[Monture]
 
 // HASH_VALUE 68D8144030082494
 // INDEX 3354
-uittLmPA0	[Mektoub 1]
+uittLmPA0	[Animal 1]
 
 // HASH_VALUE 68D8144030082494
 // INDEX 3355
-uittLmPA1	[Mektoub 2]
+uittLmPA1	[Animal 2]
 
 // HASH_VALUE 68D8144030082494
 // INDEX 3356
-uittLmPA2	[Mektoub 3]
+uittLmPA2	[Animal 3]
 
 // HASH_VALUE 68D8144034082494
 // INDEX 3357
-uittLmPA3	[Mektoub 4]
+uittLmPA3	[Animal 4]
 
 // HASH_VALUE 1B739F2919A2CAF5
 // INDEX 3358
@@ -14622,19 +14622,19 @@ uitabBag	[Sac]
 
 // HASH_VALUE 68D8144030082494
 // INDEX 3439
-uitabPacker0	[Mektoub 1]
+uitabPacker0	[Animal 1]
 
 // HASH_VALUE 68D8144030082494
 // INDEX 3440
-uitabPacker1	[Mektoub 2]
+uitabPacker1	[Animal 2]
 
 // HASH_VALUE 68D8144030082494
 // INDEX 3441
-uitabPacker2	[Mektoub 3]
+uitabPacker2	[Animal 3]
 
 // HASH_VALUE 68D8144034082494
 // INDEX 3442
-uitabPacker3	[Mektoub 4]
+uitabPacker3	[Animal 4]
 
 // HASH_VALUE 0B2190278A40A02A
 // INDEX 3443