update boost_cart, homedecor, mesecons, moretrees, unified_inventory, and worldedit

7 files changed, 1968 insertions, 867 deletions

diff --git a/homedecor_i18n/locale/de.po b/homedecor_i18n/locale/de.po
index ad927d0..7d1f2dd 100644
--- a/homedecor_i18n/locale/de.po
+++ b/homedecor_i18n/locale/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-30 21:31-0300\n"
+"POT-Creation-Date: 2017-02-10 05:34-0300\n"
 "PO-Revision-Date: 2017-01-25 00:03-0300\n"
 "Last-Translator: Xanthin <Xanthin@users.noreply.github.com>\n"
 "Language-Team: German\n"
@@ -288,7 +288,7 @@ msgstr ""
 msgid "Loaded!"
 msgstr "Geladen!"
 
-#: ../lrfurn/armchairs.lua
+#: ../lrfurn/armchairs.lua ../homedecor/furniture.lua
 #, fuzzy
 msgid "Armchair"
 msgstr "Sessel (%s)"
@@ -328,98 +328,31 @@ msgid "Glowing Embers"
 msgstr ""
 
 #: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "black"
-msgstr "schwarz"
-
-#: ../homedecor/bedroom.lua ../homedecor/books.lua
-msgid "brown"
+msgid "Stone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/books.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "blue"
-msgstr "blau"
-
-#: ../homedecor/bedroom.lua
-msgid "cyan"
+#: ../fake_fire/init.lua
+msgid "Sandstone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-#, fuzzy
-msgid "dark grey"
-msgstr "dunkelgruen"
-
-#: ../homedecor/bedroom.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "dark green"
-msgstr "dunkelgruen"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/exterior.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/books.lua
-#, fuzzy
-msgid "green"
-msgstr "gruen"
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua ../homedecor/books.lua
-msgid "grey"
+#: ../fake_fire/init.lua
+msgid "Flint and steel"
 msgstr ""
 
-#: ../homedecor/bedroom.lua
-msgid "magenta"
+#: ../fake_fire/init.lua
+msgid "This area is protected!"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "orange"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/furniture.lua
-#, fuzzy
-msgid "pink"
-msgstr "rosa"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua ../homedecor/books.lua ../homedecor/furniture.lua
 #, fuzzy
-msgid "red"
+msgid "Bed"
 msgstr "rot"
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua ../homedecor/books.lua
-#: ../homedecor/furniture.lua
-#, fuzzy
-msgid "violet"
-msgstr "violett"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#, fuzzy
-msgid "white"
-msgstr "weiss"
-
-#: ../homedecor/bedroom.lua ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua
-msgid "yellow"
-msgstr ""
-
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1)"
+msgid "Bed (king sized)"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1, king sized)"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
 msgid "mahogany"
 msgstr ""
 
@@ -485,6 +418,15 @@ msgid "Under-sink cabinet"
 msgstr "Unterschrank"
 
 #: ../homedecor/kitchen_furniture.lua
+msgid "Copper pans"
+msgstr ""
+
+#: ../homedecor/kitchen_furniture.lua
+#, fuzzy
+msgid "Kitchen Faucet"
+msgstr "Kuechenschrank"
+
+#: ../homedecor/kitchen_furniture.lua
 msgid "Paper towels"
 msgstr ""
 
@@ -617,6 +559,18 @@ msgstr "Asphaltschindeln"
 msgid "Chimney"
 msgstr ""
 
+#: ../homedecor/electrics.lua
+msgid "Power Outlet"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Light switch"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Doorbell"
+msgstr ""
+
 #: ../homedecor/window_treatments.lua
 msgid "Window (quartered)"
 msgstr ""
@@ -664,6 +618,38 @@ msgstr ""
 msgid "Stained Glass"
 msgstr ""
 
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/furniture.lua
+#, fuzzy
+msgid "red"
+msgstr "rot"
+
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/misc-nodes.lua
+#, fuzzy
+msgid "green"
+msgstr "gruen"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "blue"
+msgstr "blau"
+
+#: ../homedecor/window_treatments.lua ../homedecor/lighting.lua
+#, fuzzy
+msgid "white"
+msgstr "weiss"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "pink"
+msgstr "rosa"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "violet"
+msgstr "violett"
+
 #: ../homedecor/crafts.lua
 #, fuzzy
 msgid "Uncooked Terracotta Base"
@@ -816,6 +802,34 @@ msgstr ""
 msgid "Telephone"
 msgstr ""
 
+#: ../homedecor/cobweb.lua
+msgid "Cobweb"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Plastic analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Wooden analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Digital clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Alarm clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Grandfather Clock"
+msgstr ""
+
+#: ../homedecor/lighting.lua ../homedecor/exterior.lua
+msgid "yellow"
+msgstr ""
+
 #: ../homedecor/lighting.lua
 #, fuzzy
 msgid "Thick Glowlight"
@@ -877,6 +891,11 @@ msgid "Hanging Lantern"
 msgstr ""
 
 #: ../homedecor/lighting.lua
+#, fuzzy
+msgid "Ceiling Lantern"
+msgstr "Unterschrank"
+
+#: ../homedecor/lighting.lua
 msgid "Lattice lantern (large)"
 msgstr ""
 
@@ -894,8 +913,9 @@ msgid "Standing Lamp"
 msgstr ""
 
 #: ../homedecor/lighting.lua
-msgid "Desk Lamp (@1)"
-msgstr ""
+#, fuzzy
+msgid "Desk Lamp"
+msgstr "Tischlampe"
 
 #: ../homedecor/lighting.lua
 msgid "Ceiling Lamp"
@@ -976,21 +996,8 @@ msgid "Wrought Iron fence (type 2) Corner"
 msgstr "Schmiedeeiserner Zaun/Gelaender"
 
 #: ../homedecor/shutters.lua
-msgid "unpainted oak"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-msgid "forest green"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-#, fuzzy
-msgid "light blue"
-msgstr "rechts"
-
-#: ../homedecor/shutters.lua
 #, fuzzy
-msgid "Wooden Shutter (@1)"
+msgid "Wooden Shutter"
 msgstr "Holzjalousie (rot)"
 
 #: ../homedecor/exterior.lua
@@ -1108,6 +1115,86 @@ msgstr ""
 msgid "Radiator heater"
 msgstr ""
 
+#: ../homedecor/wardrobe.lua
+msgid "Wardrobe"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Clothes"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Storage"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Green Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Small Trash Can"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Cutlery set"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Brown bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four brown bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Green bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four misc brown/green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Wine rack"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Dartboard"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer tap"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Ahh, a frosty cold beer - look in your inventory for it!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "No room in your inventory to add a beer mug!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer mug"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Soda vending machine"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Please insert a coin in the machine."
+msgstr ""
+
 #: ../homedecor/doors_and_gates.lua
 #, fuzzy
 msgid "Mahogany Closet Door (@1 opening)"
@@ -1215,6 +1302,26 @@ msgstr ""
 msgid "Japanese-style door"
 msgstr ""
 
+#: ../homedecor/foyer.lua
+msgid "Wall-mounted coat rack"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Coat tree"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Green welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Brown welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Grey welcome mat"
+msgstr ""
+
 #: ../homedecor/misc-nodes.lua
 #, fuzzy
 msgid "Textured Ceiling Paint"
@@ -1241,6 +1348,11 @@ msgstr ""
 msgid "Rug (@1)"
 msgstr ""
 
+#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "black"
+msgstr "schwarz"
+
 #: ../homedecor/misc-nodes.lua
 msgid "Flower Pot (@1)"
 msgstr ""
@@ -1408,7 +1520,7 @@ msgid "Legs for Utility Table"
 msgstr "Tischbeine fuer Arbeitsplatte"
 
 #: ../homedecor/books.lua
-msgid "Writable Book (@1)"
+msgid "Writable Book"
 msgstr ""
 
 #: ../homedecor/books.lua
@@ -1436,13 +1548,13 @@ msgstr ""
 
 #: ../homedecor/furniture.lua
 #, fuzzy
-msgid "Kitchen chair (@1)"
-msgstr "Kuechenschrank"
+msgid "dark green"
+msgstr "dunkelgruen"
 
 #: ../homedecor/furniture.lua
 #, fuzzy
-msgid "Armchair (@1)"
-msgstr "Sessel (%s)"
+msgid "Kitchen chair"
+msgstr "Kuechenschrank"
 
 #: ../homedecor/furniture.lua
 msgid "Bookshelf (open-frame)"
@@ -1480,6 +1592,27 @@ msgstr "%s versuchte Zugang zu %s von %s zu bekommen bei %s"
 msgid "@1 (Locked)"
 msgstr "%s (verschlossen)"
 
+#: ../homedecor/handlers/expansion.lua
+msgid "Expansion placeholder (you hacker you!)"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the space for the headboard is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Someone already owns the spot where the headboard goes."
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the upper space is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+#, fuzzy
+msgid "Someone already owns that spot."
+msgstr "Tut mir leid, %s gehoert diese Stelle."
+
 #: ../homedecor/handlers/furnaces.lua
 msgid "Furnace"
 msgstr ""
@@ -1512,48 +1645,43 @@ msgstr ": Produktfelder sind voll"
 msgid "Filing cabinet"
 msgstr "Unterschrank"
 
-#: ../homedecor/bathroom_furniture.lua
+#: ../homedecor/office.lua
 #, fuzzy
-msgid "white/grey"
-msgstr "weiss"
+msgid "Desk"
+msgstr "Tischlampe"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/dark grey"
+#: ../homedecor/office.lua
+msgid "Desk globe"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/black"
+#: ../homedecor/office.lua
+msgid "Calendar"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "black/dark grey"
+#: ../homedecor/office.lua
+msgid ""
+"Date (right-click to update):\n"
+"@1"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/red"
-msgstr "weiss"
-
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/green"
+#: ../homedecor/office.lua
+msgid "Basic office chair"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/blue"
-msgstr "weiss"
+#: ../homedecor/office.lua
+msgid "Upscale office chair"
+msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "white/yellow"
+msgid "Bathroom/kitchen tiles (dark)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/tan"
-msgstr "weiss"
+msgid "Bathroom/kitchen tiles (medium)"
+msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "Bathroom/kitchen tiles (@1)"
+msgid "Bathroom/kitchen tiles (light)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
@@ -1566,6 +1694,34 @@ msgid "Medicine cabinet"
 msgstr "Unterschrank"
 
 #, fuzzy
+#~ msgid "white/grey"
+#~ msgstr "weiss"
+
+#, fuzzy
+#~ msgid "white/red"
+#~ msgstr "weiss"
+
+#, fuzzy
+#~ msgid "white/blue"
+#~ msgstr "weiss"
+
+#, fuzzy
+#~ msgid "white/tan"
+#~ msgstr "weiss"
+
+#, fuzzy
+#~ msgid "dark grey"
+#~ msgstr "dunkelgruen"
+
+#, fuzzy
+#~ msgid "light blue"
+#~ msgstr "rechts"
+
+#, fuzzy
+#~ msgid "Armchair (@1)"
+#~ msgstr "Sessel (%s)"
+
+#, fuzzy
 #~ msgid "dark_grey"
 #~ msgstr "dunkelgruen"
 
@@ -1697,9 +1853,6 @@ msgstr "Unterschrank"
 #~ msgid "someone "
 #~ msgstr "jemand"
 
-#~ msgid "Sorry, %s owns that spot. "
-#~ msgstr "Tut mir leid, %s gehoert diese Stelle."
-
 #~ msgid "White Glowlight (small cube) "
 #~ msgstr "Weisse Gluehlampe (kleiner Wuerfel)"
 
diff --git a/homedecor_i18n/locale/es.po b/homedecor_i18n/locale/es.po
index 5c52b50..75944ad 100644
--- a/homedecor_i18n/locale/es.po
+++ b/homedecor_i18n/locale/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-30 21:31-0300\n"
+"POT-Creation-Date: 2017-02-10 05:34-0300\n"
 "PO-Revision-Date: 2017-01-24 20:24-0300\n"
 "Last-Translator: Diego Martínez <kaeza@users.noreply.github.com>\n"
 "Language-Team: Spanish\n"
@@ -276,7 +276,7 @@ msgstr "¡No hay lugar para colocar el sofá!"
 msgid "Loaded!"
 msgstr "¡Cargado!"
 
-#: ../lrfurn/armchairs.lua
+#: ../lrfurn/armchairs.lua ../homedecor/furniture.lua
 msgid "Armchair"
 msgstr "Sillón"
 
@@ -313,89 +313,30 @@ msgid "Glowing Embers"
 msgstr "Brasas ardientes"
 
 #: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr "Pedernal y acero"
+msgid "Stone chimney top"
+msgstr "Chimenea de piedra"
 
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
-msgid "black"
-msgstr "negra"
+#: ../fake_fire/init.lua
+msgid "Sandstone chimney top"
+msgstr "Chimenea de arenisca"
 
-#: ../homedecor/bedroom.lua ../homedecor/books.lua
-msgid "brown"
-msgstr "marrón"
+#: ../fake_fire/init.lua
+msgid "Flint and steel"
+msgstr "Pedernal y acero"
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/books.lua ../homedecor/furniture.lua
-msgid "blue"
-msgstr "azul"
+#: ../fake_fire/init.lua
+msgid "This area is protected!"
+msgstr "¡Ésta área está protegida!"
 
 #: ../homedecor/bedroom.lua
-msgid "cyan"
-msgstr "cian"
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-msgid "dark grey"
-msgstr "gris oscuro"
-
-#: ../homedecor/bedroom.lua ../homedecor/furniture.lua
-msgid "dark green"
-msgstr "verde oscuro"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/exterior.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/books.lua
-msgid "green"
-msgstr "verde"
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua ../homedecor/books.lua
-msgid "grey"
-msgstr "gris"
+msgid "Bed"
+msgstr "Cama"
 
 #: ../homedecor/bedroom.lua
-msgid "magenta"
-msgstr "magenta"
+msgid "Bed (king sized)"
+msgstr "Cama (tamaño grande)"
 
 #: ../homedecor/bedroom.lua
-msgid "orange"
-msgstr "naranja"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/furniture.lua
-msgid "pink"
-msgstr "rosa"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua ../homedecor/books.lua ../homedecor/furniture.lua
-msgid "red"
-msgstr "roja"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua ../homedecor/books.lua
-#: ../homedecor/furniture.lua
-msgid "violet"
-msgstr "violeta"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-msgid "white"
-msgstr "blanca"
-
-#: ../homedecor/bedroom.lua ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua
-msgid "yellow"
-msgstr "amarilla"
-
-#: ../homedecor/bedroom.lua
-msgid "Bed (@1)"
-msgstr "Cama (@1)"
-
-#: ../homedecor/bedroom.lua
-msgid "Bed (@1, king sized)"
-msgstr "Cama (@1, tamaño rey)"
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
 msgid "mahogany"
 msgstr "caoba"
 
@@ -452,6 +393,14 @@ msgid "Under-sink cabinet"
 msgstr "Gabinete bajo lavabo"
 
 #: ../homedecor/kitchen_furniture.lua
+msgid "Copper pans"
+msgstr "Sartenes de cobre"
+
+#: ../homedecor/kitchen_furniture.lua
+msgid "Kitchen Faucet"
+msgstr "Grifo de cocina"
+
+#: ../homedecor/kitchen_furniture.lua
 msgid "Paper towels"
 msgstr "Toallas de papel"
 
@@ -565,6 +514,18 @@ msgstr "Claraboya de cristal"
 msgid "Chimney"
 msgstr "Chimenea"
 
+#: ../homedecor/electrics.lua
+msgid "Power Outlet"
+msgstr "Toma de corriente"
+
+#: ../homedecor/electrics.lua
+msgid "Light switch"
+msgstr "Interruptor de luz"
+
+#: ../homedecor/electrics.lua
+msgid "Doorbell"
+msgstr "Timbre"
+
 #: ../homedecor/window_treatments.lua
 msgid "Window (quartered)"
 msgstr "Ventana (cuarteada)"
@@ -583,7 +544,7 @@ msgstr "Persianas (finas)"
 
 #: ../homedecor/window_treatments.lua
 msgid "Curtains"
-msgstr "Cortinas (@1)"
+msgstr "Cortinas"
 
 #: ../homedecor/window_treatments.lua ../homedecor/fences.lua
 #: ../homedecor/misc-nodes.lua ../homedecor/tables.lua
@@ -607,6 +568,32 @@ msgstr "Caja de flores de ventana"
 msgid "Stained Glass"
 msgstr "Vídrio coloreado"
 
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/furniture.lua
+msgid "red"
+msgstr "roja"
+
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/misc-nodes.lua
+msgid "green"
+msgstr "verde"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+msgid "blue"
+msgstr "azul"
+
+#: ../homedecor/window_treatments.lua ../homedecor/lighting.lua
+msgid "white"
+msgstr "blanca"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+msgid "pink"
+msgstr "rosa"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+msgid "violet"
+msgstr "violeta"
+
 #: ../homedecor/crafts.lua
 msgid "Uncooked Terracotta Base"
 msgstr "Base de terracota sin cocer"
@@ -743,17 +730,45 @@ msgstr "DVD y reproductor de vídeo"
 msgid "Telephone"
 msgstr "Teléfono"
 
+#: ../homedecor/cobweb.lua
+msgid "Cobweb"
+msgstr "Telaraña"
+
+#: ../homedecor/clocks.lua
+msgid "Plastic analog clock"
+msgstr "Reloj análogo de plástico"
+
+#: ../homedecor/clocks.lua
+msgid "Wooden analog clock"
+msgstr "Reloj análogo de madera"
+
+#: ../homedecor/clocks.lua
+msgid "Digital clock"
+msgstr "Reloj digital"
+
+#: ../homedecor/clocks.lua
+msgid "Alarm clock"
+msgstr "Reloj de alarma"
+
+#: ../homedecor/clocks.lua
+msgid "Grandfather Clock"
+msgstr "Reloj de péndulo"
+
+#: ../homedecor/lighting.lua ../homedecor/exterior.lua
+msgid "yellow"
+msgstr "amarilla"
+
 #: ../homedecor/lighting.lua
 msgid "Thick Glowlight"
-msgstr "Luz brillante gruesa (@1)"
+msgstr "Luz brillante gruesa"
 
 #: ../homedecor/lighting.lua
 msgid "Thin Glowlight"
-msgstr "Luz brillante fina (@1)"
+msgstr "Luz brillante fina"
 
 #: ../homedecor/lighting.lua
 msgid "Small Glowlight Cube"
-msgstr "Cubo pequeño de luz brillante (@1)"
+msgstr "Cubo pequeño de luz brillante"
 
 #: ../homedecor/lighting.lua
 msgid "Plasma Lamp"
@@ -800,6 +815,10 @@ msgid "Hanging Lantern"
 msgstr "Linterna colgante"
 
 #: ../homedecor/lighting.lua
+msgid "Ceiling Lantern"
+msgstr "Linterna de techo"
+
+#: ../homedecor/lighting.lua
 msgid "Lattice lantern (large)"
 msgstr "Linterna enrejada (grande)"
 
@@ -809,15 +828,15 @@ msgstr "Linterna enrejada (pequeña)"
 
 #: ../homedecor/lighting.lua
 msgid "Table Lamp"
-msgstr "Lámpara de mesa (@1)"
+msgstr "Lámpara de mesa"
 
 #: ../homedecor/lighting.lua
 msgid "Standing Lamp"
 msgstr "Lámpara de pié"
 
 #: ../homedecor/lighting.lua
-msgid "Desk Lamp (@1)"
-msgstr "Lámpara de escritorio (@1)"
+msgid "Desk Lamp"
+msgstr "Lámpara de escritorio"
 
 #: ../homedecor/lighting.lua
 msgid "Ceiling Lamp"
@@ -884,20 +903,8 @@ msgid "Wrought Iron fence (type 2) Corner"
 msgstr "Esquina de cerca de hierro forjado (tipo 2)"
 
 #: ../homedecor/shutters.lua
-msgid "unpainted oak"
-msgstr "roble sin pintar"
-
-#: ../homedecor/shutters.lua
-msgid "forest green"
-msgstr "verde bosque"
-
-#: ../homedecor/shutters.lua
-msgid "light blue"
-msgstr "azul claro"
-
-#: ../homedecor/shutters.lua
-msgid "Wooden Shutter (@1)"
-msgstr "Postigo de madera (@1)"
+msgid "Wooden Shutter"
+msgstr "Postigo de madera"
 
 #: ../homedecor/exterior.lua
 msgid "Barbecue"
@@ -1007,6 +1014,86 @@ msgstr "Calentador de espacios"
 msgid "Radiator heater"
 msgstr "Radiador"
 
+#: ../homedecor/wardrobe.lua
+msgid "Wardrobe"
+msgstr "Guardarropa"
+
+#: ../homedecor/wardrobe.lua
+msgid "Clothes"
+msgstr "Ropa"
+
+#: ../homedecor/wardrobe.lua
+msgid "Storage"
+msgstr "Almacenamiento"
+
+#: ../homedecor/trash_cans.lua
+msgid "Green Trash Can"
+msgstr "Bote de basura verde"
+
+#: ../homedecor/trash_cans.lua
+msgid "Trash Can"
+msgstr "Bote de basura"
+
+#: ../homedecor/trash_cans.lua
+msgid "Small Trash Can"
+msgstr "Bote de basura pequeño"
+
+#: ../homedecor/gastronomy.lua
+msgid "Cutlery set"
+msgstr "Cubertería"
+
+#: ../homedecor/gastronomy.lua
+msgid "Brown bottle"
+msgstr "Botella marrón"
+
+#: ../homedecor/gastronomy.lua
+msgid "Four brown bottles"
+msgstr "Cuatro botellas marrones"
+
+#: ../homedecor/gastronomy.lua
+msgid "Green bottle"
+msgstr "Botella verde"
+
+#: ../homedecor/gastronomy.lua
+msgid "Four green bottles"
+msgstr "Cuatro botellas verdes"
+
+#: ../homedecor/gastronomy.lua
+msgid "Four misc brown/green bottles"
+msgstr "Cuatro botellas verdes/marrones"
+
+#: ../homedecor/gastronomy.lua
+msgid "Wine rack"
+msgstr "Estantería de vino"
+
+#: ../homedecor/gastronomy.lua
+msgid "Dartboard"
+msgstr "Diana"
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer tap"
+msgstr "Grifo de cerveza"
+
+#: ../homedecor/gastronomy.lua
+msgid "Ahh, a frosty cold beer - look in your inventory for it!"
+msgstr "¡Ah, una cerveza fría! La encontrarás en tu inventario."
+
+#: ../homedecor/gastronomy.lua
+msgid "No room in your inventory to add a beer mug!"
+msgstr "¡No hay lugar para tomar una jarra de cerveza!"
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer mug"
+msgstr "Jarra de cerveza"
+
+#: ../homedecor/gastronomy.lua
+msgid "Soda vending machine"
+msgstr "Máquina expendedora de refrescos"
+
+#: ../homedecor/gastronomy.lua
+msgid "Please insert a coin in the machine."
+msgstr "Por favor introduzca una moneda en la máquina."
+
 #: ../homedecor/doors_and_gates.lua
 msgid "Mahogany Closet Door (@1 opening)"
 msgstr "Puerta de armario de caoba (abre a la @1)"
@@ -1099,6 +1186,26 @@ msgstr "Tatami"
 msgid "Japanese-style door"
 msgstr "Puerta estilo japonés"
 
+#: ../homedecor/foyer.lua
+msgid "Wall-mounted coat rack"
+msgstr "Perchero de pared"
+
+#: ../homedecor/foyer.lua
+msgid "Coat tree"
+msgstr "Perchero de piso"
+
+#: ../homedecor/foyer.lua
+msgid "Green welcome mat"
+msgstr "Tapete verde de bienvenida"
+
+#: ../homedecor/foyer.lua
+msgid "Brown welcome mat"
+msgstr "Tapete marrón de bienvenida"
+
+#: ../homedecor/foyer.lua
+msgid "Grey welcome mat"
+msgstr "Tapete gris de bienvenida"
+
 #: ../homedecor/misc-nodes.lua
 msgid "Textured Ceiling Paint"
 msgstr "Pintura de techo con textura"
@@ -1123,6 +1230,10 @@ msgstr "persa"
 msgid "Rug (@1)"
 msgstr "Tapete (@1)"
 
+#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
+msgid "black"
+msgstr "negra"
+
 #: ../homedecor/misc-nodes.lua
 msgid "Flower Pot (@1)"
 msgstr "Maceta (@1)"
@@ -1280,8 +1391,8 @@ msgid "Legs for Utility Table"
 msgstr "Patas para mesa utilitaria"
 
 #: ../homedecor/books.lua
-msgid "Writable Book (@1)"
-msgstr "Libro (@1)"
+msgid "Writable Book"
+msgstr "Libro"
 
 #: ../homedecor/books.lua
 msgid "@1 has written in a book (title: \"@2\"): \"@3\" at location @4"
@@ -1304,12 +1415,12 @@ msgid "plain"
 msgstr "liso"
 
 #: ../homedecor/furniture.lua
-msgid "Kitchen chair (@1)"
-msgstr "Silla de cocina (@1)"
+msgid "dark green"
+msgstr "verde oscuro"
 
 #: ../homedecor/furniture.lua
-msgid "Armchair (@1)"
-msgstr "Sillón (@1)"
+msgid "Kitchen chair"
+msgstr "Silla de cocina"
 
 #: ../homedecor/furniture.lua
 msgid "Bookshelf (open-frame)"
@@ -1343,6 +1454,26 @@ msgstr "@1 intentó acceder a @2 perteneciente a @3 en @4"
 msgid "@1 (Locked)"
 msgstr "@1 (Cerrado)"
 
+#: ../homedecor/handlers/expansion.lua
+msgid "Expansion placeholder (you hacker you!)"
+msgstr "Marcador temporal de expansión (¡Tu, hacker!)"
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the space for the headboard is occupied!"
+msgstr "No hay suficiente espacio - ¡El espacio para la cabecera está ocupado!"
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Someone already owns the spot where the headboard goes."
+msgstr "Alguien ya es dueño del lugar donde va la cabecera."
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the upper space is occupied!"
+msgstr "No hay suficiente espacio - ¡El espacio de encima está ocupado!"
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Someone already owns that spot."
+msgstr "Alguien ya es dueño de ese lugar."
+
 #: ../homedecor/handlers/furnaces.lua
 msgid "Furnace"
 msgstr "Horno"
@@ -1365,51 +1496,51 @@ msgstr "@1 (sin combustible)"
 
 #: ../homedecor/handlers/furnaces.lua
 msgid "@1 (output bins are full)"
-msgstr "@1 (output bins are full)"
+msgstr "@1 (ranuras de salida llenas)"
 
 #: ../homedecor/office.lua
 msgid "Filing cabinet"
 msgstr "Archivador"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/grey"
-msgstr "blanco/gris"
-
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/dark grey"
-msgstr "blanco/gris oscuro"
+#: ../homedecor/office.lua
+msgid "Desk"
+msgstr "Escritorio"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/black"
-msgstr "blanco/negro"
+#: ../homedecor/office.lua
+msgid "Desk globe"
+msgstr "Globo terráqueo"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "black/dark grey"
-msgstr "negro/gris oscuro"
+#: ../homedecor/office.lua
+msgid "Calendar"
+msgstr "Calendario"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/red"
-msgstr "blanco/rojo"
+#: ../homedecor/office.lua
+msgid ""
+"Date (right-click to update):\n"
+"@1"
+msgstr ""
+"Fecha (clic derecho para actualizar):\n"
+"@1"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/green"
-msgstr "blanco/verde"
+#: ../homedecor/office.lua
+msgid "Basic office chair"
+msgstr "Silla básica de oficina"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/blue"
-msgstr "blanco/azul"
+#: ../homedecor/office.lua
+msgid "Upscale office chair"
+msgstr "Silla grande de oficina"
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "white/yellow"
-msgstr "blanco/amarillo"
+msgid "Bathroom/kitchen tiles (dark)"
+msgstr "Azulejo de baño/cocina (tonos oscuros)"
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "white/tan"
-msgstr "blanco/marrón"
+msgid "Bathroom/kitchen tiles (medium)"
+msgstr "Azulejo de baño/cocina (tonos medios)"
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "Bathroom/kitchen tiles (@1)"
-msgstr "Azulejo de baño/cocina (@1)"
+msgid "Bathroom/kitchen tiles (light)"
+msgstr "Azulejo de baño/cocina (tonos claros)"
 
 #: ../homedecor/bathroom_furniture.lua
 msgid "Towel rod with towel"
@@ -1418,3 +1549,36 @@ msgstr "Toallero con toalla"
 #: ../homedecor/bathroom_furniture.lua
 msgid "Medicine cabinet"
 msgstr "Gabinete de medicinas"
+
+#~ msgid "grey"
+#~ msgstr "gris"
+
+#~ msgid "brown"
+#~ msgstr "marrón"
+
+#~ msgid "white/grey"
+#~ msgstr "blanco/gris"
+
+#~ msgid "white/dark grey"
+#~ msgstr "blanco/gris oscuro"
+
+#~ msgid "white/black"
+#~ msgstr "blanco/negro"
+
+#~ msgid "black/dark grey"
+#~ msgstr "negro/gris oscuro"
+
+#~ msgid "white/red"
+#~ msgstr "blanco/rojo"
+
+#~ msgid "white/green"
+#~ msgstr "blanco/verde"
+
+#~ msgid "white/blue"
+#~ msgstr "blanco/azul"
+
+#~ msgid "white/yellow"
+#~ msgstr "blanco/amarillo"
+
+#~ msgid "white/tan"
+#~ msgstr "blanco/marrón"
diff --git a/homedecor_i18n/locale/fr.po b/homedecor_i18n/locale/fr.po
index 30a7809..a69fcd0 100644
--- a/homedecor_i18n/locale/fr.po
+++ b/homedecor_i18n/locale/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-30 21:31-0300\n"
+"POT-Creation-Date: 2017-02-10 05:34-0300\n"
 "PO-Revision-Date: 2017-01-25 00:03-0300\n"
 "Last-Translator: Calinou <Calinou@users.noreply.github.com>\n"
 "Language-Team: French\n"
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Loaded!"
 msgstr "Chargé !"
 
-#: ../lrfurn/armchairs.lua
+#: ../lrfurn/armchairs.lua ../homedecor/furniture.lua
 msgid "Armchair"
 msgstr ""
 
@@ -324,96 +324,31 @@ msgid "Glowing Embers"
 msgstr ""
 
 #: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
-msgid "black"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/books.lua
-msgid "brown"
+msgid "Stone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/books.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "blue"
-msgstr "bleues"
-
-#: ../homedecor/bedroom.lua
-msgid "cyan"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-msgid "dark grey"
+#: ../fake_fire/init.lua
+msgid "Sandstone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "dark green"
-msgstr "vertes"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/exterior.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/books.lua
-#, fuzzy
-msgid "green"
-msgstr "vertes"
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua ../homedecor/books.lua
-msgid "grey"
+#: ../fake_fire/init.lua
+msgid "Flint and steel"
 msgstr ""
 
-#: ../homedecor/bedroom.lua
-msgid "magenta"
+#: ../fake_fire/init.lua
+msgid "This area is protected!"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "orange"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/furniture.lua
-#, fuzzy
-msgid "pink"
-msgstr "roses"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua ../homedecor/books.lua ../homedecor/furniture.lua
 #, fuzzy
-msgid "red"
+msgid "Bed"
 msgstr "rouges"
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua ../homedecor/books.lua
-#: ../homedecor/furniture.lua
-#, fuzzy
-msgid "violet"
-msgstr "violettes"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#, fuzzy
-msgid "white"
-msgstr "blanches"
-
-#: ../homedecor/bedroom.lua ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua
-msgid "yellow"
-msgstr ""
-
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1)"
+msgid "Bed (king sized)"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1, king sized)"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
 msgid "mahogany"
 msgstr ""
 
@@ -479,6 +414,15 @@ msgid "Under-sink cabinet"
 msgstr "Meuble sous évier"
 
 #: ../homedecor/kitchen_furniture.lua
+msgid "Copper pans"
+msgstr ""
+
+#: ../homedecor/kitchen_furniture.lua
+#, fuzzy
+msgid "Kitchen Faucet"
+msgstr "Meuble de cuisine"
+
+#: ../homedecor/kitchen_furniture.lua
 msgid "Paper towels"
 msgstr ""
 
@@ -603,6 +547,18 @@ msgstr "Bardeaux d'asphalte"
 msgid "Chimney"
 msgstr ""
 
+#: ../homedecor/electrics.lua
+msgid "Power Outlet"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Light switch"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Doorbell"
+msgstr ""
+
 #: ../homedecor/window_treatments.lua
 msgid "Window (quartered)"
 msgstr ""
@@ -650,6 +606,38 @@ msgstr ""
 msgid "Stained Glass"
 msgstr ""
 
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/furniture.lua
+#, fuzzy
+msgid "red"
+msgstr "rouges"
+
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/misc-nodes.lua
+#, fuzzy
+msgid "green"
+msgstr "vertes"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "blue"
+msgstr "bleues"
+
+#: ../homedecor/window_treatments.lua ../homedecor/lighting.lua
+#, fuzzy
+msgid "white"
+msgstr "blanches"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "pink"
+msgstr "roses"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "violet"
+msgstr "violettes"
+
 #: ../homedecor/crafts.lua
 #, fuzzy
 msgid "Uncooked Terracotta Base"
@@ -802,6 +790,34 @@ msgstr ""
 msgid "Telephone"
 msgstr ""
 
+#: ../homedecor/cobweb.lua
+msgid "Cobweb"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Plastic analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Wooden analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Digital clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Alarm clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Grandfather Clock"
+msgstr ""
+
+#: ../homedecor/lighting.lua ../homedecor/exterior.lua
+msgid "yellow"
+msgstr ""
+
 #: ../homedecor/lighting.lua
 #, fuzzy
 msgid "Thick Glowlight"
@@ -862,6 +878,11 @@ msgid "Hanging Lantern"
 msgstr ""
 
 #: ../homedecor/lighting.lua
+#, fuzzy
+msgid "Ceiling Lantern"
+msgstr "Meuble sous évier"
+
+#: ../homedecor/lighting.lua
 msgid "Lattice lantern (large)"
 msgstr ""
 
@@ -878,7 +899,7 @@ msgid "Standing Lamp"
 msgstr ""
 
 #: ../homedecor/lighting.lua
-msgid "Desk Lamp (@1)"
+msgid "Desk Lamp"
 msgstr ""
 
 #: ../homedecor/lighting.lua
@@ -960,21 +981,8 @@ msgid "Wrought Iron fence (type 2) Corner"
 msgstr "Barrière en fer forgé"
 
 #: ../homedecor/shutters.lua
-msgid "unpainted oak"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-msgid "forest green"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-#, fuzzy
-msgid "light blue"
-msgstr "droite"
-
-#: ../homedecor/shutters.lua
 #, fuzzy
-msgid "Wooden Shutter (@1)"
+msgid "Wooden Shutter"
 msgstr "Volet en bois (rouge)"
 
 #: ../homedecor/exterior.lua
@@ -1086,6 +1094,86 @@ msgstr ""
 msgid "Radiator heater"
 msgstr ""
 
+#: ../homedecor/wardrobe.lua
+msgid "Wardrobe"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Clothes"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Storage"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Green Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Small Trash Can"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Cutlery set"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Brown bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four brown bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Green bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four misc brown/green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Wine rack"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Dartboard"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer tap"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Ahh, a frosty cold beer - look in your inventory for it!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "No room in your inventory to add a beer mug!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer mug"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Soda vending machine"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Please insert a coin in the machine."
+msgstr ""
+
 #: ../homedecor/doors_and_gates.lua
 #, fuzzy
 msgid "Mahogany Closet Door (@1 opening)"
@@ -1193,6 +1281,26 @@ msgstr ""
 msgid "Japanese-style door"
 msgstr ""
 
+#: ../homedecor/foyer.lua
+msgid "Wall-mounted coat rack"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Coat tree"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Green welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Brown welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Grey welcome mat"
+msgstr ""
+
 #: ../homedecor/misc-nodes.lua
 #, fuzzy
 msgid "Textured Ceiling Paint"
@@ -1219,6 +1327,10 @@ msgstr ""
 msgid "Rug (@1)"
 msgstr ""
 
+#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
+msgid "black"
+msgstr ""
+
 #: ../homedecor/misc-nodes.lua
 msgid "Flower Pot (@1)"
 msgstr ""
@@ -1386,7 +1498,7 @@ msgid "Legs for Utility Table"
 msgstr "Pieds pour table basse"
 
 #: ../homedecor/books.lua
-msgid "Writable Book (@1)"
+msgid "Writable Book"
 msgstr ""
 
 #: ../homedecor/books.lua
@@ -1413,12 +1525,13 @@ msgstr ""
 
 #: ../homedecor/furniture.lua
 #, fuzzy
-msgid "Kitchen chair (@1)"
-msgstr "Meuble de cuisine"
+msgid "dark green"
+msgstr "vertes"
 
 #: ../homedecor/furniture.lua
-msgid "Armchair (@1)"
-msgstr ""
+#, fuzzy
+msgid "Kitchen chair"
+msgstr "Meuble de cuisine"
 
 #: ../homedecor/furniture.lua
 msgid "Bookshelf (open-frame)"
@@ -1456,6 +1569,27 @@ msgstr "%s a essayé d'accéder à %s qui est propriété de %s à %s"
 msgid "@1 (Locked)"
 msgstr "%s (verrouillé)"
 
+#: ../homedecor/handlers/expansion.lua
+msgid "Expansion placeholder (you hacker you!)"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the space for the headboard is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Someone already owns the spot where the headboard goes."
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the upper space is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+#, fuzzy
+msgid "Someone already owns that spot."
+msgstr "Désolé, %s est propriétaire de cette zone."
+
 #: ../homedecor/handlers/furnaces.lua
 msgid "Furnace"
 msgstr ""
@@ -1486,48 +1620,42 @@ msgstr ""
 msgid "Filing cabinet"
 msgstr "Meuble sous évier"
 
-#: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/grey"
-msgstr "blanches"
-
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/dark grey"
+#: ../homedecor/office.lua
+msgid "Desk"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/black"
+#: ../homedecor/office.lua
+msgid "Desk globe"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "black/dark grey"
+#: ../homedecor/office.lua
+msgid "Calendar"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/red"
-msgstr "blanches"
+#: ../homedecor/office.lua
+msgid ""
+"Date (right-click to update):\n"
+"@1"
+msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/green"
+#: ../homedecor/office.lua
+msgid "Basic office chair"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/blue"
-msgstr "blanches"
+#: ../homedecor/office.lua
+msgid "Upscale office chair"
+msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "white/yellow"
+msgid "Bathroom/kitchen tiles (dark)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/tan"
-msgstr "blanches"
+msgid "Bathroom/kitchen tiles (medium)"
+msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "Bathroom/kitchen tiles (@1)"
+msgid "Bathroom/kitchen tiles (light)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
@@ -1540,6 +1668,26 @@ msgid "Medicine cabinet"
 msgstr "Meuble sous évier"
 
 #, fuzzy
+#~ msgid "white/grey"
+#~ msgstr "blanches"
+
+#, fuzzy
+#~ msgid "white/red"
+#~ msgstr "blanches"
+
+#, fuzzy
+#~ msgid "white/blue"
+#~ msgstr "blanches"
+
+#, fuzzy
+#~ msgid "white/tan"
+#~ msgstr "blanches"
+
+#, fuzzy
+#~ msgid "light blue"
+#~ msgstr "droite"
+
+#, fuzzy
 #~ msgid "dark_grey"
 #~ msgstr "vertes"
 
@@ -1640,9 +1788,6 @@ msgstr "Meuble sous évier"
 #~ msgid "someone "
 #~ msgstr "quelqu'un"
 
-#~ msgid "Sorry, %s owns that spot. "
-#~ msgstr "Désolé, %s est propriétaire de cette zone."
-
 #~ msgid "White Glowlight (small cube) "
 #~ msgstr "Lampe blanche (petit cube)"
 
diff --git a/homedecor_i18n/locale/it.po b/homedecor_i18n/locale/it.po
index 7492464..74cb57e 100644
--- a/homedecor_i18n/locale/it.po
+++ b/homedecor_i18n/locale/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-30 21:31-0300\n"
+"POT-Creation-Date: 2017-02-10 05:34-0300\n"
 "PO-Revision-Date: 2017-01-25 00:03-0300\n"
 "Last-Translator: Emon <?>\n"
 "Language-Team: Italian\n"
@@ -286,7 +286,7 @@ msgstr ""
 msgid "Loaded!"
 msgstr "Caricato!"
 
-#: ../lrfurn/armchairs.lua
+#: ../lrfurn/armchairs.lua ../homedecor/furniture.lua
 #, fuzzy
 msgid "Armchair"
 msgstr "Poltrona (%s)"
@@ -326,98 +326,31 @@ msgid "Glowing Embers"
 msgstr ""
 
 #: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "black"
-msgstr "nero"
-
-#: ../homedecor/bedroom.lua ../homedecor/books.lua
-msgid "brown"
+msgid "Stone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/books.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "blue"
-msgstr "blu"
-
-#: ../homedecor/bedroom.lua
-msgid "cyan"
+#: ../fake_fire/init.lua
+msgid "Sandstone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-#, fuzzy
-msgid "dark grey"
-msgstr "verde scuro"
-
-#: ../homedecor/bedroom.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "dark green"
-msgstr "verde scuro"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/exterior.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/books.lua
-#, fuzzy
-msgid "green"
-msgstr "verde"
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua ../homedecor/books.lua
-msgid "grey"
+#: ../fake_fire/init.lua
+msgid "Flint and steel"
 msgstr ""
 
-#: ../homedecor/bedroom.lua
-msgid "magenta"
+#: ../fake_fire/init.lua
+msgid "This area is protected!"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "orange"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/furniture.lua
-#, fuzzy
-msgid "pink"
-msgstr "rosa"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua ../homedecor/books.lua ../homedecor/furniture.lua
 #, fuzzy
-msgid "red"
+msgid "Bed"
 msgstr "rosso"
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua ../homedecor/books.lua
-#: ../homedecor/furniture.lua
-#, fuzzy
-msgid "violet"
-msgstr "viola"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#, fuzzy
-msgid "white"
-msgstr "bianco"
-
-#: ../homedecor/bedroom.lua ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua
-msgid "yellow"
-msgstr ""
-
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1)"
+msgid "Bed (king sized)"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1, king sized)"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
 msgid "mahogany"
 msgstr ""
 
@@ -483,6 +416,15 @@ msgid "Under-sink cabinet"
 msgstr "Armadietto sotto il lavandino"
 
 #: ../homedecor/kitchen_furniture.lua
+msgid "Copper pans"
+msgstr ""
+
+#: ../homedecor/kitchen_furniture.lua
+#, fuzzy
+msgid "Kitchen Faucet"
+msgstr "Armadietto della cucina"
+
+#: ../homedecor/kitchen_furniture.lua
 msgid "Paper towels"
 msgstr ""
 
@@ -615,6 +557,18 @@ msgstr "Mattonelle di asfalto"
 msgid "Chimney"
 msgstr ""
 
+#: ../homedecor/electrics.lua
+msgid "Power Outlet"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Light switch"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Doorbell"
+msgstr ""
+
 #: ../homedecor/window_treatments.lua
 msgid "Window (quartered)"
 msgstr ""
@@ -662,6 +616,38 @@ msgstr ""
 msgid "Stained Glass"
 msgstr ""
 
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/furniture.lua
+#, fuzzy
+msgid "red"
+msgstr "rosso"
+
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/misc-nodes.lua
+#, fuzzy
+msgid "green"
+msgstr "verde"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "blue"
+msgstr "blu"
+
+#: ../homedecor/window_treatments.lua ../homedecor/lighting.lua
+#, fuzzy
+msgid "white"
+msgstr "bianco"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "pink"
+msgstr "rosa"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "violet"
+msgstr "viola"
+
 #: ../homedecor/crafts.lua
 #, fuzzy
 msgid "Uncooked Terracotta Base"
@@ -814,6 +800,34 @@ msgstr ""
 msgid "Telephone"
 msgstr ""
 
+#: ../homedecor/cobweb.lua
+msgid "Cobweb"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Plastic analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Wooden analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Digital clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Alarm clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Grandfather Clock"
+msgstr ""
+
+#: ../homedecor/lighting.lua ../homedecor/exterior.lua
+msgid "yellow"
+msgstr ""
+
 #: ../homedecor/lighting.lua
 #, fuzzy
 msgid "Thick Glowlight"
@@ -875,6 +889,11 @@ msgid "Hanging Lantern"
 msgstr ""
 
 #: ../homedecor/lighting.lua
+#, fuzzy
+msgid "Ceiling Lantern"
+msgstr "Armadietto sotto il lavandino"
+
+#: ../homedecor/lighting.lua
 msgid "Lattice lantern (large)"
 msgstr ""
 
@@ -892,8 +911,9 @@ msgid "Standing Lamp"
 msgstr ""
 
 #: ../homedecor/lighting.lua
-msgid "Desk Lamp (@1)"
-msgstr ""
+#, fuzzy
+msgid "Desk Lamp"
+msgstr "Lampada da tavolo"
 
 #: ../homedecor/lighting.lua
 msgid "Ceiling Lamp"
@@ -974,21 +994,8 @@ msgid "Wrought Iron fence (type 2) Corner"
 msgstr "Recinzione/ringhiera in ferro battuto"
 
 #: ../homedecor/shutters.lua
-msgid "unpainted oak"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-msgid "forest green"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-#, fuzzy
-msgid "light blue"
-msgstr "destra"
-
-#: ../homedecor/shutters.lua
 #, fuzzy
-msgid "Wooden Shutter (@1)"
+msgid "Wooden Shutter"
 msgstr "Persiana in legno (rossa)"
 
 #: ../homedecor/exterior.lua
@@ -1106,6 +1113,86 @@ msgstr ""
 msgid "Radiator heater"
 msgstr ""
 
+#: ../homedecor/wardrobe.lua
+msgid "Wardrobe"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Clothes"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Storage"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Green Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Small Trash Can"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Cutlery set"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Brown bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four brown bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Green bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four misc brown/green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Wine rack"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Dartboard"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer tap"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Ahh, a frosty cold beer - look in your inventory for it!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "No room in your inventory to add a beer mug!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer mug"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Soda vending machine"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Please insert a coin in the machine."
+msgstr ""
+
 #: ../homedecor/doors_and_gates.lua
 #, fuzzy
 msgid "Mahogany Closet Door (@1 opening)"
@@ -1213,6 +1300,26 @@ msgstr ""
 msgid "Japanese-style door"
 msgstr ""
 
+#: ../homedecor/foyer.lua
+msgid "Wall-mounted coat rack"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Coat tree"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Green welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Brown welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Grey welcome mat"
+msgstr ""
+
 #: ../homedecor/misc-nodes.lua
 #, fuzzy
 msgid "Textured Ceiling Paint"
@@ -1239,6 +1346,11 @@ msgstr ""
 msgid "Rug (@1)"
 msgstr ""
 
+#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "black"
+msgstr "nero"
+
 #: ../homedecor/misc-nodes.lua
 msgid "Flower Pot (@1)"
 msgstr ""
@@ -1406,7 +1518,7 @@ msgid "Legs for Utility Table"
 msgstr "Gambe per il tavolo da lavoro"
 
 #: ../homedecor/books.lua
-msgid "Writable Book (@1)"
+msgid "Writable Book"
 msgstr ""
 
 #: ../homedecor/books.lua
@@ -1434,13 +1546,13 @@ msgstr ""
 
 #: ../homedecor/furniture.lua
 #, fuzzy
-msgid "Kitchen chair (@1)"
-msgstr "Armadietto della cucina"
+msgid "dark green"
+msgstr "verde scuro"
 
 #: ../homedecor/furniture.lua
 #, fuzzy
-msgid "Armchair (@1)"
-msgstr "Poltrona (%s)"
+msgid "Kitchen chair"
+msgstr "Armadietto della cucina"
 
 #: ../homedecor/furniture.lua
 msgid "Bookshelf (open-frame)"
@@ -1478,6 +1590,27 @@ msgstr "%s ha provato ad accedere a %s di proprietà di %s alla posizione %s"
 msgid "@1 (Locked)"
 msgstr "%s (Con lucchetto)"
 
+#: ../homedecor/handlers/expansion.lua
+msgid "Expansion placeholder (you hacker you!)"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the space for the headboard is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Someone already owns the spot where the headboard goes."
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the upper space is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+#, fuzzy
+msgid "Someone already owns that spot."
+msgstr "Spiacente, quel punto è di proprietà di %s."
+
 #: ../homedecor/handlers/furnaces.lua
 msgid "Furnace"
 msgstr ""
@@ -1509,48 +1642,43 @@ msgstr "i contenitori sono pieni"
 msgid "Filing cabinet"
 msgstr "Armadietto sotto il lavandino"
 
-#: ../homedecor/bathroom_furniture.lua
+#: ../homedecor/office.lua
 #, fuzzy
-msgid "white/grey"
-msgstr "bianco"
+msgid "Desk"
+msgstr "Lampada da tavolo"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/dark grey"
+#: ../homedecor/office.lua
+msgid "Desk globe"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/black"
+#: ../homedecor/office.lua
+msgid "Calendar"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "black/dark grey"
+#: ../homedecor/office.lua
+msgid ""
+"Date (right-click to update):\n"
+"@1"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/red"
-msgstr "bianco"
-
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/green"
+#: ../homedecor/office.lua
+msgid "Basic office chair"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/blue"
-msgstr "bianco"
+#: ../homedecor/office.lua
+msgid "Upscale office chair"
+msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "white/yellow"
+msgid "Bathroom/kitchen tiles (dark)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/tan"
-msgstr "bianco"
+msgid "Bathroom/kitchen tiles (medium)"
+msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "Bathroom/kitchen tiles (@1)"
+msgid "Bathroom/kitchen tiles (light)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
@@ -1563,6 +1691,34 @@ msgid "Medicine cabinet"
 msgstr "Armadietto sotto il lavandino"
 
 #, fuzzy
+#~ msgid "white/grey"
+#~ msgstr "bianco"
+
+#, fuzzy
+#~ msgid "white/red"
+#~ msgstr "bianco"
+
+#, fuzzy
+#~ msgid "white/blue"
+#~ msgstr "bianco"
+
+#, fuzzy
+#~ msgid "white/tan"
+#~ msgstr "bianco"
+
+#, fuzzy
+#~ msgid "dark grey"
+#~ msgstr "verde scuro"
+
+#, fuzzy
+#~ msgid "light blue"
+#~ msgstr "destra"
+
+#, fuzzy
+#~ msgid "Armchair (@1)"
+#~ msgstr "Poltrona (%s)"
+
+#, fuzzy
 #~ msgid "dark_grey"
 #~ msgstr "verde scuro"
 
@@ -1699,9 +1855,6 @@ msgstr "Armadietto sotto il lavandino"
 #~ msgid "someone "
 #~ msgstr "qualcuno"
 
-#~ msgid "Sorry, %s owns that spot. "
-#~ msgstr "Spiacente, quel punto è di proprietà di %s."
-
 #~ msgid "White Glowlight (small cube) "
 #~ msgstr "Luce fosforescente bianca (cubo piccolo)"
 
diff --git a/homedecor_i18n/locale/ms.po b/homedecor_i18n/locale/ms.po
index c550a46..e4b1ec2 100644
--- a/homedecor_i18n/locale/ms.po
+++ b/homedecor_i18n/locale/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-30 21:31-0300\n"
+"POT-Creation-Date: 2017-02-10 05:34-0300\n"
 "PO-Revision-Date: 2017-01-25 00:03-0300\n"
 "Last-Translator: muhdnurhidayat <MuhdNurHidayat@users.noreply.github.com>\n"
 "Language-Team: Malay\n"
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Loaded!"
 msgstr "Telah Dimuatkan!"
 
-#: ../lrfurn/armchairs.lua
+#: ../lrfurn/armchairs.lua ../homedecor/furniture.lua
 #, fuzzy
 msgid "Armchair"
 msgstr "Kerusi Tangan (%s)"
@@ -325,98 +325,31 @@ msgid "Glowing Embers"
 msgstr ""
 
 #: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "black"
-msgstr "Hitam"
-
-#: ../homedecor/bedroom.lua ../homedecor/books.lua
-msgid "brown"
+msgid "Stone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/books.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "blue"
-msgstr "biru"
-
-#: ../homedecor/bedroom.lua
-msgid "cyan"
+#: ../fake_fire/init.lua
+msgid "Sandstone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-#, fuzzy
-msgid "dark grey"
-msgstr "Hijau Gelap"
-
-#: ../homedecor/bedroom.lua ../homedecor/furniture.lua
-#, fuzzy
-msgid "dark green"
-msgstr "Hijau Gelap"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/exterior.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/books.lua
-#, fuzzy
-msgid "green"
-msgstr "hijau"
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua ../homedecor/books.lua
-msgid "grey"
+#: ../fake_fire/init.lua
+msgid "Flint and steel"
 msgstr ""
 
-#: ../homedecor/bedroom.lua
-msgid "magenta"
+#: ../fake_fire/init.lua
+msgid "This area is protected!"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "orange"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/furniture.lua
-#, fuzzy
-msgid "pink"
-msgstr "merah jambu"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua ../homedecor/books.lua ../homedecor/furniture.lua
 #, fuzzy
-msgid "red"
+msgid "Bed"
 msgstr "merah"
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua ../homedecor/books.lua
-#: ../homedecor/furniture.lua
-#, fuzzy
-msgid "violet"
-msgstr "ungu"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#, fuzzy
-msgid "white"
-msgstr "putih"
-
-#: ../homedecor/bedroom.lua ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua
-msgid "yellow"
-msgstr ""
-
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1)"
+msgid "Bed (king sized)"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1, king sized)"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
 msgid "mahogany"
 msgstr ""
 
@@ -482,6 +415,15 @@ msgid "Under-sink cabinet"
 msgstr "Kabinet Bawah Sinki"
 
 #: ../homedecor/kitchen_furniture.lua
+msgid "Copper pans"
+msgstr ""
+
+#: ../homedecor/kitchen_furniture.lua
+#, fuzzy
+msgid "Kitchen Faucet"
+msgstr "Kabinet Dapur"
+
+#: ../homedecor/kitchen_furniture.lua
 msgid "Paper towels"
 msgstr ""
 
@@ -614,6 +556,18 @@ msgstr "Genting Asfalt"
 msgid "Chimney"
 msgstr ""
 
+#: ../homedecor/electrics.lua
+msgid "Power Outlet"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Light switch"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Doorbell"
+msgstr ""
+
 #: ../homedecor/window_treatments.lua
 msgid "Window (quartered)"
 msgstr ""
@@ -661,6 +615,38 @@ msgstr ""
 msgid "Stained Glass"
 msgstr ""
 
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/furniture.lua
+#, fuzzy
+msgid "red"
+msgstr "merah"
+
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/misc-nodes.lua
+#, fuzzy
+msgid "green"
+msgstr "hijau"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "blue"
+msgstr "biru"
+
+#: ../homedecor/window_treatments.lua ../homedecor/lighting.lua
+#, fuzzy
+msgid "white"
+msgstr "putih"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "pink"
+msgstr "merah jambu"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "violet"
+msgstr "ungu"
+
 #: ../homedecor/crafts.lua
 #, fuzzy
 msgid "Uncooked Terracotta Base"
@@ -813,6 +799,34 @@ msgstr ""
 msgid "Telephone"
 msgstr ""
 
+#: ../homedecor/cobweb.lua
+msgid "Cobweb"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Plastic analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Wooden analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Digital clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Alarm clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Grandfather Clock"
+msgstr ""
+
+#: ../homedecor/lighting.lua ../homedecor/exterior.lua
+msgid "yellow"
+msgstr ""
+
 #: ../homedecor/lighting.lua
 #, fuzzy
 msgid "Thick Glowlight"
@@ -874,6 +888,11 @@ msgid "Hanging Lantern"
 msgstr ""
 
 #: ../homedecor/lighting.lua
+#, fuzzy
+msgid "Ceiling Lantern"
+msgstr "Kabinet Bawah Sinki"
+
+#: ../homedecor/lighting.lua
 msgid "Lattice lantern (large)"
 msgstr ""
 
@@ -891,8 +910,9 @@ msgid "Standing Lamp"
 msgstr ""
 
 #: ../homedecor/lighting.lua
-msgid "Desk Lamp (@1)"
-msgstr ""
+#, fuzzy
+msgid "Desk Lamp"
+msgstr "Lampu Meja"
 
 #: ../homedecor/lighting.lua
 msgid "Ceiling Lamp"
@@ -973,21 +993,8 @@ msgid "Wrought Iron fence (type 2) Corner"
 msgstr "Pagar/Kisi-kisi Besi Tempaan"
 
 #: ../homedecor/shutters.lua
-msgid "unpainted oak"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-msgid "forest green"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-#, fuzzy
-msgid "light blue"
-msgstr "kanan"
-
-#: ../homedecor/shutters.lua
 #, fuzzy
-msgid "Wooden Shutter (@1)"
+msgid "Wooden Shutter"
 msgstr "Pengatup Kayu (Merah)"
 
 #: ../homedecor/exterior.lua
@@ -1105,6 +1112,86 @@ msgstr ""
 msgid "Radiator heater"
 msgstr ""
 
+#: ../homedecor/wardrobe.lua
+msgid "Wardrobe"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Clothes"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Storage"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Green Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Small Trash Can"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Cutlery set"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Brown bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four brown bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Green bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four misc brown/green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Wine rack"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Dartboard"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer tap"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Ahh, a frosty cold beer - look in your inventory for it!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "No room in your inventory to add a beer mug!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer mug"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Soda vending machine"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Please insert a coin in the machine."
+msgstr ""
+
 #: ../homedecor/doors_and_gates.lua
 #, fuzzy
 msgid "Mahogany Closet Door (@1 opening)"
@@ -1212,6 +1299,26 @@ msgstr ""
 msgid "Japanese-style door"
 msgstr ""
 
+#: ../homedecor/foyer.lua
+msgid "Wall-mounted coat rack"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Coat tree"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Green welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Brown welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Grey welcome mat"
+msgstr ""
+
 #: ../homedecor/misc-nodes.lua
 #, fuzzy
 msgid "Textured Ceiling Paint"
@@ -1238,6 +1345,11 @@ msgstr ""
 msgid "Rug (@1)"
 msgstr ""
 
+#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
+#, fuzzy
+msgid "black"
+msgstr "Hitam"
+
 #: ../homedecor/misc-nodes.lua
 msgid "Flower Pot (@1)"
 msgstr ""
@@ -1405,7 +1517,7 @@ msgid "Legs for Utility Table"
 msgstr "Kaki untuk Meja Utiliti"
 
 #: ../homedecor/books.lua
-msgid "Writable Book (@1)"
+msgid "Writable Book"
 msgstr ""
 
 #: ../homedecor/books.lua
@@ -1433,13 +1545,13 @@ msgstr ""
 
 #: ../homedecor/furniture.lua
 #, fuzzy
-msgid "Kitchen chair (@1)"
-msgstr "Kabinet Dapur"
+msgid "dark green"
+msgstr "Hijau Gelap"
 
 #: ../homedecor/furniture.lua
 #, fuzzy
-msgid "Armchair (@1)"
-msgstr "Kerusi Tangan (%s)"
+msgid "Kitchen chair"
+msgstr "Kabinet Dapur"
 
 #: ../homedecor/furniture.lua
 msgid "Bookshelf (open-frame)"
@@ -1477,6 +1589,27 @@ msgstr "%s cuba untuk pakai %s milik %s dekat %s"
 msgid "@1 (Locked)"
 msgstr "%s (Berkunci)"
 
+#: ../homedecor/handlers/expansion.lua
+msgid "Expansion placeholder (you hacker you!)"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the space for the headboard is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Someone already owns the spot where the headboard goes."
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the upper space is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+#, fuzzy
+msgid "Someone already owns that spot."
+msgstr "Maaf, ini kawasan %s."
+
 #: ../homedecor/handlers/furnaces.lua
 msgid "Furnace"
 msgstr ""
@@ -1509,48 +1642,43 @@ msgstr ": dulang keluar penuh"
 msgid "Filing cabinet"
 msgstr "Kabinet Bawah Sinki"
 
-#: ../homedecor/bathroom_furniture.lua
+#: ../homedecor/office.lua
 #, fuzzy
-msgid "white/grey"
-msgstr "putih"
+msgid "Desk"
+msgstr "Lampu Meja"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/dark grey"
+#: ../homedecor/office.lua
+msgid "Desk globe"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/black"
+#: ../homedecor/office.lua
+msgid "Calendar"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "black/dark grey"
+#: ../homedecor/office.lua
+msgid ""
+"Date (right-click to update):\n"
+"@1"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/red"
-msgstr "putih"
-
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/green"
+#: ../homedecor/office.lua
+msgid "Basic office chair"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/blue"
-msgstr "putih"
+#: ../homedecor/office.lua
+msgid "Upscale office chair"
+msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "white/yellow"
+msgid "Bathroom/kitchen tiles (dark)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-#, fuzzy
-msgid "white/tan"
-msgstr "putih"
+msgid "Bathroom/kitchen tiles (medium)"
+msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "Bathroom/kitchen tiles (@1)"
+msgid "Bathroom/kitchen tiles (light)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
@@ -1563,6 +1691,34 @@ msgid "Medicine cabinet"
 msgstr "Kabinet Bawah Sinki"
 
 #, fuzzy
+#~ msgid "white/grey"
+#~ msgstr "putih"
+
+#, fuzzy
+#~ msgid "white/red"
+#~ msgstr "putih"
+
+#, fuzzy
+#~ msgid "white/blue"
+#~ msgstr "putih"
+
+#, fuzzy
+#~ msgid "white/tan"
+#~ msgstr "putih"
+
+#, fuzzy
+#~ msgid "dark grey"
+#~ msgstr "Hijau Gelap"
+
+#, fuzzy
+#~ msgid "light blue"
+#~ msgstr "kanan"
+
+#, fuzzy
+#~ msgid "Armchair (@1)"
+#~ msgstr "Kerusi Tangan (%s)"
+
+#, fuzzy
 #~ msgid "dark_grey"
 #~ msgstr "Hijau Gelap"
 
@@ -1699,9 +1855,6 @@ msgstr "Kabinet Bawah Sinki"
 #~ msgid "someone "
 #~ msgstr "seseorang"
 
-#~ msgid "Sorry, %s owns that spot. "
-#~ msgstr "Maaf, ini kawasan %s."
-
 #~ msgid "White Glowlight (small cube) "
 #~ msgstr "Lampu Bara Putih (kiub kecil)"
 
diff --git a/homedecor_i18n/locale/pt.po b/homedecor_i18n/locale/pt.po
index a343f54..ccd4cd5 100644
--- a/homedecor_i18n/locale/pt.po
+++ b/homedecor_i18n/locale/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-30 21:31-0300\n"
+"POT-Creation-Date: 2017-02-10 05:34-0300\n"
 "PO-Revision-Date: 2017-01-29 00:21-0200\n"
 "Last-Translator: Aracnus <frederico@teia.bio.br>\n"
 "Language-Team: Portuguese\n"
@@ -298,7 +298,7 @@ msgstr ""
 msgid "Loaded!"
 msgstr "Carregado!"
 
-#: ../lrfurn/armchairs.lua
+#: ../lrfurn/armchairs.lua ../homedecor/furniture.lua
 #, fuzzy
 msgid "Armchair"
 msgstr "Poltrona (@1)"
@@ -338,89 +338,32 @@ msgid "Glowing Embers"
 msgstr ""
 
 #: ../fake_fire/init.lua
-msgid "Flint and steel"
+msgid "Stone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
-msgid "black"
-msgstr "preto"
-
-#: ../homedecor/bedroom.lua ../homedecor/books.lua
-msgid "brown"
-msgstr "marrom"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/books.lua ../homedecor/furniture.lua
-msgid "blue"
-msgstr "azul"
-
-#: ../homedecor/bedroom.lua
-msgid "cyan"
-msgstr "ciano\t\t"
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-msgid "dark grey"
-msgstr "cinza escuro"
-
-#: ../homedecor/bedroom.lua ../homedecor/furniture.lua
-msgid "dark green"
-msgstr "verde escuro"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/exterior.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/books.lua
-msgid "green"
-msgstr "verde"
+#: ../fake_fire/init.lua
+msgid "Sandstone chimney top"
+msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua ../homedecor/books.lua
-msgid "grey"
-msgstr "cinza"
+#: ../fake_fire/init.lua
+msgid "Flint and steel"
+msgstr ""
 
-#: ../homedecor/bedroom.lua
-msgid "magenta"
-msgstr "magenta"
+#: ../fake_fire/init.lua
+msgid "This area is protected!"
+msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "orange"
-msgstr "laranja"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/furniture.lua
-msgid "pink"
-msgstr "rosa"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua ../homedecor/books.lua ../homedecor/furniture.lua
-msgid "red"
+#, fuzzy
+msgid "Bed"
 msgstr "vermelho"
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua ../homedecor/books.lua
-#: ../homedecor/furniture.lua
-msgid "violet"
-msgstr "violeta"
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-msgid "white"
-msgstr "branco"
-
-#: ../homedecor/bedroom.lua ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua
-msgid "yellow"
-msgstr "amarelo"
-
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1)"
-msgstr "Cama (@1)"
-
-#: ../homedecor/bedroom.lua
-msgid "Bed (@1, king sized)"
+#, fuzzy
+msgid "Bed (king sized)"
 msgstr "Cama (@1, aumentada)"
 
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
+#: ../homedecor/bedroom.lua
 msgid "mahogany"
 msgstr "mogno"
 
@@ -477,6 +420,16 @@ msgid "Under-sink cabinet"
 msgstr "Armário sob a Pia"
 
 #: ../homedecor/kitchen_furniture.lua
+#, fuzzy
+msgid "Copper pans"
+msgstr "Tira de Cobre"
+
+#: ../homedecor/kitchen_furniture.lua
+#, fuzzy
+msgid "Kitchen Faucet"
+msgstr "Armário de Cozinha"
+
+#: ../homedecor/kitchen_furniture.lua
 msgid "Paper towels"
 msgstr "Papel toalha"
 
@@ -590,6 +543,19 @@ msgstr "Telhas de Vidro"
 msgid "Chimney"
 msgstr "Chaminé"
 
+#: ../homedecor/electrics.lua
+#, fuzzy
+msgid "Power Outlet"
+msgstr "Cristal de Força"
+
+#: ../homedecor/electrics.lua
+msgid "Light switch"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Doorbell"
+msgstr ""
+
 #: ../homedecor/window_treatments.lua
 msgid "Window (quartered)"
 msgstr "Janela Dividida"
@@ -633,6 +599,32 @@ msgstr "Janela com Caixa de Flores"
 msgid "Stained Glass"
 msgstr "Vitral"
 
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/furniture.lua
+msgid "red"
+msgstr "vermelho"
+
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/misc-nodes.lua
+msgid "green"
+msgstr "verde"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+msgid "blue"
+msgstr "azul"
+
+#: ../homedecor/window_treatments.lua ../homedecor/lighting.lua
+msgid "white"
+msgstr "branco"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+msgid "pink"
+msgstr "rosa"
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+msgid "violet"
+msgstr "violeta"
+
 #: ../homedecor/crafts.lua
 msgid "Uncooked Terracotta Base"
 msgstr "Base Bruta de Terracota"
@@ -769,6 +761,34 @@ msgstr "DVD e VCR"
 msgid "Telephone"
 msgstr "Telefone"
 
+#: ../homedecor/cobweb.lua
+msgid "Cobweb"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Plastic analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Wooden analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Digital clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Alarm clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Grandfather Clock"
+msgstr ""
+
+#: ../homedecor/lighting.lua ../homedecor/exterior.lua
+msgid "yellow"
+msgstr "amarelo"
+
 #: ../homedecor/lighting.lua
 #, fuzzy
 msgid "Thick Glowlight"
@@ -829,6 +849,11 @@ msgid "Hanging Lantern"
 msgstr "Lanterna de Parede"
 
 #: ../homedecor/lighting.lua
+#, fuzzy
+msgid "Ceiling Lantern"
+msgstr "Ventilador de Teto"
+
+#: ../homedecor/lighting.lua
 msgid "Lattice lantern (large)"
 msgstr "Lanterna com gelosia (grande)"
 
@@ -847,7 +872,8 @@ msgid "Standing Lamp"
 msgstr "Luminária Elevada (@1)"
 
 #: ../homedecor/lighting.lua
-msgid "Desk Lamp (@1)"
+#, fuzzy
+msgid "Desk Lamp"
 msgstr "Luminária de Escritório (@1)"
 
 #: ../homedecor/lighting.lua
@@ -915,19 +941,8 @@ msgid "Wrought Iron fence (type 2) Corner"
 msgstr "Cerca de Ferro Forjado (tipo 2) de Canto"
 
 #: ../homedecor/shutters.lua
-msgid "unpainted oak"
-msgstr "carvalho não pintado"
-
-#: ../homedecor/shutters.lua
-msgid "forest green"
-msgstr "verde floresta"
-
-#: ../homedecor/shutters.lua
-msgid "light blue"
-msgstr "azul claro"
-
-#: ../homedecor/shutters.lua
-msgid "Wooden Shutter (@1)"
+#, fuzzy
+msgid "Wooden Shutter"
 msgstr "Persiana de Madeira (@1)"
 
 #: ../homedecor/exterior.lua
@@ -1038,6 +1053,89 @@ msgstr "Aquecedor de ambiente"
 msgid "Radiator heater"
 msgstr "Aquecedor de radiador"
 
+#: ../homedecor/wardrobe.lua
+msgid "Wardrobe"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Clothes"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Storage"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Green Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+#, fuzzy
+msgid "Trash Can"
+msgstr "Vela Fina"
+
+#: ../homedecor/trash_cans.lua
+msgid "Small Trash Can"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Cutlery set"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Brown bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four brown bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Green bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four misc brown/green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Wine rack"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+#, fuzzy
+msgid "Dartboard"
+msgstr "Skate"
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer tap"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Ahh, a frosty cold beer - look in your inventory for it!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "No room in your inventory to add a beer mug!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer mug"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+#, fuzzy
+msgid "Soda vending machine"
+msgstr "Moeda de Ouro (para máquina de venda de refrigerante)"
+
+#: ../homedecor/gastronomy.lua
+msgid "Please insert a coin in the machine."
+msgstr ""
+
 #: ../homedecor/doors_and_gates.lua
 msgid "Mahogany Closet Door (@1 opening)"
 msgstr "Porta de Closet em Mogno (abre para @1)"
@@ -1130,6 +1228,26 @@ msgstr "Tatami Japonês"
 msgid "Japanese-style door"
 msgstr "Porta estilo japonês"
 
+#: ../homedecor/foyer.lua
+msgid "Wall-mounted coat rack"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Coat tree"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Green welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Brown welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Grey welcome mat"
+msgstr ""
+
 #: ../homedecor/misc-nodes.lua
 msgid "Textured Ceiling Paint"
 msgstr "Pintura Texturizada do Teto"
@@ -1154,6 +1272,10 @@ msgstr "persiana"
 msgid "Rug (@1)"
 msgstr "Carpete (@1)"
 
+#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
+msgid "black"
+msgstr "preto"
+
 #: ../homedecor/misc-nodes.lua
 msgid "Flower Pot (@1)"
 msgstr "Vaso de Flores"
@@ -1311,7 +1433,8 @@ msgid "Legs for Utility Table"
 msgstr "Pernas para Mesa de Trabalho"
 
 #: ../homedecor/books.lua
-msgid "Writable Book (@1)"
+#, fuzzy
+msgid "Writable Book"
 msgstr "Livro Consumível (@1)"
 
 #: ../homedecor/books.lua
@@ -1335,12 +1458,13 @@ msgid "plain"
 msgstr "Sem Acabamento"
 
 #: ../homedecor/furniture.lua
-msgid "Kitchen chair (@1)"
-msgstr "Cadeira de Cozinha (@1)"
+msgid "dark green"
+msgstr "verde escuro"
 
 #: ../homedecor/furniture.lua
-msgid "Armchair (@1)"
-msgstr "Poltrona (@1)"
+#, fuzzy
+msgid "Kitchen chair"
+msgstr "Cadeira de Cozinha (@1)"
 
 #: ../homedecor/furniture.lua
 msgid "Bookshelf (open-frame)"
@@ -1374,6 +1498,27 @@ msgstr "@1 tentou acessar @2 pertencente a @3 em @4"
 msgid "@1 (Locked)"
 msgstr "@1 (trancado)"
 
+#: ../homedecor/handlers/expansion.lua
+msgid "Expansion placeholder (you hacker you!)"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the space for the headboard is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Someone already owns the spot where the headboard goes."
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the upper space is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+#, fuzzy
+msgid "Someone already owns that spot."
+msgstr "Desculpe, mas esse local pertence a %s."
+
 #: ../homedecor/handlers/furnaces.lua
 msgid "Furnace"
 msgstr "Forno"
@@ -1402,44 +1547,46 @@ msgstr "@1 (saída de itens está lotada)"
 msgid "Filing cabinet"
 msgstr "Armário sob a Pia"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/grey"
-msgstr "branco/cinza"
-
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/dark grey"
-msgstr "branco/cinza escuro"
+#: ../homedecor/office.lua
+#, fuzzy
+msgid "Desk"
+msgstr "Ventilador de Escritório"
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/black"
-msgstr "branco/preto"
+#: ../homedecor/office.lua
+msgid "Desk globe"
+msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "black/dark grey"
-msgstr "preto/cinza escuro"
+#: ../homedecor/office.lua
+msgid "Calendar"
+msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/red"
-msgstr "branco/vermelho"
+#: ../homedecor/office.lua
+msgid ""
+"Date (right-click to update):\n"
+"@1"
+msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/green"
-msgstr "branco/verde"
+#: ../homedecor/office.lua
+msgid "Basic office chair"
+msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/blue"
-msgstr "branco/azul"
+#: ../homedecor/office.lua
+msgid "Upscale office chair"
+msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "white/yellow"
-msgstr "branco/amarelo"
+#, fuzzy
+msgid "Bathroom/kitchen tiles (dark)"
+msgstr "Azulejo de Banheiro/Cozinha (@1)"
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "white/tan"
-msgstr "branco/bronzeado"
+#, fuzzy
+msgid "Bathroom/kitchen tiles (medium)"
+msgstr "Azulejo de Banheiro/Cozinha (@1)"
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "Bathroom/kitchen tiles (@1)"
+#, fuzzy
+msgid "Bathroom/kitchen tiles (light)"
 msgstr "Azulejo de Banheiro/Cozinha (@1)"
 
 #: ../homedecor/bathroom_furniture.lua
@@ -1450,6 +1597,66 @@ msgstr "Tolo de Toalha com Toalha"
 msgid "Medicine cabinet"
 msgstr "Gabinete Medicinal"
 
+#~ msgid "grey"
+#~ msgstr "cinza"
+
+#~ msgid "brown"
+#~ msgstr "marrom"
+
+#~ msgid "white/grey"
+#~ msgstr "branco/cinza"
+
+#~ msgid "white/dark grey"
+#~ msgstr "branco/cinza escuro"
+
+#~ msgid "white/black"
+#~ msgstr "branco/preto"
+
+#~ msgid "black/dark grey"
+#~ msgstr "preto/cinza escuro"
+
+#~ msgid "white/red"
+#~ msgstr "branco/vermelho"
+
+#~ msgid "white/green"
+#~ msgstr "branco/verde"
+
+#~ msgid "white/blue"
+#~ msgstr "branco/azul"
+
+#~ msgid "white/yellow"
+#~ msgstr "branco/amarelo"
+
+#~ msgid "white/tan"
+#~ msgstr "branco/bronzeado"
+
+#~ msgid "cyan"
+#~ msgstr "ciano\t\t"
+
+#~ msgid "dark grey"
+#~ msgstr "cinza escuro"
+
+#~ msgid "magenta"
+#~ msgstr "magenta"
+
+#~ msgid "orange"
+#~ msgstr "laranja"
+
+#~ msgid "Bed (@1)"
+#~ msgstr "Cama (@1)"
+
+#~ msgid "unpainted oak"
+#~ msgstr "carvalho não pintado"
+
+#~ msgid "forest green"
+#~ msgstr "verde floresta"
+
+#~ msgid "light blue"
+#~ msgstr "azul claro"
+
+#~ msgid "Armchair (@1)"
+#~ msgstr "Poltrona (@1)"
+
 #, fuzzy
 #~ msgid "dark_grey"
 #~ msgstr "cinza escuro"
@@ -1557,9 +1764,6 @@ msgstr "Gabinete Medicinal"
 #~ msgid "someone "
 #~ msgstr "alguém"
 
-#~ msgid "Sorry, %s owns that spot. "
-#~ msgstr "Desculpe, mas esse local pertence a %s."
-
 #~ msgid "White Glowlight (small cube) "
 #~ msgstr "Arandela branca (cubo pequeno)"
 
diff --git a/homedecor_i18n/locale/template.pot b/homedecor_i18n/locale/template.pot
index bde49c5..b4d754f 100644
--- a/homedecor_i18n/locale/template.pot
+++ b/homedecor_i18n/locale/template.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-30 21:31-0300\n"
+"POT-Creation-Date: 2017-02-10 05:34-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Loaded!"
 msgstr ""
 
-#: ../lrfurn/armchairs.lua
+#: ../lrfurn/armchairs.lua ../homedecor/furniture.lua
 msgid "Armchair"
 msgstr ""
 
@@ -313,89 +313,30 @@ msgid "Glowing Embers"
 msgstr ""
 
 #: ../fake_fire/init.lua
-msgid "Flint and steel"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
-msgid "black"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/books.lua
-msgid "brown"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/books.lua ../homedecor/furniture.lua
-msgid "blue"
-msgstr ""
-
-#: ../homedecor/bedroom.lua
-msgid "cyan"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
-msgid "dark grey"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/furniture.lua
-msgid "dark green"
+msgid "Stone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/exterior.lua
-#: ../homedecor/misc-nodes.lua ../homedecor/books.lua
-msgid "green"
+#: ../fake_fire/init.lua
+msgid "Sandstone chimney top"
 msgstr ""
 
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua ../homedecor/books.lua
-msgid "grey"
+#: ../fake_fire/init.lua
+msgid "Flint and steel"
 msgstr ""
 
-#: ../homedecor/bedroom.lua
-msgid "magenta"
+#: ../fake_fire/init.lua
+msgid "This area is protected!"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "orange"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/furniture.lua
-msgid "pink"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua ../homedecor/books.lua ../homedecor/furniture.lua
-msgid "red"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua ../homedecor/books.lua
-#: ../homedecor/furniture.lua
-msgid "violet"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/window_treatments.lua
-#: ../homedecor/lighting.lua ../homedecor/shutters.lua
-msgid "white"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/lighting.lua ../homedecor/shutters.lua
-#: ../homedecor/exterior.lua
-msgid "yellow"
+msgid "Bed"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1)"
+msgid "Bed (king sized)"
 msgstr ""
 
 #: ../homedecor/bedroom.lua
-msgid "Bed (@1, king sized)"
-msgstr ""
-
-#: ../homedecor/bedroom.lua ../homedecor/shutters.lua
 msgid "mahogany"
 msgstr ""
 
@@ -452,6 +393,14 @@ msgid "Under-sink cabinet"
 msgstr ""
 
 #: ../homedecor/kitchen_furniture.lua
+msgid "Copper pans"
+msgstr ""
+
+#: ../homedecor/kitchen_furniture.lua
+msgid "Kitchen Faucet"
+msgstr ""
+
+#: ../homedecor/kitchen_furniture.lua
 msgid "Paper towels"
 msgstr ""
 
@@ -565,6 +514,18 @@ msgstr ""
 msgid "Chimney"
 msgstr ""
 
+#: ../homedecor/electrics.lua
+msgid "Power Outlet"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Light switch"
+msgstr ""
+
+#: ../homedecor/electrics.lua
+msgid "Doorbell"
+msgstr ""
+
 #: ../homedecor/window_treatments.lua
 msgid "Window (quartered)"
 msgstr ""
@@ -607,6 +568,32 @@ msgstr ""
 msgid "Stained Glass"
 msgstr ""
 
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/furniture.lua
+msgid "red"
+msgstr ""
+
+#: ../homedecor/window_treatments.lua ../homedecor/exterior.lua
+#: ../homedecor/misc-nodes.lua
+msgid "green"
+msgstr ""
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+msgid "blue"
+msgstr ""
+
+#: ../homedecor/window_treatments.lua ../homedecor/lighting.lua
+msgid "white"
+msgstr ""
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+msgid "pink"
+msgstr ""
+
+#: ../homedecor/window_treatments.lua ../homedecor/furniture.lua
+msgid "violet"
+msgstr ""
+
 #: ../homedecor/crafts.lua
 msgid "Uncooked Terracotta Base"
 msgstr ""
@@ -743,6 +730,34 @@ msgstr ""
 msgid "Telephone"
 msgstr ""
 
+#: ../homedecor/cobweb.lua
+msgid "Cobweb"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Plastic analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Wooden analog clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Digital clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Alarm clock"
+msgstr ""
+
+#: ../homedecor/clocks.lua
+msgid "Grandfather Clock"
+msgstr ""
+
+#: ../homedecor/lighting.lua ../homedecor/exterior.lua
+msgid "yellow"
+msgstr ""
+
 #: ../homedecor/lighting.lua
 msgid "Thick Glowlight"
 msgstr ""
@@ -800,6 +815,10 @@ msgid "Hanging Lantern"
 msgstr ""
 
 #: ../homedecor/lighting.lua
+msgid "Ceiling Lantern"
+msgstr ""
+
+#: ../homedecor/lighting.lua
 msgid "Lattice lantern (large)"
 msgstr ""
 
@@ -816,7 +835,7 @@ msgid "Standing Lamp"
 msgstr ""
 
 #: ../homedecor/lighting.lua
-msgid "Desk Lamp (@1)"
+msgid "Desk Lamp"
 msgstr ""
 
 #: ../homedecor/lighting.lua
@@ -884,19 +903,7 @@ msgid "Wrought Iron fence (type 2) Corner"
 msgstr ""
 
 #: ../homedecor/shutters.lua
-msgid "unpainted oak"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-msgid "forest green"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-msgid "light blue"
-msgstr ""
-
-#: ../homedecor/shutters.lua
-msgid "Wooden Shutter (@1)"
+msgid "Wooden Shutter"
 msgstr ""
 
 #: ../homedecor/exterior.lua
@@ -1007,6 +1014,86 @@ msgstr ""
 msgid "Radiator heater"
 msgstr ""
 
+#: ../homedecor/wardrobe.lua
+msgid "Wardrobe"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Clothes"
+msgstr ""
+
+#: ../homedecor/wardrobe.lua
+msgid "Storage"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Green Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Trash Can"
+msgstr ""
+
+#: ../homedecor/trash_cans.lua
+msgid "Small Trash Can"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Cutlery set"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Brown bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four brown bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Green bottle"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Four misc brown/green bottles"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Wine rack"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Dartboard"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer tap"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Ahh, a frosty cold beer - look in your inventory for it!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "No room in your inventory to add a beer mug!"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Beer mug"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Soda vending machine"
+msgstr ""
+
+#: ../homedecor/gastronomy.lua
+msgid "Please insert a coin in the machine."
+msgstr ""
+
 #: ../homedecor/doors_and_gates.lua
 msgid "Mahogany Closet Door (@1 opening)"
 msgstr ""
@@ -1099,6 +1186,26 @@ msgstr ""
 msgid "Japanese-style door"
 msgstr ""
 
+#: ../homedecor/foyer.lua
+msgid "Wall-mounted coat rack"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Coat tree"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Green welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Brown welcome mat"
+msgstr ""
+
+#: ../homedecor/foyer.lua
+msgid "Grey welcome mat"
+msgstr ""
+
 #: ../homedecor/misc-nodes.lua
 msgid "Textured Ceiling Paint"
 msgstr ""
@@ -1123,6 +1230,10 @@ msgstr ""
 msgid "Rug (@1)"
 msgstr ""
 
+#: ../homedecor/misc-nodes.lua ../homedecor/furniture.lua
+msgid "black"
+msgstr ""
+
 #: ../homedecor/misc-nodes.lua
 msgid "Flower Pot (@1)"
 msgstr ""
@@ -1280,7 +1391,7 @@ msgid "Legs for Utility Table"
 msgstr ""
 
 #: ../homedecor/books.lua
-msgid "Writable Book (@1)"
+msgid "Writable Book"
 msgstr ""
 
 #: ../homedecor/books.lua
@@ -1304,11 +1415,11 @@ msgid "plain"
 msgstr ""
 
 #: ../homedecor/furniture.lua
-msgid "Kitchen chair (@1)"
+msgid "dark green"
 msgstr ""
 
 #: ../homedecor/furniture.lua
-msgid "Armchair (@1)"
+msgid "Kitchen chair"
 msgstr ""
 
 #: ../homedecor/furniture.lua
@@ -1343,6 +1454,26 @@ msgstr ""
 msgid "@1 (Locked)"
 msgstr ""
 
+#: ../homedecor/handlers/expansion.lua
+msgid "Expansion placeholder (you hacker you!)"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the space for the headboard is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Someone already owns the spot where the headboard goes."
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Not enough room - the upper space is occupied!"
+msgstr ""
+
+#: ../homedecor/handlers/expansion.lua
+msgid "Someone already owns that spot."
+msgstr ""
+
 #: ../homedecor/handlers/furnaces.lua
 msgid "Furnace"
 msgstr ""
@@ -1371,44 +1502,42 @@ msgstr ""
 msgid "Filing cabinet"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/grey"
-msgstr ""
-
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/dark grey"
+#: ../homedecor/office.lua
+msgid "Desk"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/black"
+#: ../homedecor/office.lua
+msgid "Desk globe"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "black/dark grey"
+#: ../homedecor/office.lua
+msgid "Calendar"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/red"
+#: ../homedecor/office.lua
+msgid ""
+"Date (right-click to update):\n"
+"@1"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/green"
+#: ../homedecor/office.lua
+msgid "Basic office chair"
 msgstr ""
 
-#: ../homedecor/bathroom_furniture.lua
-msgid "white/blue"
+#: ../homedecor/office.lua
+msgid "Upscale office chair"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "white/yellow"
+msgid "Bathroom/kitchen tiles (dark)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "white/tan"
+msgid "Bathroom/kitchen tiles (medium)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua
-msgid "Bathroom/kitchen tiles (@1)"
+msgid "Bathroom/kitchen tiles (light)"
 msgstr ""
 
 #: ../homedecor/bathroom_furniture.lua