Merge branch 'master' into stable

12 files changed, 22 insertions, 15 deletions

diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index 92b8cc756..f876629a1 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -124,6 +124,7 @@
     </palette>
 
     <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
+    <progressbar id="HP_POISON" color="#ffff00,70ff00,50ff00,30ff00" />
     <progressbar id="MP" color="#1a66e6" />
     <progressbar id="NO_MP" color="#646464" />
     <progressbar id="EXP" color="#8fc0d3" />
diff --git a/data/help/chatcommands.txt b/data/help/chatcommands.txt
index b2a71c927..be1915e5a 100644
--- a/data/help/chatcommands.txt
+++ b/data/help/chatcommands.txt
@@ -47,6 +47,7 @@
     <</dropn - drop N items from any slot.>>
     <</info - show guild info. Only for native guilds only.>>
     <</wait NAME - wait for nick or moster with name.>>
+    <</gm MESSAGE - send message to all online gms.>>
 
 ##9<<Trade>>
 ##2
@@ -104,7 +105,7 @@
 
 ##9<<Content devs>>
 ##2
-    <</cleangraphics - remove all cached graphics. Usefull for content developers.>>
+    <</cleangraphics - remove all cached graphics. Useful for content developers.>>
     <</testparticle FILENAME - set test particle on player.>>
 
 ##9<<Other>>
diff --git a/data/themes/blacknblack/colors.xml b/data/themes/blacknblack/colors.xml
index 429a46a66..3cdf14382 100644
--- a/data/themes/blacknblack/colors.xml
+++ b/data/themes/blacknblack/colors.xml
@@ -125,6 +125,7 @@
     </palette>
 
     <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
+    <progressbar id="HP_POISON" color="#ffff00,70ff00,50ff00,30ff00" />
     <progressbar id="MP" color="#1a66e6" />
     <progressbar id="NO_MP" color="#646464" />
     <progressbar id="EXP" color="#8fc0d3" />
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 30cddd93d..10783b846 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -124,6 +124,7 @@
     </palette>
 
     <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
+    <progressbar id="HP_POISON" color="#ffff00,70ff00,50ff00,30ff00" />
     <progressbar id="MP" color="#1a66e6" />
     <progressbar id="NO_MP" color="#646464" />
     <progressbar id="EXP" color="#8fc0d3" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index ed0b47824..e2ee35822 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -125,6 +125,7 @@
     </palette>
 
     <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
+    <progressbar id="HP_POISON" color="#ffff00,70ff00,50ff00,30ff00" />
     <progressbar id="MP" color="#1a66e6" />
     <progressbar id="NO_MP" color="#646464" />
     <progressbar id="EXP" color="#8fc0d3" />
diff --git a/data/themes/golden-delicious/colors.xml b/data/themes/golden-delicious/colors.xml
index 258498f05..67129f420 100644
--- a/data/themes/golden-delicious/colors.xml
+++ b/data/themes/golden-delicious/colors.xml
@@ -358,14 +358,11 @@
         <color id="STATUSBAR_OFF" color="#ffff00" />
     </palette>
 
-<!-- DEFAULT progressbar is obsolete! This would be removed from
-future versions of theme, it only left here to keep compatibility
-with older versions for some time -->
-    <progressbar id="DEFAULT" color="#266091" />
     <progressbar id="UPDATE" color="#165081" />
     <progressbar id="STATUS" color="#888808" />
     <progressbar id="MONEY" color="#606060" />
     <progressbar id="HP" color="#D00000,C09800,779000,008710" />
+    <progressbar id="HP_POISON" color="#ffff00,70ff00,50ff00,30ff00" />
     <progressbar id="MP" color="#1250b0" />
     <progressbar id="NO_MP" color="#646464" />
     <progressbar id="EXP" color="#6080a0" />
diff --git a/data/themes/jewelry/colors.xml b/data/themes/jewelry/colors.xml
index 2721d6d2d..616d57db6 100644
--- a/data/themes/jewelry/colors.xml
+++ b/data/themes/jewelry/colors.xml
@@ -406,6 +406,7 @@
     </palette>
 
     <progressbar id="HP" color="#b80000" />
+    <progressbar id="HP_POISON" color="#ffff00,70ff00,50ff00,30ff00" />
     <progressbar id="MP" color="#1a66e6" />
     <progressbar id="NO_MP" color="#646464" />
     <progressbar id="EXP" color="#8fc0d3" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index 7bc5afcec..9a56ee44e 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -125,6 +125,7 @@
     </palette>
 
     <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
+    <progressbar id="HP_POISON" color="#ffff00,70ff00,50ff00,30ff00" />
     <progressbar id="MP" color="#1a66e6" />
     <progressbar id="NO_MP" color="#646464" />
     <progressbar id="EXP" color="#8fc0d3" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index f9b1dc441..f720bb8fc 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -125,6 +125,7 @@
     </palette>
 
     <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
+    <progressbar id="HP_POISON" color="#ffff00,70ff00,50ff00,30ff00" />
     <progressbar id="MP" color="#1a66e6" />
     <progressbar id="NO_MP" color="#646464" />
     <progressbar id="EXP" color="#8fc0d3" />
diff --git a/data/themes/unity/colors.xml b/data/themes/unity/colors.xml
index 552bce4bf..942f19d77 100644
--- a/data/themes/unity/colors.xml
+++ b/data/themes/unity/colors.xml
@@ -124,6 +124,7 @@
     </palette>
 
     <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
+    <progressbar id="HP_POISON" color="#ffff00,70ff00,50ff00,30ff00" />
     <progressbar id="MP" color="#1a66e6" />
     <progressbar id="NO_MP" color="#646464" />
     <progressbar id="EXP" color="#8fc0d3" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 9f3915ab5..f3059f820 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -125,6 +125,7 @@
     </palette>
 
     <progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
+    <progressbar id="HP_POISON" color="#ffff00,70ff00,50ff00,30ff00" />
     <progressbar id="MP" color="#1a66e6" />
     <progressbar id="NO_MP" color="#646464" />
     <progressbar id="EXP" color="#8fc0d3" />
diff --git a/data/translations/help/es.po b/data/translations/help/es.po
index 16f98a3d8..caaec32d6 100644
--- a/data/translations/help/es.po
+++ b/data/translations/help/es.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
-"PO-Revision-Date: 2014-03-09 22:58+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"PO-Revision-Date: 2014-03-17 19:44+0000\n"
+"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -349,7 +349,7 @@ msgid "/addpriorityattack NAME - add monster to priority attack list."
 msgstr "/addpriorityattack NOMBRE - Agregar monstruo a la lista de ataque prioritario."
 
 msgid "For TMW support:"
-msgstr ""
+msgstr "Para ayuda de TMW:"
 
 msgid "/priceload - load shop price from disc."
 msgstr "/priceload - Cargar precios de la tienda desde disco."
@@ -363,7 +363,7 @@ msgid "\"Item shortcut 13\""
 msgstr "\"Atajo para objeto 13\"  "
 
 msgid "For other servers may exists other copyrights."
-msgstr ""
+msgstr "Para otros servidores podrían existir otros derechos de autor."
 
 msgid "\"Outfit shortcut 13\""
 msgstr "\"Atajo para vestimenta 13\""
@@ -482,7 +482,7 @@ msgid "\"Item shortcut 2\""
 msgstr "\"Atajo para objeto 2\"  "
 
 msgid "About current server"
-msgstr ""
+msgstr "Acerca del servidor actual"
 
 msgid "\"Quick heal target or self\""
 msgstr "\"Curar rápidamente al objetivo o a sí mismo\""
@@ -702,7 +702,7 @@ msgid "/magicattack - attack target with magic."
 msgstr "/magicattack - Ataca al objetivo con magia."
 
 msgid "For ManaPlus Online support:"
-msgstr ""
+msgstr "Para ayuda de ManaPlus Online:"
 
 msgid "\"Set direction right\""
 msgstr "\"Voltear a la derecha\""
@@ -844,7 +844,7 @@ msgid "\"Emote shortcut 8\""
 msgstr "\"Atajo para emoticono 8\""
 
 msgid "For Evol Online support:"
-msgstr ""
+msgstr "Para ayuda de Evol Online:"
 
 msgid "/follow NICK - start follow mode."
 msgstr "/follow NICK - iniciar el modo seguimiento."
@@ -915,7 +915,7 @@ msgid "\"Set direction up\""
 msgstr "\"Voltear hacia arriba\""
 
 msgid "or come visit us on our IRC channel:"
-msgstr ""
+msgstr "O ven a visitarnos en nuestro canal de IRC:"
 
 msgid "\"Toggle camera mode\""
 msgstr "\"Activar el modo de cámara\""
@@ -973,7 +973,7 @@ msgstr "Contribuyentes al desarrollo del cliente"
 msgid ""
 "Otherwise see the @@team|Development Team@@ section to have a list of\n"
 " developers and how to contact them."
-msgstr ""
+msgstr "Por otro lado, visita la sección @@team|Equipo de Desarrollo@@ para tener\nuna lista de desarrolladores y cómo contactarlos."
 
 msgid "\"Item shortcut 11\""
 msgstr "\"Atajo para objeto 11\"  "
@@ -1047,7 +1047,7 @@ msgid "/friend NICK, /befriend NICK - add nick to friends list."
 msgstr "/friend NICK, /befriend NICK - agregar nick a la lista de amigos."
 
 msgid "ABOUT THE MANA WORLD"
-msgstr ""
+msgstr "ACERCA DE THE MANA WORLD"
 
 msgid "\"Emote shortcut 14\""
 msgstr "\"Atajo para emoticono 14\""