Merge branch 'master' into jshint-compliance

.gitignore

@@ -2,3 +2,4 @@
 *.TODO
 *.mo
 *.swp
+.idea

lang/es/strings.po

@@ -348,16 +348,16 @@ msgstr "luces encendidas."
 
 #: ../../script/engine.js:493
 msgid "Go Hyper?"
-msgstr ""
+msgstr "¿Activar modo Hyper?"
 
 #: ../../script/engine.js:496
 msgid ""
 "turning hyper mode speeds up the game to x2 speed. do you want to do that?"
-msgstr ""
+msgstr "al activar el modo Hyper el juego irá al doble de velocidad, ¿quieres hacerlo?"
 
 #: ../../script/engine.js:519
 msgid "classic."
-msgstr ""
+msgstr "clásico."
 
 #: ../../script/engine.js:620
 msgid "{0} per {1}s"
@@ -420,11 +420,11 @@ msgstr "nada"
 
 #: ../../script/events.js:627
 msgid "all"
-msgstr ""
+msgstr "todo"
 
 #: ../../script/events.js:649
 msgid "take everything"
-msgstr ""
+msgstr "tomar todo"
 
 #: ../../script/events.js:653 ../../script/outside.js:627
 msgid " and "
@@ -677,7 +677,7 @@ msgstr "el bosque está en silencio."
 
 #: ../../script/events/outside.js:40
 msgid "nothing was found"
-msgstr ""
+msgstr "nada fue encontrado"
 
 #: ../../script/events/outside.js:43 ../../script/events/outside.js:61
 #: ../../script/events/outside.js:126 ../../script/events/outside.js:144
@@ -756,7 +756,7 @@ msgstr "la enfermedad se cura a tiempo."
 
 #: ../../script/events/outside.js:123
 msgid "sufferers are healed"
-msgstr ""
+msgstr "los heridos se han sanado"
 
 #: ../../script/events/outside.js:133
 msgid "the sickness spreads through the village."
@@ -772,7 +772,7 @@ msgstr "las noches llenas de gritos."
 
 #: ../../script/events/outside.js:137
 msgid "sufferers are left to die"
-msgstr ""
+msgstr "a los heridos se es deja morir"
 
 #: ../../script/events/outside.js:153
 msgid "Plague"
@@ -813,7 +813,7 @@ msgstr "el resto los enterrará."
 
 #: ../../script/events/outside.js:190
 msgid "epidemic is eradicated eventually"
-msgstr ""
+msgstr "la epidemia se erradica eventualmente"
 
 #: ../../script/events/outside.js:204
 msgid "the plague rips through the village."
@@ -825,7 +825,7 @@ msgstr "la única esperanza es una muerte rápida."
 
 #: ../../script/events/outside.js:208
 msgid "population is almost exterminated"
-msgstr ""
+msgstr "la población está casi extinta"
 
 #: ../../script/events/outside.js:224
 msgid "A Beast Attack"
@@ -845,11 +845,11 @@ msgstr "los aldeanos se retiran a lamentar a los muertos."
 
 #: ../../script/events/outside.js:235
 msgid "wild beasts attack the villagers"
-msgstr ""
+msgstr "bestias salvajes atacan a los aldeanos"
 
 #: ../../script/events/outside.js:249
 msgid "predators become prey. price is unfair"
-msgstr ""
+msgstr "los depredadores se convirtieron en la presa. el precio es injusto"
 
 #: ../../script/events/outside.js:258
 msgid "A Military Raid"
@@ -874,7 +874,7 @@ msgstr "la plaga arrasa con la aldea."
 
 #: ../../script/events/outside.js:283
 msgid "warfare is bloodthirsty"
-msgstr ""
+msgstr "la guerra es sanguinaria"
 
 #: ../../script/events/room.js:6
 msgid "The Nomad"
@@ -1645,15 +1645,15 @@ msgstr "todavía podría haber cosas valgan la pena dentro."
 
 #: ../../script/events/setpieces.js:1247
 msgid "the towers of a decaying city dominate the skyline"
-msgstr ""
+msgstr "las torres de una ciudad podrida dominan el horizonte"
 
 #: ../../script/events/setpieces.js:1261
 msgid "the streets are empty."
 msgstr "las calles están vacías."
 
 #: ../../script/events/setpieces.js:1262
 msgid "the air is filled with dust, driven relentlessly by the hard winds."
-msgstr ""
+msgstr "el aire está lleno de polvo, impulsado sin descanso por los fuertes vientos"
 
 #: ../../script/events/setpieces.js:1270 ../../script/events/setpieces.js:1286
 #: ../../script/events/setpieces.js:1302 ../../script/events/setpieces.js:1318
@@ -1685,19 +1685,19 @@ msgstr "abandonar ciudad"
 
 #: ../../script/events/setpieces.js:1277
 msgid "orange traffic cones are set across the street, faded and cracked."
-msgstr ""
+msgstr "los conos del tránsito están puestos en la calle, descoloridos y agrietados."
 
 #: ../../script/events/setpieces.js:1278
 msgid "lights flash through the alleys between buildings."
-msgstr ""
+msgstr "las luces parpadean a través de callejones entre edificios."
 
 #: ../../script/events/setpieces.js:1293
 msgid "a large shanty town sprawls across the streets."
-msgstr ""
+msgstr "una larga y pobre ciudad se extiende a través de las calles."
 
 #: ../../script/events/setpieces.js:1294
 msgid "faces, darkened by soot and blood, stare out from crooked huts."
-msgstr ""
+msgstr "rostros, oscurecidos por hollín y sangre, miran fuera de las chozas cocidas."
 
 #: ../../script/events/setpieces.js:1309
 msgid "the shell of an abandoned hospital looms ahead."
@@ -1709,15 +1709,15 @@ msgstr "la antigua torre parece casi intacta."
 
 #: ../../script/events/setpieces.js:1326
 msgid "the shell of a burned out car blocks the entrance."
-msgstr ""
+msgstr "el armazón de autos quemados bloquean la entrada."
 
 #: ../../script/events/setpieces.js:1327
 msgid "most of the windows at ground level are busted anyway."
-msgstr ""
+msgstr "la mayoría de las ventanas a nivel de la tierra están estropeadas de todas maneras."
 
 #: ../../script/events/setpieces.js:1342
 msgid "a huge lizard scrambles up out of the darkness of an old metro station."
-msgstr ""
+msgstr "un lagarto enorme aparece desde la oscuridad de una antigua estación de metro."
 
 # command
 #: ../../script/events/setpieces.js:1368
@@ -1730,43 +1730,43 @@ msgstr "el disparo hace eco en la calle vacía."
 
 #: ../../script/events/setpieces.js:1420
 msgid "the soldier steps out from between the buildings, rifle raised."
-msgstr ""
+msgstr "el soldado sale de entre los edificios, con el rifle en alto."
 
 #: ../../script/events/setpieces.js:1460
 msgid "a frail man stands defiantly, blocking the path."
-msgstr ""
+msgstr "un hombre frágil está de pie desafiante, bloqueando el camino."
 
 #: ../../script/events/setpieces.js:1505
 msgid "nothing but downcast eyes."
 msgstr "nada más que los ojos bajos."
 
 #: ../../script/events/setpieces.js:1506
 msgid "the people here were broken a long time ago."
-msgstr ""
+msgstr "la gente aquí se rompió hace ya mucho tiempo."
 
 #: ../../script/events/setpieces.js:1521
 msgid "empty corridors."
 msgstr "pasillos vacíos."
 
 #: ../../script/events/setpieces.js:1522
 msgid "the place has been swept clean by scavengers."
-msgstr ""
+msgstr el lugar ha sido barrido por carroñeros.""
 
 #: ../../script/events/setpieces.js:1536
 msgid "an old man bursts through a door, wielding a scalpel."
-msgstr ""
+msgstr "un anciano irrumpe a través de una puerta, blandiendo un bisturí."
 
 #: ../../script/events/setpieces.js:1575
 msgid "a thug is waiting on the other side of the wall."
-msgstr ""
+msgstr "un matón está esperando al otro lado de la pared."
 
 #: ../../script/events/setpieces.js:1615
 msgid "a snarling beast jumps out from behind a car."
 msgstr "una bestia gruñona salta desde detrás de un coche."
 
 #: ../../script/events/setpieces.js:1656
 msgid "street above the subway platform is blown away."
-msgstr ""
+msgstr "la calle sobre el subterráneo es alucinante.."
 
 #: ../../script/events/setpieces.js:1657
 msgid "lets some light down into the dusty haze."
@@ -1782,15 +1782,15 @@ msgstr "parece una clase de campamento más adelante."
 
 #: ../../script/events/setpieces.js:1677
 msgid "rusted chainlink is pulled across an alleyway."
-msgstr ""
+msgstr "el lazo oxidado de la cadena es tirado a través de un callejón."
 
 #: ../../script/events/setpieces.js:1678
 msgid "fires burn in the courtyard beyond."
 msgstr "incendios queman en el patio más allá."
 
 #: ../../script/events/setpieces.js:1694
 msgid "more voices can be heard ahead."
-msgstr "más voces pueden ser escuchadas más adelante."
+msgstr "más voces pueden ser escuchadas en las proximidades."
 
 #: ../../script/events/setpieces.js:1695
 msgid "they must be here for a reason."
@@ -1814,35 +1814,35 @@ msgstr "alguien lanza una piedra."
 
 #: ../../script/events/setpieces.js:1746
 msgid "an improvised shop is set up on the sidewalk."
-msgstr ""
+msgstr "una tienda improvisada se estableció en la acera."
 
 #: ../../script/events/setpieces.js:1747
 msgid "the owner stands by, stoic."
 msgstr "el propietario hace una pausa, estoica."
 
 #: ../../script/events/setpieces.js:1792
 msgid "strips of meat hang drying by the side of the street."
-msgstr ""
+msgstr "las tiras de carne están colgando para secarse en el otro lado de la calle."
 
 #: ../../script/events/setpieces.js:1793
 msgid "the people back away, avoiding eye contact."
-msgstr ""
+msgstr "las personas se dan vuelta, evitando contacto visual."
 
 #: ../../script/events/setpieces.js:1818
 msgid "someone has locked and barricaded the door to this operating theatre."
-msgstr ""
+msgstr "alguien ha bloqueado y hecho una barricada en la entrada de este teatro."
 
 #: ../../script/events/setpieces.js:1833
 msgid "a tribe of elderly squatters is camped out in this ward."
-msgstr ""
+msgstr "una tribu de ancianos ocupas está acampando en esta sala."
 
 #: ../../script/events/setpieces.js:1874
 msgid "a pack of lizards rounds the corner."
 msgstr "una manada de lagartos redondea la esquina."
 
 #: ../../script/events/setpieces.js:1916
 msgid "strips of meat are hung up to dry in this ward."
-msgstr ""
+msgstr "las tiras de carne se están secando al colgar en esta sala."
 
 #: ../../script/events/setpieces.js:1940
 msgid "a large bird nests at the top of the stairs."
@@ -1866,7 +1866,7 @@ msgstr ""
 
 #: ../../script/events/setpieces.js:2082
 msgid "a second soldier opens fire."
-msgstr ""
+msgstr "un segundo soldado abre fuego."
 
 #: ../../script/events/setpieces.js:2123
 msgid "a masked soldier rounds the corner, gun drawn"
@@ -1890,7 +1890,7 @@ msgstr ""
 
 #: ../../script/events/setpieces.js:2310
 msgid "as soon as the door is open a little bit, hundreds of tentacles erupt."
-msgstr ""
+msgstr "tan pronto como la puerta se abre un poco, cientos de tentáculos salen de ella."
 
 #: ../../script/events/setpieces.js:2337
 msgid "bird must have liked shiney things."
@@ -1906,7 +1906,7 @@ msgstr "no hay mucho aquí."
 
 #: ../../script/events/setpieces.js:2373
 msgid "scavengers must have gotten to this place already."
-msgstr ""
+msgstr "los carroñeros ya deben haber llegado a este lugar."
 
 #: ../../script/events/setpieces.js:2403
 msgid "the tunnel opens up at another platform."

lang/fr/main.css

@@ -1,3 +1,18 @@
 .button{width: 100px !important;}
 #outsidePanel .button{width: 115px !important;}
-.eventPanel .button {width: 122px !important;}
+.eventPanel .button {width: 122px !important;}
+#lootButtons:before {
+	content: "prendre :" !important;
+}
+#dropMenu:before {
+	content: "déposer :" !important;
+}
+#hullRow {
+    width: 80px !important;
+}
+div#workers {
+    width: 160px !important;
+}
+div.button div.tooltip {
+	width: 120px !important;
+}