summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-06-25 16:00:32 +0100
committerKHobbits <rob@khobbits.co.uk>2013-06-25 16:00:32 +0100
commit9edc68bb2b316fd2e1401475b2a35b7203e2305e (patch)
tree2368542572328cbbbe137f3bc90ff146f10cc70d
parentc0ed8649d008a5636159b87b07767de50b7a3551 (diff)
parent8f1f68f2bed69c69397e5ebdd5a7769f19eff6cd (diff)
downloadEssentials-9edc68bb2b316fd2e1401475b2a35b7203e2305e.tar
Essentials-9edc68bb2b316fd2e1401475b2a35b7203e2305e.tar.gz
Essentials-9edc68bb2b316fd2e1401475b2a35b7203e2305e.tar.lz
Essentials-9edc68bb2b316fd2e1401475b2a35b7203e2305e.tar.xz
Essentials-9edc68bb2b316fd2e1401475b2a35b7203e2305e.zip
Merge branch '2.x' of github.com:essentials/Essentials into 2.9
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandspawner.java1
-rw-r--r--Essentials/src/messages_fr.properties20
2 files changed, 11 insertions, 10 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
index a0fb1d9b0..d4f23fd27 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
@@ -66,6 +66,7 @@ public class Commandspawner extends EssentialsCommand
CreatureSpawner spawner = (CreatureSpawner)target.getBlock().getState();
spawner.setSpawnedType(mob.getType());
spawner.setDelay(delay);
+ spawner.update();
}
catch (Throwable ex)
{
diff --git a/Essentials/src/messages_fr.properties b/Essentials/src/messages_fr.properties
index 35ef8fa2f..f2657c17a 100644
--- a/Essentials/src/messages_fr.properties
+++ b/Essentials/src/messages_fr.properties
@@ -447,7 +447,7 @@ teleportingPortal=\u00a77T\u00e9l\u00e9portation via portail.
tempBanned=Banni temporairement du serveur pour {0}.
tempbanExempt=\u00a77Vous ne pouvez pas bannir temporairement ce joueur.
thunder=Vous avez {0} la foudre dans votre monde.
-thunderDuration=Vous avez {0} la foudre dans le serveur pendant {1} seconde(s).
+thunderDuration=Vous avez {0} la foudre sur le serveur pendant {1} seconde(s).
timeBeforeHeal=Temps avant le prochain soin : {0}
timeBeforeTeleport=Temps avant la prochaine t\u00e9l\u00e9portation {0}
timeFormat=\u00a73{0}\u00a7f ou \u00a73{1}\u00a7f ou \u00a73{2}\u00a7f
@@ -532,13 +532,13 @@ year=ann\u00e9e
years=ann\u00e9es
youAreHealed=\u00a77Vous avez \u00e9t\u00e9 soign\u00e9.
youHaveNewMail=\u00a7cVous avez {0} message(s) ! \u00a7fEntrez \u00a77/mail read\u00a7f pour voir votre courrier.
-whoisHunger=\u00a76 - Faim :\u00a7r {0}/20 (+{1} saturation)
+whoisHunger=\u00a76 - Faim :\u00a7r {0} / 20 (+{1} saturation)
kitDelay=\u00a7m{0}\u00a7r
-giveSpawnFailure=\u00a74Not enough space, \u00a7c{0} \u00a7c{1} \u00a74was lost.
-noKitGroup=\u00a74You do not have access to this kit.
-inventoryClearingFromAll=\u00a76Clearing the inventory of all users...
-inventoryClearingAllItems=\u00a76Cleared all inventory items from {0}\u00a76.
-inventoryClearingAllArmor=\u00a76Cleared all inventory items and armor from {0}\u00a76.
-inventoryClearingAllStack=\u00a76Cleared all\u00a7c {0} \u00a76from {1}\u00a76.
-inventoryClearingStack=\u00a76Removed\u00a7c {0} \u00a76of\u00a7c {1} \u00a76from {2}\u00a76.
-inventoryClearFail=\u00a74Player {0} \u00a74does not have\u00a7c {1} \u00a74of\u00a7c {2}\u00a74.
+giveSpawnFailure=\u00a74Pas assez d''espace dans l''inventaire, \u00a7c{0} \u00a7c{1} \u00a74n''ont pas pu \u00eatre donn\u00e9s.
+noKitGroup=\u00a74Vous n'avez pas acc\u00e8 \u00e0 ce kit.
+inventoryClearingFromAll=\u00a76Tous les inventaires sont en train d'\u00ea vid\u00e9s...
+inventoryClearingAllItems=\u00a76Tous les items de l''inventaire de {0}\u00a76 ont \u00e9t\u00e9 supprim\u00e9s.
+inventoryClearingAllArmor=\u00a76Tous les items de l''inventaire et l''armure de {0}\u00a76 ont \u00e9t\u00e9 supprim\u00e9s.
+inventoryClearingAllStack=\u00a76Tous les\u00a7c {0} \u00a76de l''inventaire de {1}\u00a76 ont \u00e9t\u00e9 supprim\u00e9s.
+inventoryClearingStack=\u00a7c{0} \u00a7c {1} \u00a76ont \u00e9t\u00e9 supprim\u00e9s de l''inventaire de {2}\u00a76.
+inventoryClearFail=\u00a74Le joueur {0} \u00a74n''a pas\u00a7c {1}\u00a7c {2}\u00a74 sur lui.