Update translations.

author: Andrei Karas <akaras@inbox.ru> 2017-01-18 18:49:12 +0300
committer: Andrei Karas <akaras@inbox.ru> 2017-01-18 18:49:12 +0300
commit: 2a5ee4c0676dc191000485f1764833ea5da8b399 (patch)
tree: a63c8e403d63f0759399b667f78478acb9702d6e /translations
parent: 6ef4930f3f3b0c4a7fe5213323a830719863a841 (diff)
download: clientdata-2a5ee4c0676dc191000485f1764833ea5da8b399.tar.gz
clientdata-2a5ee4c0676dc191000485f1764833ea5da8b399.tar.bz2
clientdata-2a5ee4c0676dc191000485f1764833ea5da8b399.tar.xz
clientdata-2a5ee4c0676dc191000485f1764833ea5da8b399.zip
10 files changed, 1072 insertions, 1527 deletions
diff --git a/translations/ca.po b/translations/ca.po
index 93c0be7e..4cd77233 100644
--- a/translations/ca.po
+++ b/translations/ca.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evol Online\n"
-"POT-Creation-Date: 2016-08-07 16:28+0300\n"
-"PO-Revision-Date: 2016-08-08 08:48+0000\n"
+"POT-Creation-Date: 2016-09-11 23:23+0300\n"
+"PO-Revision-Date: 2016-09-12 10:02+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/evol/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -377,7 +377,7 @@ msgid "Blah"
 msgstr "Blah"
 
 #. (itstool) path: homunculuses/homunculus@name
-#: homunculuses.xml:6
+#: homunculuses.xml:27
 msgid "homum"
 msgstr ""
 
@@ -2029,43 +2029,18 @@ msgid "Yellow Cotton Dye"
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1265 items.xml:1273
-msgid "Bow 1"
+#: items.xml:1268
+msgid "Wooden Bow"
 msgstr ""
 
 #. (itstool) path: items/item@description
-#: items.xml:1265 items.xml:1273
-msgid "Testing bow 1"
+#: items.xml:1268 items.xml:1279
+msgid "For bow training. Does not seem much reliable."
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1282
-msgid "Arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1282
-msgid "Testing arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1289
-msgid "Arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1289
-msgid "Testing arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1296
-msgid "Arrow 3"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1296
-msgid "Testing arrow 3"
+#: items.xml:1279
+msgid "Training Arrow"
 msgstr ""
 
 #. (itstool) path: emote/sprite@name
@@ -2346,7 +2321,7 @@ msgid "Right Wing"
 msgstr ""
 
 #. (itstool) path: mercenaries/mercenary@name
-#: mercenaries.xml:6
+#: mercenaries.xml:27
 msgid "merc"
 msgstr ""
 
@@ -2670,7 +2645,7 @@ msgstr "Són antigues i fan una mica de pudor però la sensació càlida que don
 
 #. (itstool) path: quest/reward
 #: quests.xml:72
-msgid "A [Creased Shirt] and old [Creased Shorts]."
+msgid "A {@@1} and old {@@2}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2713,7 +2688,7 @@ msgstr ""
 #: quests.xml:92
 msgid ""
 "In fact, he hides in a hole in the main hallway. It leads to the ship's "
-"storage room where he can reach for some barrels full of [Piberries]."
+"storage room where he can reach for some barrels full of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2725,8 +2700,7 @@ msgstr "Ell està tip de menjar aquestes baies tot el temps. És per això que v
 
 #. (itstool) path: quest/text
 #: quests.xml:102
-msgid ""
-"You brought Alige some food, different from the [Piberries] he usually eats."
+msgid "You brought Alige some food, different from the {@@1} he usually eats."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2738,7 +2712,7 @@ msgstr "Sembla que està desitjós de provar nous sabors. Intenta portar altres
 
 #. (itstool) path: quest/reward
 #: quests.xml:108
-msgid "A handful of [Piberries]."
+msgid "A handful of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2891,7 +2865,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:217 quests.xml:225
-msgid "50 EXP, [Bandana]."
+msgid "50 EXP, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2922,8 +2896,8 @@ msgid "La Johanne, Second Deck. (50,24)"
 msgstr ""
 
 #. (itstool) path: quest/reward
-#: quests.xml:237
-msgid "[Knife]."
+#: quests.xml:237 quests.xml:484 quests.xml:530 quests.xml:560
+msgid "{@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2999,7 +2973,7 @@ msgstr "Has vist un cofre del tresor a la part superior d'un penya-segat a l'est
 
 #. (itstool) path: quest/text
 #: quests.xml:272
-msgid "The chest contains gold and an [Old Book]."
+msgid "The chest contains gold and an {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3009,7 +2983,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:275
-msgid "100 E, [Old Book]."
+msgid "100 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3021,8 +2995,7 @@ msgstr "Ajuda Inesperada"
 #: quests.xml:301
 msgid ""
 "Gugli told you about the sailors' task on the island. He wants you to help "
-"some of them bringing him 6 boxes full of [Croconut], [Aquada] and "
-"[Plushroom]."
+"some of them bringing him 6 boxes full of {@@1}, {@@2} and {@@3}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3065,8 +3038,8 @@ msgstr "Dos tinents en un vaixell. "
 #. (itstool) path: quest/text
 #: quests.xml:325
 msgid ""
-"Chef Gado wants you to collect 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] "
-"and 1 [Sea Drops] to prepare a [Poisoned Dish], for Julia."
+"Chef Gado wants you to collect 2 {@@1}, 2 {@@2}, 1 {@@3} and 1 {@@4} to "
+"prepare a {@@5}, for Julia."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3083,9 +3056,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:333
-msgid ""
-"Chef Gado prepared the [Poisoned Dish]. He would like you to give it to "
-"Julia."
+msgid "Chef Gado prepared the {@@1}. He would like you to give it to Julia."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3107,7 +3078,7 @@ msgstr "Has enverinat correctament la Julia. El Chef Gado finalment ha aconsegui
 
 #. (itstool) path: quest/reward
 #: quests.xml:355
-msgid "15 EXP, 200 E, [Bread]."
+msgid "15 EXP, 200 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3202,12 +3173,12 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:412
-msgid "His sister was very happy and gave you an [Aquada] as a reward."
+msgid "His sister was very happy and gave you an {@@1} as a reward."
 msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:416
-msgid "An [Aquada]."
+msgid "An {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3222,7 +3193,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:425
-msgid "She wants you to bring her [Croc Claw]s to get rid of spikes."
+msgid "She wants you to bring her {@@1}s to get rid of spikes."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3307,7 +3278,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:470
-msgid "You need to bring him 10 [Small Tentacles]."
+msgid "You need to bring him 10 {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3335,11 +3306,6 @@ msgstr ""
 msgid "You can use it to catch fish."
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:484
-msgid "[Fishing Rod]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:492 quests.xml:502 quests.xml:511
 msgid "The Buried Treasure"
@@ -3413,7 +3379,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:525
-msgid "Bacchus asked you to bring him a [Pumpkin]."
+msgid "Bacchus asked you to bring him a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3431,11 +3397,6 @@ msgstr ""
 msgid "La Johanne, Hold. (31,30)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:530
-msgid "[Pumpkin Hat]."
-msgstr ""
-
 #. (itstool) path: quest/text
 #: quests.xml:534
 msgid "Bacchus offers you to see a small part of your future."
@@ -3474,7 +3435,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:556
-msgid "For killing the scary Cuco, he gave me a [Barrel]."
+msgid "For killing the scary Cuco, he gave me a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3482,11 +3443,6 @@ msgstr ""
 msgid "Artis, Dream World. (71,132)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:560
-msgid "[Barrel]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:568 quests.xml:576 quests.xml:583
 msgid "Plushroom Addict"
@@ -3514,7 +3470,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:577
-msgid "Rumly is waiting for you to bring him some [Plushroom]s."
+msgid "Rumly is waiting for you to bring him some {@@1}s."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3524,7 +3480,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:585
-msgid "Bring him some [Plushroom]s and he will be able to do it for you."
+msgid "Bring him some {@@1}s and he will be able to do it for you."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3613,7 +3569,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:654
-msgid "Resa gave you a cute [%Color% Artis Tank Top, Camel Cotton Dye]."
+msgid "Resa gave you a cute {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3646,7 +3602,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:681
-msgid "Ivan gave you some [Piberries Infusion]."
+msgid "Ivan gave you some {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3691,9 +3647,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:705
-msgid ""
-"[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries"
-" Infusion]s"
+msgid "{@@1}, {@@2}, 5 {@@3}s"
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3725,7 +3679,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:723 quests.xml:732
-msgid "Fexil wants to open a business of [Fluffy Fur]'s clothes."
+msgid "Fexil wants to open a business of {@@1}'s clothes."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3750,7 +3704,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:737
-msgid "15 per [Fluffy Fur]."
+msgid "15 per {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3873,197 +3827,197 @@ msgid "Hells plant"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:12
+#: stats.xml:14
 msgid "Strength"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:18
+#: stats.xml:20
 msgid "Agility"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:24
+#: stats.xml:26
 msgid "Vitality"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:30
+#: stats.xml:32
 msgid "Intelligence"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:36
+#: stats.xml:38
 msgid "Dexterity"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:42
+#: stats.xml:44
 msgid "Luck"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:49 stats.xml:196 stats.xml:273
+#: stats.xml:51 stats.xml:198 stats.xml:275
 msgid "Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:54 stats.xml:191
+#: stats.xml:56 stats.xml:193
 msgid "Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:59 stats.xml:186
+#: stats.xml:61 stats.xml:188
 msgid "M.Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:64 stats.xml:181 stats.xml:258
+#: stats.xml:66 stats.xml:183 stats.xml:260
 msgid "M.Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:69 stats.xml:176 stats.xml:253
+#: stats.xml:71 stats.xml:178 stats.xml:255
 msgid "% Accuracy"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:74 stats.xml:171 stats.xml:248
+#: stats.xml:76 stats.xml:173 stats.xml:250
 msgid "% Evade"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:79 stats.xml:166 stats.xml:243
+#: stats.xml:81 stats.xml:168 stats.xml:245
 msgid "% Critical"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:84 stats.xml:151 stats.xml:228
+#: stats.xml:86 stats.xml:153 stats.xml:230
 msgid "Attack delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:89
+#: stats.xml:91
 msgid "Walk delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:94 stats.xml:156 stats.xml:233
+#: stats.xml:96 stats.xml:158 stats.xml:235
 msgid "Attack range"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:99 stats.xml:161 stats.xml:238
+#: stats.xml:101 stats.xml:163 stats.xml:240
 msgid "Damage per sec."
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:104
+#: stats.xml:106
 msgid "Karma"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:109
+#: stats.xml:111
 msgid "Manner"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:111
+#: stats.xml:113
 msgid "Homun"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:116 stats.xml:203
+#: stats.xml:118 stats.xml:205
 msgid "Level"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:121 stats.xml:208 stats.xml:300
+#: stats.xml:123 stats.xml:210 stats.xml:302
 msgid "Hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:126 stats.xml:213 stats.xml:305
+#: stats.xml:128 stats.xml:215 stats.xml:307
 msgid "Max hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:131
+#: stats.xml:133
 msgid "Mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:136
+#: stats.xml:138
 msgid "Max mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:141
+#: stats.xml:143
 msgid "Exp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:146
+#: stats.xml:148
 msgid "Need exp"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:198
+#: stats.xml:200
 msgid "Merc"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:218 stats.xml:310
+#: stats.xml:220 stats.xml:312
 msgid "Mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:223 stats.xml:315
+#: stats.xml:225 stats.xml:317
 msgid "Max mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:263
+#: stats.xml:265
 msgid "M.Atk"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:268
+#: stats.xml:270
 msgid "Defence"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:278
+#: stats.xml:280
 msgid "Expire"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:283
+#: stats.xml:285
 msgid "Faith"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:288
+#: stats.xml:290
 msgid "Calls"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:293
+#: stats.xml:295
 msgid "Kills"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:295
+#: stats.xml:297
 msgid "Elemental"
 msgstr ""
 
diff --git a/translations/de.po b/translations/de.po
index ee73a73e..8a452fe5 100644
--- a/translations/de.po
+++ b/translations/de.po
@@ -15,13 +15,14 @@
 # Nemo <nw-nemo@gmx.net>, 2015
 # Nessi <vanessabrolfs@gmail.com>, 2016
 # Philipp <philipp.krueger1@googlemail.com>, 2012
+# Shaman, 2016
 # Kristin Joris <kristin.joris@gmail.com>, 2015
 # Shaman, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Evol Online\n"
-"POT-Creation-Date: 2016-08-07 16:28+0300\n"
-"PO-Revision-Date: 2016-08-10 11:43+0000\n"
+"POT-Creation-Date: 2016-09-11 23:23+0300\n"
+"PO-Revision-Date: 2016-09-12 14:51+0000\n"
 "Last-Translator: Shaman\n"
 "Language-Team: German (http://www.transifex.com/akaras/evol/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -393,7 +394,7 @@ msgid "Blah"
 msgstr "Blah"
 
 #. (itstool) path: homunculuses/homunculus@name
-#: homunculuses.xml:6
+#: homunculuses.xml:27
 msgid "homum"
 msgstr "homum"
 
@@ -2045,44 +2046,19 @@ msgid "Yellow Cotton Dye"
 msgstr "Gelbe Baumwoll Farbe"
 
 #. (itstool) path: items/item@name
-#: items.xml:1265 items.xml:1273
-msgid "Bow 1"
-msgstr "Bogen 1"
-
-#. (itstool) path: items/item@description
-#: items.xml:1265 items.xml:1273
-msgid "Testing bow 1"
-msgstr "Testbogen 1"
-
-#. (itstool) path: items/item@name
-#: items.xml:1282
-msgid "Arrow 1"
-msgstr "Pfeil 1"
-
-#. (itstool) path: items/item@description
-#: items.xml:1282
-msgid "Testing arrow 1"
-msgstr "Testpfeil 1"
-
-#. (itstool) path: items/item@name
-#: items.xml:1289
-msgid "Arrow 2"
-msgstr "Pfeil 2"
+#: items.xml:1268
+msgid "Wooden Bow"
+msgstr "Holzbogen"
 
 #. (itstool) path: items/item@description
-#: items.xml:1289
-msgid "Testing arrow 2"
-msgstr "Testpfeil 2"
+#: items.xml:1268 items.xml:1279
+msgid "For bow training. Does not seem much reliable."
+msgstr "Zum Bogentraining. Sieht nicht sehr zuverlässig aus."
 
 #. (itstool) path: items/item@name
-#: items.xml:1296
-msgid "Arrow 3"
-msgstr "Pfeil 3"
-
-#. (itstool) path: items/item@description
-#: items.xml:1296
-msgid "Testing arrow 3"
-msgstr "Testpfeil 3"
+#: items.xml:1279
+msgid "Training Arrow"
+msgstr "Trainingspfeil"
 
 #. (itstool) path: emote/sprite@name
 #: tmp/manaplus_emotes.xml:8
@@ -2362,7 +2338,7 @@ msgid "Right Wing"
 msgstr "Rechter Flügel"
 
 #. (itstool) path: mercenaries/mercenary@name
-#: mercenaries.xml:6
+#: mercenaries.xml:27
 msgid "merc"
 msgstr "merc"
 
@@ -2686,8 +2662,8 @@ msgstr "Sie sind alt und riechen ein wenig, aber das warme Gefühl, das sie auss
 
 #. (itstool) path: quest/reward
 #: quests.xml:72
-msgid "A [Creased Shirt] and old [Creased Shorts]."
-msgstr "Ein [Zerknittertes Hemd] und alte [Zerknitterte kurze Hosen]."
+msgid "A {@@1} and old {@@2}."
+msgstr "Ein {@@1} und alte {@@2}."
 
 #. (itstool) path: quest/name
 #: quests.xml:79 quests.xml:89 quests.xml:101
@@ -2729,8 +2705,8 @@ msgstr "Alige, der geheimnisvolle Reisende, bittet dich, ihm dabei zu helfen, et
 #: quests.xml:92
 msgid ""
 "In fact, he hides in a hole in the main hallway. It leads to the ship's "
-"storage room where he can reach for some barrels full of [Piberries]."
-msgstr "Tatsächlich versteckt er sich in einem Loch im Mittelgang. Es führt zum Lagerraum des Schiffes, wo er nach paar Fässer voll [Piberries] erreichen kann."
+"storage room where he can reach for some barrels full of {@@1}."
+msgstr "Eigentlich versteckt er sich in einem Loch im Hauptkorridor. Dieser führt zum Lagerraum des Schiffes, wo er ein paar Fässer voll mit [@@1] erreichen kann."
 
 #. (itstool) path: quest/text
 #: quests.xml:94
@@ -2741,9 +2717,8 @@ msgstr "Er ist genervt davon, die ganze Zeit diese Beeren zu essen. Darum hätte
 
 #. (itstool) path: quest/text
 #: quests.xml:102
-msgid ""
-"You brought Alige some food, different from the [Piberries] he usually eats."
-msgstr "Du hast Alige was Anderes als seine [Piberries] zu Essen gebracht."
+msgid "You brought Alige some food, different from the {@@1} he usually eats."
+msgstr "Du hast Alige was Anderes als seine gewöhnlichen [@@1] zu Essen gebracht."
 
 #. (itstool) path: quest/text
 #: quests.xml:104
@@ -2754,8 +2729,8 @@ msgstr "Es sieht aus, als würde er gerne andere Geschmäcker probieren. Versuch
 
 #. (itstool) path: quest/reward
 #: quests.xml:108
-msgid "A handful of [Piberries]."
-msgstr "Eine handvoll [Pibeeren]."
+msgid "A handful of {@@1}."
+msgstr "Eine handvoll [@@1]."
 
 #. (itstool) path: quest/name
 #: quests.xml:115 quests.xml:125 quests.xml:135 quests.xml:143 quests.xml:153
@@ -2907,8 +2882,8 @@ msgstr "La Johanne, Nard's Zimmer. (25,24)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:217 quests.xml:225
-msgid "50 EXP, [Bandana]."
-msgstr "50 EXP, [Kopftuch]."
+msgid "50 EXP, {@@1}."
+msgstr "50 EXP, {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:221
@@ -2938,9 +2913,9 @@ msgid "La Johanne, Second Deck. (50,24)"
 msgstr "La Johanne, Unterdeck. (50,24)"
 
 #. (itstool) path: quest/reward
-#: quests.xml:237
-msgid "[Knife]."
-msgstr "[Messer]."
+#: quests.xml:237 quests.xml:484 quests.xml:530 quests.xml:560
+msgid "{@@1}."
+msgstr "{@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:244 quests.xml:254
@@ -3015,8 +2990,8 @@ msgstr "Du hast eine Schatzkiste auf der Spitze einer Klippe an der Ostseite der
 
 #. (itstool) path: quest/text
 #: quests.xml:272
-msgid "The chest contains gold and an [Old Book]."
-msgstr "Diese Kiste enthält Gold und ein [Altes Buch]."
+msgid "The chest contains gold and an {@@1}."
+msgstr "Diese Kiste enthält Gold und ein [@@1]."
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:274
@@ -3025,8 +3000,8 @@ msgstr "Drasil. (83,70)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:275
-msgid "100 E, [Old Book]."
-msgstr "100 E, [Altes Buch]."
+msgid "100 E, {@@1}."
+msgstr "100 E, {@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:300 quests.xml:312
@@ -3037,9 +3012,8 @@ msgstr "Unerwartete Hilfe"
 #: quests.xml:301
 msgid ""
 "Gugli told you about the sailors' task on the island. He wants you to help "
-"some of them bringing him 6 boxes full of [Croconut], [Aquada] and "
-"[Plushroom]."
-msgstr "Gugli erzählte dir von Aufgaben der Seemänner auf der Insel. Du solltest einigen von ihnen helfen, indem du für Gugli 6 Kisten voller [Krokosnüsse], [Aquada] und [Plushrooms] abholst."
+"some of them bringing him 6 boxes full of {@@1}, {@@2} and {@@3}."
+msgstr "Gugli hat dir von den Aufgaben der Matrosen auf der Insel erzählt. Er möchte, dass du ihnen hilfst, ihm 6 Kisten voll mit  {@@1}, {@@2} und {@@3} zu bringen."
 
 #. (itstool) path: quest/text
 #: quests.xml:303
@@ -3081,9 +3055,9 @@ msgstr "Zwei Leutnants in einem Boot"
 #. (itstool) path: quest/text
 #: quests.xml:325
 msgid ""
-"Chef Gado wants you to collect 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] "
-"and 1 [Sea Drops] to prepare a [Poisoned Dish], for Julia."
-msgstr "Chef Gado will, dass du 2 [Piou Beine], 2 [Halbe Krokosnuss], 1 [Aquada] und 1 [Meerestropfen] sammelst, um ein [Vergiftetes Gericht] für Julia vorzubereiten."
+"Chef Gado wants you to collect 2 {@@1}, 2 {@@2}, 1 {@@3} and 1 {@@4} to "
+"prepare a {@@5}, for Julia."
+msgstr "Koch Gado möchte, dass du 2 {@@1}, 2 {@@2}, 1 {@@3} und 1 {@@4} sammelst, damit er ein {@@5} für Julia vorbereiten kann."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:327 quests.xml:337 quests.xml:345 quests.xml:353 quests.xml:361
@@ -3099,10 +3073,8 @@ msgstr "La Johanne, Unterdeck. (17,28)"
 
 #. (itstool) path: quest/text
 #: quests.xml:333
-msgid ""
-"Chef Gado prepared the [Poisoned Dish]. He would like you to give it to "
-"Julia."
-msgstr "Koch Gado hat das [@@717|Vergiftete Essen@@] vorbereitet. Er möchte, dass du es Julia gibst."
+msgid "Chef Gado prepared the {@@1}. He would like you to give it to Julia."
+msgstr "Koch Gado hat das {@@1} vorbereitet. Er möchte, dass du es Julia gibst."
 
 #. (itstool) path: quest/text
 #: quests.xml:335
@@ -3123,8 +3095,8 @@ msgstr "Du hast Julia erfolgreich vergiftet. Endlich konnte sich Koch Gado räch
 
 #. (itstool) path: quest/reward
 #: quests.xml:355
-msgid "15 EXP, 200 E, [Bread]."
-msgstr "15 EXP, 200 E, [Brot]."
+msgid "15 EXP, 200 E, {@@1}."
+msgstr "15 EXP, 200 E, {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:359
@@ -3218,13 +3190,13 @@ msgstr "Du hast Bobo gefunden. Er hat versprochen, schnell nach Hause zu gehen."
 
 #. (itstool) path: quest/text
 #: quests.xml:412
-msgid "His sister was very happy and gave you an [Aquada] as a reward."
-msgstr "Seine Schwester war erfreut und gab dir ein [Aquada] als Belohnung."
+msgid "His sister was very happy and gave you an {@@1} as a reward."
+msgstr "Seine Schwester war erfreut und gab dir ein {@@1} als Belohnung."
 
 #. (itstool) path: quest/reward
 #: quests.xml:416
-msgid "An [Aquada]."
-msgstr "Ein [Aquada]."
+msgid "An {@@1}."
+msgstr "Ein {@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:423 quests.xml:432
@@ -3238,8 +3210,8 @@ msgstr "Das Elvenmädchen Moon trat aus Versehen auf einen Seeigel."
 
 #. (itstool) path: quest/text
 #: quests.xml:425
-msgid "She wants you to bring her [Croc Claw]s to get rid of spikes."
-msgstr "Sie möchte, dass Du ihr einige [Croc Klaue]n bringst, um die Stachel loszuwerden."
+msgid "She wants you to bring her {@@1}s to get rid of spikes."
+msgstr "Sie möchte, dass Du ihr einige {@@1}n bringst, um die Stachel loszuwerden."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:427 quests.xml:435
@@ -3323,8 +3295,8 @@ msgstr "Er wollte sie möglichst schnell ausprobieren, darüber vergaß er glatt
 
 #. (itstool) path: quest/text
 #: quests.xml:470
-msgid "You need to bring him 10 [Small Tentacles]."
-msgstr "Du sollst ihm 10 [Kleine Tentakeln] bringen."
+msgid "You need to bring him 10 {@@1}."
+msgstr "Du sollst Ihm 10 {@@1} bringen."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:472 quests.xml:482
@@ -3351,11 +3323,6 @@ msgstr "Aus Dankbarkeit hast du seine alte Angel bekommen."
 msgid "You can use it to catch fish."
 msgstr "Du kannst damit Fische fangen."
 
-#. (itstool) path: quest/reward
-#: quests.xml:484
-msgid "[Fishing Rod]."
-msgstr "[Angelrute]."
-
 #. (itstool) path: quest/name
 #: quests.xml:492 quests.xml:502 quests.xml:511
 msgid "The Buried Treasure"
@@ -3429,8 +3396,8 @@ msgstr "Besuche Artis!"
 
 #. (itstool) path: quest/text
 #: quests.xml:525
-msgid "Bacchus asked you to bring him a [Pumpkin]."
-msgstr "Bacchus frägt dich nach einem [Kürbis]."
+msgid "Bacchus asked you to bring him a {@@1}."
+msgstr "Bacchus frägt dich nach einem {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:526
@@ -3447,11 +3414,6 @@ msgstr "Bacchus"
 msgid "La Johanne, Hold. (31,30)"
 msgstr "La Johanne, Laderaum. (31,30)"
 
-#. (itstool) path: quest/reward
-#: quests.xml:530
-msgid "[Pumpkin Hat]."
-msgstr "[Kürbishut]."
-
 #. (itstool) path: quest/text
 #: quests.xml:534
 msgid "Bacchus offers you to see a small part of your future."
@@ -3490,19 +3452,14 @@ msgstr "Irgendwie tauchte Alige in meiner Zukunftsvision auf."
 
 #. (itstool) path: quest/text
 #: quests.xml:556
-msgid "For killing the scary Cuco, he gave me a [Barrel]."
-msgstr "Für den Tod des schrecklichen Cuco gab er mir ein [Barrel]."
+msgid "For killing the scary Cuco, he gave me a {@@1}."
+msgstr "Für den Tod des schrecklichen Cuco gab er mir ein {@@1}."
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:559
 msgid "Artis, Dream World. (71,132)"
 msgstr "Artis, Traumland. (71,132)"
 
-#. (itstool) path: quest/reward
-#: quests.xml:560
-msgid "[Barrel]."
-msgstr "[Fass]"
-
 #. (itstool) path: quest/name
 #: quests.xml:568 quests.xml:576 quests.xml:583
 msgid "Plushroom Addict"
@@ -3530,8 +3487,8 @@ msgstr "Artis, Marktplatz. (35,125)"
 
 #. (itstool) path: quest/text
 #: quests.xml:577
-msgid "Rumly is waiting for you to bring him some [Plushroom]s."
-msgstr "Rumly wartet darauf, daß du ihm ein paar [Plushroom]s bringst."
+msgid "Rumly is waiting for you to bring him some {@@1}s."
+msgstr "Rumly wartet darauf, daß du ihm ein paar {@@1}s bringst."
 
 #. (itstool) path: quest/text
 #: quests.xml:584
@@ -3540,8 +3497,8 @@ msgstr "Rumly kann deine Statuspunkte zurücksetzen."
 
 #. (itstool) path: quest/text
 #: quests.xml:585
-msgid "Bring him some [Plushroom]s and he will be able to do it for you."
-msgstr "Bring ihm ein paar [Plushroom]s, damit kann er das erledigen."
+msgid "Bring him some {@@1}s and he will be able to do it for you."
+msgstr "Bring ihm ein paar {@@1}s, damit kann er das erledigen."
 
 #. (itstool) path: quest/name
 #: quests.xml:608 quests.xml:617 quests.xml:626 quests.xml:635 quests.xml:644
@@ -3629,8 +3586,8 @@ msgstr "Resa befindet sich in der Rüstungschmiede für leichte Rüstung (55,72)
 
 #. (itstool) path: quest/text
 #: quests.xml:654
-msgid "Resa gave you a cute [%Color% Artis Tank Top, Camel Cotton Dye]."
-msgstr "Resa gab dir ein süßes [%color% Artis Oberteil, Kamel Baumwollfärbung]."
+msgid "Resa gave you a cute {@@1}."
+msgstr "Resa gab dir ein nettes {@@1}."
 
 #. (itstool) path: quest/reward
 #: quests.xml:659
@@ -3662,8 +3619,8 @@ msgstr "Ivan ist in einem kleinen Haus in der Nähe des Kanals zu finden (163,71
 
 #. (itstool) path: quest/text
 #: quests.xml:681
-msgid "Ivan gave you some [Piberries Infusion]."
-msgstr "Ivan hat dir einige [Pibbeerentee]s gegeben."
+msgid "Ivan gave you some {@@1}."
+msgstr "Ivan hat dir ein paar {@@1} gegeben."
 
 #. (itstool) path: quest/text
 #: quests.xml:682
@@ -3707,10 +3664,8 @@ msgstr "Du hast jede Aufgabe erfüllt und sogar den Hügel von diesen schrecklic
 
 #. (itstool) path: quest/reward
 #: quests.xml:705
-msgid ""
-"[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries"
-" Infusion]s"
-msgstr "[Übungskurzschwert], [%Color% Artis Tank Top, Ocker Baumwoll Farbe], 5 [Pibeerentee]s"
+msgid "{@@1}, {@@2}, 5 {@@3}s"
+msgstr "{@@1}, {@@2}, 5 {@@3}s"
 
 #. (itstool) path: quest/reward
 #: quests.xml:706
@@ -3741,8 +3696,8 @@ msgstr "Artis, Händlergilde. (101,37)"
 
 #. (itstool) path: quest/text
 #: quests.xml:723 quests.xml:732
-msgid "Fexil wants to open a business of [Fluffy Fur]'s clothes."
-msgstr "Fexil möchte ein Geschäft für [Fluffy Fell] Klamotten öffnen."
+msgid "Fexil wants to open a business of {@@1}'s clothes."
+msgstr "Fexil möchte ein Geschäft mit Kleidung aus {@@1} eröffnen."
 
 #. (itstool) path: quest/text
 #: quests.xml:724
@@ -3766,8 +3721,8 @@ msgstr "Er belohnt dich für jeden Pelz, den du ihm bringst."
 
 #. (itstool) path: quest/reward
 #: quests.xml:737
-msgid "15 per [Fluffy Fur]."
-msgstr "15 pro [Fluffy Fell]."
+msgid "15 per {@@1}."
+msgstr "15 per {@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:743
@@ -3889,197 +3844,197 @@ msgid "Hells plant"
 msgstr "Höllenpflanze"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:12
+#: stats.xml:14
 msgid "Strength"
 msgstr "Kraft"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:18
+#: stats.xml:20
 msgid "Agility"
 msgstr "Beweglichkeit"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:24
+#: stats.xml:26
 msgid "Vitality"
 msgstr "Leben"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:30
+#: stats.xml:32
 msgid "Intelligence"
 msgstr "Intelligenz"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:36
+#: stats.xml:38
 msgid "Dexterity"
 msgstr "Geschicklichkeit"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:42
+#: stats.xml:44
 msgid "Luck"
 msgstr "Glück"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:49 stats.xml:196 stats.xml:273
+#: stats.xml:51 stats.xml:198 stats.xml:275
 msgid "Attack"
 msgstr "Angriff"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:54 stats.xml:191
+#: stats.xml:56 stats.xml:193
 msgid "Defense"
 msgstr "Verteidigung"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:59 stats.xml:186
+#: stats.xml:61 stats.xml:188
 msgid "M.Attack"
 msgstr "M.Angriff"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:64 stats.xml:181 stats.xml:258
+#: stats.xml:66 stats.xml:183 stats.xml:260
 msgid "M.Defense"
 msgstr "M.Verteidigung"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:69 stats.xml:176 stats.xml:253
+#: stats.xml:71 stats.xml:178 stats.xml:255
 msgid "% Accuracy"
 msgstr "% Genauigkeit"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:74 stats.xml:171 stats.xml:248
+#: stats.xml:76 stats.xml:173 stats.xml:250
 msgid "% Evade"
 msgstr "% Ausweichen"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:79 stats.xml:166 stats.xml:243
+#: stats.xml:81 stats.xml:168 stats.xml:245
 msgid "% Critical"
 msgstr "% Kritisch"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:84 stats.xml:151 stats.xml:228
+#: stats.xml:86 stats.xml:153 stats.xml:230
 msgid "Attack delay"
 msgstr "Angriffsverzug"
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:89
+#: stats.xml:91
 msgid "Walk delay"
 msgstr "Bewegungsverzug"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:94 stats.xml:156 stats.xml:233
+#: stats.xml:96 stats.xml:158 stats.xml:235
 msgid "Attack range"
 msgstr "Angriffsreichweite"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:99 stats.xml:161 stats.xml:238
+#: stats.xml:101 stats.xml:163 stats.xml:240
 msgid "Damage per sec."
 msgstr "Schaden pro Sekunde"
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:104
+#: stats.xml:106
 msgid "Karma"
 msgstr "Karma"
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:109
+#: stats.xml:111
 msgid "Manner"
 msgstr "Verhalten"
 
 #. (itstool) path: stats/page@name
-#: stats.xml:111
+#: stats.xml:113
 msgid "Homun"
 msgstr "Homun"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:116 stats.xml:203
+#: stats.xml:118 stats.xml:205
 msgid "Level"
 msgstr "Level"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:121 stats.xml:208 stats.xml:300
+#: stats.xml:123 stats.xml:210 stats.xml:302
 msgid "Hp"
 msgstr "Hp"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:126 stats.xml:213 stats.xml:305
+#: stats.xml:128 stats.xml:215 stats.xml:307
 msgid "Max hp"
 msgstr "Max. hp"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:131
+#: stats.xml:133
 msgid "Mana"
 msgstr "Mana"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:136
+#: stats.xml:138
 msgid "Max mana"
 msgstr "Max. Mana"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:141
+#: stats.xml:143
 msgid "Exp"
 msgstr "EP"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:146
+#: stats.xml:148
 msgid "Need exp"
 msgstr "benötigte EP"
 
 #. (itstool) path: stats/page@name
-#: stats.xml:198
+#: stats.xml:200
 msgid "Merc"
 msgstr "Merc"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:218 stats.xml:310
+#: stats.xml:220 stats.xml:312
 msgid "Mp"
 msgstr "Mp"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:223 stats.xml:315
+#: stats.xml:225 stats.xml:317
 msgid "Max mp"
 msgstr "Max. mp"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:263
+#: stats.xml:265
 msgid "M.Atk"
 msgstr "M.Ang."
 
 #. (itstool) path: page/stat@name
-#: stats.xml:268
+#: stats.xml:270
 msgid "Defence"
 msgstr "Verteidigung"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:278
+#: stats.xml:280
 msgid "Expire"
 msgstr "Endet"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:283
+#: stats.xml:285
 msgid "Faith"
 msgstr "Hoffnung"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:288
+#: stats.xml:290
 msgid "Calls"
 msgstr "Anrufe"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:293
+#: stats.xml:295
 msgid "Kills"
 msgstr "Getötet"
 
 #. (itstool) path: stats/page@name
-#: stats.xml:295
+#: stats.xml:297
 msgid "Elemental"
 msgstr "Elementar"
 
diff --git a/translations/es.po b/translations/es.po
index 2e77721c..e8383726 100644
--- a/translations/es.po
+++ b/translations/es.po
@@ -1,5 +1,6 @@
 # 
 # Translators:
+# Albert, 2016
 # Mr Pingo <mrpingo@hotmail.com>, 2016
 # 0x0Eddine <salahbubuli44@gmail.com>, 2012
 # Maria <mtorres2022@gmail.com>, 2012
@@ -12,9 +13,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evol Online\n"
-"POT-Creation-Date: 2016-08-07 16:28+0300\n"
-"PO-Revision-Date: 2016-08-08 08:48+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2016-09-11 23:23+0300\n"
+"PO-Revision-Date: 2016-11-10 20:54+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/evol/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -385,9 +386,9 @@ msgid "Blah"
 msgstr "Bla"
 
 #. (itstool) path: homunculuses/homunculus@name
-#: homunculuses.xml:6
+#: homunculuses.xml:27
 msgid "homum"
-msgstr ""
+msgstr "homum"
 
 #. (itstool) path: list/color@name
 #: itemcolors.xml:8 itemcolors.xml:82 itemcolors.xml:90
@@ -1269,7 +1270,7 @@ msgstr "Curar 20-30 HP"
 #. (itstool) path: items/item@name
 #: items.xml:432
 msgid "Red Plush Wine"
-msgstr ""
+msgstr "Vino rojo de lujo"
 
 #. (itstool) path: items/item@description
 #: items.xml:432
@@ -1284,7 +1285,7 @@ msgstr "Curar 40-90 HP"
 #. (itstool) path: items/item@name
 #: items.xml:439
 msgid "Piou and The Fluffy"
-msgstr ""
+msgstr "Piou y el peluche"
 
 #. (itstool) path: items/item@description
 #: items.xml:439
@@ -1311,7 +1312,7 @@ msgstr "Coro del Bosque"
 msgid ""
 "Historical foundations of this poem is from centuries ago on the great "
 "continent, Ealia."
-msgstr ""
+msgstr "Fundaciones históricas de este problema es de hace siglos en el gran continente, Ealia."
 
 #. (itstool) path: items/item@name
 #: items.xml:460
@@ -1549,7 +1550,7 @@ msgstr "Calabaza"
 #. (itstool) path: items/item@description
 #: items.xml:613
 msgid "An invasive specimen, sometimes carved during festivals."
-msgstr ""
+msgstr "Un espécimen invasivo, a veces tallado durante los festivales."
 
 #. (itstool) path: items/item@name
 #: items.xml:620
@@ -1579,7 +1580,7 @@ msgstr "Tentáculos"
 #. (itstool) path: items/item@description
 #: items.xml:634
 msgid "Boneless appendage of invertebrates."
-msgstr ""
+msgstr "Extremidad deshuesada de invertebrados."
 
 #. (itstool) path: items/item@name
 #: items.xml:641
@@ -1589,7 +1590,7 @@ msgstr "Carpa Común"
 #. (itstool) path: items/item@description
 #: items.xml:641
 msgid "Freshwater is often infested with these pests."
-msgstr ""
+msgstr "El agua dulce está a menudo infectada con estas plagas."
 
 #. (itstool) path: items/item@name
 #: items.xml:648
@@ -1630,7 +1631,7 @@ msgstr "Certificación de Gremio"
 #: items.xml:669
 msgid ""
 "This piece of paper grants you the exclusive permission to create a guild."
-msgstr ""
+msgstr "Este papel le garantiza el permiso exclusivo de crear un gremio."
 
 #. (itstool) path: items/item@name
 #: items.xml:689
@@ -1836,12 +1837,12 @@ msgstr "Para usar en festivales y en ciertos eventos."
 #. (itstool) path: items/item@name
 #: items.xml:971
 msgid "Shemagh"
-msgstr ""
+msgstr "Shemagh"
 
 #. (itstool) path: items/item@description
 #: items.xml:971
 msgid "An improved scarf used by mercenaries in tough environment."
-msgstr ""
+msgstr "Una bufanda mejorada usada por los mercenarios en entornos duros."
 
 #. (itstool) path: items/item@name
 #: items.xml:986
@@ -1871,7 +1872,7 @@ msgstr "Gladius de Entrenamiento"
 #. (itstool) path: items/item@description
 #: items.xml:1014
 msgid "A short sword made for close combat."
-msgstr ""
+msgstr "Una espada corta hecha para combate cercano."
 
 #. (itstool) path: items/item@name
 #: items.xml:1028
@@ -2037,44 +2038,19 @@ msgid "Yellow Cotton Dye"
 msgstr "Tinte Amarillo para Algodón"
 
 #. (itstool) path: items/item@name
-#: items.xml:1265 items.xml:1273
-msgid "Bow 1"
-msgstr ""
+#: items.xml:1268
+msgid "Wooden Bow"
+msgstr "Arco de madera"
 
 #. (itstool) path: items/item@description
-#: items.xml:1265 items.xml:1273
-msgid "Testing bow 1"
-msgstr ""
+#: items.xml:1268 items.xml:1279
+msgid "For bow training. Does not seem much reliable."
+msgstr "Para entrenamiento con arco. No parece muy fiable."
 
 #. (itstool) path: items/item@name
-#: items.xml:1282
-msgid "Arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1282
-msgid "Testing arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1289
-msgid "Arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1289
-msgid "Testing arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1296
-msgid "Arrow 3"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1296
-msgid "Testing arrow 3"
-msgstr ""
+#: items.xml:1279
+msgid "Training Arrow"
+msgstr "Flecha de entrenamiento"
 
 #. (itstool) path: emote/sprite@name
 #: tmp/manaplus_emotes.xml:8
@@ -2199,12 +2175,12 @@ msgstr "Llorando"
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-0-0.tmx:9 ../../client-data/maps/000-0-1.tmx:9
 msgid "Sailor's Room"
-msgstr ""
+msgstr "Camarote de marinero"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-0.tmx:8
 msgid "Oceania"
-msgstr ""
+msgstr "Oceania"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-1.tmx:8
@@ -2224,7 +2200,7 @@ msgstr "Segunda Cubierta"
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-2-2.tmx:9 ../../client-data/maps/001-2-23.tmx:9
 msgid "Hold"
-msgstr ""
+msgstr "Agarrar"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-2-3.tmx:8 ../../client-data/maps/001-2-24.tmx:8
@@ -2234,7 +2210,7 @@ msgstr "Habitación de Nard"
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-2-4.tmx:9
 msgid "Alige's Hiding Place"
-msgstr ""
+msgstr "Escondite de Alige"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-1.tmx:8
@@ -2251,7 +2227,7 @@ msgstr "Tienda de Armaduras Ligeras"
 #: ../../client-data/maps/001-2-12.tmx:8 ../../client-data/maps/001-2-15.tmx:8
 #: ../../client-data/maps/001-2-1.tmx:8
 msgid "Noble House"
-msgstr ""
+msgstr "Casa noble"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-13.tmx:8 ../../client-data/maps/001-2-29.tmx:8
@@ -2267,27 +2243,27 @@ msgstr "Sótano"
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-16.tmx:8
 msgid "Harbourmaster Lodge"
-msgstr ""
+msgstr "Hospedaje de puerto"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-17.tmx:8 ../../client-data/maps/001-2-20.tmx:8
 msgid "Backroom"
-msgstr ""
+msgstr "Trastienda"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-18.tmx:8
 msgid "Docks Warehouse"
-msgstr ""
+msgstr "Almacén de atraque"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-19.tmx:8
 msgid "Merchant Hall"
-msgstr ""
+msgstr "Vestíbulo mercantil"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-25.tmx:8
 msgid "Storage Room"
-msgstr ""
+msgstr "Despensa"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-26.tmx:8
@@ -2302,7 +2278,7 @@ msgstr "Tienda del Herrero"
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-28.tmx:9
 msgid "Red Plush Inn"
-msgstr ""
+msgstr "Taberna roja de lujo"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-2.tmx:8
@@ -2336,7 +2312,7 @@ msgstr "Biblioteca"
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-5.tmx:8
 msgid "Warehouse"
-msgstr ""
+msgstr "Almacén"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-7.tmx:8
@@ -2354,9 +2330,9 @@ msgid "Right Wing"
 msgstr "Ala Derecha"
 
 #. (itstool) path: mercenaries/mercenary@name
-#: mercenaries.xml:6
+#: mercenaries.xml:27
 msgid "merc"
-msgstr ""
+msgstr "merc"
 
 #. (itstool) path: monsters/monster@name
 #: monsters.xml:27
@@ -2512,7 +2488,7 @@ msgstr "Lanzar"
 #. (itstool) path: npc/menu@name
 #: npcs.xml:508
 msgid "Pull"
-msgstr ""
+msgstr "Tirar"
 
 #. (itstool) path: npc/menu@name
 #: npcs.xml:564
@@ -2612,7 +2588,7 @@ msgstr "Para hablar con un NPC, haz clic en éste con el puntero del ratón. O t
 #. (itstool) path: quest/questgiver
 #: quests.xml:38 quests.xml:48 quests.xml:60 quests.xml:70
 msgid "Magic Arpan"
-msgstr ""
+msgstr "Arpan mágica"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:39 quests.xml:61 quests.xml:71
@@ -2678,8 +2654,8 @@ msgstr "Son viejos  y apestan un poco pero la cálida sensación que dan te hace
 
 #. (itstool) path: quest/reward
 #: quests.xml:72
-msgid "A [Creased Shirt] and old [Creased Shorts]."
-msgstr ""
+msgid "A {@@1} and old {@@2}."
+msgstr "Un {@@1} y {@@2} viejo."
 
 #. (itstool) path: quest/name
 #: quests.xml:79 quests.xml:89 quests.xml:101
@@ -2721,8 +2697,8 @@ msgstr "Alige, el viajero misterioso, está pidiéndote ayuda para encontrarle a
 #: quests.xml:92
 msgid ""
 "In fact, he hides in a hole in the main hallway. It leads to the ship's "
-"storage room where he can reach for some barrels full of [Piberries]."
-msgstr "De hecho, él se esconde en un hueco en el corredor principal. Ésta conduce a la zona de almacenamiento donde puede obtener algunos barriles llenos de [Pibayas]."
+"storage room where he can reach for some barrels full of {@@1}."
+msgstr "De h echo, él se esconde en un agujero en el recibidor principal. Se dirige a la despensa del barco donde puede alcanzar algunos barriles llenos de {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:94
@@ -2733,9 +2709,8 @@ msgstr "Él está asqueado de comer esas bayas todo el tiempo. Por eso es que le
 
 #. (itstool) path: quest/text
 #: quests.xml:102
-msgid ""
-"You brought Alige some food, different from the [Piberries] he usually eats."
-msgstr "Le has traído algo de comida a Alige, diferente de las [Pibayas] que él siempre come."
+msgid "You brought Alige some food, different from the {@@1} he usually eats."
+msgstr "Usted le trajo alguna comida a Alige, distinta al {@@1} que él come normalmente."
 
 #. (itstool) path: quest/text
 #: quests.xml:104
@@ -2746,8 +2721,8 @@ msgstr "Parece que él está ansioso de probar nuevos sabores. Intenta traerle o
 
 #. (itstool) path: quest/reward
 #: quests.xml:108
-msgid "A handful of [Piberries]."
-msgstr "Un puñado de [Pibayas]."
+msgid "A handful of {@@1}."
+msgstr "Un puñado de {@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:115 quests.xml:125 quests.xml:135 quests.xml:143 quests.xml:153
@@ -2758,7 +2733,7 @@ msgstr "Exterminio de Rattos"
 #. (itstool) path: quest/text
 #: quests.xml:116
 msgid "Peter needs your help to clear La Johanne's hold of some rattos."
-msgstr ""
+msgstr "Peter necesita su ayuda para limpiar la bodega de La Johanne's de algunos rattos."
 
 #. (itstool) path: quest/text
 #: quests.xml:118
@@ -2899,8 +2874,8 @@ msgstr "La Johanne, Habitación de Nard. (25,24)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:217 quests.xml:225
-msgid "50 EXP, [Bandana]."
-msgstr "50 EXP, [Bandana]."
+msgid "50 EXP, {@@1}."
+msgstr "50 EXP, {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:221
@@ -2930,9 +2905,9 @@ msgid "La Johanne, Second Deck. (50,24)"
 msgstr "La Johanne, Segunda Cubierta. (50,24)"
 
 #. (itstool) path: quest/reward
-#: quests.xml:237
-msgid "[Knife]."
-msgstr "[Cuchillo]."
+#: quests.xml:237 quests.xml:484 quests.xml:530 quests.xml:560
+msgid "{@@1}."
+msgstr "{@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:244 quests.xml:254
@@ -2954,12 +2929,12 @@ msgstr "Él no menciono ninguna recompensa, pero quiere que le entregues esto a
 #. (itstool) path: quest/questgiver
 #: quests.xml:249 quests.xml:261
 msgid "Couwan"
-msgstr ""
+msgstr "Couwan"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:250 quests.xml:308 quests.xml:316
 msgid "Drasil Island. (85,108)"
-msgstr ""
+msgstr "Isla de Drasil. (85,108)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:251
@@ -2986,7 +2961,7 @@ msgstr "También te advirtió que no confíes en nadie."
 #. (itstool) path: quest/coordinates
 #: quests.xml:262
 msgid "Drasil Island. (89,36)"
-msgstr ""
+msgstr "Isla de Drasil. (89,36)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:263
@@ -3007,18 +2982,18 @@ msgstr "Viste un cofre del tesoro en la cima del acantilado en el lado este de l
 
 #. (itstool) path: quest/text
 #: quests.xml:272
-msgid "The chest contains gold and an [Old Book]."
-msgstr "El cofre contiene oro y un [Libro Viejo]."
+msgid "The chest contains gold and an {@@1}."
+msgstr "El cofre contiene oro y un {@@1}."
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:274
 msgid "Drasil Island. (83,70)"
-msgstr ""
+msgstr "Isla de Drasil. (83,70)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:275
-msgid "100 E, [Old Book]."
-msgstr "100 E, [Libro Viejo]."
+msgid "100 E, {@@1}."
+msgstr "100 E, {@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:300 quests.xml:312
@@ -3029,9 +3004,8 @@ msgstr "Ayuda Inesperada"
 #: quests.xml:301
 msgid ""
 "Gugli told you about the sailors' task on the island. He wants you to help "
-"some of them bringing him 6 boxes full of [Croconut], [Aquada] and "
-"[Plushroom]."
-msgstr ""
+"some of them bringing him 6 boxes full of {@@1}, {@@2} and {@@3}."
+msgstr "Gugli le habló de la tarea de los marineros en la isla. Quiere que ayude a algunos de ellos a traerle 6 cajas llenas de {@@1}, {@@2} y {@@3}."
 
 #. (itstool) path: quest/text
 #: quests.xml:303
@@ -3050,7 +3024,7 @@ msgstr "Max, Silvio y Lean pueden saber algo sobre donde están estos marineros.
 #. (itstool) path: quest/questgiver
 #: quests.xml:307 quests.xml:315
 msgid "Gugli"
-msgstr ""
+msgstr "Gugli"
 
 #. (itstool) path: quest/text
 #: quests.xml:313
@@ -3073,15 +3047,15 @@ msgstr "Dos Tenientes en Un Bote"
 #. (itstool) path: quest/text
 #: quests.xml:325
 msgid ""
-"Chef Gado wants you to collect 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] "
-"and 1 [Sea Drops] to prepare a [Poisoned Dish], for Julia."
-msgstr ""
+"Chef Gado wants you to collect 2 {@@1}, 2 {@@2}, 1 {@@3} and 1 {@@4} to "
+"prepare a {@@5}, for Julia."
+msgstr "El cocinero Gado quiere que recoja 2 {@@1}, 2 {@@2}, 1 {@@3} y 1 {@@4} para preparar un {@@5}, para Julia."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:327 quests.xml:337 quests.xml:345 quests.xml:353 quests.xml:361
 #: quests.xml:369
 msgid "Chef Gado"
-msgstr ""
+msgstr "Cocinero Gado"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:328 quests.xml:338 quests.xml:346 quests.xml:354 quests.xml:362
@@ -3091,10 +3065,8 @@ msgstr "La Johanne, Segunda Cubierta. (17,28)"
 
 #. (itstool) path: quest/text
 #: quests.xml:333
-msgid ""
-"Chef Gado prepared the [Poisoned Dish]. He would like you to give it to "
-"Julia."
-msgstr ""
+msgid "Chef Gado prepared the {@@1}. He would like you to give it to Julia."
+msgstr "El cocinero Gado preparó el {@@1}. Le gustaría que usted se lo diera a Julia."
 
 #. (itstool) path: quest/text
 #: quests.xml:335
@@ -3115,8 +3087,8 @@ msgstr "Envenenaste exitosamente a Julia. ¡El Chef Gado finalmente obtuvo su ve
 
 #. (itstool) path: quest/reward
 #: quests.xml:355
-msgid "15 EXP, 200 E, [Bread]."
-msgstr "15 EXP, 200 E, [Pan]."
+msgid "15 EXP, 200 E, {@@1}."
+msgstr "15 EXP, 200 E, {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:359
@@ -3153,13 +3125,13 @@ msgstr "Katja quiere que encuentres a su hermano."
 #. (itstool) path: quest/text
 #: quests.xml:381
 msgid "He is hiding somewhere on the hill, not far from here."
-msgstr ""
+msgstr "Él se está escondiendo en alguna parte de la colina, cerca de aquí."
 
 #. (itstool) path: quest/text
 #: quests.xml:382
 msgid ""
 "You should probably go and check behind trees, they are great for hiding."
-msgstr ""
+msgstr "Usted probablemente debería ir y comprobar tras los árboles, son buenos para esconderse."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:384 quests.xml:394 quests.xml:405 quests.xml:414
@@ -3196,12 +3168,12 @@ msgstr "100 E."
 #. (itstool) path: quest/text
 #: quests.xml:402
 msgid "You can not allow this. Therefore you told him to go home."
-msgstr ""
+msgstr "No puede permitir esto. Por lo tanto dígale que se vaya a casa."
 
 #. (itstool) path: quest/text
 #: quests.xml:403
 msgid "You should go tell Katja about it."
-msgstr ""
+msgstr "Debería hablarle a Katja sobre eso."
 
 #. (itstool) path: quest/text
 #: quests.xml:411
@@ -3210,13 +3182,13 @@ msgstr "Encontraste a Bobo. Él promete ir a casa pronto."
 
 #. (itstool) path: quest/text
 #: quests.xml:412
-msgid "His sister was very happy and gave you an [Aquada] as a reward."
-msgstr ""
+msgid "His sister was very happy and gave you an {@@1} as a reward."
+msgstr "Su hermana estaba muy feliz y le dio a usted un {@@1} como recompensa."
 
 #. (itstool) path: quest/reward
 #: quests.xml:416
-msgid "An [Aquada]."
-msgstr ""
+msgid "An {@@1}."
+msgstr "Un {@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:423 quests.xml:432
@@ -3230,8 +3202,8 @@ msgstr "Moon, la joven elfo, accidentalmente pisó un erizo."
 
 #. (itstool) path: quest/text
 #: quests.xml:425
-msgid "She wants you to bring her [Croc Claw]s to get rid of spikes."
-msgstr ""
+msgid "She wants you to bring her {@@1}s to get rid of spikes."
+msgstr "Ella quiere que le lleve {@@1}s para librarse de las espinas."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:427 quests.xml:435
@@ -3271,7 +3243,7 @@ msgstr "Un piou escapó de él, y quiere que lo captures."
 #. (itstool) path: quest/text
 #: quests.xml:447
 msgid "The piou is flying around the town, not far from the market."
-msgstr ""
+msgstr "El piou está volando alrededor de la ciudad, cerca del mercado."
 
 #. (itstool) path: quest/text
 #: quests.xml:448
@@ -3281,7 +3253,7 @@ msgstr "Cuando lo captures, vuelve rápido donde Salem."
 #. (itstool) path: quest/questgiver
 #: quests.xml:450 quests.xml:458
 msgid "Salem"
-msgstr ""
+msgstr "Salem"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:451 quests.xml:459
@@ -3291,7 +3263,7 @@ msgstr "Artis, Mercado. (57,118)"
 #. (itstool) path: quest/reward
 #: quests.xml:452 quests.xml:460
 msgid "90% discount on piou."
-msgstr ""
+msgstr "90% de descuento en piou."
 
 #. (itstool) path: quest/text
 #: quests.xml:456
@@ -3311,12 +3283,12 @@ msgstr "Eugene, el pescador en los muelles de Artis, compró una nueva caña de
 #. (itstool) path: quest/text
 #: quests.xml:469
 msgid "He hurried so much to try it out, that he forgot to take enough baits."
-msgstr ""
+msgstr "Él se dio tanta prisa por probarlo, que olvidó coger suficientes anzuelos."
 
 #. (itstool) path: quest/text
 #: quests.xml:470
-msgid "You need to bring him 10 [Small Tentacles]."
-msgstr ""
+msgid "You need to bring him 10 {@@1}."
+msgstr "Necesita traerle 10 {@@1}."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:472 quests.xml:482
@@ -3326,7 +3298,7 @@ msgstr "Eugene"
 #. (itstool) path: quest/coordinates
 #: quests.xml:473 quests.xml:483
 msgid "Artis, Docks. (113,120)"
-msgstr ""
+msgstr "Artis, Muelles. (113,120)"
 
 #. (itstool) path: quest/text
 #: quests.xml:478
@@ -3343,11 +3315,6 @@ msgstr "Como agradecimiento, él te da su vieja caña de pescar."
 msgid "You can use it to catch fish."
 msgstr "Puedes usarla para capturar peces."
 
-#. (itstool) path: quest/reward
-#: quests.xml:484
-msgid "[Fishing Rod]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:492 quests.xml:502 quests.xml:511
 msgid "The Buried Treasure"
@@ -3363,19 +3330,19 @@ msgstr "Q'Onan, el marinero orco de la tripulación de Nard, solía ser un ladr�
 msgid ""
 "His last \"business\" involved robbing a nobleman. But he didn't succeed "
 "completely, he had to bury the chest full of coins to save himself."
-msgstr ""
+msgstr "Su último \"negocio\" implicaba robar a un noble. Pero no tuvo éxito completamente, tuvo que enterrar el cofre lleno de monedas para salvarse."
 
 #. (itstool) path: quest/text
 #: quests.xml:495
 msgid ""
 "He only knows an approximate location of the chest on Artis Hill (180, 27), "
 "so you'll have to do a little digging to find the chest."
-msgstr ""
+msgstr "Él sólo conoce una ubicación aproximada del cofre en la Colina de Artis (180, 27), así que usted de be hacer una pequeña excavación para encontrar el cofre."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:497 quests.xml:506 quests.xml:515
 msgid "Q'Onan"
-msgstr ""
+msgstr "Q'Onan"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:498 quests.xml:507 quests.xml:516
@@ -3421,8 +3388,8 @@ msgstr "Visitando Artis"
 
 #. (itstool) path: quest/text
 #: quests.xml:525
-msgid "Bacchus asked you to bring him a [Pumpkin]."
-msgstr ""
+msgid "Bacchus asked you to bring him a {@@1}."
+msgstr "Bacchus le pidió llevarle un {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:526
@@ -3432,17 +3399,12 @@ msgstr "Cuco las arroja, en el cuarto cerrado de la Bodega de La Johanne."
 #. (itstool) path: quest/questgiver
 #: quests.xml:528 quests.xml:537
 msgid "Bacchus"
-msgstr ""
+msgstr "Bacchus"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:529 quests.xml:538
 msgid "La Johanne, Hold. (31,30)"
-msgstr ""
-
-#. (itstool) path: quest/reward
-#: quests.xml:530
-msgid "[Pumpkin Hat]."
-msgstr ""
+msgstr "La Johanne, Bodega. (31,30)"
 
 #. (itstool) path: quest/text
 #: quests.xml:534
@@ -3452,12 +3414,12 @@ msgstr "Bacchus te ofrece ver una pequeña parte de tu futuro."
 #. (itstool) path: quest/text
 #: quests.xml:535
 msgid "The payment is 10 Halloween Candy."
-msgstr ""
+msgstr "El pago son 10 caramelos de Halloween."
 
 #. (itstool) path: quest/reward
 #: quests.xml:539
 msgid "chance to see the future."
-msgstr ""
+msgstr "oportunidad de ver el futuro."
 
 #. (itstool) path: quest/name
 #: quests.xml:546 quests.xml:554
@@ -3473,7 +3435,7 @@ msgstr "Alige estaba muy asustado de Cuco. Ahora que ha muerto, él debería est
 #. (itstool) path: quest/coordinates
 #: quests.xml:550
 msgid "La Johanne, Hold, Alige's Hideout. (38,22)"
-msgstr ""
+msgstr "La Johanne, Bodega, Guarida de Alige. (38,22)"
 
 #. (itstool) path: quest/text
 #: quests.xml:555
@@ -3482,18 +3444,13 @@ msgstr "De algún modo Alige apareció en mi visión del futuro."
 
 #. (itstool) path: quest/text
 #: quests.xml:556
-msgid "For killing the scary Cuco, he gave me a [Barrel]."
-msgstr "Por matar al aterrador Cuco, él me dio un [Barril]."
+msgid "For killing the scary Cuco, he gave me a {@@1}."
+msgstr "Para matar al escalofriante Cuco, él me dio un {@@1}."
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:559
 msgid "Artis, Dream World. (71,132)"
-msgstr ""
-
-#. (itstool) path: quest/reward
-#: quests.xml:560
-msgid "[Barrel]."
-msgstr "[Barril]."
+msgstr "Artis, Mundo Soñado. (71,132)"
 
 #. (itstool) path: quest/name
 #: quests.xml:568 quests.xml:576 quests.xml:583
@@ -3513,17 +3470,17 @@ msgstr "Todavía está ofreciendo sus servicios."
 #. (itstool) path: quest/questgiver
 #: quests.xml:572 quests.xml:579 quests.xml:587
 msgid "Rumly"
-msgstr ""
+msgstr "Rumly"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:573 quests.xml:580 quests.xml:588
 msgid "Artis, Market Place. (35,125)"
-msgstr ""
+msgstr "Artis, Mercado. (35,125)"
 
 #. (itstool) path: quest/text
 #: quests.xml:577
-msgid "Rumly is waiting for you to bring him some [Plushroom]s."
-msgstr ""
+msgid "Rumly is waiting for you to bring him some {@@1}s."
+msgstr "Rumly le está esperando que le lleve algunos {@@1}s."
 
 #. (itstool) path: quest/text
 #: quests.xml:584
@@ -3532,8 +3489,8 @@ msgstr "Rumly es capaz de restablecer tus puntos del personaje."
 
 #. (itstool) path: quest/text
 #: quests.xml:585
-msgid "Bring him some [Plushroom]s and he will be able to do it for you."
-msgstr ""
+msgid "Bring him some {@@1}s and he will be able to do it for you."
+msgstr "Llevele algunos {@@1}s y él será capaz de hacerlo para usted."
 
 #. (itstool) path: quest/name
 #: quests.xml:608 quests.xml:617 quests.xml:626 quests.xml:635 quests.xml:644
@@ -3545,18 +3502,18 @@ msgstr "La Misión del Novato"
 #. (itstool) path: quest/text
 #: quests.xml:609
 msgid "You are charged to visit Chelios and bring back Enora's package."
-msgstr ""
+msgstr "Usted ha sido enviado a visitar a Chelios y traerle de vuelta el paquete de Enora."
 
 #. (itstool) path: quest/text
 #: quests.xml:610
 msgid "Chelios is reachable at the Blacksmith Shop (95,109)."
-msgstr ""
+msgstr "Chelios se puede encontrar en la tienda del herrero (95,109)."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:612 quests.xml:639 quests.xml:648 quests.xml:657 quests.xml:666
 #: quests.xml:675 quests.xml:684 quests.xml:695 quests.xml:703
 msgid "Enora"
-msgstr ""
+msgstr "Enora"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:613 quests.xml:640 quests.xml:649 quests.xml:658 quests.xml:667
@@ -3572,17 +3529,17 @@ msgstr "Chelios te pide que le lleves un poco de hierro negro"
 #. (itstool) path: quest/text
 #: quests.xml:619
 msgid "You should look for Lloyd in the Merchant Hall (100,37)."
-msgstr ""
+msgstr "Debería buscar a Lloyd en el vestíbulo del mercader (100,37)."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:621 quests.xml:630
 msgid "Chelios"
-msgstr ""
+msgstr "Chelios"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:622 quests.xml:631
 msgid "Artis, Blacksmith Shop. (95,109)"
-msgstr ""
+msgstr "Artis, Tienda del herrero. (95,109)"
 
 #. (itstool) path: quest/text
 #: quests.xml:627
@@ -3621,8 +3578,8 @@ msgstr "Resa se encuentra en el edificio de Armaduras Ligeras (55,72)."
 
 #. (itstool) path: quest/text
 #: quests.xml:654
-msgid "Resa gave you a cute [%Color% Artis Tank Top, Camel Cotton Dye]."
-msgstr ""
+msgid "Resa gave you a cute {@@1}."
+msgstr "Resa le dio un bonito {@@1}."
 
 #. (itstool) path: quest/reward
 #: quests.xml:659
@@ -3632,14 +3589,14 @@ msgstr "40 EXP, 125 E."
 #. (itstool) path: quest/text
 #: quests.xml:663
 msgid "You are charged to visit Q'Pid and bring back Enora's package."
-msgstr ""
+msgstr "Usted ha sido enviado a visitar a Q'Pid y traerle de vuelta el paquete de Enora."
 
 #. (itstool) path: quest/text
 #: quests.xml:664
 msgid ""
 "Q'Pid is reachable at the Market Place, in the south-west area of Artis "
 "(61,116)."
-msgstr ""
+msgstr "Q'Pid puede encontrarse en el mercado, en el área suroeste de Artis (61,116)."
 
 #. (itstool) path: quest/text
 #: quests.xml:672
@@ -3654,8 +3611,8 @@ msgstr "Ivan está en una pequeña casa cerca al canal de Artis (163,71)."
 
 #. (itstool) path: quest/text
 #: quests.xml:681
-msgid "Ivan gave you some [Piberries Infusion]."
-msgstr "Ivan te da un poco de [Infusión de Pibayas]."
+msgid "Ivan gave you some {@@1}."
+msgstr "Ivan le dio algunos {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:682
@@ -3688,7 +3645,7 @@ msgstr "Matando unos 10 Plumosos debería ser suficiente para calmar el vecindar
 #. (itstool) path: quest/text
 #: quests.xml:693
 msgid "The hill is located on north-east of Artis (172,46)."
-msgstr ""
+msgstr "La colina está al noreste de Artis (172,46)."
 
 #. (itstool) path: quest/text
 #: quests.xml:701
@@ -3699,10 +3656,8 @@ msgstr "Completaste cada tarea e incluso te deshiciste de esos terribles Fluffie
 
 #. (itstool) path: quest/reward
 #: quests.xml:705
-msgid ""
-"[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries"
-" Infusion]s"
-msgstr ""
+msgid "{@@1}, {@@2}, 5 {@@3}s"
+msgstr "{@@1}, {@@2}, 5 {@@3}s"
 
 #. (itstool) path: quest/reward
 #: quests.xml:706
@@ -3712,14 +3667,14 @@ msgstr "140 EXP, 500 E."
 #. (itstool) path: quest/name
 #: quests.xml:714 quests.xml:722 quests.xml:731
 msgid "Fexil's Free Pass"
-msgstr ""
+msgstr "Pase libre de Fexil"
 
 #. (itstool) path: quest/text
 #: quests.xml:715
 msgid ""
 "Lloyd gave you a pass that Fexil forgot when he registered himself in the "
 "Merchant Guild."
-msgstr ""
+msgstr "Lloyd le dio un pase que Fexil olvidó cuando se registró en el Gremio de Mercaderes."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:717 quests.xml:747
@@ -3729,57 +3684,57 @@ msgstr "Lloyd"
 #. (itstool) path: quest/coordinates
 #: quests.xml:718 quests.xml:748
 msgid "Artis, Merchant Guild. (101,37)"
-msgstr ""
+msgstr "Artis, Gremio de Mercaderes. (101,37)"
 
 #. (itstool) path: quest/text
 #: quests.xml:723 quests.xml:732
-msgid "Fexil wants to open a business of [Fluffy Fur]'s clothes."
-msgstr ""
+msgid "Fexil wants to open a business of {@@1}'s clothes."
+msgstr "Fexil quiere que abra un negocio de {@@1}'s ropas."
 
 #. (itstool) path: quest/text
 #: quests.xml:724
 msgid "He will reward you for each fur you bring him."
-msgstr ""
+msgstr "Él le recompensará por cada piel que le lleve."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:726 quests.xml:735
 msgid "Fexil"
-msgstr ""
+msgstr "Fexil"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:727 quests.xml:736
 msgid "Artis, Market Place. (48,134)"
-msgstr ""
+msgstr "Artis, Mercado. (48,134)"
 
 #. (itstool) path: quest/text
 #: quests.xml:733
 msgid "He rewards you for each fur you bring him."
-msgstr ""
+msgstr "Él le recompensa por cada piel que le lleve."
 
 #. (itstool) path: quest/reward
 #: quests.xml:737
-msgid "15 per [Fluffy Fur]."
-msgstr ""
+msgid "15 per {@@1}."
+msgstr "15 por {@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:743
 msgid "Worship of Money"
-msgstr ""
+msgstr "Adoración al dinero"
 
 #. (itstool) path: quest/text
 #: quests.xml:744
 msgid "You are now registered in the Merchant Guild."
-msgstr ""
+msgstr "Ahora está registrado en el Gremio de Mercaderes."
 
 #. (itstool) path: quest/text
 #: quests.xml:745
 msgid "This Guild offers storage and bank services."
-msgstr ""
+msgstr "Este gremio ofrece almacén y servicios bancarios."
 
 #. (itstool) path: quest/reward
 #: quests.xml:749
 msgid "Merchant Guild access."
-msgstr ""
+msgstr "Acceso al Gremio de Mercaderes."
 
 #. (itstool) path: skills/set@name
 #. (itstool) path: set/skill@name
@@ -3795,32 +3750,32 @@ msgstr "Permitir hacer cosas básicas."
 #. (itstool) path: set/skill@name
 #: skills.xml:21
 msgid "Fire ball"
-msgstr ""
+msgstr "Bola de fuego"
 
 #. (itstool) path: set/skill@description
 #: skills.xml:21
 msgid "Attack enemy with fireball."
-msgstr ""
+msgstr "Atacar al enemigo con bola de fuego."
 
 #. (itstool) path: set/skill@name
 #: skills.xml:27
 msgid "Mass provoke"
-msgstr ""
+msgstr "Provocar la masa"
 
 #. (itstool) path: set/skill@description
 #: skills.xml:27
 msgid "Allow provoke many monsters."
-msgstr ""
+msgstr "Permite provocar a muchos monstruos."
 
 #. (itstool) path: set/skill@name
 #: skills.xml:32
 msgid "Magic shield"
-msgstr ""
+msgstr "Escudo mágico"
 
 #. (itstool) path: set/skill@description
 #: skills.xml:32
 msgid "Allow protect from magic attacks."
-msgstr ""
+msgstr "Permite protegerse de ataques mágicos."
 
 #. (itstool) path: skills/set@name
 #: skills.xml:34
@@ -3843,237 +3798,237 @@ msgstr "Escribe en el suelo."
 #. (itstool) path: skillunits/skillunit@name
 #: skillunits.xml:7
 msgid "Crazy weed"
-msgstr ""
+msgstr "Maleza loca"
 
 #. (itstool) path: skillunits/skillunit@name
 #: skillunits.xml:11
 msgid "Wall of thorn 2"
-msgstr ""
+msgstr "Muro de espinas 2"
 
 #. (itstool) path: skillunits/skillunit@name
 #: skillunits.xml:15
 msgid "Lord of vermillion"
-msgstr ""
+msgstr "Señor de vermillion"
 
 #. (itstool) path: skillunits/skillunit@name
 #: skillunits.xml:21
 msgid "Family call"
-msgstr ""
+msgstr "Llamada familiar"
 
 #. (itstool) path: skillunits/skillunit@name
 #: skillunits.xml:25
 msgid "Cluster bomb"
-msgstr ""
+msgstr "Bomba de racimo"
 
 #. (itstool) path: skillunits/skillunit@name
 #: skillunits.xml:29
 msgid "Dimension door"
-msgstr ""
+msgstr "Puerta dimensional"
 
 #. (itstool) path: skillunits/skillunit@name
 #: skillunits.xml:38
 msgid "Wall of thorn 1"
-msgstr ""
+msgstr "Muro de espinas 1"
 
 #. (itstool) path: skillunits/skillunit@name
 #: skillunits.xml:42
 msgid "Hells plant"
-msgstr ""
+msgstr "Planta infernal"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:12
+#: stats.xml:14
 msgid "Strength"
 msgstr "Fuerza"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:18
+#: stats.xml:20
 msgid "Agility"
 msgstr "Agilidad"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:24
+#: stats.xml:26
 msgid "Vitality"
 msgstr "Vitalidad"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:30
+#: stats.xml:32
 msgid "Intelligence"
 msgstr "Inteligencia"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:36
+#: stats.xml:38
 msgid "Dexterity"
 msgstr "Destreza"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:42
+#: stats.xml:44
 msgid "Luck"
 msgstr "Suerte"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:49 stats.xml:196 stats.xml:273
+#: stats.xml:51 stats.xml:198 stats.xml:275
 msgid "Attack"
 msgstr "Ataque"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:54 stats.xml:191
+#: stats.xml:56 stats.xml:193
 msgid "Defense"
 msgstr "Defensa"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:59 stats.xml:186
+#: stats.xml:61 stats.xml:188
 msgid "M.Attack"
 msgstr "Ataque M."
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:64 stats.xml:181 stats.xml:258
+#: stats.xml:66 stats.xml:183 stats.xml:260
 msgid "M.Defense"
 msgstr "Defensa M."
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:69 stats.xml:176 stats.xml:253
+#: stats.xml:71 stats.xml:178 stats.xml:255
 msgid "% Accuracy"
 msgstr "% de Precisión"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:74 stats.xml:171 stats.xml:248
+#: stats.xml:76 stats.xml:173 stats.xml:250
 msgid "% Evade"
 msgstr "% de Evasión"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:79 stats.xml:166 stats.xml:243
+#: stats.xml:81 stats.xml:168 stats.xml:245
 msgid "% Critical"
 msgstr "% de Críticos"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:84 stats.xml:151 stats.xml:228
+#: stats.xml:86 stats.xml:153 stats.xml:230
 msgid "Attack delay"
-msgstr ""
+msgstr "Retraso de ataque"
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:89
+#: stats.xml:91
 msgid "Walk delay"
-msgstr ""
+msgstr "Retraso al caminar"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:94 stats.xml:156 stats.xml:233
+#: stats.xml:96 stats.xml:158 stats.xml:235
 msgid "Attack range"
-msgstr ""
+msgstr "Rango de ataque"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:99 stats.xml:161 stats.xml:238
+#: stats.xml:101 stats.xml:163 stats.xml:240
 msgid "Damage per sec."
 msgstr "Daño por segundo."
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:104
+#: stats.xml:106
 msgid "Karma"
 msgstr "Karma"
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:109
+#: stats.xml:111
 msgid "Manner"
 msgstr "Comportamiento"
 
 #. (itstool) path: stats/page@name
-#: stats.xml:111
+#: stats.xml:113
 msgid "Homun"
-msgstr ""
+msgstr "Homun"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:116 stats.xml:203
+#: stats.xml:118 stats.xml:205
 msgid "Level"
-msgstr ""
+msgstr "Nivel"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:121 stats.xml:208 stats.xml:300
+#: stats.xml:123 stats.xml:210 stats.xml:302
 msgid "Hp"
-msgstr ""
+msgstr "Hp"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:126 stats.xml:213 stats.xml:305
+#: stats.xml:128 stats.xml:215 stats.xml:307
 msgid "Max hp"
-msgstr ""
+msgstr "Hp máximo"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:131
+#: stats.xml:133
 msgid "Mana"
-msgstr ""
+msgstr "Maná"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:136
+#: stats.xml:138
 msgid "Max mana"
-msgstr ""
+msgstr "Maná máximo"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:141
+#: stats.xml:143
 msgid "Exp"
-msgstr ""
+msgstr "Exp"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:146
+#: stats.xml:148
 msgid "Need exp"
-msgstr ""
+msgstr "Necesita experiencia"
 
 #. (itstool) path: stats/page@name
-#: stats.xml:198
+#: stats.xml:200
 msgid "Merc"
-msgstr ""
+msgstr "Merc"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:218 stats.xml:310
+#: stats.xml:220 stats.xml:312
 msgid "Mp"
-msgstr ""
+msgstr "Mp"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:223 stats.xml:315
+#: stats.xml:225 stats.xml:317
 msgid "Max mp"
-msgstr ""
+msgstr "Mp máximos"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:263
+#: stats.xml:265
 msgid "M.Atk"
-msgstr ""
+msgstr "M.Atk"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:268
+#: stats.xml:270
 msgid "Defence"
-msgstr ""
+msgstr "Defensa"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:278
+#: stats.xml:280
 msgid "Expire"
-msgstr ""
+msgstr "Expirar"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:283
+#: stats.xml:285
 msgid "Faith"
-msgstr ""
+msgstr "Fe"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:288
+#: stats.xml:290
 msgid "Calls"
-msgstr ""
+msgstr "Llamadas"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:293
+#: stats.xml:295
 msgid "Kills"
-msgstr ""
+msgstr "Mata"
 
 #. (itstool) path: stats/page@name
-#: stats.xml:295
+#: stats.xml:297
 msgid "Elemental"
-msgstr ""
+msgstr "Elemental"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:19
@@ -4098,27 +4053,27 @@ msgstr "ocultar"
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:39
 msgid "cloacking"
-msgstr ""
+msgstr "encubrimiento"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:43
 msgid "enchant poison"
-msgstr ""
+msgstr "Veneno hechizado"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:47
 msgid "poison react"
-msgstr ""
+msgstr "Reacción al veneno"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:51
 msgid "quagmire"
-msgstr ""
+msgstr "Ciénaga"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:56
 msgid "angelus"
-msgstr ""
+msgstr "angelus"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:60
@@ -4128,32 +4083,32 @@ msgstr "bendición"
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:64
 msgid "inc agi"
-msgstr ""
+msgstr "inc agi"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:68
 msgid "dec agi"
-msgstr ""
+msgstr "dec agi"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:75
 msgid "magnificat"
-msgstr ""
+msgstr "magnificat"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:81
 msgid "riding"
-msgstr ""
+msgstr "Equitación"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:86
 msgid "falcon"
-msgstr ""
+msgstr "Halcón"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:90
 msgid "trick dead"
-msgstr ""
+msgstr "trampa mortal"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:94
@@ -4168,107 +4123,107 @@ msgstr "90% de peso"
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:102
 msgid "att haste 1"
-msgstr ""
+msgstr "Velocidad de ataque 1"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:106
 msgid "att haste 2"
-msgstr ""
+msgstr "Velocidad de ataque 2"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:110
 msgid "att haste 3"
-msgstr ""
+msgstr "Velocidad de ataque 3"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:114
 msgid "post delay"
-msgstr ""
+msgstr "retraso de correo"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:121
 msgid "lk concentration"
-msgstr ""
+msgstr "Loncentración lk"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:125
 msgid "cart boost"
-msgstr ""
+msgstr "Empujar carreta"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:130
 msgid "bleeding"
-msgstr ""
+msgstr "sangriento"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:134
 msgid "run"
-msgstr ""
+msgstr "correr"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:138
 msgid "ting"
-msgstr ""
+msgstr "tintineo"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:142
 msgid "inc str"
-msgstr ""
+msgstr "inc str"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:148
 msgid "hide"
-msgstr ""
+msgstr "Esconder"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:152
 msgid "cash plus exp"
-msgstr ""
+msgstr "dinero mas experiencia"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:159
 msgid "heal s"
-msgstr ""
+msgstr "curar s"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:166
 msgid "heal l"
-msgstr ""
+msgstr "curar l"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:170
 msgid "stasis"
-msgstr ""
+msgstr "estasis"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:174
 msgid "camouflage"
-msgstr ""
+msgstr "camuflaje"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:178
 msgid "sphere 1"
-msgstr ""
+msgstr "esfera 1"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:182
 msgid "sphere 2"
-msgstr ""
+msgstr "esfera 2"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:186
 msgid "sphere 3"
-msgstr ""
+msgstr "esfera 3"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:190
 msgid "sphere 4"
-msgstr ""
+msgstr "esfera 4"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:194
 msgid "sphere 5"
-msgstr ""
+msgstr "esfera 5"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:203
@@ -4278,47 +4233,47 @@ msgstr "invisibilidad"
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:207
 msgid "cloud kill"
-msgstr ""
+msgstr "nube mortal"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:214
 msgid "heal g"
-msgstr ""
+msgstr "curar g"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:218
 msgid "sit"
-msgstr ""
+msgstr "sentarse"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:225
 msgid "heal m"
-msgstr ""
+msgstr "curar m"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:230
 msgid "cart"
-msgstr ""
+msgstr "carreta"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:234
 msgid "equip arrows"
-msgstr ""
+msgstr "equipar flechas"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:241
 msgid "spell-protection"
-msgstr ""
+msgstr "protección contra hechizo"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:247
 msgid "sight"
-msgstr ""
+msgstr "vista"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:252
 msgid "cart 1"
-msgstr ""
+msgstr "carreta 1"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:262
@@ -4348,159 +4303,159 @@ msgstr "tarjeta 5"
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:287
 msgid "orcish"
-msgstr ""
+msgstr "orco"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:292
 msgid "wedding"
-msgstr ""
+msgstr "boda"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:297
 msgid "ruwach"
-msgstr ""
+msgstr "ruwach"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:302
 msgid "chase walk"
-msgstr ""
+msgstr "paseo de caza"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:307
 msgid "flying"
-msgstr ""
+msgstr "volando"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:312
 msgid "xmas"
-msgstr ""
+msgstr "Navidad"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:317
 msgid "transform"
-msgstr ""
+msgstr "transformar"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:322
 msgid "summer"
-msgstr ""
+msgstr "verano"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:327
 msgid "dragon 1"
-msgstr ""
+msgstr "dragón 1"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:332
 msgid "wug"
-msgstr ""
+msgstr "wug"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:337
 msgid "wug rider"
-msgstr ""
+msgstr "jinete wug"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:342
 msgid "mado gear"
-msgstr ""
+msgstr "rueda mado"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:347
 msgid "dragon 2"
-msgstr ""
+msgstr "dragón 2"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:352
 msgid "dragon 3"
-msgstr ""
+msgstr "dragón 3"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:357
 msgid "dragon 4"
-msgstr ""
+msgstr "dragón 4"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:362
 msgid "dragon 5"
-msgstr ""
+msgstr "dragón 5"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:367
 msgid "hanbok"
-msgstr ""
+msgstr "hanbok"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:372
 msgid "oktoberfest"
-msgstr ""
+msgstr "oktoberfest"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:378 status-effects.xml:398
 msgid "stone"
-msgstr ""
+msgstr "Piedra"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:383
 msgid "freeze"
-msgstr ""
+msgstr "congelar"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:388
 msgid "stun"
-msgstr ""
+msgstr "aturdir"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:393
 msgid "sleep"
-msgstr ""
+msgstr "dormir"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:403
 msgid "burning"
-msgstr ""
+msgstr "ardiendo"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:408
 msgid "imprison"
-msgstr ""
+msgstr "aprisionar"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:413
 msgid "crystalize"
-msgstr ""
+msgstr "cristalizar"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:422
 msgid "poison"
-msgstr ""
+msgstr "veneno"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:427
 msgid "curse"
-msgstr ""
+msgstr "maldición"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:432
 msgid "silence"
-msgstr ""
+msgstr "silencio"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:437
 msgid "signum crucis"
-msgstr ""
+msgstr "signum crucis"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:442
 msgid "blind"
-msgstr ""
+msgstr "cegar"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:447
 msgid "dpoison"
-msgstr ""
+msgstr "veneno d"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:452
 msgid "fear"
-msgstr ""
+msgstr "miedo"
diff --git a/translations/fr.po b/translations/fr.po
index ce0e1c16..cd3616ac 100644
--- a/translations/fr.po
+++ b/translations/fr.po
@@ -9,12 +9,13 @@
 # Escales Loïc <loic.escales@gmail.com>, 2015
 # Jacques Bossu <ja.bossu@caramail.com>, 2015
 # mortis tmw <mortistmw@gmail.com>, 2015
+# mon warez <monwarez@mailoo.org>, 2016
 # reid <reidyaro@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Evol Online\n"
-"POT-Creation-Date: 2016-08-07 16:28+0300\n"
-"PO-Revision-Date: 2016-09-07 15:10+0000\n"
+"POT-Creation-Date: 2016-09-11 23:23+0300\n"
+"PO-Revision-Date: 2016-09-18 08:23+0000\n"
 "Last-Translator: Alige\n"
 "Language-Team: French (http://www.transifex.com/akaras/evol/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -386,7 +387,7 @@ msgid "Blah"
 msgstr "Blah"
 
 #. (itstool) path: homunculuses/homunculus@name
-#: homunculuses.xml:6
+#: homunculuses.xml:27
 msgid "homum"
 msgstr "homon"
 
@@ -2038,44 +2039,19 @@ msgid "Yellow Cotton Dye"
 msgstr "Teinture Coton Jaune"
 
 #. (itstool) path: items/item@name
-#: items.xml:1265 items.xml:1273
-msgid "Bow 1"
-msgstr "Arc 1"
+#: items.xml:1268
+msgid "Wooden Bow"
+msgstr "Arc en Bois"
 
 #. (itstool) path: items/item@description
-#: items.xml:1265 items.xml:1273
-msgid "Testing bow 1"
-msgstr "Arc de test 1"
+#: items.xml:1268 items.xml:1279
+msgid "For bow training. Does not seem much reliable."
+msgstr "Pour s'entraîner à l'arc. N'a pas l'air très fiable."
 
 #. (itstool) path: items/item@name
-#: items.xml:1282
-msgid "Arrow 1"
-msgstr "Flèche 1"
-
-#. (itstool) path: items/item@description
-#: items.xml:1282
-msgid "Testing arrow 1"
-msgstr "Flèche de test 1"
-
-#. (itstool) path: items/item@name
-#: items.xml:1289
-msgid "Arrow 2"
-msgstr "Flèche 2"
-
-#. (itstool) path: items/item@description
-#: items.xml:1289
-msgid "Testing arrow 2"
-msgstr "Flèche de test 2"
-
-#. (itstool) path: items/item@name
-#: items.xml:1296
-msgid "Arrow 3"
-msgstr "Flèche 3"
-
-#. (itstool) path: items/item@description
-#: items.xml:1296
-msgid "Testing arrow 3"
-msgstr "Flèche de test 3"
+#: items.xml:1279
+msgid "Training Arrow"
+msgstr "Flèche d'Entraînement"
 
 #. (itstool) path: emote/sprite@name
 #: tmp/manaplus_emotes.xml:8
@@ -2355,7 +2331,7 @@ msgid "Right Wing"
 msgstr "Aile Droite"
 
 #. (itstool) path: mercenaries/mercenary@name
-#: mercenaries.xml:6
+#: mercenaries.xml:27
 msgid "merc"
 msgstr "merc"
 
@@ -2679,8 +2655,8 @@ msgstr "Ils sont un peu vieux et sentent maivais, mais la sensation de chaleur q
 
 #. (itstool) path: quest/reward
 #: quests.xml:72
-msgid "A [Creased Shirt] and old [Creased Shorts]."
-msgstr "Une [Creased Shirt] et un [Creased Shorts]."
+msgid "A {@@1} and old {@@2}."
+msgstr "Un {@@1} et un vieux {@@2}."
 
 #. (itstool) path: quest/name
 #: quests.xml:79 quests.xml:89 quests.xml:101
@@ -2722,8 +2698,8 @@ msgstr "Alige, le voyageur mistérieux, te demande de l'aide pour lui trouver de
 #: quests.xml:92
 msgid ""
 "In fact, he hides in a hole in the main hallway. It leads to the ship's "
-"storage room where he can reach for some barrels full of [Piberries]."
-msgstr "En fait, il se cache dans un trou dans le couloir principal. Ce trou donne sur l'espace de stockage du bateau où il peut atteindre des tonneaux pleins de [Piberries]."
+"storage room where he can reach for some barrels full of {@@1}."
+msgstr "En fait, il se cache dans un trou dans le couloir principal. Ce dernier donne sur l'espace de stockage du bateau où il peut atteindre des tonneaux pleins de {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:94
@@ -2734,9 +2710,8 @@ msgstr "Il en a marre de manger ces baies tout le temps. C'est pourquoi il aimer
 
 #. (itstool) path: quest/text
 #: quests.xml:102
-msgid ""
-"You brought Alige some food, different from the [Piberries] he usually eats."
-msgstr "Tu as apporté de la nourriture à Alige, différente des [Piberries] qu'il mange habituellement."
+msgid "You brought Alige some food, different from the {@@1} he usually eats."
+msgstr "Tu as apporté de la nourriture à Alige, différente des {@@1} qu'il mange habituellement."
 
 #. (itstool) path: quest/text
 #: quests.xml:104
@@ -2747,8 +2722,8 @@ msgstr "Il semblerait qu'il soit avide de goûter à de nouvelles saveurs. Essay
 
 #. (itstool) path: quest/reward
 #: quests.xml:108
-msgid "A handful of [Piberries]."
-msgstr "Une poignée de [Piberries]."
+msgid "A handful of {@@1}."
+msgstr "Une poignée de {001}."
 
 #. (itstool) path: quest/name
 #: quests.xml:115 quests.xml:125 quests.xml:135 quests.xml:143 quests.xml:153
@@ -2900,8 +2875,8 @@ msgstr "La Johanne, Bureau de Nard. (25,24)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:217 quests.xml:225
-msgid "50 EXP, [Bandana]."
-msgstr "50 EXP, [Bandana]."
+msgid "50 EXP, {@@1}."
+msgstr "50 EXP, {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:221
@@ -2931,9 +2906,9 @@ msgid "La Johanne, Second Deck. (50,24)"
 msgstr "La Johanne, Second Pont. (50,24)"
 
 #. (itstool) path: quest/reward
-#: quests.xml:237
-msgid "[Knife]."
-msgstr "[Knife]."
+#: quests.xml:237 quests.xml:484 quests.xml:530 quests.xml:560
+msgid "{@@1}."
+msgstr "{@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:244 quests.xml:254
@@ -3008,8 +2983,8 @@ msgstr "Tu as remarqué un coffre au trésor en haut d'une falaise à l'est de l
 
 #. (itstool) path: quest/text
 #: quests.xml:272
-msgid "The chest contains gold and an [Old Book]."
-msgstr "Le coffre contient de l'or et un [Old Book]."
+msgid "The chest contains gold and an {@@1}."
+msgstr "Le coffre contient de l'or et un {@@1}."
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:274
@@ -3018,8 +2993,8 @@ msgstr "Île Drasil. (83,70)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:275
-msgid "100 E, [Old Book]."
-msgstr "100 E, [Old Book]."
+msgid "100 E, {@@1}."
+msgstr "100 E, {@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:300 quests.xml:312
@@ -3030,9 +3005,8 @@ msgstr "Aide Inattendue"
 #: quests.xml:301
 msgid ""
 "Gugli told you about the sailors' task on the island. He wants you to help "
-"some of them bringing him 6 boxes full of [Croconut], [Aquada] and "
-"[Plushroom]."
-msgstr "Gugli t'a parlé de la tâche de marins sur l'île. Il veut que aides certains d'entre eux à lui rapporter 6 boîtes pleines de [Croconut], d'[Aquada]s et de [Plushroom]s."
+"some of them bringing him 6 boxes full of {@@1}, {@@2} and {@@3}."
+msgstr "Gugli t'a parlé de la tâche de marins sur l'île. Il veut que tu aides certains d'entre eux à lui rapporter 6 boîtes pleines de {@@1}, d'{@@2}s et de {@@3}s."
 
 #. (itstool) path: quest/text
 #: quests.xml:303
@@ -3074,9 +3048,9 @@ msgstr "Deux Lieutenants dans Un Bateau"
 #. (itstool) path: quest/text
 #: quests.xml:325
 msgid ""
-"Chef Gado wants you to collect 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] "
-"and 1 [Sea Drops] to prepare a [Poisoned Dish], for Julia."
-msgstr "Le Chef Gado veut que tu ailles chercher 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] and 1 [Sea Drops] afin qu'il puisse préparer un [Poisoned Dish] pour Julia."
+"Chef Gado wants you to collect 2 {@@1}, 2 {@@2}, 1 {@@3} and 1 {@@4} to "
+"prepare a {@@5}, for Julia."
+msgstr "Le chef Gado veut que tu ailles chercher 2 {@@1}, 2 {@@2}, 1 {@@3} et 1 {@@4} afin de préparer un {@@5} pour Julia."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:327 quests.xml:337 quests.xml:345 quests.xml:353 quests.xml:361
@@ -3092,10 +3066,8 @@ msgstr "La Johanne, Second Pont. (17,28)"
 
 #. (itstool) path: quest/text
 #: quests.xml:333
-msgid ""
-"Chef Gado prepared the [Poisoned Dish]. He would like you to give it to "
-"Julia."
-msgstr "Le Chef Gado veut que tu prépares un [Poisoned Dish]. Il voudrait que tu ailles le donner à Julia."
+msgid "Chef Gado prepared the {@@1}. He would like you to give it to Julia."
+msgstr "Le chef Gado a préparé le {@@1}. Il voudrait que tu ailles le donner à Julia."
 
 #. (itstool) path: quest/text
 #: quests.xml:335
@@ -3116,8 +3088,8 @@ msgstr "Tu as bien empoisonné Julia. Chef Gado a enfin eu sa vengeance !"
 
 #. (itstool) path: quest/reward
 #: quests.xml:355
-msgid "15 EXP, 200 E, [Bread]."
-msgstr "15 EXP, 200 E, [Bread]."
+msgid "15 EXP, 200 E, {@@1}."
+msgstr "15 EXP, 200 E, {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:359
@@ -3211,13 +3183,13 @@ msgstr "Tu as trouvé Bob. Il a promi qu'il rentrerait bienôt à la maison."
 
 #. (itstool) path: quest/text
 #: quests.xml:412
-msgid "His sister was very happy and gave you an [Aquada] as a reward."
-msgstr "Sa sœur était très contente et t'a donné une [Aquada] comme récompense."
+msgid "His sister was very happy and gave you an {@@1} as a reward."
+msgstr "Sa sœur était très contente et t'a donné une {@@1} comme récompense."
 
 #. (itstool) path: quest/reward
 #: quests.xml:416
-msgid "An [Aquada]."
-msgstr "Une [Aquada]."
+msgid "An {@@1}."
+msgstr "Une {@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:423 quests.xml:432
@@ -3231,8 +3203,8 @@ msgstr "Lune, l'elfe, a accidentellement marché sur un Oursin."
 
 #. (itstool) path: quest/text
 #: quests.xml:425
-msgid "She wants you to bring her [Croc Claw]s to get rid of spikes."
-msgstr "Elle veut que tu lui apportes des [Croc Claw] pour se débarasser de ses épines."
+msgid "She wants you to bring her {@@1}s to get rid of spikes."
+msgstr "Elle veut que tu lui apportes des {@@1} pour se débarrasser de ses épines."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:427 quests.xml:435
@@ -3316,8 +3288,8 @@ msgstr "Il s'est tellement empressé de l'essayer qu'il a oublié de prendre ass
 
 #. (itstool) path: quest/text
 #: quests.xml:470
-msgid "You need to bring him 10 [Small Tentacles]."
-msgstr "Tu dois lui apporter 10 [Small Tentacles]."
+msgid "You need to bring him 10 {@@1}."
+msgstr "Tu dois lui apporter 10 {@@1}."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:472 quests.xml:482
@@ -3344,11 +3316,6 @@ msgstr "En signe de gratitude, il t'a donné sa vieille canne à pêche."
 msgid "You can use it to catch fish."
 msgstr "Tu peux l'utiliser pour attraper du poisson."
 
-#. (itstool) path: quest/reward
-#: quests.xml:484
-msgid "[Fishing Rod]."
-msgstr "[Fishing Rod]."
-
 #. (itstool) path: quest/name
 #: quests.xml:492 quests.xml:502 quests.xml:511
 msgid "The Buried Treasure"
@@ -3422,8 +3389,8 @@ msgstr "Visiter Artis"
 
 #. (itstool) path: quest/text
 #: quests.xml:525
-msgid "Bacchus asked you to bring him a [Pumpkin]."
-msgstr "Bacchus t'a demandé de lui apporter une [Pumpkin]."
+msgid "Bacchus asked you to bring him a {@@1}."
+msgstr "Bacchus t'a demandé de lui apporter une {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:526
@@ -3440,11 +3407,6 @@ msgstr "Bacchus"
 msgid "La Johanne, Hold. (31,30)"
 msgstr "La Johanne, Cale. (31,30)"
 
-#. (itstool) path: quest/reward
-#: quests.xml:530
-msgid "[Pumpkin Hat]."
-msgstr "[Pumpkin Hat]."
-
 #. (itstool) path: quest/text
 #: quests.xml:534
 msgid "Bacchus offers you to see a small part of your future."
@@ -3483,19 +3445,14 @@ msgstr "Je ne sais pas comment mais Alige est apparu dans ma vision du futur."
 
 #. (itstool) path: quest/text
 #: quests.xml:556
-msgid "For killing the scary Cuco, he gave me a [Barrel]."
-msgstr "Pour avoir tué l'effrayant Cuco, il m'a donné un [Barrel]."
+msgid "For killing the scary Cuco, he gave me a {@@1}."
+msgstr "Pour avoir tué l'effrayant Cuco, il m'a donné un {@@1}."
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:559
 msgid "Artis, Dream World. (71,132)"
 msgstr "Artis, Monde de Rêve. (71,132)"
 
-#. (itstool) path: quest/reward
-#: quests.xml:560
-msgid "[Barrel]."
-msgstr "[Barrel]."
-
 #. (itstool) path: quest/name
 #: quests.xml:568 quests.xml:576 quests.xml:583
 msgid "Plushroom Addict"
@@ -3523,18 +3480,18 @@ msgstr "Artis, Place du Marché. (35,125)"
 
 #. (itstool) path: quest/text
 #: quests.xml:577
-msgid "Rumly is waiting for you to bring him some [Plushroom]s."
-msgstr "Rumly t'attend pour que tu lui apportes des [Plushroom]s."
+msgid "Rumly is waiting for you to bring him some {@@1}s."
+msgstr "Rumly t'attend pour que tu lui apportes des {@@1}s."
 
 #. (itstool) path: quest/text
 #: quests.xml:584
 msgid "Rumly is able to reset your character point."
-msgstr "Rumly a le pouvoir de remettre à zéro tes points de personnage."
+msgstr "Rumly a le pouvoir de réinitialiser tes points de personnage."
 
 #. (itstool) path: quest/text
 #: quests.xml:585
-msgid "Bring him some [Plushroom]s and he will be able to do it for you."
-msgstr "Apporte-lui des [Plushroom]s. et il pourra le faire pour toi."
+msgid "Bring him some {@@1}s and he will be able to do it for you."
+msgstr "Apporte-lui des {@@1}s et il pourra le faire pour toi."
 
 #. (itstool) path: quest/name
 #: quests.xml:608 quests.xml:617 quests.xml:626 quests.xml:635 quests.xml:644
@@ -3622,8 +3579,8 @@ msgstr "Resa est joignable au bâtiment des Armures Légères (55,75)."
 
 #. (itstool) path: quest/text
 #: quests.xml:654
-msgid "Resa gave you a cute [%Color% Artis Tank Top, Camel Cotton Dye]."
-msgstr "Resa t'as donné un minion petit [%Color% Artis Tank Top, Camel Cotton Dye]."
+msgid "Resa gave you a cute {@@1}."
+msgstr "Resa t'as donné un {@@1} tout mignon."
 
 #. (itstool) path: quest/reward
 #: quests.xml:659
@@ -3655,8 +3612,8 @@ msgstr "Ivan est dans une petite maison près du canal d'Artis (163,71)."
 
 #. (itstool) path: quest/text
 #: quests.xml:681
-msgid "Ivan gave you some [Piberries Infusion]."
-msgstr "Ivan t'a donné des [Piberries Infusion]."
+msgid "Ivan gave you some {@@1}."
+msgstr "Ivan t'as donné quelques {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:682
@@ -3700,10 +3657,8 @@ msgstr "Tu as maintenant accompli toutes tes tâches et tu as même nettoyé la
 
 #. (itstool) path: quest/reward
 #: quests.xml:705
-msgid ""
-"[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries"
-" Infusion]s"
-msgstr "[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries Infusion]s"
+msgid "{@@1}, {@@2}, 5 {@@3}s"
+msgstr "{@@1}, {@@2}, 5 {@@3}"
 
 #. (itstool) path: quest/reward
 #: quests.xml:706
@@ -3734,8 +3689,8 @@ msgstr "Artis, Guilde des Marchands. (101,37)"
 
 #. (itstool) path: quest/text
 #: quests.xml:723 quests.xml:732
-msgid "Fexil wants to open a business of [Fluffy Fur]'s clothes."
-msgstr "Fexil voudrait créer une affaire de vêtements faits à partir de [Fluffy Fur]s."
+msgid "Fexil wants to open a business of {@@1}'s clothes."
+msgstr "Fexil voudrait ouvrir un commerce vêtements faits à partir de {@@1}."
 
 #. (itstool) path: quest/text
 #: quests.xml:724
@@ -3759,8 +3714,8 @@ msgstr "Il te récompense pour chaque fourrure que tu lui apportes."
 
 #. (itstool) path: quest/reward
 #: quests.xml:737
-msgid "15 per [Fluffy Fur]."
-msgstr "15 par [Fluffy Fur]."
+msgid "15 per {@@1}."
+msgstr "15 par {@@1}."
 
 #. (itstool) path: quest/name
 #: quests.xml:743
@@ -3882,197 +3837,197 @@ msgid "Hells plant"
 msgstr "Plantes de l'enfer"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:12
+#: stats.xml:14
 msgid "Strength"
 msgstr "Force"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:18
+#: stats.xml:20
 msgid "Agility"
 msgstr "Agilité"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:24
+#: stats.xml:26
 msgid "Vitality"
 msgstr "Vitalité"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:30
+#: stats.xml:32
 msgid "Intelligence"
 msgstr "Intelligence"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:36
+#: stats.xml:38
 msgid "Dexterity"
 msgstr "Dextérité"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:42
+#: stats.xml:44
 msgid "Luck"
 msgstr "Chance"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:49 stats.xml:196 stats.xml:273
+#: stats.xml:51 stats.xml:198 stats.xml:275
 msgid "Attack"
 msgstr "Attaque"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:54 stats.xml:191
+#: stats.xml:56 stats.xml:193
 msgid "Defense"
 msgstr "Défense"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:59 stats.xml:186
+#: stats.xml:61 stats.xml:188
 msgid "M.Attack"
 msgstr "AttaqueM."
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:64 stats.xml:181 stats.xml:258
+#: stats.xml:66 stats.xml:183 stats.xml:260
 msgid "M.Defense"
 msgstr "DéfenseM."
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:69 stats.xml:176 stats.xml:253
+#: stats.xml:71 stats.xml:178 stats.xml:255
 msgid "% Accuracy"
 msgstr "% Précision"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:74 stats.xml:171 stats.xml:248
+#: stats.xml:76 stats.xml:173 stats.xml:250
 msgid "% Evade"
 msgstr "% Évasion"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:79 stats.xml:166 stats.xml:243
+#: stats.xml:81 stats.xml:168 stats.xml:245
 msgid "% Critical"
 msgstr "% Critique"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:84 stats.xml:151 stats.xml:228
+#: stats.xml:86 stats.xml:153 stats.xml:230
 msgid "Attack delay"
 msgstr "Délai d'attaque"
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:89
+#: stats.xml:91
 msgid "Walk delay"
 msgstr "Délai de marche"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:94 stats.xml:156 stats.xml:233
+#: stats.xml:96 stats.xml:158 stats.xml:235
 msgid "Attack range"
 msgstr "Portée d'attaque"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:99 stats.xml:161 stats.xml:238
+#: stats.xml:101 stats.xml:163 stats.xml:240
 msgid "Damage per sec."
 msgstr "Dégâts par sec."
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:104
+#: stats.xml:106
 msgid "Karma"
 msgstr "Karma"
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:109
+#: stats.xml:111
 msgid "Manner"
 msgstr "Manière"
 
 #. (itstool) path: stats/page@name
-#: stats.xml:111
+#: stats.xml:113
 msgid "Homun"
 msgstr "Homon"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:116 stats.xml:203
+#: stats.xml:118 stats.xml:205
 msgid "Level"
 msgstr "Niveau"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:121 stats.xml:208 stats.xml:300
+#: stats.xml:123 stats.xml:210 stats.xml:302
 msgid "Hp"
 msgstr "Pv"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:126 stats.xml:213 stats.xml:305
+#: stats.xml:128 stats.xml:215 stats.xml:307
 msgid "Max hp"
 msgstr "Max pv"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:131
+#: stats.xml:133
 msgid "Mana"
 msgstr "Mana"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:136
+#: stats.xml:138
 msgid "Max mana"
 msgstr "Max mana"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:141
+#: stats.xml:143
 msgid "Exp"
 msgstr "Exp"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:146
+#: stats.xml:148
 msgid "Need exp"
 msgstr "Besoin d'exp"
 
 #. (itstool) path: stats/page@name
-#: stats.xml:198
+#: stats.xml:200
 msgid "Merc"
 msgstr "Merc"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:218 stats.xml:310
+#: stats.xml:220 stats.xml:312
 msgid "Mp"
 msgstr "Mp"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:223 stats.xml:315
+#: stats.xml:225 stats.xml:317
 msgid "Max mp"
 msgstr "Mp max"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:263
+#: stats.xml:265
 msgid "M.Atk"
 msgstr "Att.M"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:268
+#: stats.xml:270
 msgid "Defence"
 msgstr "Défense"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:278
+#: stats.xml:280
 msgid "Expire"
 msgstr "Expire"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:283
+#: stats.xml:285
 msgid "Faith"
 msgstr "Foi"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:288
+#: stats.xml:290
 msgid "Calls"
 msgstr "Appelle"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:293
+#: stats.xml:295
 msgid "Kills"
 msgstr "Tue"
 
 #. (itstool) path: stats/page@name
-#: stats.xml:295
+#: stats.xml:297
 msgid "Elemental"
 msgstr "Élemental"
 
diff --git a/translations/it.po b/translations/it.po
index 5aedace3..f873ba14 100644
--- a/translations/it.po
+++ b/translations/it.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evol Online\n"
-"POT-Creation-Date: 2016-08-07 16:28+0300\n"
-"PO-Revision-Date: 2016-08-08 08:48+0000\n"
+"POT-Creation-Date: 2016-09-11 23:23+0300\n"
+"PO-Revision-Date: 2016-09-12 10:02+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/evol/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -379,7 +379,7 @@ msgid "Blah"
 msgstr "Blah"
 
 #. (itstool) path: homunculuses/homunculus@name
-#: homunculuses.xml:6
+#: homunculuses.xml:27
 msgid "homum"
 msgstr ""
 
@@ -2031,43 +2031,18 @@ msgid "Yellow Cotton Dye"
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1265 items.xml:1273
-msgid "Bow 1"
+#: items.xml:1268
+msgid "Wooden Bow"
 msgstr ""
 
 #. (itstool) path: items/item@description
-#: items.xml:1265 items.xml:1273
-msgid "Testing bow 1"
+#: items.xml:1268 items.xml:1279
+msgid "For bow training. Does not seem much reliable."
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1282
-msgid "Arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1282
-msgid "Testing arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1289
-msgid "Arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1289
-msgid "Testing arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1296
-msgid "Arrow 3"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1296
-msgid "Testing arrow 3"
+#: items.xml:1279
+msgid "Training Arrow"
 msgstr ""
 
 #. (itstool) path: emote/sprite@name
@@ -2348,7 +2323,7 @@ msgid "Right Wing"
 msgstr ""
 
 #. (itstool) path: mercenaries/mercenary@name
-#: mercenaries.xml:6
+#: mercenaries.xml:27
 msgid "merc"
 msgstr ""
 
@@ -2672,7 +2647,7 @@ msgstr "Sono vecchi e alquanto puzzolenti ma il calore che danno ti fa sentire a
 
 #. (itstool) path: quest/reward
 #: quests.xml:72
-msgid "A [Creased Shirt] and old [Creased Shorts]."
+msgid "A {@@1} and old {@@2}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2715,7 +2690,7 @@ msgstr ""
 #: quests.xml:92
 msgid ""
 "In fact, he hides in a hole in the main hallway. It leads to the ship's "
-"storage room where he can reach for some barrels full of [Piberries]."
+"storage room where he can reach for some barrels full of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2727,8 +2702,7 @@ msgstr "Sembra sia stufo di mangiare solo bacche tutto il giorno. Infatti vorreb
 
 #. (itstool) path: quest/text
 #: quests.xml:102
-msgid ""
-"You brought Alige some food, different from the [Piberries] he usually eats."
+msgid "You brought Alige some food, different from the {@@1} he usually eats."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2740,7 +2714,7 @@ msgstr "Sembra essere ansioso di assaporare nuovi sapori. Prova a portargli altr
 
 #. (itstool) path: quest/reward
 #: quests.xml:108
-msgid "A handful of [Piberries]."
+msgid "A handful of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2893,7 +2867,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:217 quests.xml:225
-msgid "50 EXP, [Bandana]."
+msgid "50 EXP, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2924,8 +2898,8 @@ msgid "La Johanne, Second Deck. (50,24)"
 msgstr ""
 
 #. (itstool) path: quest/reward
-#: quests.xml:237
-msgid "[Knife]."
+#: quests.xml:237 quests.xml:484 quests.xml:530 quests.xml:560
+msgid "{@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3001,7 +2975,7 @@ msgstr "Hai avvistato un baule in cima ad un'altura nella parte Ovest dell'isola
 
 #. (itstool) path: quest/text
 #: quests.xml:272
-msgid "The chest contains gold and an [Old Book]."
+msgid "The chest contains gold and an {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3011,7 +2985,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:275
-msgid "100 E, [Old Book]."
+msgid "100 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3023,8 +2997,7 @@ msgstr "Un aiuto insperato"
 #: quests.xml:301
 msgid ""
 "Gugli told you about the sailors' task on the island. He wants you to help "
-"some of them bringing him 6 boxes full of [Croconut], [Aquada] and "
-"[Plushroom]."
+"some of them bringing him 6 boxes full of {@@1}, {@@2} and {@@3}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3067,8 +3040,8 @@ msgstr "Due luogotenenti nella stessa barca"
 #. (itstool) path: quest/text
 #: quests.xml:325
 msgid ""
-"Chef Gado wants you to collect 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] "
-"and 1 [Sea Drops] to prepare a [Poisoned Dish], for Julia."
+"Chef Gado wants you to collect 2 {@@1}, 2 {@@2}, 1 {@@3} and 1 {@@4} to "
+"prepare a {@@5}, for Julia."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3085,9 +3058,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:333
-msgid ""
-"Chef Gado prepared the [Poisoned Dish]. He would like you to give it to "
-"Julia."
+msgid "Chef Gado prepared the {@@1}. He would like you to give it to Julia."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3109,7 +3080,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:355
-msgid "15 EXP, 200 E, [Bread]."
+msgid "15 EXP, 200 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3204,12 +3175,12 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:412
-msgid "His sister was very happy and gave you an [Aquada] as a reward."
+msgid "His sister was very happy and gave you an {@@1} as a reward."
 msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:416
-msgid "An [Aquada]."
+msgid "An {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3224,7 +3195,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:425
-msgid "She wants you to bring her [Croc Claw]s to get rid of spikes."
+msgid "She wants you to bring her {@@1}s to get rid of spikes."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3309,7 +3280,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:470
-msgid "You need to bring him 10 [Small Tentacles]."
+msgid "You need to bring him 10 {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3337,11 +3308,6 @@ msgstr ""
 msgid "You can use it to catch fish."
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:484
-msgid "[Fishing Rod]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:492 quests.xml:502 quests.xml:511
 msgid "The Buried Treasure"
@@ -3415,7 +3381,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:525
-msgid "Bacchus asked you to bring him a [Pumpkin]."
+msgid "Bacchus asked you to bring him a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3433,11 +3399,6 @@ msgstr ""
 msgid "La Johanne, Hold. (31,30)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:530
-msgid "[Pumpkin Hat]."
-msgstr ""
-
 #. (itstool) path: quest/text
 #: quests.xml:534
 msgid "Bacchus offers you to see a small part of your future."
@@ -3476,7 +3437,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:556
-msgid "For killing the scary Cuco, he gave me a [Barrel]."
+msgid "For killing the scary Cuco, he gave me a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3484,11 +3445,6 @@ msgstr ""
 msgid "Artis, Dream World. (71,132)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:560
-msgid "[Barrel]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:568 quests.xml:576 quests.xml:583
 msgid "Plushroom Addict"
@@ -3516,7 +3472,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:577
-msgid "Rumly is waiting for you to bring him some [Plushroom]s."
+msgid "Rumly is waiting for you to bring him some {@@1}s."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3526,7 +3482,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:585
-msgid "Bring him some [Plushroom]s and he will be able to do it for you."
+msgid "Bring him some {@@1}s and he will be able to do it for you."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3615,7 +3571,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:654
-msgid "Resa gave you a cute [%Color% Artis Tank Top, Camel Cotton Dye]."
+msgid "Resa gave you a cute {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3648,7 +3604,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:681
-msgid "Ivan gave you some [Piberries Infusion]."
+msgid "Ivan gave you some {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3693,9 +3649,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:705
-msgid ""
-"[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries"
-" Infusion]s"
+msgid "{@@1}, {@@2}, 5 {@@3}s"
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3727,7 +3681,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:723 quests.xml:732
-msgid "Fexil wants to open a business of [Fluffy Fur]'s clothes."
+msgid "Fexil wants to open a business of {@@1}'s clothes."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3752,7 +3706,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:737
-msgid "15 per [Fluffy Fur]."
+msgid "15 per {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3875,197 +3829,197 @@ msgid "Hells plant"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:12
+#: stats.xml:14
 msgid "Strength"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:18
+#: stats.xml:20
 msgid "Agility"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:24
+#: stats.xml:26
 msgid "Vitality"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:30
+#: stats.xml:32
 msgid "Intelligence"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:36
+#: stats.xml:38
 msgid "Dexterity"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:42
+#: stats.xml:44
 msgid "Luck"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:49 stats.xml:196 stats.xml:273
+#: stats.xml:51 stats.xml:198 stats.xml:275
 msgid "Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:54 stats.xml:191
+#: stats.xml:56 stats.xml:193
 msgid "Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:59 stats.xml:186
+#: stats.xml:61 stats.xml:188
 msgid "M.Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:64 stats.xml:181 stats.xml:258
+#: stats.xml:66 stats.xml:183 stats.xml:260
 msgid "M.Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:69 stats.xml:176 stats.xml:253
+#: stats.xml:71 stats.xml:178 stats.xml:255
 msgid "% Accuracy"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:74 stats.xml:171 stats.xml:248
+#: stats.xml:76 stats.xml:173 stats.xml:250
 msgid "% Evade"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:79 stats.xml:166 stats.xml:243
+#: stats.xml:81 stats.xml:168 stats.xml:245
 msgid "% Critical"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:84 stats.xml:151 stats.xml:228
+#: stats.xml:86 stats.xml:153 stats.xml:230
 msgid "Attack delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:89
+#: stats.xml:91
 msgid "Walk delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:94 stats.xml:156 stats.xml:233
+#: stats.xml:96 stats.xml:158 stats.xml:235
 msgid "Attack range"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:99 stats.xml:161 stats.xml:238
+#: stats.xml:101 stats.xml:163 stats.xml:240
 msgid "Damage per sec."
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:104
+#: stats.xml:106
 msgid "Karma"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:109
+#: stats.xml:111
 msgid "Manner"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:111
+#: stats.xml:113
 msgid "Homun"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:116 stats.xml:203
+#: stats.xml:118 stats.xml:205
 msgid "Level"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:121 stats.xml:208 stats.xml:300
+#: stats.xml:123 stats.xml:210 stats.xml:302
 msgid "Hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:126 stats.xml:213 stats.xml:305
+#: stats.xml:128 stats.xml:215 stats.xml:307
 msgid "Max hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:131
+#: stats.xml:133
 msgid "Mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:136
+#: stats.xml:138
 msgid "Max mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:141
+#: stats.xml:143
 msgid "Exp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:146
+#: stats.xml:148
 msgid "Need exp"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:198
+#: stats.xml:200
 msgid "Merc"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:218 stats.xml:310
+#: stats.xml:220 stats.xml:312
 msgid "Mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:223 stats.xml:315
+#: stats.xml:225 stats.xml:317
 msgid "Max mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:263
+#: stats.xml:265
 msgid "M.Atk"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:268
+#: stats.xml:270
 msgid "Defence"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:278
+#: stats.xml:280
 msgid "Expire"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:283
+#: stats.xml:285
 msgid "Faith"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:288
+#: stats.xml:290
 msgid "Calls"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:293
+#: stats.xml:295
 msgid "Kills"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:295
+#: stats.xml:297
 msgid "Elemental"
 msgstr ""
 
diff --git a/translations/ja.po b/translations/ja.po
index 721bd655..8eca4544 100644
--- a/translations/ja.po
+++ b/translations/ja.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evol Online\n"
-"POT-Creation-Date: 2016-08-07 16:28+0300\n"
-"PO-Revision-Date: 2016-08-08 08:48+0000\n"
+"POT-Creation-Date: 2016-09-11 23:23+0300\n"
+"PO-Revision-Date: 2016-09-12 10:02+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/evol/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -377,7 +377,7 @@ msgid "Blah"
 msgstr ""
 
 #. (itstool) path: homunculuses/homunculus@name
-#: homunculuses.xml:6
+#: homunculuses.xml:27
 msgid "homum"
 msgstr ""
 
@@ -2029,43 +2029,18 @@ msgid "Yellow Cotton Dye"
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1265 items.xml:1273
-msgid "Bow 1"
+#: items.xml:1268
+msgid "Wooden Bow"
 msgstr ""
 
 #. (itstool) path: items/item@description
-#: items.xml:1265 items.xml:1273
-msgid "Testing bow 1"
+#: items.xml:1268 items.xml:1279
+msgid "For bow training. Does not seem much reliable."
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1282
-msgid "Arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1282
-msgid "Testing arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1289
-msgid "Arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1289
-msgid "Testing arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1296
-msgid "Arrow 3"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1296
-msgid "Testing arrow 3"
+#: items.xml:1279
+msgid "Training Arrow"
 msgstr ""
 
 #. (itstool) path: emote/sprite@name
@@ -2346,7 +2321,7 @@ msgid "Right Wing"
 msgstr ""
 
 #. (itstool) path: mercenaries/mercenary@name
-#: mercenaries.xml:6
+#: mercenaries.xml:27
 msgid "merc"
 msgstr ""
 
@@ -2670,7 +2645,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:72
-msgid "A [Creased Shirt] and old [Creased Shorts]."
+msgid "A {@@1} and old {@@2}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2713,7 +2688,7 @@ msgstr ""
 #: quests.xml:92
 msgid ""
 "In fact, he hides in a hole in the main hallway. It leads to the ship's "
-"storage room where he can reach for some barrels full of [Piberries]."
+"storage room where he can reach for some barrels full of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2725,8 +2700,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:102
-msgid ""
-"You brought Alige some food, different from the [Piberries] he usually eats."
+msgid "You brought Alige some food, different from the {@@1} he usually eats."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2738,7 +2712,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:108
-msgid "A handful of [Piberries]."
+msgid "A handful of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2891,7 +2865,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:217 quests.xml:225
-msgid "50 EXP, [Bandana]."
+msgid "50 EXP, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2922,8 +2896,8 @@ msgid "La Johanne, Second Deck. (50,24)"
 msgstr ""
 
 #. (itstool) path: quest/reward
-#: quests.xml:237
-msgid "[Knife]."
+#: quests.xml:237 quests.xml:484 quests.xml:530 quests.xml:560
+msgid "{@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2999,7 +2973,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:272
-msgid "The chest contains gold and an [Old Book]."
+msgid "The chest contains gold and an {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3009,7 +2983,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:275
-msgid "100 E, [Old Book]."
+msgid "100 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3021,8 +2995,7 @@ msgstr ""
 #: quests.xml:301
 msgid ""
 "Gugli told you about the sailors' task on the island. He wants you to help "
-"some of them bringing him 6 boxes full of [Croconut], [Aquada] and "
-"[Plushroom]."
+"some of them bringing him 6 boxes full of {@@1}, {@@2} and {@@3}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3065,8 +3038,8 @@ msgstr ""
 #. (itstool) path: quest/text
 #: quests.xml:325
 msgid ""
-"Chef Gado wants you to collect 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] "
-"and 1 [Sea Drops] to prepare a [Poisoned Dish], for Julia."
+"Chef Gado wants you to collect 2 {@@1}, 2 {@@2}, 1 {@@3} and 1 {@@4} to "
+"prepare a {@@5}, for Julia."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3083,9 +3056,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:333
-msgid ""
-"Chef Gado prepared the [Poisoned Dish]. He would like you to give it to "
-"Julia."
+msgid "Chef Gado prepared the {@@1}. He would like you to give it to Julia."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3107,7 +3078,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:355
-msgid "15 EXP, 200 E, [Bread]."
+msgid "15 EXP, 200 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3202,12 +3173,12 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:412
-msgid "His sister was very happy and gave you an [Aquada] as a reward."
+msgid "His sister was very happy and gave you an {@@1} as a reward."
 msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:416
-msgid "An [Aquada]."
+msgid "An {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3222,7 +3193,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:425
-msgid "She wants you to bring her [Croc Claw]s to get rid of spikes."
+msgid "She wants you to bring her {@@1}s to get rid of spikes."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3307,7 +3278,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:470
-msgid "You need to bring him 10 [Small Tentacles]."
+msgid "You need to bring him 10 {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3335,11 +3306,6 @@ msgstr ""
 msgid "You can use it to catch fish."
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:484
-msgid "[Fishing Rod]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:492 quests.xml:502 quests.xml:511
 msgid "The Buried Treasure"
@@ -3413,7 +3379,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:525
-msgid "Bacchus asked you to bring him a [Pumpkin]."
+msgid "Bacchus asked you to bring him a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3431,11 +3397,6 @@ msgstr ""
 msgid "La Johanne, Hold. (31,30)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:530
-msgid "[Pumpkin Hat]."
-msgstr ""
-
 #. (itstool) path: quest/text
 #: quests.xml:534
 msgid "Bacchus offers you to see a small part of your future."
@@ -3474,7 +3435,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:556
-msgid "For killing the scary Cuco, he gave me a [Barrel]."
+msgid "For killing the scary Cuco, he gave me a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3482,11 +3443,6 @@ msgstr ""
 msgid "Artis, Dream World. (71,132)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:560
-msgid "[Barrel]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:568 quests.xml:576 quests.xml:583
 msgid "Plushroom Addict"
@@ -3514,7 +3470,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:577
-msgid "Rumly is waiting for you to bring him some [Plushroom]s."
+msgid "Rumly is waiting for you to bring him some {@@1}s."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3524,7 +3480,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:585
-msgid "Bring him some [Plushroom]s and he will be able to do it for you."
+msgid "Bring him some {@@1}s and he will be able to do it for you."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3613,7 +3569,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:654
-msgid "Resa gave you a cute [%Color% Artis Tank Top, Camel Cotton Dye]."
+msgid "Resa gave you a cute {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3646,7 +3602,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:681
-msgid "Ivan gave you some [Piberries Infusion]."
+msgid "Ivan gave you some {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3691,9 +3647,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:705
-msgid ""
-"[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries"
-" Infusion]s"
+msgid "{@@1}, {@@2}, 5 {@@3}s"
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3725,7 +3679,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:723 quests.xml:732
-msgid "Fexil wants to open a business of [Fluffy Fur]'s clothes."
+msgid "Fexil wants to open a business of {@@1}'s clothes."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3750,7 +3704,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:737
-msgid "15 per [Fluffy Fur]."
+msgid "15 per {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3873,197 +3827,197 @@ msgid "Hells plant"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:12
+#: stats.xml:14
 msgid "Strength"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:18
+#: stats.xml:20
 msgid "Agility"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:24
+#: stats.xml:26
 msgid "Vitality"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:30
+#: stats.xml:32
 msgid "Intelligence"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:36
+#: stats.xml:38
 msgid "Dexterity"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:42
+#: stats.xml:44
 msgid "Luck"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:49 stats.xml:196 stats.xml:273
+#: stats.xml:51 stats.xml:198 stats.xml:275
 msgid "Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:54 stats.xml:191
+#: stats.xml:56 stats.xml:193
 msgid "Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:59 stats.xml:186
+#: stats.xml:61 stats.xml:188
 msgid "M.Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:64 stats.xml:181 stats.xml:258
+#: stats.xml:66 stats.xml:183 stats.xml:260
 msgid "M.Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:69 stats.xml:176 stats.xml:253
+#: stats.xml:71 stats.xml:178 stats.xml:255
 msgid "% Accuracy"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:74 stats.xml:171 stats.xml:248
+#: stats.xml:76 stats.xml:173 stats.xml:250
 msgid "% Evade"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:79 stats.xml:166 stats.xml:243
+#: stats.xml:81 stats.xml:168 stats.xml:245
 msgid "% Critical"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:84 stats.xml:151 stats.xml:228
+#: stats.xml:86 stats.xml:153 stats.xml:230
 msgid "Attack delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:89
+#: stats.xml:91
 msgid "Walk delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:94 stats.xml:156 stats.xml:233
+#: stats.xml:96 stats.xml:158 stats.xml:235
 msgid "Attack range"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:99 stats.xml:161 stats.xml:238
+#: stats.xml:101 stats.xml:163 stats.xml:240
 msgid "Damage per sec."
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:104
+#: stats.xml:106
 msgid "Karma"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:109
+#: stats.xml:111
 msgid "Manner"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:111
+#: stats.xml:113
 msgid "Homun"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:116 stats.xml:203
+#: stats.xml:118 stats.xml:205
 msgid "Level"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:121 stats.xml:208 stats.xml:300
+#: stats.xml:123 stats.xml:210 stats.xml:302
 msgid "Hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:126 stats.xml:213 stats.xml:305
+#: stats.xml:128 stats.xml:215 stats.xml:307
 msgid "Max hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:131
+#: stats.xml:133
 msgid "Mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:136
+#: stats.xml:138
 msgid "Max mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:141
+#: stats.xml:143
 msgid "Exp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:146
+#: stats.xml:148
 msgid "Need exp"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:198
+#: stats.xml:200
 msgid "Merc"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:218 stats.xml:310
+#: stats.xml:220 stats.xml:312
 msgid "Mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:223 stats.xml:315
+#: stats.xml:225 stats.xml:317
 msgid "Max mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:263
+#: stats.xml:265
 msgid "M.Atk"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:268
+#: stats.xml:270
 msgid "Defence"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:278
+#: stats.xml:280
 msgid "Expire"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:283
+#: stats.xml:285
 msgid "Faith"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:288
+#: stats.xml:290
 msgid "Calls"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:293
+#: stats.xml:295
 msgid "Kills"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:295
+#: stats.xml:297
 msgid "Elemental"
 msgstr ""
 
diff --git a/translations/nl_BE.po b/translations/nl_BE.po
index 75306844..58910714 100644
--- a/translations/nl_BE.po
+++ b/translations/nl_BE.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evol Online\n"
-"POT-Creation-Date: 2016-08-07 16:28+0300\n"
-"PO-Revision-Date: 2016-08-08 08:48+0000\n"
+"POT-Creation-Date: 2016-09-11 23:23+0300\n"
+"PO-Revision-Date: 2016-09-12 10:02+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/evol/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -378,7 +378,7 @@ msgid "Blah"
 msgstr "Blah"
 
 #. (itstool) path: homunculuses/homunculus@name
-#: homunculuses.xml:6
+#: homunculuses.xml:27
 msgid "homum"
 msgstr ""
 
@@ -2030,43 +2030,18 @@ msgid "Yellow Cotton Dye"
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1265 items.xml:1273
-msgid "Bow 1"
+#: items.xml:1268
+msgid "Wooden Bow"
 msgstr ""
 
 #. (itstool) path: items/item@description
-#: items.xml:1265 items.xml:1273
-msgid "Testing bow 1"
+#: items.xml:1268 items.xml:1279
+msgid "For bow training. Does not seem much reliable."
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1282
-msgid "Arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1282
-msgid "Testing arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1289
-msgid "Arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1289
-msgid "Testing arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1296
-msgid "Arrow 3"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1296
-msgid "Testing arrow 3"
+#: items.xml:1279
+msgid "Training Arrow"
 msgstr ""
 
 #. (itstool) path: emote/sprite@name
@@ -2347,7 +2322,7 @@ msgid "Right Wing"
 msgstr ""
 
 #. (itstool) path: mercenaries/mercenary@name
-#: mercenaries.xml:6
+#: mercenaries.xml:27
 msgid "merc"
 msgstr ""
 
@@ -2671,7 +2646,7 @@ msgstr "Ze zijn oud en geuren een beetje, maar de warmte die ze uitstralen geven
 
 #. (itstool) path: quest/reward
 #: quests.xml:72
-msgid "A [Creased Shirt] and old [Creased Shorts]."
+msgid "A {@@1} and old {@@2}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2714,7 +2689,7 @@ msgstr ""
 #: quests.xml:92
 msgid ""
 "In fact, he hides in a hole in the main hallway. It leads to the ship's "
-"storage room where he can reach for some barrels full of [Piberries]."
+"storage room where he can reach for some barrels full of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2726,8 +2701,7 @@ msgstr "Het lijkt dat hij de bessen meer dan beu is geworden. Daarom vraagt hij
 
 #. (itstool) path: quest/text
 #: quests.xml:102
-msgid ""
-"You brought Alige some food, different from the [Piberries] he usually eats."
+msgid "You brought Alige some food, different from the {@@1} he usually eats."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2739,7 +2713,7 @@ msgstr "Het lijkt erop dat hij gretig is om nieuwe smaken te proberen en je hier
 
 #. (itstool) path: quest/reward
 #: quests.xml:108
-msgid "A handful of [Piberries]."
+msgid "A handful of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2892,7 +2866,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:217 quests.xml:225
-msgid "50 EXP, [Bandana]."
+msgid "50 EXP, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2923,8 +2897,8 @@ msgid "La Johanne, Second Deck. (50,24)"
 msgstr ""
 
 #. (itstool) path: quest/reward
-#: quests.xml:237
-msgid "[Knife]."
+#: quests.xml:237 quests.xml:484 quests.xml:530 quests.xml:560
+msgid "{@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3000,7 +2974,7 @@ msgstr "Je merkte een schatkist op, op de rand van een afgrond aan de oostkant v
 
 #. (itstool) path: quest/text
 #: quests.xml:272
-msgid "The chest contains gold and an [Old Book]."
+msgid "The chest contains gold and an {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3010,7 +2984,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:275
-msgid "100 E, [Old Book]."
+msgid "100 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3022,8 +2996,7 @@ msgstr "Onverwachte Hulp"
 #: quests.xml:301
 msgid ""
 "Gugli told you about the sailors' task on the island. He wants you to help "
-"some of them bringing him 6 boxes full of [Croconut], [Aquada] and "
-"[Plushroom]."
+"some of them bringing him 6 boxes full of {@@1}, {@@2} and {@@3}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3066,8 +3039,8 @@ msgstr "Twee luitenanten in één boot."
 #. (itstool) path: quest/text
 #: quests.xml:325
 msgid ""
-"Chef Gado wants you to collect 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] "
-"and 1 [Sea Drops] to prepare a [Poisoned Dish], for Julia."
+"Chef Gado wants you to collect 2 {@@1}, 2 {@@2}, 1 {@@3} and 1 {@@4} to "
+"prepare a {@@5}, for Julia."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3084,9 +3057,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:333
-msgid ""
-"Chef Gado prepared the [Poisoned Dish]. He would like you to give it to "
-"Julia."
+msgid "Chef Gado prepared the {@@1}. He would like you to give it to Julia."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3108,7 +3079,7 @@ msgstr "Je hebt Julia vergiftigd. Chef Gado heeft eindelijk zijn wraak!"
 
 #. (itstool) path: quest/reward
 #: quests.xml:355
-msgid "15 EXP, 200 E, [Bread]."
+msgid "15 EXP, 200 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3203,12 +3174,12 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:412
-msgid "His sister was very happy and gave you an [Aquada] as a reward."
+msgid "His sister was very happy and gave you an {@@1} as a reward."
 msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:416
-msgid "An [Aquada]."
+msgid "An {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3223,7 +3194,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:425
-msgid "She wants you to bring her [Croc Claw]s to get rid of spikes."
+msgid "She wants you to bring her {@@1}s to get rid of spikes."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3308,7 +3279,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:470
-msgid "You need to bring him 10 [Small Tentacles]."
+msgid "You need to bring him 10 {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3336,11 +3307,6 @@ msgstr ""
 msgid "You can use it to catch fish."
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:484
-msgid "[Fishing Rod]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:492 quests.xml:502 quests.xml:511
 msgid "The Buried Treasure"
@@ -3414,7 +3380,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:525
-msgid "Bacchus asked you to bring him a [Pumpkin]."
+msgid "Bacchus asked you to bring him a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3432,11 +3398,6 @@ msgstr ""
 msgid "La Johanne, Hold. (31,30)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:530
-msgid "[Pumpkin Hat]."
-msgstr ""
-
 #. (itstool) path: quest/text
 #: quests.xml:534
 msgid "Bacchus offers you to see a small part of your future."
@@ -3475,7 +3436,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:556
-msgid "For killing the scary Cuco, he gave me a [Barrel]."
+msgid "For killing the scary Cuco, he gave me a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3483,11 +3444,6 @@ msgstr ""
 msgid "Artis, Dream World. (71,132)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:560
-msgid "[Barrel]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:568 quests.xml:576 quests.xml:583
 msgid "Plushroom Addict"
@@ -3515,7 +3471,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:577
-msgid "Rumly is waiting for you to bring him some [Plushroom]s."
+msgid "Rumly is waiting for you to bring him some {@@1}s."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3525,7 +3481,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:585
-msgid "Bring him some [Plushroom]s and he will be able to do it for you."
+msgid "Bring him some {@@1}s and he will be able to do it for you."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3614,7 +3570,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:654
-msgid "Resa gave you a cute [%Color% Artis Tank Top, Camel Cotton Dye]."
+msgid "Resa gave you a cute {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3647,7 +3603,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:681
-msgid "Ivan gave you some [Piberries Infusion]."
+msgid "Ivan gave you some {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3692,9 +3648,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:705
-msgid ""
-"[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries"
-" Infusion]s"
+msgid "{@@1}, {@@2}, 5 {@@3}s"
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3726,7 +3680,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:723 quests.xml:732
-msgid "Fexil wants to open a business of [Fluffy Fur]'s clothes."
+msgid "Fexil wants to open a business of {@@1}'s clothes."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3751,7 +3705,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:737
-msgid "15 per [Fluffy Fur]."
+msgid "15 per {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3874,197 +3828,197 @@ msgid "Hells plant"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:12
+#: stats.xml:14
 msgid "Strength"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:18
+#: stats.xml:20
 msgid "Agility"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:24
+#: stats.xml:26
 msgid "Vitality"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:30
+#: stats.xml:32
 msgid "Intelligence"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:36
+#: stats.xml:38
 msgid "Dexterity"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:42
+#: stats.xml:44
 msgid "Luck"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:49 stats.xml:196 stats.xml:273
+#: stats.xml:51 stats.xml:198 stats.xml:275
 msgid "Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:54 stats.xml:191
+#: stats.xml:56 stats.xml:193
 msgid "Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:59 stats.xml:186
+#: stats.xml:61 stats.xml:188
 msgid "M.Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:64 stats.xml:181 stats.xml:258
+#: stats.xml:66 stats.xml:183 stats.xml:260
 msgid "M.Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:69 stats.xml:176 stats.xml:253
+#: stats.xml:71 stats.xml:178 stats.xml:255
 msgid "% Accuracy"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:74 stats.xml:171 stats.xml:248
+#: stats.xml:76 stats.xml:173 stats.xml:250
 msgid "% Evade"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:79 stats.xml:166 stats.xml:243
+#: stats.xml:81 stats.xml:168 stats.xml:245
 msgid "% Critical"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:84 stats.xml:151 stats.xml:228
+#: stats.xml:86 stats.xml:153 stats.xml:230
 msgid "Attack delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:89
+#: stats.xml:91
 msgid "Walk delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:94 stats.xml:156 stats.xml:233
+#: stats.xml:96 stats.xml:158 stats.xml:235
 msgid "Attack range"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:99 stats.xml:161 stats.xml:238
+#: stats.xml:101 stats.xml:163 stats.xml:240
 msgid "Damage per sec."
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:104
+#: stats.xml:106
 msgid "Karma"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:109
+#: stats.xml:111
 msgid "Manner"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:111
+#: stats.xml:113
 msgid "Homun"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:116 stats.xml:203
+#: stats.xml:118 stats.xml:205
 msgid "Level"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:121 stats.xml:208 stats.xml:300
+#: stats.xml:123 stats.xml:210 stats.xml:302
 msgid "Hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:126 stats.xml:213 stats.xml:305
+#: stats.xml:128 stats.xml:215 stats.xml:307
 msgid "Max hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:131
+#: stats.xml:133
 msgid "Mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:136
+#: stats.xml:138
 msgid "Max mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:141
+#: stats.xml:143
 msgid "Exp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:146
+#: stats.xml:148
 msgid "Need exp"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:198
+#: stats.xml:200
 msgid "Merc"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:218 stats.xml:310
+#: stats.xml:220 stats.xml:312
 msgid "Mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:223 stats.xml:315
+#: stats.xml:225 stats.xml:317
 msgid "Max mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:263
+#: stats.xml:265
 msgid "M.Atk"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:268
+#: stats.xml:270
 msgid "Defence"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:278
+#: stats.xml:280
 msgid "Expire"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:283
+#: stats.xml:285
 msgid "Faith"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:288
+#: stats.xml:290
 msgid "Calls"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:293
+#: stats.xml:295
 msgid "Kills"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:295
+#: stats.xml:297
 msgid "Elemental"
 msgstr ""
 
diff --git a/translations/pl.po b/translations/pl.po
index 9b039f79..cb9e8b19 100644
--- a/translations/pl.po
+++ b/translations/pl.po
@@ -2,15 +2,16 @@
 # Translators:
 # Avenn <avenn3@gmail.com>, 2013
 # foobo <lukasz.antoni.komorowski@poczta.fm>, 2012
+# Łukasz Wiśniewski <gamelogicpol@gmail.com>, 2016
 # derpella <matwa@poczta.pl>, 2012
 # reid <reidyaro@gmail.com>, 2012
 # Wojciech Łukaszczyk <wojciech.lukaszczyk@sfr.fr>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Evol Online\n"
-"POT-Creation-Date: 2016-08-07 16:28+0300\n"
-"PO-Revision-Date: 2016-08-08 08:48+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2016-09-11 23:23+0300\n"
+"PO-Revision-Date: 2016-12-01 19:49+0000\n"
+"Last-Translator: Łukasz Wiśniewski <gamelogicpol@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/evol/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,12 +22,12 @@ msgstr ""
 #. (itstool) path: messages/message
 #: tmp/deadmessages.xml:9 deadmessages.xml:6
 msgid "You are dead."
-msgstr ""
+msgstr "Nie żyjesz."
 
 #. (itstool) path: messages/message
 #: tmp/deadmessages.xml:10 deadmessages.xml:7
 msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
+msgstr "Bardzo nam przykro, twoja postać zginę‭‭‭‭ła w walce."
 
 #. (itstool) path: messages/message
 #: tmp/deadmessages.xml:11 deadmessages.xml:8
@@ -381,7 +382,7 @@ msgid "Blah"
 msgstr "Ble"
 
 #. (itstool) path: homunculuses/homunculus@name
-#: homunculuses.xml:6
+#: homunculuses.xml:27
 msgid "homum"
 msgstr ""
 
@@ -2033,43 +2034,18 @@ msgid "Yellow Cotton Dye"
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1265 items.xml:1273
-msgid "Bow 1"
+#: items.xml:1268
+msgid "Wooden Bow"
 msgstr ""
 
 #. (itstool) path: items/item@description
-#: items.xml:1265 items.xml:1273
-msgid "Testing bow 1"
+#: items.xml:1268 items.xml:1279
+msgid "For bow training. Does not seem much reliable."
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1282
-msgid "Arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1282
-msgid "Testing arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1289
-msgid "Arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1289
-msgid "Testing arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1296
-msgid "Arrow 3"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1296
-msgid "Testing arrow 3"
+#: items.xml:1279
+msgid "Training Arrow"
 msgstr ""
 
 #. (itstool) path: emote/sprite@name
@@ -2350,7 +2326,7 @@ msgid "Right Wing"
 msgstr ""
 
 #. (itstool) path: mercenaries/mercenary@name
-#: mercenaries.xml:6
+#: mercenaries.xml:27
 msgid "merc"
 msgstr ""
 
@@ -2674,7 +2650,7 @@ msgstr "Są stare, trochę śmierdzące, ale sprawiają że czujesz się jak w d
 
 #. (itstool) path: quest/reward
 #: quests.xml:72
-msgid "A [Creased Shirt] and old [Creased Shorts]."
+msgid "A {@@1} and old {@@2}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2717,7 +2693,7 @@ msgstr ""
 #: quests.xml:92
 msgid ""
 "In fact, he hides in a hole in the main hallway. It leads to the ship's "
-"storage room where he can reach for some barrels full of [Piberries]."
+"storage room where he can reach for some barrels full of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2729,8 +2705,7 @@ msgstr "Jest chory od ciągłego jedzenia jagódenek. Dlatego prosi cię byś zn
 
 #. (itstool) path: quest/text
 #: quests.xml:102
-msgid ""
-"You brought Alige some food, different from the [Piberries] he usually eats."
+msgid "You brought Alige some food, different from the {@@1} he usually eats."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2742,7 +2717,7 @@ msgstr "Wygląda na głodnego nowych smaków. Spróbuj przynieść mu coś inneg
 
 #. (itstool) path: quest/reward
 #: quests.xml:108
-msgid "A handful of [Piberries]."
+msgid "A handful of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2895,7 +2870,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:217 quests.xml:225
-msgid "50 EXP, [Bandana]."
+msgid "50 EXP, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2926,8 +2901,8 @@ msgid "La Johanne, Second Deck. (50,24)"
 msgstr ""
 
 #. (itstool) path: quest/reward
-#: quests.xml:237
-msgid "[Knife]."
+#: quests.xml:237 quests.xml:484 quests.xml:530 quests.xml:560
+msgid "{@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3003,7 +2978,7 @@ msgstr "Zauważyłeś skrzynię ze skarbem na szczycie klifu w wschodniej częś
 
 #. (itstool) path: quest/text
 #: quests.xml:272
-msgid "The chest contains gold and an [Old Book]."
+msgid "The chest contains gold and an {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3013,7 +2988,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:275
-msgid "100 E, [Old Book]."
+msgid "100 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3025,8 +3000,7 @@ msgstr "Nieoczekiwana pomoc."
 #: quests.xml:301
 msgid ""
 "Gugli told you about the sailors' task on the island. He wants you to help "
-"some of them bringing him 6 boxes full of [Croconut], [Aquada] and "
-"[Plushroom]."
+"some of them bringing him 6 boxes full of {@@1}, {@@2} and {@@3}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3069,8 +3043,8 @@ msgstr "Dwaj porucznicy na jednej łodzi."
 #. (itstool) path: quest/text
 #: quests.xml:325
 msgid ""
-"Chef Gado wants you to collect 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] "
-"and 1 [Sea Drops] to prepare a [Poisoned Dish], for Julia."
+"Chef Gado wants you to collect 2 {@@1}, 2 {@@2}, 1 {@@3} and 1 {@@4} to "
+"prepare a {@@5}, for Julia."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3087,9 +3061,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:333
-msgid ""
-"Chef Gado prepared the [Poisoned Dish]. He would like you to give it to "
-"Julia."
+msgid "Chef Gado prepared the {@@1}. He would like you to give it to Julia."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3111,7 +3083,7 @@ msgstr "Udało Ci się otruć Julię. Szef Gado ma wreszcie swoją zemstę !"
 
 #. (itstool) path: quest/reward
 #: quests.xml:355
-msgid "15 EXP, 200 E, [Bread]."
+msgid "15 EXP, 200 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3206,12 +3178,12 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:412
-msgid "His sister was very happy and gave you an [Aquada] as a reward."
+msgid "His sister was very happy and gave you an {@@1} as a reward."
 msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:416
-msgid "An [Aquada]."
+msgid "An {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3226,7 +3198,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:425
-msgid "She wants you to bring her [Croc Claw]s to get rid of spikes."
+msgid "She wants you to bring her {@@1}s to get rid of spikes."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3311,7 +3283,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:470
-msgid "You need to bring him 10 [Small Tentacles]."
+msgid "You need to bring him 10 {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3339,11 +3311,6 @@ msgstr ""
 msgid "You can use it to catch fish."
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:484
-msgid "[Fishing Rod]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:492 quests.xml:502 quests.xml:511
 msgid "The Buried Treasure"
@@ -3417,7 +3384,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:525
-msgid "Bacchus asked you to bring him a [Pumpkin]."
+msgid "Bacchus asked you to bring him a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3435,11 +3402,6 @@ msgstr ""
 msgid "La Johanne, Hold. (31,30)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:530
-msgid "[Pumpkin Hat]."
-msgstr ""
-
 #. (itstool) path: quest/text
 #: quests.xml:534
 msgid "Bacchus offers you to see a small part of your future."
@@ -3478,7 +3440,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:556
-msgid "For killing the scary Cuco, he gave me a [Barrel]."
+msgid "For killing the scary Cuco, he gave me a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3486,11 +3448,6 @@ msgstr ""
 msgid "Artis, Dream World. (71,132)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:560
-msgid "[Barrel]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:568 quests.xml:576 quests.xml:583
 msgid "Plushroom Addict"
@@ -3518,7 +3475,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:577
-msgid "Rumly is waiting for you to bring him some [Plushroom]s."
+msgid "Rumly is waiting for you to bring him some {@@1}s."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3528,7 +3485,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:585
-msgid "Bring him some [Plushroom]s and he will be able to do it for you."
+msgid "Bring him some {@@1}s and he will be able to do it for you."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3617,7 +3574,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:654
-msgid "Resa gave you a cute [%Color% Artis Tank Top, Camel Cotton Dye]."
+msgid "Resa gave you a cute {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3650,7 +3607,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:681
-msgid "Ivan gave you some [Piberries Infusion]."
+msgid "Ivan gave you some {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3695,9 +3652,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:705
-msgid ""
-"[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries"
-" Infusion]s"
+msgid "{@@1}, {@@2}, 5 {@@3}s"
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3729,7 +3684,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:723 quests.xml:732
-msgid "Fexil wants to open a business of [Fluffy Fur]'s clothes."
+msgid "Fexil wants to open a business of {@@1}'s clothes."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3754,7 +3709,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:737
-msgid "15 per [Fluffy Fur]."
+msgid "15 per {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3877,197 +3832,197 @@ msgid "Hells plant"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:12
+#: stats.xml:14
 msgid "Strength"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:18
+#: stats.xml:20
 msgid "Agility"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:24
+#: stats.xml:26
 msgid "Vitality"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:30
+#: stats.xml:32
 msgid "Intelligence"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:36
+#: stats.xml:38
 msgid "Dexterity"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:42
+#: stats.xml:44
 msgid "Luck"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:49 stats.xml:196 stats.xml:273
+#: stats.xml:51 stats.xml:198 stats.xml:275
 msgid "Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:54 stats.xml:191
+#: stats.xml:56 stats.xml:193
 msgid "Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:59 stats.xml:186
+#: stats.xml:61 stats.xml:188
 msgid "M.Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:64 stats.xml:181 stats.xml:258
+#: stats.xml:66 stats.xml:183 stats.xml:260
 msgid "M.Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:69 stats.xml:176 stats.xml:253
+#: stats.xml:71 stats.xml:178 stats.xml:255
 msgid "% Accuracy"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:74 stats.xml:171 stats.xml:248
+#: stats.xml:76 stats.xml:173 stats.xml:250
 msgid "% Evade"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:79 stats.xml:166 stats.xml:243
+#: stats.xml:81 stats.xml:168 stats.xml:245
 msgid "% Critical"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:84 stats.xml:151 stats.xml:228
+#: stats.xml:86 stats.xml:153 stats.xml:230
 msgid "Attack delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:89
+#: stats.xml:91
 msgid "Walk delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:94 stats.xml:156 stats.xml:233
+#: stats.xml:96 stats.xml:158 stats.xml:235
 msgid "Attack range"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:99 stats.xml:161 stats.xml:238
+#: stats.xml:101 stats.xml:163 stats.xml:240
 msgid "Damage per sec."
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:104
+#: stats.xml:106
 msgid "Karma"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:109
+#: stats.xml:111
 msgid "Manner"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:111
+#: stats.xml:113
 msgid "Homun"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:116 stats.xml:203
+#: stats.xml:118 stats.xml:205
 msgid "Level"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:121 stats.xml:208 stats.xml:300
+#: stats.xml:123 stats.xml:210 stats.xml:302
 msgid "Hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:126 stats.xml:213 stats.xml:305
+#: stats.xml:128 stats.xml:215 stats.xml:307
 msgid "Max hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:131
+#: stats.xml:133
 msgid "Mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:136
+#: stats.xml:138
 msgid "Max mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:141
+#: stats.xml:143
 msgid "Exp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:146
+#: stats.xml:148
 msgid "Need exp"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:198
+#: stats.xml:200
 msgid "Merc"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:218 stats.xml:310
+#: stats.xml:220 stats.xml:312
 msgid "Mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:223 stats.xml:315
+#: stats.xml:225 stats.xml:317
 msgid "Max mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:263
+#: stats.xml:265
 msgid "M.Atk"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:268
+#: stats.xml:270
 msgid "Defence"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:278
+#: stats.xml:280
 msgid "Expire"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:283
+#: stats.xml:285
 msgid "Faith"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:288
+#: stats.xml:290
 msgid "Calls"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:293
+#: stats.xml:295
 msgid "Kills"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:295
+#: stats.xml:297
 msgid "Elemental"
 msgstr ""
 
diff --git a/translations/pt_BR.po b/translations/pt_BR.po
index c616d01e..3cb65b77 100644
--- a/translations/pt_BR.po
+++ b/translations/pt_BR.po
@@ -3,6 +3,7 @@
 # alastrim <alasmirt@gmail.com>, 2016
 # alastrim <alasmirt@gmail.com>, 2012
 # Bruno Nunes <bruno@dukkha.com.br>, 2013
+# Ciro Meneses <ciroccuva@hotmail.com>, 2016
 # Diogo RBG <diogorbg@gmail.com>, 2016
 # freya <freya.df@gmail.com>, 2012
 # Jesusaves <cpntb1@ymail.com>, 2014-2015
@@ -10,9 +11,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evol Online\n"
-"POT-Creation-Date: 2016-08-07 16:28+0300\n"
-"PO-Revision-Date: 2016-08-08 08:48+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2016-09-11 23:23+0300\n"
+"PO-Revision-Date: 2016-09-17 15:50+0000\n"
+"Last-Translator: Ciro Meneses <ciroccuva@hotmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/evol/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -383,7 +384,7 @@ msgid "Blah"
 msgstr "Blah"
 
 #. (itstool) path: homunculuses/homunculus@name
-#: homunculuses.xml:6
+#: homunculuses.xml:27
 msgid "homum"
 msgstr ""
 
@@ -1112,7 +1113,7 @@ msgstr ""
 #. (itstool) path: items/item@description
 #: items.xml:340
 msgid "A potion made from piberries."
-msgstr ""
+msgstr "Uma poção feita de piberries"
 
 #. (itstool) path: items/item@effect
 #: items.xml:340
@@ -1597,7 +1598,7 @@ msgstr "Carpa capim"
 #. (itstool) path: items/item@description
 #: items.xml:648
 msgid "A smart fish, very difficult to catch."
-msgstr ""
+msgstr "Um pequeno peixe, muito difícil de capturar."
 
 #. (itstool) path: items/item@name
 #: items.xml:655
@@ -1869,7 +1870,7 @@ msgstr "Gladius de treinamento"
 #. (itstool) path: items/item@description
 #: items.xml:1014
 msgid "A short sword made for close combat."
-msgstr ""
+msgstr "Uma espada curta feita para combate de perto."
 
 #. (itstool) path: items/item@name
 #: items.xml:1028
@@ -2035,43 +2036,18 @@ msgid "Yellow Cotton Dye"
 msgstr "Tinta amarela para algodão"
 
 #. (itstool) path: items/item@name
-#: items.xml:1265 items.xml:1273
-msgid "Bow 1"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1265 items.xml:1273
-msgid "Testing bow 1"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1282
-msgid "Arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1282
-msgid "Testing arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1289
-msgid "Arrow 2"
+#: items.xml:1268
+msgid "Wooden Bow"
 msgstr ""
 
 #. (itstool) path: items/item@description
-#: items.xml:1289
-msgid "Testing arrow 2"
+#: items.xml:1268 items.xml:1279
+msgid "For bow training. Does not seem much reliable."
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1296
-msgid "Arrow 3"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1296
-msgid "Testing arrow 3"
+#: items.xml:1279
+msgid "Training Arrow"
 msgstr ""
 
 #. (itstool) path: emote/sprite@name
@@ -2202,22 +2178,22 @@ msgstr "Sala dos Marinheiros"
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-0.tmx:8
 msgid "Oceania"
-msgstr ""
+msgstr "Oceania"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-1.tmx:8
 msgid "Drasil Island"
-msgstr ""
+msgstr "Ilha Drasil"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-2-0.tmx:8 ../../client-data/maps/001-2-21.tmx:8
 msgid "First Deck"
-msgstr ""
+msgstr "Primeiro andar"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-2-1.tmx:9 ../../client-data/maps/001-2-22.tmx:9
 msgid "Second Deck"
-msgstr ""
+msgstr "Segundo andar"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-2-2.tmx:9 ../../client-data/maps/001-2-23.tmx:9
@@ -2227,7 +2203,7 @@ msgstr ""
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-2-3.tmx:8 ../../client-data/maps/001-2-24.tmx:8
 msgid "Nard's Room"
-msgstr ""
+msgstr "Sala de Nard's"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/000-2-4.tmx:9
@@ -2310,7 +2286,7 @@ msgstr ""
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-30.tmx:8
 msgid "Second Floor"
-msgstr ""
+msgstr "Segundo andar"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-31.tmx:8 ../../client-data/maps/001-2-32.tmx:8
@@ -2329,7 +2305,7 @@ msgstr ""
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-4.tmx:8
 msgid "Library"
-msgstr ""
+msgstr "Biblioteca"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-5.tmx:8
@@ -2344,15 +2320,15 @@ msgstr ""
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-8.tmx:8
 msgid "Left Wing"
-msgstr ""
+msgstr "Asa esquerda"
 
 #. (itstool) path: properties/property@value
 #: ../../client-data/maps/001-2-9.tmx:8
 msgid "Right Wing"
-msgstr ""
+msgstr "Asa direita"
 
 #. (itstool) path: mercenaries/mercenary@name
-#: mercenaries.xml:6
+#: mercenaries.xml:27
 msgid "merc"
 msgstr ""
 
@@ -2569,7 +2545,7 @@ msgstr ""
 #: quests.xml:650 quests.xml:668 quests.xml:677 quests.xml:697 quests.xml:719
 #: quests.xml:728
 msgid "Unknown."
-msgstr ""
+msgstr "Desconhecido."
 
 #. (itstool) path: quest/text
 #: quests.xml:20
@@ -2588,7 +2564,7 @@ msgstr ""
 #. (itstool) path: quest/reward
 #: quests.xml:26 quests.xml:132 quests.xml:150
 msgid "Nothing."
-msgstr ""
+msgstr "Não."
 
 #. (itstool) path: quest/name
 #: quests.xml:33 quests.xml:43 quests.xml:53 quests.xml:65
@@ -2676,7 +2652,7 @@ msgstr "Elas estão velhas e um pouco fedidas, mas a sensação de calor faz voc
 
 #. (itstool) path: quest/reward
 #: quests.xml:72
-msgid "A [Creased Shirt] and old [Creased Shorts]."
+msgid "A {@@1} and old {@@2}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2719,8 +2695,8 @@ msgstr ""
 #: quests.xml:92
 msgid ""
 "In fact, he hides in a hole in the main hallway. It leads to the ship's "
-"storage room where he can reach for some barrels full of [Piberries]."
-msgstr "Na verdade, ele se esconde em um buraco do corredor principal que leva ao setor de armazenamento, onde ele tem acesso a alguns barris de [Piberries]."
+"storage room where he can reach for some barrels full of {@@1}."
+msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:94
@@ -2731,9 +2707,8 @@ msgstr "Ele está cansado de comer esses frutos toda hora. Por isso ele quer que
 
 #. (itstool) path: quest/text
 #: quests.xml:102
-msgid ""
-"You brought Alige some food, different from the [Piberries] he usually eats."
-msgstr "Você trouxe para Alige um pouco de comida diferente das [Piberries] que ele geralmente come."
+msgid "You brought Alige some food, different from the {@@1} he usually eats."
+msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:104
@@ -2744,7 +2719,7 @@ msgstr "Parece que ele está ansioso para experimentar novos sabores. Experiment
 
 #. (itstool) path: quest/reward
 #: quests.xml:108
-msgid "A handful of [Piberries]."
+msgid "A handful of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2897,7 +2872,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:217 quests.xml:225
-msgid "50 EXP, [Bandana]."
+msgid "50 EXP, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2928,8 +2903,8 @@ msgid "La Johanne, Second Deck. (50,24)"
 msgstr ""
 
 #. (itstool) path: quest/reward
-#: quests.xml:237
-msgid "[Knife]."
+#: quests.xml:237 quests.xml:484 quests.xml:530 quests.xml:560
+msgid "{@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2957,7 +2932,7 @@ msgstr ""
 #. (itstool) path: quest/coordinates
 #: quests.xml:250 quests.xml:308 quests.xml:316
 msgid "Drasil Island. (85,108)"
-msgstr ""
+msgstr "Ilha Drasil. (85,108)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:251
@@ -2984,7 +2959,7 @@ msgstr "Ele também te avisou para não confiar em ninguém."
 #. (itstool) path: quest/coordinates
 #: quests.xml:262
 msgid "Drasil Island. (89,36)"
-msgstr ""
+msgstr "Ilha Drasil. (89,36)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:263
@@ -3005,17 +2980,17 @@ msgstr "Você viu um baú de tesouro no topo de um penhasco no lado leste da ilh
 
 #. (itstool) path: quest/text
 #: quests.xml:272
-msgid "The chest contains gold and an [Old Book]."
-msgstr "O baú contém ouro e um [Livro Velho]."
+msgid "The chest contains gold and an {@@1}."
+msgstr ""
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:274
 msgid "Drasil Island. (83,70)"
-msgstr ""
+msgstr "Ilha Drasil. (83,70)"
 
 #. (itstool) path: quest/reward
 #: quests.xml:275
-msgid "100 E, [Old Book]."
+msgid "100 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3027,8 +3002,7 @@ msgstr "Ajuda Inesperada"
 #: quests.xml:301
 msgid ""
 "Gugli told you about the sailors' task on the island. He wants you to help "
-"some of them bringing him 6 boxes full of [Croconut], [Aquada] and "
-"[Plushroom]."
+"some of them bringing him 6 boxes full of {@@1}, {@@2} and {@@3}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3071,8 +3045,8 @@ msgstr "Dois Tenentes em Um Barco"
 #. (itstool) path: quest/text
 #: quests.xml:325
 msgid ""
-"Chef Gado wants you to collect 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] "
-"and 1 [Sea Drops] to prepare a [Poisoned Dish], for Julia."
+"Chef Gado wants you to collect 2 {@@1}, 2 {@@2}, 1 {@@3} and 1 {@@4} to "
+"prepare a {@@5}, for Julia."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3089,10 +3063,8 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:333
-msgid ""
-"Chef Gado prepared the [Poisoned Dish]. He would like you to give it to "
-"Julia."
-msgstr "Chef Gado preparou um [Prato Envenenado]. Ele gostaria que você desse o prato para Julia."
+msgid "Chef Gado prepared the {@@1}. He would like you to give it to Julia."
+msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:335
@@ -3113,7 +3085,7 @@ msgstr "Você envenenou Julia com sucesso. Chef Gado finalmente teve sua vingan�
 
 #. (itstool) path: quest/reward
 #: quests.xml:355
-msgid "15 EXP, 200 E, [Bread]."
+msgid "15 EXP, 200 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3151,13 +3123,13 @@ msgstr "Katja quer que você encontre o irmão dela."
 #. (itstool) path: quest/text
 #: quests.xml:381
 msgid "He is hiding somewhere on the hill, not far from here."
-msgstr ""
+msgstr "Ele está escondido em algum lugar da colina, não muito distante daqui."
 
 #. (itstool) path: quest/text
 #: quests.xml:382
 msgid ""
 "You should probably go and check behind trees, they are great for hiding."
-msgstr ""
+msgstr "Provavelmente você precisa procurar atrás das árvores, eles são muito bons em se esconder."
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:384 quests.xml:394 quests.xml:405 quests.xml:414
@@ -3184,7 +3156,7 @@ msgstr "Aparentemente ele está aqui o dia inteiro porque não quer fazer sua li
 #. (itstool) path: quest/text
 #: quests.xml:392
 msgid "You decided to let him do so in exchange for a small reward."
-msgstr ""
+msgstr "Você decidiu deixá-lo fazer isso em troca de uma pequena recompensa."
 
 #. (itstool) path: quest/reward
 #: quests.xml:396
@@ -3208,12 +3180,12 @@ msgstr "Você encontrou Bobo. Ele prometeu ir para casa em breve."
 
 #. (itstool) path: quest/text
 #: quests.xml:412
-msgid "His sister was very happy and gave you an [Aquada] as a reward."
+msgid "His sister was very happy and gave you an {@@1} as a reward."
 msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:416
-msgid "An [Aquada]."
+msgid "An {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3228,13 +3200,13 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:425
-msgid "She wants you to bring her [Croc Claw]s to get rid of spikes."
+msgid "She wants you to bring her {@@1}s to get rid of spikes."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
 #: quests.xml:427 quests.xml:435
 msgid "Moon"
-msgstr ""
+msgstr "Lua"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:428 quests.xml:436
@@ -3299,7 +3271,7 @@ msgstr ""
 #. (itstool) path: quest/name
 #: quests.xml:467 quests.xml:477
 msgid "Fishman"
-msgstr ""
+msgstr "Pescador"
 
 #. (itstool) path: quest/text
 #: quests.xml:468
@@ -3313,7 +3285,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:470
-msgid "You need to bring him 10 [Small Tentacles]."
+msgid "You need to bring him 10 {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3329,7 +3301,7 @@ msgstr ""
 #. (itstool) path: quest/text
 #: quests.xml:478
 msgid "You helped Eugene."
-msgstr ""
+msgstr "Você ajudou Eugene."
 
 #. (itstool) path: quest/text
 #: quests.xml:479
@@ -3339,12 +3311,7 @@ msgstr ""
 #. (itstool) path: quest/text
 #: quests.xml:480
 msgid "You can use it to catch fish."
-msgstr ""
-
-#. (itstool) path: quest/reward
-#: quests.xml:484
-msgid "[Fishing Rod]."
-msgstr ""
+msgstr "Você pode usar isso para capturar peixes."
 
 #. (itstool) path: quest/name
 #: quests.xml:492 quests.xml:502 quests.xml:511
@@ -3388,7 +3355,7 @@ msgstr ""
 #. (itstool) path: quest/text
 #: quests.xml:503
 msgid "After a lot of digging, you found the treasure chest."
-msgstr ""
+msgstr "Depois de muito escavar, você encontrou o baú do tesouro."
 
 #. (itstool) path: quest/text
 #: quests.xml:504
@@ -3419,7 +3386,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:525
-msgid "Bacchus asked you to bring him a [Pumpkin]."
+msgid "Bacchus asked you to bring him a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3437,11 +3404,6 @@ msgstr ""
 msgid "La Johanne, Hold. (31,30)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:530
-msgid "[Pumpkin Hat]."
-msgstr ""
-
 #. (itstool) path: quest/text
 #: quests.xml:534
 msgid "Bacchus offers you to see a small part of your future."
@@ -3450,7 +3412,7 @@ msgstr ""
 #. (itstool) path: quest/text
 #: quests.xml:535
 msgid "The payment is 10 Halloween Candy."
-msgstr ""
+msgstr "O pagamento é 10 Halloween Candy."
 
 #. (itstool) path: quest/reward
 #: quests.xml:539
@@ -3480,7 +3442,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:556
-msgid "For killing the scary Cuco, he gave me a [Barrel]."
+msgid "For killing the scary Cuco, he gave me a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3488,11 +3450,6 @@ msgstr ""
 msgid "Artis, Dream World. (71,132)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:560
-msgid "[Barrel]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:568 quests.xml:576 quests.xml:583
 msgid "Plushroom Addict"
@@ -3501,7 +3458,7 @@ msgstr ""
 #. (itstool) path: quest/text
 #: quests.xml:569
 msgid "Rumly is expecting you to return."
-msgstr ""
+msgstr "Rumly está esperando você voltar."
 
 #. (itstool) path: quest/text
 #: quests.xml:570
@@ -3511,7 +3468,7 @@ msgstr ""
 #. (itstool) path: quest/questgiver
 #: quests.xml:572 quests.xml:579 quests.xml:587
 msgid "Rumly"
-msgstr ""
+msgstr "Rumly"
 
 #. (itstool) path: quest/coordinates
 #: quests.xml:573 quests.xml:580 quests.xml:588
@@ -3520,7 +3477,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:577
-msgid "Rumly is waiting for you to bring him some [Plushroom]s."
+msgid "Rumly is waiting for you to bring him some {@@1}s."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3530,7 +3487,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:585
-msgid "Bring him some [Plushroom]s and he will be able to do it for you."
+msgid "Bring him some {@@1}s and he will be able to do it for you."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3619,7 +3576,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:654
-msgid "Resa gave you a cute [%Color% Artis Tank Top, Camel Cotton Dye]."
+msgid "Resa gave you a cute {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3652,7 +3609,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:681
-msgid "Ivan gave you some [Piberries Infusion]."
+msgid "Ivan gave you some {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3686,7 +3643,7 @@ msgstr ""
 #. (itstool) path: quest/text
 #: quests.xml:693
 msgid "The hill is located on north-east of Artis (172,46)."
-msgstr ""
+msgstr "A colina está se localiza ao Noroeste de Artis (172,46)."
 
 #. (itstool) path: quest/text
 #: quests.xml:701
@@ -3697,9 +3654,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:705
-msgid ""
-"[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries"
-" Infusion]s"
+msgid "{@@1}, {@@2}, 5 {@@3}s"
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3731,7 +3686,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:723 quests.xml:732
-msgid "Fexil wants to open a business of [Fluffy Fur]'s clothes."
+msgid "Fexil wants to open a business of {@@1}'s clothes."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3756,7 +3711,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:737
-msgid "15 per [Fluffy Fur]."
+msgid "15 per {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3793,7 +3748,7 @@ msgstr ""
 #. (itstool) path: set/skill@name
 #: skills.xml:21
 msgid "Fire ball"
-msgstr ""
+msgstr "Bola de fogo"
 
 #. (itstool) path: set/skill@description
 #: skills.xml:21
@@ -3813,7 +3768,7 @@ msgstr ""
 #. (itstool) path: set/skill@name
 #: skills.xml:32
 msgid "Magic shield"
-msgstr ""
+msgstr "Escudo mágico"
 
 #. (itstool) path: set/skill@description
 #: skills.xml:32
@@ -3879,197 +3834,197 @@ msgid "Hells plant"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:12
+#: stats.xml:14
 msgid "Strength"
-msgstr ""
+msgstr "Força"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:18
+#: stats.xml:20
 msgid "Agility"
-msgstr ""
+msgstr "Agilidade"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:24
+#: stats.xml:26
 msgid "Vitality"
-msgstr ""
+msgstr "Vitalidade"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:30
+#: stats.xml:32
 msgid "Intelligence"
-msgstr ""
+msgstr "Inteligência"
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:36
+#: stats.xml:38
 msgid "Dexterity"
-msgstr ""
+msgstr "Destreza "
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:42
+#: stats.xml:44
 msgid "Luck"
-msgstr ""
+msgstr "Sorte"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:49 stats.xml:196 stats.xml:273
+#: stats.xml:51 stats.xml:198 stats.xml:275
 msgid "Attack"
-msgstr ""
+msgstr "Ataque"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:54 stats.xml:191
+#: stats.xml:56 stats.xml:193
 msgid "Defense"
-msgstr ""
+msgstr "Defesa"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:59 stats.xml:186
+#: stats.xml:61 stats.xml:188
 msgid "M.Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:64 stats.xml:181 stats.xml:258
+#: stats.xml:66 stats.xml:183 stats.xml:260
 msgid "M.Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:69 stats.xml:176 stats.xml:253
+#: stats.xml:71 stats.xml:178 stats.xml:255
 msgid "% Accuracy"
-msgstr ""
+msgstr "% Precisão"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:74 stats.xml:171 stats.xml:248
+#: stats.xml:76 stats.xml:173 stats.xml:250
 msgid "% Evade"
-msgstr ""
+msgstr "% Esquiva"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:79 stats.xml:166 stats.xml:243
+#: stats.xml:81 stats.xml:168 stats.xml:245
 msgid "% Critical"
-msgstr ""
+msgstr "% Crítico"
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:84 stats.xml:151 stats.xml:228
+#: stats.xml:86 stats.xml:153 stats.xml:230
 msgid "Attack delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:89
+#: stats.xml:91
 msgid "Walk delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:94 stats.xml:156 stats.xml:233
+#: stats.xml:96 stats.xml:158 stats.xml:235
 msgid "Attack range"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:99 stats.xml:161 stats.xml:238
+#: stats.xml:101 stats.xml:163 stats.xml:240
 msgid "Damage per sec."
-msgstr ""
+msgstr "Dano por segundo"
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:104
+#: stats.xml:106
 msgid "Karma"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:109
+#: stats.xml:111
 msgid "Manner"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:111
+#: stats.xml:113
 msgid "Homun"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:116 stats.xml:203
+#: stats.xml:118 stats.xml:205
 msgid "Level"
-msgstr ""
+msgstr "Level"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:121 stats.xml:208 stats.xml:300
+#: stats.xml:123 stats.xml:210 stats.xml:302
 msgid "Hp"
-msgstr ""
+msgstr "Vida"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:126 stats.xml:213 stats.xml:305
+#: stats.xml:128 stats.xml:215 stats.xml:307
 msgid "Max hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:131
+#: stats.xml:133
 msgid "Mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:136
+#: stats.xml:138
 msgid "Max mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:141
+#: stats.xml:143
 msgid "Exp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:146
+#: stats.xml:148
 msgid "Need exp"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:198
+#: stats.xml:200
 msgid "Merc"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:218 stats.xml:310
+#: stats.xml:220 stats.xml:312
 msgid "Mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:223 stats.xml:315
+#: stats.xml:225 stats.xml:317
 msgid "Max mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:263
+#: stats.xml:265
 msgid "M.Atk"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:268
+#: stats.xml:270
 msgid "Defence"
-msgstr ""
+msgstr "Defesa"
 
 #. (itstool) path: page/stat@name
-#: stats.xml:278
+#: stats.xml:280
 msgid "Expire"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:283
+#: stats.xml:285
 msgid "Faith"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:288
+#: stats.xml:290
 msgid "Calls"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:293
+#: stats.xml:295
 msgid "Kills"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:295
+#: stats.xml:297
 msgid "Elemental"
 msgstr ""
 
@@ -4086,12 +4041,12 @@ msgstr ""
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:27
 msgid "concentration"
-msgstr ""
+msgstr "concentração"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:33
 msgid "hiding"
-msgstr ""
+msgstr "esconder"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:39
@@ -4436,7 +4391,7 @@ msgstr ""
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:378 status-effects.xml:398
 msgid "stone"
-msgstr ""
+msgstr "pedra"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:383
@@ -4456,7 +4411,7 @@ msgstr ""
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:403
 msgid "burning"
-msgstr ""
+msgstr "queimar"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:408
@@ -4471,7 +4426,7 @@ msgstr ""
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:422
 msgid "poison"
-msgstr ""
+msgstr "veneno"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:427
@@ -4481,7 +4436,7 @@ msgstr ""
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:432
 msgid "silence"
-msgstr ""
+msgstr "silêncio"
 
 #. (itstool) path: status-effects/status-effect@name
 #: status-effects.xml:437
diff --git a/translations/ru.po b/translations/ru.po
index a15784d2..213f5f62 100644
--- a/translations/ru.po
+++ b/translations/ru.po
@@ -16,8 +16,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evol Online\n"
-"POT-Creation-Date: 2016-08-07 16:28+0300\n"
-"PO-Revision-Date: 2016-08-08 08:48+0000\n"
+"POT-Creation-Date: 2016-09-11 23:23+0300\n"
+"PO-Revision-Date: 2016-09-12 10:02+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/evol/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -389,7 +389,7 @@ msgid "Blah"
 msgstr "Вздор!"
 
 #. (itstool) path: homunculuses/homunculus@name
-#: homunculuses.xml:6
+#: homunculuses.xml:27
 msgid "homum"
 msgstr ""
 
@@ -2041,43 +2041,18 @@ msgid "Yellow Cotton Dye"
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1265 items.xml:1273
-msgid "Bow 1"
+#: items.xml:1268
+msgid "Wooden Bow"
 msgstr ""
 
 #. (itstool) path: items/item@description
-#: items.xml:1265 items.xml:1273
-msgid "Testing bow 1"
+#: items.xml:1268 items.xml:1279
+msgid "For bow training. Does not seem much reliable."
 msgstr ""
 
 #. (itstool) path: items/item@name
-#: items.xml:1282
-msgid "Arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1282
-msgid "Testing arrow 1"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1289
-msgid "Arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1289
-msgid "Testing arrow 2"
-msgstr ""
-
-#. (itstool) path: items/item@name
-#: items.xml:1296
-msgid "Arrow 3"
-msgstr ""
-
-#. (itstool) path: items/item@description
-#: items.xml:1296
-msgid "Testing arrow 3"
+#: items.xml:1279
+msgid "Training Arrow"
 msgstr ""
 
 #. (itstool) path: emote/sprite@name
@@ -2358,7 +2333,7 @@ msgid "Right Wing"
 msgstr ""
 
 #. (itstool) path: mercenaries/mercenary@name
-#: mercenaries.xml:6
+#: mercenaries.xml:27
 msgid "merc"
 msgstr ""
 
@@ -2682,7 +2657,7 @@ msgstr "Она старая и немного вонючая, но тёплые
 
 #. (itstool) path: quest/reward
 #: quests.xml:72
-msgid "A [Creased Shirt] and old [Creased Shorts]."
+msgid "A {@@1} and old {@@2}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2725,7 +2700,7 @@ msgstr ""
 #: quests.xml:92
 msgid ""
 "In fact, he hides in a hole in the main hallway. It leads to the ship's "
-"storage room where he can reach for some barrels full of [Piberries]."
+"storage room where he can reach for some barrels full of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2737,8 +2712,7 @@ msgstr "Его уже тошнит от этих ягод, которые он �
 
 #. (itstool) path: quest/text
 #: quests.xml:102
-msgid ""
-"You brought Alige some food, different from the [Piberries] he usually eats."
+msgid "You brought Alige some food, different from the {@@1} he usually eats."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2750,7 +2724,7 @@ msgstr "Похоже, он жаждет новых вкусовых ощущен
 
 #. (itstool) path: quest/reward
 #: quests.xml:108
-msgid "A handful of [Piberries]."
+msgid "A handful of {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -2903,7 +2877,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:217 quests.xml:225
-msgid "50 EXP, [Bandana]."
+msgid "50 EXP, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -2934,8 +2908,8 @@ msgid "La Johanne, Second Deck. (50,24)"
 msgstr ""
 
 #. (itstool) path: quest/reward
-#: quests.xml:237
-msgid "[Knife]."
+#: quests.xml:237 quests.xml:484 quests.xml:530 quests.xml:560
+msgid "{@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3011,7 +2985,7 @@ msgstr "Ты нашел клад на вершине утёса, в восточ
 
 #. (itstool) path: quest/text
 #: quests.xml:272
-msgid "The chest contains gold and an [Old Book]."
+msgid "The chest contains gold and an {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3021,7 +2995,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:275
-msgid "100 E, [Old Book]."
+msgid "100 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3033,8 +3007,7 @@ msgstr "Неожиданная помощь"
 #: quests.xml:301
 msgid ""
 "Gugli told you about the sailors' task on the island. He wants you to help "
-"some of them bringing him 6 boxes full of [Croconut], [Aquada] and "
-"[Plushroom]."
+"some of them bringing him 6 boxes full of {@@1}, {@@2} and {@@3}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3077,8 +3050,8 @@ msgstr "Два лейтенанта на одном судне"
 #. (itstool) path: quest/text
 #: quests.xml:325
 msgid ""
-"Chef Gado wants you to collect 2 [Piou Legs], 2 [Half Croconut], 1 [Aquada] "
-"and 1 [Sea Drops] to prepare a [Poisoned Dish], for Julia."
+"Chef Gado wants you to collect 2 {@@1}, 2 {@@2}, 1 {@@3} and 1 {@@4} to "
+"prepare a {@@5}, for Julia."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3095,9 +3068,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:333
-msgid ""
-"Chef Gado prepared the [Poisoned Dish]. He would like you to give it to "
-"Julia."
+msgid "Chef Gado prepared the {@@1}. He would like you to give it to Julia."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3119,7 +3090,7 @@ msgstr "Ты успешно отравил Джулию. Шеф Гадо нак�
 
 #. (itstool) path: quest/reward
 #: quests.xml:355
-msgid "15 EXP, 200 E, [Bread]."
+msgid "15 EXP, 200 E, {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3214,12 +3185,12 @@ msgstr "Вы нашли Бобо. Он обещал пойти домой."
 
 #. (itstool) path: quest/text
 #: quests.xml:412
-msgid "His sister was very happy and gave you an [Aquada] as a reward."
+msgid "His sister was very happy and gave you an {@@1} as a reward."
 msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:416
-msgid "An [Aquada]."
+msgid "An {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3234,7 +3205,7 @@ msgstr "Эльфийская девушка по имени Луна, случа
 
 #. (itstool) path: quest/text
 #: quests.xml:425
-msgid "She wants you to bring her [Croc Claw]s to get rid of spikes."
+msgid "She wants you to bring her {@@1}s to get rid of spikes."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3319,7 +3290,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:470
-msgid "You need to bring him 10 [Small Tentacles]."
+msgid "You need to bring him 10 {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/questgiver
@@ -3347,11 +3318,6 @@ msgstr "В благодарность он отдал вам свою стару
 msgid "You can use it to catch fish."
 msgstr "используйте её для ловли рыбы."
 
-#. (itstool) path: quest/reward
-#: quests.xml:484
-msgid "[Fishing Rod]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:492 quests.xml:502 quests.xml:511
 msgid "The Buried Treasure"
@@ -3425,7 +3391,7 @@ msgstr "Посещение Артиса"
 
 #. (itstool) path: quest/text
 #: quests.xml:525
-msgid "Bacchus asked you to bring him a [Pumpkin]."
+msgid "Bacchus asked you to bring him a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3443,11 +3409,6 @@ msgstr ""
 msgid "La Johanne, Hold. (31,30)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:530
-msgid "[Pumpkin Hat]."
-msgstr ""
-
 #. (itstool) path: quest/text
 #: quests.xml:534
 msgid "Bacchus offers you to see a small part of your future."
@@ -3486,7 +3447,7 @@ msgstr "Непостижимым образом Элайдж попал в мо�
 
 #. (itstool) path: quest/text
 #: quests.xml:556
-msgid "For killing the scary Cuco, he gave me a [Barrel]."
+msgid "For killing the scary Cuco, he gave me a {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/coordinates
@@ -3494,11 +3455,6 @@ msgstr ""
 msgid "Artis, Dream World. (71,132)"
 msgstr ""
 
-#. (itstool) path: quest/reward
-#: quests.xml:560
-msgid "[Barrel]."
-msgstr ""
-
 #. (itstool) path: quest/name
 #: quests.xml:568 quests.xml:576 quests.xml:583
 msgid "Plushroom Addict"
@@ -3526,7 +3482,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:577
-msgid "Rumly is waiting for you to bring him some [Plushroom]s."
+msgid "Rumly is waiting for you to bring him some {@@1}s."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3536,7 +3492,7 @@ msgstr "Румли может сбросить очки навыков ваше�
 
 #. (itstool) path: quest/text
 #: quests.xml:585
-msgid "Bring him some [Plushroom]s and he will be able to do it for you."
+msgid "Bring him some {@@1}s and he will be able to do it for you."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3625,7 +3581,7 @@ msgstr "Ресу можно найти в магазине лёгкой брон
 
 #. (itstool) path: quest/text
 #: quests.xml:654
-msgid "Resa gave you a cute [%Color% Artis Tank Top, Camel Cotton Dye]."
+msgid "Resa gave you a cute {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3658,7 +3614,7 @@ msgstr "Иван живёт в небольшом доме поблизости
 
 #. (itstool) path: quest/text
 #: quests.xml:681
-msgid "Ivan gave you some [Piberries Infusion]."
+msgid "Ivan gave you some {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3703,9 +3659,7 @@ msgstr "Вы справились со всеми заданиями и даже
 
 #. (itstool) path: quest/reward
 #: quests.xml:705
-msgid ""
-"[Training Gladius], [%Color% Artis Tank Top, Camel Cotton Dye], 5 [Piberries"
-" Infusion]s"
+msgid "{@@1}, {@@2}, 5 {@@3}s"
 msgstr ""
 
 #. (itstool) path: quest/reward
@@ -3737,7 +3691,7 @@ msgstr ""
 
 #. (itstool) path: quest/text
 #: quests.xml:723 quests.xml:732
-msgid "Fexil wants to open a business of [Fluffy Fur]'s clothes."
+msgid "Fexil wants to open a business of {@@1}'s clothes."
 msgstr ""
 
 #. (itstool) path: quest/text
@@ -3762,7 +3716,7 @@ msgstr ""
 
 #. (itstool) path: quest/reward
 #: quests.xml:737
-msgid "15 per [Fluffy Fur]."
+msgid "15 per {@@1}."
 msgstr ""
 
 #. (itstool) path: quest/name
@@ -3885,197 +3839,197 @@ msgid "Hells plant"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:12
+#: stats.xml:14
 msgid "Strength"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:18
+#: stats.xml:20
 msgid "Agility"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:24
+#: stats.xml:26
 msgid "Vitality"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:30
+#: stats.xml:32
 msgid "Intelligence"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:36
+#: stats.xml:38
 msgid "Dexterity"
 msgstr ""
 
 #. (itstool) path: basic/stat@name
-#: stats.xml:42
+#: stats.xml:44
 msgid "Luck"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:49 stats.xml:196 stats.xml:273
+#: stats.xml:51 stats.xml:198 stats.xml:275
 msgid "Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:54 stats.xml:191
+#: stats.xml:56 stats.xml:193
 msgid "Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:59 stats.xml:186
+#: stats.xml:61 stats.xml:188
 msgid "M.Attack"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:64 stats.xml:181 stats.xml:258
+#: stats.xml:66 stats.xml:183 stats.xml:260
 msgid "M.Defense"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:69 stats.xml:176 stats.xml:253
+#: stats.xml:71 stats.xml:178 stats.xml:255
 msgid "% Accuracy"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:74 stats.xml:171 stats.xml:248
+#: stats.xml:76 stats.xml:173 stats.xml:250
 msgid "% Evade"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:79 stats.xml:166 stats.xml:243
+#: stats.xml:81 stats.xml:168 stats.xml:245
 msgid "% Critical"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:84 stats.xml:151 stats.xml:228
+#: stats.xml:86 stats.xml:153 stats.xml:230
 msgid "Attack delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:89
+#: stats.xml:91
 msgid "Walk delay"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:94 stats.xml:156 stats.xml:233
+#: stats.xml:96 stats.xml:158 stats.xml:235
 msgid "Attack range"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
 #. (itstool) path: page/stat@name
-#: stats.xml:99 stats.xml:161 stats.xml:238
+#: stats.xml:101 stats.xml:163 stats.xml:240
 msgid "Damage per sec."
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:104
+#: stats.xml:106
 msgid "Karma"
 msgstr ""
 
 #. (itstool) path: extended/stat@name
-#: stats.xml:109
+#: stats.xml:111
 msgid "Manner"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:111
+#: stats.xml:113
 msgid "Homun"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:116 stats.xml:203
+#: stats.xml:118 stats.xml:205
 msgid "Level"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:121 stats.xml:208 stats.xml:300
+#: stats.xml:123 stats.xml:210 stats.xml:302
 msgid "Hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:126 stats.xml:213 stats.xml:305
+#: stats.xml:128 stats.xml:215 stats.xml:307
 msgid "Max hp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:131
+#: stats.xml:133
 msgid "Mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:136
+#: stats.xml:138
 msgid "Max mana"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:141
+#: stats.xml:143
 msgid "Exp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:146
+#: stats.xml:148
 msgid "Need exp"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:198
+#: stats.xml:200
 msgid "Merc"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:218 stats.xml:310
+#: stats.xml:220 stats.xml:312
 msgid "Mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:223 stats.xml:315
+#: stats.xml:225 stats.xml:317
 msgid "Max mp"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:263
+#: stats.xml:265
 msgid "M.Atk"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:268
+#: stats.xml:270
 msgid "Defence"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:278
+#: stats.xml:280
 msgid "Expire"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:283
+#: stats.xml:285
 msgid "Faith"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:288
+#: stats.xml:290
 msgid "Calls"
 msgstr ""
 
 #. (itstool) path: page/stat@name
-#: stats.xml:293
+#: stats.xml:295
 msgid "Kills"
 msgstr ""
 
 #. (itstool) path: stats/page@name
-#: stats.xml:295
+#: stats.xml:297
 msgid "Elemental"
 msgstr ""
author	Andrei Karas <akaras@inbox.ru>	2017-01-18 18:49:12 +0300
committer	Andrei Karas <akaras@inbox.ru>	2017-01-18 18:49:12 +0300
commit	2a5ee4c0676dc191000485f1764833ea5da8b399 (patch)
tree	a63c8e403d63f0759399b667f78478acb9702d6e /translations
parent	6ef4930f3f3b0c4a7fe5213323a830719863a841 (diff)
download	clientdata-2a5ee4c0676dc191000485f1764833ea5da8b399.tar.gz clientdata-2a5ee4c0676dc191000485f1764833ea5da8b399.tar.bz2 clientdata-2a5ee4c0676dc191000485f1764833ea5da8b399.tar.xz clientdata-2a5ee4c0676dc191000485f1764833ea5da8b399.zip