Merge remote-tracking branch 'upstream/master'

author: Aline Ferraz <freya.df@gmail.com> 2011-06-12 14:03:02 -0300
committer: Aline Ferraz <freya.df@gmail.com> 2011-06-12 14:03:02 -0300
commit: a1f01bc3c10d0bf79a617f469247499ed53ddf5e (patch)
tree: 54b3b8d5207ca7a47efac138751d14acfc99b1ad
parent: 0a9ff93c5bc314ff76a41d104c901349cb037179 (diff)
parent: aaea79df0b87ec528e02743c4324429b20a413ed (diff)
download: manaplus-a1f01bc3c10d0bf79a617f469247499ed53ddf5e.tar.gz
manaplus-a1f01bc3c10d0bf79a617f469247499ed53ddf5e.tar.bz2
manaplus-a1f01bc3c10d0bf79a617f469247499ed53ddf5e.tar.xz
manaplus-a1f01bc3c10d0bf79a617f469247499ed53ddf5e.zip
32 files changed, 1098 insertions, 900 deletions
diff --git a/ChangeLog b/ChangeLog
index e2949753a..b2513dcae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2011-06-12 New release 1.1.6.12
+ManaPlus:
+fix: outfits item selection.
+fix: item slots in "show items" menu item.
+fix: memory leaks.
+fix: item colors in different windows.
+add: secure font for highlighting incorrect nicks.
+add: gender sign with any players names.
+add: extend quick move items from inventory and back (LSHIFT)
+modifier key + left click - move all items from/to storage.
+modifier key + right clikc - show window for amount selection for moving.
+modifier key + drop button - drop all items from selected slot.
+add: add "drop all" to context menu.
+add: menu item to copy text from bars to chat.
+add: did you know window.
+add: improve software draw mode (SDL) speed.
+
+
 2011-05-29 New release 1.1.5.29
 ManaPlus:
 fix: infinite paste.
diff --git a/README b/README
index 4e44805d9..1c724308e 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.5.29        Date: 2011-05-29
+ Version: 1.1.6.12        Date: 2011-06-12
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 153c3cddf..cbc56a9b7 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.1.5.29        Date: 2011-05-29
+ Version: 1.1.6.12        Date: 2011-06-12
 
  Development team:
   - See AUTHORS file for a list
diff --git a/configure.ac b/configure.ac
index 065f389c0..3e69f6523 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.1.5.29], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.1.6.12], [akaras@inbox.ru], [manaplus])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
diff --git a/packwin b/packwin
index 476d331eb..96e37b2b2 100755
--- a/packwin
+++ b/packwin
@@ -5,7 +5,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
-    -DPRODUCT_VERSION="1.1.5.29" \
+    -DPRODUCT_VERSION="1.1.6.12" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6dc2a6af0..fe3b86f32 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,6 +16,7 @@ src/gui/chatwindow.cpp
 src/gui/confirmdialog.cpp
 src/gui/connectiondialog.cpp
 src/gui/debugwindow.cpp
+src/gui/didyouknowwindow.cpp
 src/gui/editdialog.cpp
 src/gui/equipmentwindow.cpp
 src/gui/helpwindow.cpp
diff --git a/po/da.po b/po/da.po
index 124221942..f9cc377ba 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
 "PO-Revision-Date: 2009-07-25 17:33+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Opsætning"
 
@@ -918,6 +918,30 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Luk"
+
+#: src/gui/didyouknowwindow.cpp:62
+#, fuzzy
+msgid "< Previous"
+msgstr "Forrige"
+
+#: src/gui/didyouknowwindow.cpp:63
+#, fuzzy
+msgid "Next >"
+msgstr "Næste"
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -939,14 +963,8 @@ msgstr "Tag af"
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Luk"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventarliste"
 
@@ -3757,7 +3775,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3776,11 +3794,11 @@ msgstr "Ændre"
 msgid "Choose World"
 msgstr "Vælg din server"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Opbevaret"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
@@ -6302,9 +6320,6 @@ msgstr "Ukendt genstand"
 #~ msgid "Effect: %s"
 #~ msgstr "Effekt: %s"
 
-#~ msgid "Previous"
-#~ msgstr "Forrige"
-
 #~ msgid "New"
 #~ msgstr "Opret"
 
diff --git a/po/de.po b/po/de.po
index 7bac5bf4e..be1897182 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,23 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
-#   <Necromong@inbox.ru>, 2011
-#   <jack@krass.com>, 2011
-# Andrei Karas <akaras@inbox.ru>, 2011
+# 
+#   <Necromong@inbox.ru>, 2011.
+#   <jack@krass.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
-"PO-Revision-Date: 2011-06-07 00:00+0000\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"PO-Revision-Date: 2011-06-11 17:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
-"de/)\n"
-"Language: de\n"
+"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1030
@@ -32,7 +31,7 @@ msgstr "ausweichen"
 msgid "miss"
 msgstr "verfehlt"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
@@ -129,8 +128,8 @@ msgstr "Kann keine leeren Nachrichten versenden!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
 "einer, oder der Spieler bist du."
@@ -287,8 +286,7 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
+msgstr "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
 #: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
 msgid "General"
@@ -860,6 +858,28 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Schließen"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -881,14 +901,8 @@ msgstr "Ablegen"
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Schließen"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventar"
 
@@ -3089,10 +3103,11 @@ msgid "Change"
 msgstr "Ändern"
 
 #: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
-"Gegenstände hinzufügen."
+"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser"
+" Gegenstände hinzufügen."
 
 #: src/gui/tradewindow.cpp:381
 msgid "You don't have enough money."
@@ -3441,7 +3456,8 @@ msgid "Command: /unignore <player>"
 msgstr "Befehl: /unignore <Spieler>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -3520,7 +3536,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3536,11 +3552,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
@@ -4186,8 +4202,8 @@ msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
-"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
-"nicht ganz so genial, wie Du dachtest..."
+"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider"
+" nicht ganz so genial, wie Du dachtest..."
 
 #: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:114
 msgid "I guess this did not run too well."
@@ -4857,8 +4873,8 @@ msgstr ""
 #: src/net/tmwa/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
-"/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der "
-"Party"
+"/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der"
+" Party"
 
 #: src/net/tmwa/gui/partytab.cpp:84
 msgid "This command invites <nick> to party with you."
@@ -5156,7 +5172,8 @@ msgstr "Nachricht"
 
 #: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
 "heilen."
@@ -5297,8 +5314,8 @@ msgstr ""
 #: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien "
-"Platz mehr."
+"Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien"
+" Platz mehr."
 
 #: src/net/tmwa/tradehandler.cpp:260
 msgid "Failed adding item. You can't trade this item."
@@ -5352,3 +5369,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:168
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
+
+
diff --git a/po/en_GB.po b/po/en_GB.po
index d3dbf9406..b20d349b2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Setup"
 
@@ -921,6 +921,30 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Close"
+
+#: src/gui/didyouknowwindow.cpp:62
+#, fuzzy
+msgid "< Previous"
+msgstr "Previous"
+
+#: src/gui/didyouknowwindow.cpp:63
+#, fuzzy
+msgid "Next >"
+msgstr "Next"
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -942,14 +966,8 @@ msgstr "Unequip"
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Close"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventory"
 
@@ -3749,7 +3767,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3768,11 +3786,11 @@ msgstr "Change"
 msgid "Choose World"
 msgstr "Choose your server"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Storage"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
@@ -6317,9 +6335,6 @@ msgstr "Unknown item"
 #~ msgid "Effect: %s"
 #~ msgstr "Effect: %s"
 
-#~ msgid "Previous"
-#~ msgstr "Previous"
-
 #~ msgid "New"
 #~ msgstr "New"
 
diff --git a/po/es.po b/po/es.po
index e93725e75..d5158fbee 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,24 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Nelson Martell <nelson6eeduardo65@gmail.com>, 2011
-# Nelson  <nelson6eeduardo65@gmail.com>, 2011
-# Jumpy <antoinebcn@hotmail.com>, 2011
-# Andrei Karas <akaras@inbox.ru>, 2011
+# 
+# Nelson  <nelson6eeduardo65@gmail.com>, 2011.
+# Nelson Martell <nelson6eeduardo65@gmail.com>, 2011.
+# Jumpy <antoinebcn@hotmail.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
-"PO-Revision-Date: 2011-06-07 00:00+0000\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"PO-Revision-Date: 2011-06-11 17:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"manaplus/team/es/)\n"
-"Language: es\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/manaplus/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1030
@@ -33,7 +32,7 @@ msgstr "evade"
 msgid "miss"
 msgstr "falla"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
@@ -129,8 +128,8 @@ msgstr "¡No puedes enviar susurros vacíos!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
@@ -287,8 +286,7 @@ msgstr "Imágenes de recurso huérfano:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
 msgid "General"
@@ -848,7 +846,7 @@ msgstr "Golpe crítico:"
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
 #, c-format
 msgid "Ping: %s ms"
-msgstr ""
+msgstr "Ping: %s ms"
 
 #: src/gui/debugwindow.cpp:393
 #, c-format
@@ -860,6 +858,28 @@ msgstr "In: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Out: %d bytes/s"
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Cerrar"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -881,14 +901,8 @@ msgstr "Quitárselo"
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Cerrar"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -1025,36 +1039,36 @@ msgstr "Restablecer cronometrador"
 #: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
 #, c-format
 msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "Nivel: %d de %f%%"
 
 #: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
 #, c-format
 msgid "Exp: %d/%d Left: %d"
-msgstr ""
+msgstr "Exp: %d/%d Queda: %d"
 
 #: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
 #: src/gui/killstats.cpp:224
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr ""
+msgstr "1%% = %d exp, prom. pandilla para 1%%: %s"
 
 #: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
 #: src/gui/killstats.cpp:233
 #, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr ""
+msgstr "Muertes: %s, exp. total: %s"
 
 #: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
 #: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Prom. Exp: %s, Prom. de pandilla para siguiente nivel: %s"
 
 #: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
 #: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr ""
+msgstr "Matanza/Mín: %s, Exp/Mín: %s"
 
 #: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
 #: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
@@ -1062,41 +1076,41 @@ msgstr ""
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Rapidez de experiencia por %d minuto: %s"
+msgstr[1] "Rapidez de experiencia por %d minutos: %s"
 
 #: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s"
+msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
 
 #: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
 msgid "Last kill exp:"
-msgstr ""
+msgstr "Exp de último monstruo eliminado:"
 
 #: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
 #: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
 #: src/gui/killstats.cpp:371
 msgid "Time before jacko spawn:"
-msgstr ""
+msgstr "Tiempo antes de que jacko desove:"
 
 #: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
 #: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
 #: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
 #, c-format
 msgid "  Time for next level: %s"
-msgstr ""
+msgstr "  Tiempo para el siguiente nivel: %s"
 
 #: src/gui/killstats.cpp:360
 #, c-format
 msgid "%s %d?"
-msgstr ""
+msgstr "¿%s %d?"
 
 #: src/gui/killstats.cpp:366
 msgid "jacko spawning"
-msgstr ""
+msgstr "desove de jacko"
 
 #: src/gui/logindialog.cpp:59
 msgid "Normal"
@@ -1470,7 +1484,7 @@ msgstr "Almacenar todo"
 #: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
 #: src/gui/popupmenu.cpp:1693
 msgid "Drop all"
-msgstr ""
+msgstr "Tirar todo"
 
 #: src/gui/popupmenu.cpp:1574
 msgid "Retrieve 10"
@@ -1506,7 +1520,7 @@ msgstr "Restablecer barra amarilla"
 
 #: src/gui/popupmenu.cpp:1785
 msgid "Copy to chat"
-msgstr ""
+msgstr "Copiar al chat"
 
 #: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
@@ -3088,7 +3102,8 @@ msgid "Change"
 msgstr "Cambiar"
 
 #: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
@@ -3440,7 +3455,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jugador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si había sido ignorado."
 
 #: src/gui/windowmenu.cpp:65
@@ -3519,7 +3535,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr "SET"
 
@@ -3535,11 +3551,11 @@ msgstr "Cambiar de Login"
 msgid "Choose World"
 msgstr "Escojer Mundo"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr "Mochila"
 
@@ -3919,7 +3935,7 @@ msgstr "Interruptor de tipo de cámara"
 
 #: src/keyboardconfig.cpp:336
 msgid "Modifier key"
-msgstr ""
+msgstr "Tecla modificadora"
 
 #: src/keyboardconfig.cpp:408
 #, c-format
@@ -4883,7 +4899,8 @@ msgstr "Comando: /item"
 
 #: src/net/tmwa/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
-msgstr "Este comando muestra el actual estado de compartir objetos en el grupo"
+msgstr ""
+"Este comando muestra el actual estado de compartir objetos en el grupo"
 
 #: src/net/tmwa/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
@@ -4978,8 +4995,8 @@ msgstr "Rechazado del servidor."
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
-"GM."
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo"
+" GM."
 
 #: src/net/tmwa/loginhandler.cpp:180
 msgid "Client too old."
@@ -5142,7 +5159,8 @@ msgstr "Mensaje"
 
 #: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
 #: src/net/tmwa/playerhandler.cpp:353
@@ -5334,3 +5352,5 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:168
 msgid "Unknown item"
 msgstr "Objeto desconocido"
+
+
diff --git a/po/fi.po b/po/fi.po
index 853eca2b3..b1eb1f07e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,21 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011
-# Andrei Karas <akaras@inbox.ru>, 2011
+# 
+# Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
-"PO-Revision-Date: 2011-06-07 00:00+0000\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"PO-Revision-Date: 2011-06-11 17:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1030
@@ -30,7 +30,7 @@ msgstr "väistö"
 msgid "miss"
 msgstr "huti"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
@@ -126,11 +126,11 @@ msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
-"käytit omaa nimeäsi."
+"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai"
+" käytit omaa nimeäsi."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -285,8 +285,8 @@ msgstr "Orvot resurssikuvat:"
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
-"\"true\", \"false\", \"1\" tai \"0\"."
+"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti"
+" \"true\", \"false\", \"1\" tai \"0\"."
 
 #: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
 msgid "General"
@@ -858,6 +858,28 @@ msgstr "Sisään: %d tavua/s"
 msgid "Out: %d bytes/s"
 msgstr "Ulos: %d tavua/s"
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Sulje"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -879,14 +901,8 @@ msgstr "Poista varuste käytöstä"
 msgid "Help"
 msgstr "Apua"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Sulje"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Tavarat"
 
@@ -1664,8 +1680,8 @@ msgstr "Huomaa"
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
-"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet "
-"musiikit"
+"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet"
+" musiikit"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
@@ -2241,7 +2257,8 @@ msgstr "-"
 #: src/gui/setup_video.cpp:535
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
+msgstr ""
+"Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
 #: src/gui/setup_video.cpp:541
 msgid ""
@@ -3084,7 +3101,8 @@ msgid "Change"
 msgstr "Muuta"
 
 #: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #: src/gui/tradewindow.cpp:381
@@ -3434,7 +3452,8 @@ msgid "Command: /unignore <player>"
 msgstr "Komento: /unignore <pelaajan nimi>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Tämä komento huomioi pelaajan taas, jos tämä on ensin jätetty huomiotta."
 
@@ -3514,7 +3533,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr "Ase"
 
@@ -3530,11 +3549,11 @@ msgstr "Vaihda kirjautumistietoja"
 msgid "Choose World"
 msgstr "Valitse pelimaailma"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Varasto"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr "Kärry"
 
@@ -4512,7 +4531,8 @@ msgstr "Tuntematon hahmopalvelinvirhe."
 
 #: src/net/tmwa/charserverhandler.cpp:174
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
+msgstr ""
+"Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
 #: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
 msgid "Wrong name."
@@ -4679,17 +4699,14 @@ msgid "M.Defense"
 msgstr "T.-puolustus"
 
 #: src/net/tmwa/generalhandler.cpp:263
-#, fuzzy
 msgid "% Accuracy"
 msgstr "% Tarkkuus"
 
 #: src/net/tmwa/generalhandler.cpp:264
-#, fuzzy
 msgid "% Evade"
 msgstr "% Välttö"
 
 #: src/net/tmwa/generalhandler.cpp:265
-#, fuzzy
 msgid "% Critical"
 msgstr "% Täysosuma"
 
@@ -5140,8 +5157,10 @@ msgstr "Viesti"
 
 #: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+"Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
 #: src/net/tmwa/playerhandler.cpp:353
 msgid "You are carrying less than half your weight. You can regain health."
@@ -5332,3 +5351,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:168
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
+
+
diff --git a/po/fr.po b/po/fr.po
index b32fe204e..5b7111edc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,24 +1,23 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
-#   <antoinebcn@hotmail.com>, 2011
-# Jumpy <antoinebcn@hotmail.com>, 2011
-# Bernard  <nard@bh28.net>, 2011
-# Andrei Karas <akaras@inbox.ru>, 2011
+# 
+#   <antoinebcn@hotmail.com>, 2011.
+# Jumpy <antoinebcn@hotmail.com>, 2011.
+# Bernard  <nard@bh28.net>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
-"PO-Revision-Date: 2011-06-07 00:00+0000\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"PO-Revision-Date: 2011-06-11 17:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
-"fr/)\n"
-"Language: fr\n"
+"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1030
@@ -33,7 +32,7 @@ msgstr "esquivé"
 msgid "miss"
 msgstr "raté"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
@@ -130,11 +129,11 @@ msgstr "Vous ne pouvez pas envoyer de messages vides."
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
-"\". Soit elle existe déjà, soit il s'agit de vous même."
+"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom "
+"\"%s\". Soit elle existe déjà, soit il s'agit de vous même."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -289,8 +288,7 @@ msgstr "Images des ressources non affectées :"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
 msgid "General"
@@ -863,6 +861,28 @@ msgstr "Entrée : %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Sortie : %d bytes/s"
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Fermer"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -884,14 +904,8 @@ msgstr "Retirer"
 msgid "Help"
 msgstr "Aide"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Fermer"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -1473,7 +1487,7 @@ msgstr "Entreposer tout"
 #: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
 #: src/gui/popupmenu.cpp:1693
 msgid "Drop all"
-msgstr ""
+msgstr "Jeter tout"
 
 #: src/gui/popupmenu.cpp:1574
 msgid "Retrieve 10"
@@ -1509,7 +1523,7 @@ msgstr "Remise aux valeurs de défaut de la barre jaune"
 
 #: src/gui/popupmenu.cpp:1785
 msgid "Copy to chat"
-msgstr ""
+msgstr "Copier dans la conversation"
 
 #: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
@@ -2509,8 +2523,8 @@ msgstr "Choisissez le nom de la guilde."
 #: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
-"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
-"dans une."
+"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà"
+" dans une."
 
 #: src/gui/socialwindow.cpp:1315
 #, c-format
@@ -3099,7 +3113,8 @@ msgid "Change"
 msgstr "Changer"
 
 #: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
@@ -3345,7 +3360,8 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
-msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr ""
+"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
@@ -3455,8 +3471,10 @@ msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -3528,13 +3546,13 @@ msgstr "Jet"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "YK"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "Le savez-vous ?"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr "Cfg"
 
@@ -3550,11 +3568,11 @@ msgstr "Changer de Compte"
 msgid "Choose World"
 msgstr "Choix du monde"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Entrepôt"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr "Sac"
 
@@ -3743,7 +3761,7 @@ msgstr "Fenêtre - Qui est en ligne ?"
 
 #: src/keyboardconfig.cpp:161
 msgid "Did you know Window"
-msgstr ""
+msgstr "Connaissiez-vous la fenêtre ?"
 
 #: src/keyboardconfig.cpp:164
 msgid "Previous Social Tab"
@@ -3934,7 +3952,7 @@ msgstr "Changer le mode caméra"
 
 #: src/keyboardconfig.cpp:336
 msgid "Modifier key"
-msgstr ""
+msgstr "Modifier la touche"
 
 #: src/keyboardconfig.cpp:408
 #, c-format
@@ -4099,7 +4117,8 @@ msgstr ""
 
 #: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr ""
+"      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:72
 msgid "     --safemode       : Start game in safe mode"
@@ -5180,10 +5199,11 @@ msgstr "Message"
 
 #: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
-"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
-"en mesure de regagner vos points de vie."
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus"
+" en mesure de regagner vos points de vie."
 
 #: src/net/tmwa/playerhandler.cpp:353
 msgid "You are carrying less than half your weight. You can regain health."
@@ -5379,3 +5399,5 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:168
 msgid "Unknown item"
 msgstr "Objet inconnu"
+
+
diff --git a/po/hr.po b/po/hr.po
index 9a499a7f2..410589687 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Podešavanje"
 
@@ -926,6 +926,30 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Zatvori"
+
+#: src/gui/didyouknowwindow.cpp:62
+#, fuzzy
+msgid "< Previous"
+msgstr "Prethodni"
+
+#: src/gui/didyouknowwindow.cpp:63
+#, fuzzy
+msgid "Next >"
+msgstr "Slijedeći"
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -947,14 +971,8 @@ msgstr "Skini opremu"
 msgid "Help"
 msgstr "Pomoć"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Zatvori"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Zalihe"
 
@@ -3754,7 +3772,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3773,11 +3791,11 @@ msgstr "Izmijeni"
 msgid "Choose World"
 msgstr "Izaberite vaš server"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Pohrana"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
@@ -6260,9 +6278,6 @@ msgstr "Nepoznati predmet"
 #~ msgid "Effect: %s"
 #~ msgstr "Učinak: %s"
 
-#~ msgid "Previous"
-#~ msgstr "Prethodni"
-
 #~ msgid "New"
 #~ msgstr "Novi"
 
diff --git a/po/hu.po b/po/hu.po
index fd18744a2..23860e9e2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Beállítások"
 
@@ -922,6 +922,30 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Bezár"
+
+#: src/gui/didyouknowwindow.cpp:62
+#, fuzzy
+msgid "< Previous"
+msgstr "Előző"
+
+#: src/gui/didyouknowwindow.cpp:63
+#, fuzzy
+msgid "Next >"
+msgstr "Következő"
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -943,14 +967,8 @@ msgstr "Nem használ"
 msgid "Help"
 msgstr "Súgó"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Bezár"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Táska"
 
@@ -3754,7 +3772,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3773,11 +3791,11 @@ msgstr "Változtatás"
 msgid "Choose World"
 msgstr "Válassz szervert"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Raktár"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
@@ -6328,9 +6346,6 @@ msgstr "Ismeretlen tárgy"
 #~ msgid "Effect: %s"
 #~ msgstr "Hatás: %s"
 
-#~ msgid "Previous"
-#~ msgstr "Előző"
-
 #~ msgid "New"
 #~ msgstr "Új"
 
diff --git a/po/it.po b/po/it.po
index 7d24e1637..73859a310 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,20 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
+#   <guglielmo__@hotmail.it>, 2011.
+# WildX <guglielmo__@hotmail.it>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
-"PO-Revision-Date: 2011-04-15 17:33+0000\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"PO-Revision-Date: 2011-06-11 17:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Italian <>\n"
-"Language: it\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1030
@@ -29,7 +31,7 @@ msgstr "Schivato"
 msgid "miss"
 msgstr "Mancato"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Impostazioni"
 
@@ -125,8 +127,8 @@ msgstr "Impossibile inviare un sussurro vuoto!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
 "sei tu."
@@ -265,14 +267,12 @@ msgid "Cache size:"
 msgstr ""
 
 #: src/commandhandler.cpp:1098
-#, fuzzy
 msgid "Created:"
-msgstr "Crea"
+msgstr ""
 
 #: src/commandhandler.cpp:1100
-#, fuzzy
 msgid "Deleted:"
-msgstr "Elimina"
+msgstr ""
 
 #: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
 msgid "Resource images:"
@@ -286,8 +286,8 @@ msgstr ""
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
-"\" (falso), \"1\", \"0\"."
+"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" "
+"(falso), \"1\", \"0\"."
 
 #: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
 msgid "General"
@@ -601,19 +601,16 @@ msgid "Change Email"
 msgstr "Cambia email"
 
 #: src/gui/charselectdialog.cpp:254
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Cambia la Password"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Cancellazione del personaggio fallita."
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:287
-#, fuzzy
 msgid "Enter password:"
-msgstr "Password:"
+msgstr ""
 
 #: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
@@ -732,14 +729,12 @@ msgid "Map"
 msgstr "Mappa"
 
 #: src/gui/debugwindow.cpp:71
-#, fuzzy
 msgid "Target"
-msgstr "Target:"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:72
-#, fuzzy
 msgid "Net"
-msgstr "Prossimo"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
 #: src/gui/debugwindow.cpp:249
@@ -767,9 +762,8 @@ msgid "Player Position:"
 msgstr "Posizione giocatore:"
 
 #: src/gui/debugwindow.cpp:152
-#, fuzzy
 msgid "Particle count:"
-msgstr "Effetti particelle"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
 #: src/gui/debugwindow.cpp:254
@@ -832,15 +826,13 @@ msgstr "Gilda del Target"
 
 #: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
 #: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
-#, fuzzy
 msgid "Attack delay:"
-msgstr "Attacco %+d"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
 #: src/gui/debugwindow.cpp:349
-#, fuzzy
 msgid "Minimal hit:"
-msgstr "Mini mappa:"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
 #: src/gui/debugwindow.cpp:350
@@ -849,14 +841,13 @@ msgstr ""
 
 #: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
 #: src/gui/debugwindow.cpp:351
-#, fuzzy
 msgid "Critical hit:"
-msgstr "Colpo critico"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
-#, fuzzy, c-format
+#, c-format
 msgid "Ping: %s ms"
-msgstr "Ping: %d ms"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:393
 #, c-format
@@ -868,6 +859,28 @@ msgstr "In: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Out: %d bytes/s"
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Chiudi"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -889,14 +902,8 @@ msgstr "Togli"
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Chiudi"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventario"
 
@@ -1031,9 +1038,9 @@ msgid "Reset timer"
 msgstr "Reset timer"
 
 #: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
-#, fuzzy, c-format
+#, c-format
 msgid "Level: %d at %f%%"
-msgstr "Livello: %d"
+msgstr ""
 
 #: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
 #, c-format
@@ -1042,62 +1049,60 @@ msgstr ""
 
 #: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
 #: src/gui/killstats.cpp:224
-#, fuzzy, c-format
+#, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr "exp, Mob Avg per l'1%: ?"
+msgstr ""
 
 #: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
 #: src/gui/killstats.cpp:233
-#, fuzzy, c-format
+#, c-format
 msgid "Kills: %s, total exp: %s"
-msgstr "Uccisioni: ?, Exp totale: ?"
+msgstr ""
 
 #: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
 #: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
-#, fuzzy, c-format
+#, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
-msgstr "Avg Exp: ?, N. di media mob per il livello successivo: ?"
+msgstr ""
 
 #: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
 #: src/gui/killstats.cpp:236
-#, fuzzy, c-format
+#, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr "Uccisioni al minuto: ?, Exp al minuto: ?"
+msgstr ""
 
 #: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
 #: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
 #: src/gui/killstats.cpp:322
-#, fuzzy, c-format
+#, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
-msgstr[0] "Velocità exp al minuto: ?"
-msgstr[1] "Velocità exp al minuto: ?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
-#, fuzzy, c-format
+#, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
-msgstr[0] "Tempo per il prossimo livello per 1 min: ?"
-msgstr[1] "Tempo per il prossimo livello per 1 min: ?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
-#, fuzzy
 msgid "Last kill exp:"
-msgstr "Exp dell'ultima uccisione: ?"
+msgstr ""
 
 #: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
 #: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
 #: src/gui/killstats.cpp:371
-#, fuzzy
 msgid "Time before jacko spawn:"
-msgstr "Tempo prima dell'apparizione di Jacko:"
+msgstr ""
 
 #: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
 #: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
 #: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
-#, fuzzy, c-format
+#, c-format
 msgid "  Time for next level: %s"
-msgstr "Tempo per il prossimo livello: %f"
+msgstr ""
 
 #: src/gui/killstats.cpp:360
 #, c-format
@@ -1259,18 +1264,16 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:355
 #: src/gui/popupmenu.cpp:596
-#, fuzzy
 msgid "Be friend"
-msgstr "Amico"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
 #: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:357
 #: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:382
 #: src/gui/popupmenu.cpp:598 src/gui/popupmenu.cpp:606
 #: src/gui/popupmenu.cpp:630
-#, fuzzy
 msgid "Disregard"
-msgstr "Disprezzato"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:155
 #: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:171
@@ -1286,9 +1289,8 @@ msgstr ""
 #: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
 #: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:622
 #: src/gui/popupmenu.cpp:628
-#, fuzzy
 msgid "Unignore"
-msgstr "Ignora"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
 #: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
@@ -1299,9 +1301,8 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:392
 #: src/gui/popupmenu.cpp:640
-#, fuzzy
 msgid "Follow"
-msgstr "Giallo"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:393
 #: src/gui/popupmenu.cpp:641
@@ -1309,38 +1310,32 @@ msgid "Imitation"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:200 src/gui/popupmenu.cpp:662
-#, fuzzy
 msgid "Invite to party"
-msgstr "@@party|Invita nel party@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:402
 #: src/gui/popupmenu.cpp:667
-#, fuzzy
 msgid "Kick from party"
-msgstr "@@kick party|Escludi dal party@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:413
 #: src/gui/popupmenu.cpp:681
-#, fuzzy
 msgid "Kick from guild"
-msgstr "@@guild-kick|Escludi dalla Gilda@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:415
 #: src/gui/popupmenu.cpp:683
-#, fuzzy
 msgid "Change pos in guild"
-msgstr "@@guild-pos|Cambia rango nella Gilda >@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:420
 #: src/gui/popupmenu.cpp:689
-#, fuzzy
 msgid "Invite to guild"
-msgstr "@@guild|Invita nella Gilda@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:236
-#, fuzzy
 msgid "Kick player"
-msgstr "Espulsione fallita!"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:238
 msgid "Nuke"
@@ -1364,37 +1359,33 @@ msgid "Remove from attack list"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:290
-#, fuzzy
 msgid "Add to priority attack list"
-msgstr "@@attack|Attacco@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:292
-#, fuzzy
 msgid "Add to attack list"
-msgstr "@@attack|Attacco@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:295
 msgid "Add to ignore list"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:431
-#, fuzzy
 msgid "Add name to chat"
-msgstr "@@name|Aggiungi il nome alla chat@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:457
-#, fuzzy
 msgid "Pick up"
-msgstr "Raccogli"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:1582
 #: src/gui/popupmenu.cpp:1662 src/gui/popupmenu.cpp:1705
 msgid "Add to chat"
-msgstr ""
+msgstr "Aggiungi alla chat"
 
 #: src/gui/popupmenu.cpp:475
 msgid "Map Item"
-msgstr ""
+msgstr "Oggetto mappa"
 
 #: src/gui/popupmenu.cpp:476
 msgid "Rename"
@@ -1411,7 +1402,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
 msgid "Spells"
-msgstr ""
+msgstr "Spells"
 
 #: src/gui/popupmenu.cpp:509
 msgid "Load old spells"
@@ -1423,11 +1414,11 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:536
 msgid "Disable highlight"
-msgstr ""
+msgstr "Disabilita highlight"
 
 #: src/gui/popupmenu.cpp:541
 msgid "Enable highlight"
-msgstr ""
+msgstr "Abilita highlight"
 
 #: src/gui/popupmenu.cpp:546
 msgid "Dont remove name"
@@ -1451,7 +1442,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:702
 msgid "Change guild position"
-msgstr ""
+msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: number of chars in string should be near original
 #: src/gui/popupmenu.cpp:1124
@@ -1461,7 +1452,7 @@ msgstr ""
 #. TRANSLATORS: number of chars in string should be near original
 #: src/gui/popupmenu.cpp:1126
 msgid "Name:                    "
-msgstr ""
+msgstr "Nome:"
 
 #: src/gui/popupmenu.cpp:1507
 msgid "Add to trade"
@@ -1481,41 +1472,40 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1530
 msgid "Store 10"
-msgstr ""
+msgstr "Salva 10"
 
 #: src/gui/popupmenu.cpp:1533
 msgid "Store half"
-msgstr ""
+msgstr "Salva metà"
 
 #: src/gui/popupmenu.cpp:1535
 msgid "Store all"
-msgstr ""
+msgstr "Salva tutto"
 
 #: src/gui/popupmenu.cpp:1553 src/gui/popupmenu.cpp:1650
 #: src/gui/popupmenu.cpp:1693
-#, fuzzy
 msgid "Drop all"
-msgstr "Lascia"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1574
 msgid "Retrieve 10"
-msgstr ""
+msgstr "Ritira 10"
 
 #: src/gui/popupmenu.cpp:1577
 msgid "Retrieve half"
-msgstr ""
+msgstr "Ritira metà"
 
 #: src/gui/popupmenu.cpp:1579
 msgid "Retrieve all"
-msgstr ""
+msgstr "Ritira tutto"
 
 #: src/gui/popupmenu.cpp:1610 src/gui/popupmenu.cpp:1666
 msgid "Load old item shortcuts"
-msgstr ""
+msgstr "Carica vecchie scorciatoie oggetti"
 
 #: src/gui/popupmenu.cpp:1709
 msgid "Load old drop shortcuts"
-msgstr ""
+msgstr "Carica vecchie scorciatoie drop"
 
 #: src/gui/popupmenu.cpp:1735 src/gui/popupmenu.cpp:1770
 msgid "Hide"
@@ -1535,23 +1525,20 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1802 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
-#, fuzzy
 msgid "(default)"
-msgstr "Predefinito"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1814 src/gui/popupmenu.cpp:1832
-#, fuzzy
 msgid "Move up"
-msgstr "Muoviti verso l'alto"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1819 src/gui/popupmenu.cpp:1837
-#, fuzzy
 msgid "Move down"
-msgstr "Muoviti verso il basso"
+msgstr ""
 
 #: src/gui/quitdialog.cpp:56
 msgid "Save state"
-msgstr ""
+msgstr "Salva stato"
 
 #: src/gui/quitdialog.cpp:57
 msgid "Switch server"
@@ -1595,7 +1582,7 @@ msgstr "Le password non corrispondono."
 
 #: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
-msgstr ""
+msgstr "Scegli il tuo server"
 
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
@@ -1603,77 +1590,77 @@ msgstr "Porta:"
 
 #: src/gui/serverdialog.cpp:247
 msgid "Use same ip for game sub servers"
-msgstr ""
+msgstr "Utilizzare lo stesso IP per i sub server di gioco"
 
 #: src/gui/serverdialog.cpp:261
 msgid "Server type:"
-msgstr ""
+msgstr "Tipo di server:"
 
 #: src/gui/serverdialog.cpp:285
 msgid "Load"
-msgstr ""
+msgstr "Carica"
 
 #: src/gui/serverdialog.cpp:286
 msgid "Connect"
-msgstr ""
+msgstr "Connetti"
 
 #: src/gui/serverdialog.cpp:287
 msgid "Custom Server"
-msgstr ""
+msgstr "Server personalizzati"
 
 #: src/gui/serverdialog.cpp:392
 msgid "Please type both the address and the port of a server."
-msgstr "Per favore inserisci l'indirizzo e la porta del server."
+msgstr "Inserire l'indirizzo e la porta del server."
 
 #: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "Downloading server list... %2.2f%%"
 
 #: src/gui/serverdialog.cpp:555
 msgid "Waiting for server..."
-msgstr ""
+msgstr "Attesa del server..."
 
 #: src/gui/serverdialog.cpp:559
 msgid "Preparing download"
-msgstr ""
+msgstr "Preparazione download"
 
 #: src/gui/serverdialog.cpp:563
 msgid "Error retreiving server list!"
-msgstr ""
+msgstr "Errore nel ricevimento della lista sei server!"
 
 #: src/gui/serverdialog.cpp:661
 msgid "requires a newer version"
-msgstr ""
+msgstr "Richiede una versione più nuova"
 
 #: src/gui/serverdialog.cpp:663
 #, c-format
 msgid "requires v%s"
-msgstr ""
+msgstr "Richiede v%s"
 
 #: src/gui/setup_audio.cpp:50
 msgid "Enable Audio"
-msgstr ""
+msgstr "Abilita audio"
 
 #: src/gui/setup_audio.cpp:51
 msgid "Enable game sfx"
-msgstr ""
+msgstr "Abilita game sfx"
 
 #: src/gui/setup_audio.cpp:52
 msgid "Enable gui sfx"
-msgstr ""
+msgstr "Abilita gui sfx"
 
 #: src/gui/setup_audio.cpp:53
 msgid "Enable music"
-msgstr ""
+msgstr "Abilita musica"
 
 #: src/gui/setup_audio.cpp:54
 msgid "Enable mumble voice chat"
-msgstr ""
+msgstr "Abilita chat vocale mumble"
 
 #: src/gui/setup_audio.cpp:56
 msgid "Download music"
-msgstr ""
+msgstr "Scarica musica"
 
 #: src/gui/setup_audio.cpp:61
 msgid "Audio"
@@ -1689,27 +1676,29 @@ msgstr "Volume musica"
 
 #: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr ""
+msgstr "Avviso"
 
 #: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
+"Potrebbe essere necessario riavviare il client se si desidera scaricare "
+"nuova musica"
 
 #: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
-msgstr ""
+msgstr "Ingenieria suono"
 
 #: src/gui/setup_chat.cpp:68
 msgid "Remove colors from received chat messages"
-msgstr ""
+msgstr "Rimuovi colori dei messaggi ricevuti in chat"
 
 #: src/gui/setup_chat.cpp:72
 msgid "Log magic messages in debug tab"
-msgstr ""
+msgstr "Salva i messaggi delle magie nella debug tab"
 
 #: src/gui/setup_chat.cpp:79
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
+msgstr "Autorizza i comandi delle magie e dei GM per tutte le tabelle di chat"
 
 #: src/gui/setup_chat.cpp:84
 msgid "Show server messages in debug tab"
@@ -1973,9 +1962,8 @@ msgid "Crazy Move A"
 msgstr ""
 
 #: src/gui/setup_other.cpp:297
-#, fuzzy
 msgid "Afk message"
-msgstr "Messaggio"
+msgstr ""
 
 #: src/gui/setup_players.cpp:65
 msgid "Relation"
@@ -2042,9 +2030,8 @@ msgid "Target dead players"
 msgstr ""
 
 #: src/gui/setup_players.cpp:325
-#, fuzzy
 msgid "Secure trades"
-msgstr "Accetta scambio"
+msgstr ""
 
 #: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
 msgid "Unsecure chars in names"
@@ -2075,9 +2062,8 @@ msgid "Help font"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:118
-#, fuzzy
 msgid "Secure font"
-msgstr "Accetta scambio"
+msgstr ""
 
 #: src/gui/setup_theme.cpp:241
 msgid "Theme Changed"
@@ -2456,23 +2442,20 @@ msgid "Nav"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:799
-#, fuzzy
 msgid "Atk"
-msgstr "Attacco"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:840
 msgid "Priority mobs"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:872
-#, fuzzy
 msgid "Attack mobs"
-msgstr "Attacco"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:907
-#, fuzzy
 msgid "Ignore mobs"
-msgstr "Ignora"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
@@ -3117,10 +3100,11 @@ msgid "Change"
 msgstr "Cambia"
 
 #: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
-"finestra."
+"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla"
+" finestra."
 
 #: src/gui/tradewindow.cpp:381
 msgid "You don't have enough money."
@@ -3467,7 +3451,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <giocatore>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -3546,7 +3531,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3562,11 +3547,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
@@ -3738,9 +3723,8 @@ msgid "Quick drop Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:152
-#, fuzzy
 msgid "Kill Stats Window"
-msgstr "Finestra degli Status"
+msgstr ""
 
 #: src/keyboardconfig.cpp:154
 msgid "Commands Window"
@@ -3826,14 +3810,12 @@ msgid "Next Chat Tab"
 msgstr "Scheda Chat Successiva"
 
 #: src/keyboardconfig.cpp:277
-#, fuzzy
 msgid "Previous chat line"
-msgstr "Scheda Chat Precedente"
+msgstr ""
 
 #: src/keyboardconfig.cpp:279
-#, fuzzy
 msgid "Next chat line"
-msgstr "Scheda Chat Successiva"
+msgstr ""
 
 #: src/keyboardconfig.cpp:281
 msgid "Chat Auto Complete"
@@ -4766,9 +4748,8 @@ msgid "This command causes the player to leave the guild."
 msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:112 src/net/tmwa/guildhandler.cpp:117
-#, fuzzy
 msgid "You are already in guild."
-msgstr "Errore durante la creazione della gilda."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:122
 msgid "Emperium check failed."
@@ -4899,7 +4880,8 @@ msgstr "Comando: /item <politica>"
 #: src/net/tmwa/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
-"Questo comando modifica la politica di condivisione degli oggetti nel gruppo."
+"Questo comando modifica la politica di condivisione degli oggetti nel "
+"gruppo."
 
 #: src/net/tmwa/gui/partytab.cpp:98
 msgid ""
@@ -5052,9 +5034,9 @@ msgid "Party successfully created."
 msgstr "Party creato con successo."
 
 #: src/net/tmwa/partyhandler.cpp:143
-#, fuzzy, c-format
+#, c-format
 msgid "%s has joined your party."
-msgstr "%s ha lasciato il tuo party."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:179
 #, c-format
@@ -5165,17 +5147,15 @@ msgstr "Messaggio"
 
 #: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
 "energie."
 
 #: src/net/tmwa/playerhandler.cpp:353
-#, fuzzy
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
-"Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
-"energie."
 
 #: src/net/tmwa/playerhandler.cpp:458
 #, c-format
@@ -5310,11 +5290,8 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:260
-#, fuzzy
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
-"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
-"finestra."
 
 #: src/net/tmwa/tradehandler.cpp:264
 msgid "Failed adding item for unknown reason."
@@ -5365,127 +5342,4 @@ msgstr "PM %+d"
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
-#, fuzzy
-#~ msgid "Time for Next level per %d min: %s"
-#~ msgstr "Tempo per il prossimo livello per 15 min:?"
-
-#~ msgid "Ping: ? ms"
-#~ msgstr "Ping: ? ms"
-
-#~ msgid "Level: "
-#~ msgstr "Livello: "
-
-#~ msgid "Exp: "
-#~ msgstr "Exp: "
-
-#~ msgid " Left: "
-#~ msgstr " Rimanente: "
-
-#~ msgid "Exp speed per 5 min: ?"
-#~ msgstr "Velocità di Exp per 5 min:?"
-
-#~ msgid "Time for next level per 5 min: ?"
-#~ msgstr "Tempo per il prossimo livello per 5 min: ?"
-
-#~ msgid "Exp speed per 15 min: ?"
-#~ msgstr "Exp velocità per 15 min: ?"
-
-#~ msgid "Time before jacko spawn: ?"
-#~ msgstr "Tempo prima dell'apparizione di JackO"
-
-#~ msgid "Exp Speed per 1 min: %d"
-#~ msgstr "Exp Speed per 1 min: %d"
-
-#~ msgid "  Time For Next Level: ?"
-#~ msgstr "Tempo per il prossimo livello: ?"
-
-#~ msgid "Exp Speed per 5 min: %d"
-#~ msgstr "Exp Speed per 5 minuti: %d"
-
-#~ msgid "Exp Speed per 15 min: %d"
-#~ msgstr "Exp Speed per 15 min: %d"
-
-#~ msgid "Time before jacko spawn: jacko alive"
-#~ msgstr "Tempo prima dell'apparizione di Jacko: Jacko è vivo!"
-
-#~ msgid "?"
-#~ msgstr "?"
-
-#~ msgid "Time before jacko spawn: jacko spawning"
-#~ msgstr "Tempo prima dell'apparizione di JackO: JackO sta arrivando."
-
-#~ msgid "Cursor: (%d, %d)"
-#~ msgstr "Cursore: (%d, %d)"
-
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Scambio@@"
-
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Attacco@@"
-
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@whisper|Sussurro@@"
-
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@heal|Cura@@"
-
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Disprezza@@"
-
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|Ignora@@"
-
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@erase|Rimuovi dallo schermo@@"
-
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Annulla ignoro@@"
-
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Ignora completamente@@"
-
-#~ msgid "@@follow|Follow@@"
-#~ msgstr "@@follow|Segui@@"
-
-#~ msgid "@@imitation|Imitation@@"
-#~ msgstr "@@imitation|Imita@@"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Espelli giocatore@@"
-
-#~ msgid "@@nuke|Nuke@@"
-#~ msgstr "@@nuke|Elimina completamente dallo schermo@@"
-
-#~ msgid "@@move|Move@@"
-#~ msgstr "@@move|Move@@"
-
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@undress|Svesti@@"
-
-#~ msgid "@@buy|Buy@@"
-#~ msgstr "@@buy|Compra@@"
-
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@sell|Sell@@"
-
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@talk|Parla@@"
-
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Escludi@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Cancella@@"
-
-#~ msgid "@@player_%u|%s >@@"
-#~ msgstr "@@player_%u|%s >@@"
-
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Raccogli@@"
-
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Aggiungi alla chat@@"
 
-#, fuzzy
-#~ msgid "Selected mobs"
-#~ msgstr "Seleziona OK"
diff --git a/po/ja.po b/po/ja.po
index 733e49ab7..b4580eb3d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,16 +2,16 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
-#   <Necromong@inbox.ru>, 2011
-# Necromonger <Necromong@inbox.ru>, 2011
-# sn0w75 <ibenrunnin@gmail.com>, 2011
-# Andrei Karas <akaras@inbox.ru>, 2011
+#   <Necromong@inbox.ru>, 2011.
+# Necromonger <Necromong@inbox.ru>, 2011.
+# sn0w75 <ibenrunnin@gmail.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-07 02:56+0300\n"
-"PO-Revision-Date: 2011-06-07 00:00+0000\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"PO-Revision-Date: 2011-06-11 17:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -32,35 +32,35 @@ msgstr "ドッジ"
 msgid "miss"
 msgstr "ミス"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:97
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:854
+#: src/client.cpp:855
 msgid "Connecting to server"
 msgstr "サーバー通信中…"
 
-#: src/client.cpp:885
+#: src/client.cpp:886
 msgid "Logging in"
 msgstr "ログイン中…"
 
-#: src/client.cpp:918
+#: src/client.cpp:919
 msgid "Entering game world"
 msgstr "ゲームの世界に入る中"
 
-#: src/client.cpp:1010
+#: src/client.cpp:1011
 msgid "Requesting characters"
 msgstr "服：％d"
 
-#: src/client.cpp:1041
+#: src/client.cpp:1042
 msgid "Connecting to the game server"
 msgstr "ゲームサーバー通信中…"
 
-#: src/client.cpp:1051
+#: src/client.cpp:1052
 msgid "Changing game servers"
 msgstr "サーバーを入り替え中…"
 
-#: src/client.cpp:1086 src/client.cpp:1093 src/client.cpp:1230
+#: src/client.cpp:1087 src/client.cpp:1094 src/client.cpp:1231
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
 #: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
@@ -70,49 +70,49 @@ msgstr "サーバーを入り替え中…"
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1102
+#: src/client.cpp:1103
 msgid "Requesting registration details"
 msgstr "登録細目を要請中"
 
-#: src/client.cpp:1129
+#: src/client.cpp:1130
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1130
+#: src/client.cpp:1131
 msgid "Password changed successfully!"
 msgstr "パスワード変更成功！"
 
-#: src/client.cpp:1149
+#: src/client.cpp:1150
 msgid "Email Change"
 msgstr "メール変更"
 
-#: src/client.cpp:1150
+#: src/client.cpp:1151
 msgid "Email changed successfully!"
 msgstr "メール変更成功！"
 
-#: src/client.cpp:1170
+#: src/client.cpp:1171
 msgid "Unregister Successful"
 msgstr "登録解除成功"
 
-#: src/client.cpp:1171
+#: src/client.cpp:1172
 msgid "Farewell, come back any time..."
 msgstr "さよなら、いつでも戻ってね..."
 
-#: src/client.cpp:1360 src/client.cpp:1390 src/client.cpp:1434
+#: src/client.cpp:1361 src/client.cpp:1391 src/client.cpp:1435
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s は存在しないので作成することが不可能！終了中…"
 
-#: src/client.cpp:1563
+#: src/client.cpp:1564
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効なアップデートホスト:  %s"
 
-#: src/client.cpp:1597 src/client.cpp:1603
+#: src/client.cpp:1598 src/client.cpp:1604
 msgid "Error creating updates directory!"
 msgstr "更新フォルダの作成エラー"
 
-#: src/client.cpp:1624
+#: src/client.cpp:1625
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー： %s は存在しないので作成することが不可能！終了中…"
@@ -281,43 +281,43 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"。"
 
-#: src/game.cpp:236 src/gui/widgets/chattab.cpp:400
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:240 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:402
 msgid "Debug"
 msgstr "デバッグ"
 
-#: src/game.cpp:455
+#: src/game.cpp:464
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:463
+#: src/game.cpp:472
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存することに失敗しました！"
 
-#: src/game.cpp:502
+#: src/game.cpp:511
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:516
+#: src/game.cpp:525
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
-#: src/game.cpp:1034
+#: src/game.cpp:1043
 msgid "Ignoring incoming trade requests"
 msgstr "他人からのトレードリクエストを無視します。"
 
-#: src/game.cpp:1041
+#: src/game.cpp:1050
 msgid "Accepting incoming trade requests"
 msgstr "他人からのトレードリクエストを受け入れます。"
 
-#: src/game.cpp:1416
+#: src/game.cpp:1425
 msgid "Could Not Load Map"
 msgstr "マップをロードできませんでした"
 
-#: src/game.cpp:1417
+#: src/game.cpp:1426
 #, c-format
 msgid "Error while loading %s"
 msgstr "%sをロードしている間にエラーが起きました。"
@@ -401,7 +401,7 @@ msgstr "-"
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
 #: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "終了"
 
@@ -851,13 +851,35 @@ msgstr "入力: %d バイト/秒"
 msgid "Out: %d bytes/s"
 msgstr "出力: %d バイト/秒"
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "閉じる"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:73
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "装備"
 
@@ -872,14 +894,8 @@ msgstr "外す"
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "閉じる"
-
-#: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:75
-#: src/inventory.cpp:243
+#: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "アイテム"
 
@@ -952,7 +968,7 @@ msgstr "取り戻す"
 
 #: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1557
 #: src/gui/popupmenu.cpp:1654 src/gui/popupmenu.cpp:1697
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "落とす"
 
@@ -992,16 +1008,16 @@ msgstr ""
 msgid "Unknown."
 msgstr "不明."
 
-#: src/gui/itempopup.cpp:173 src/gui/itempopup.cpp:179
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
 msgid ", "
 msgstr "、　"
 
-#: src/gui/itempopup.cpp:189
+#: src/gui/itempopup.cpp:192
 #, c-format
 msgid "Weight: %s"
 msgstr "重力：%s"
 
-#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:68
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "殺人統計ウィンドウ"
 
@@ -1128,43 +1144,43 @@ msgstr "登録する"
 msgid "Change Server"
 msgstr "サーバーを変える"
 
-#: src/gui/ministatus.cpp:58
+#: src/gui/ministatus.cpp:59
 msgid "health bar"
 msgstr "健康"
 
-#: src/gui/ministatus.cpp:64
+#: src/gui/ministatus.cpp:65
 msgid "mana bar"
 msgstr "マナ"
 
-#: src/gui/ministatus.cpp:76
+#: src/gui/ministatus.cpp:77
 msgid "experience bar"
 msgstr "経験"
 
-#: src/gui/ministatus.cpp:82
+#: src/gui/ministatus.cpp:83
 msgid "job bar"
 msgstr "職"
 
-#: src/gui/ministatus.cpp:91
+#: src/gui/ministatus.cpp:92
 msgid "weight bar"
 msgstr "重量"
 
-#: src/gui/ministatus.cpp:94
+#: src/gui/ministatus.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:97
+#: src/gui/ministatus.cpp:98
 msgid "money bar"
 msgstr "金銭"
 
-#: src/gui/ministatus.cpp:100
+#: src/gui/ministatus.cpp:101
 msgid "arrows bar"
 msgstr "矢"
 
-#: src/gui/ministatus.cpp:103
+#: src/gui/ministatus.cpp:104
 msgid "status bar"
 msgstr "情勢"
 
-#: src/gui/ministatus.cpp:289 src/gui/ministatus.cpp:329
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
 msgid "Need"
 msgstr "必要"
 
@@ -1269,7 +1285,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:180
 #: src/gui/popupmenu.cpp:371 src/gui/popupmenu.cpp:384
 #: src/gui/popupmenu.cpp:616 src/gui/popupmenu.cpp:632
-#: src/playerrelations.cpp:407
+#: src/playerrelations.cpp:400
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -1374,7 +1390,7 @@ msgstr "取り去る"
 msgid "Load old outfits"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:95
+#: src/gui/popupmenu.cpp:507 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "呪文"
 
@@ -2312,35 +2328,35 @@ msgstr "取引要求"
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:240 src/gui/windowmenu.cpp:80
+#: src/gui/skilldialog.cpp:243 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "スキル"
 
-#: src/gui/skilldialog.cpp:251
+#: src/gui/skilldialog.cpp:254
 msgid "Up"
 msgstr "上げる"
 
-#: src/gui/skilldialog.cpp:304
+#: src/gui/skilldialog.cpp:307
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
-#: src/gui/skilldialog.cpp:380
+#: src/gui/skilldialog.cpp:383
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
-#: src/gui/skilldialog.cpp:392
+#: src/gui/skilldialog.cpp:395
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
-#: src/gui/skilldialog.cpp:456 src/gui/skilldialog.cpp:509
+#: src/gui/skilldialog.cpp:459 src/gui/skilldialog.cpp:512
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
-#: src/gui/skilldialog.cpp:501
+#: src/gui/skilldialog.cpp:504
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Lvl：%d (%+d)"
@@ -2437,7 +2453,7 @@ msgstr "ギルドを作成する"
 msgid "Create Party"
 msgstr "パーティを作る"
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:92
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "ソシアル"
 
@@ -2535,7 +2551,7 @@ msgstr "パーティ名"
 msgid "Choose your party's name."
 msgstr "パーティ名を選んでください"
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:87
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr "スペシアール"
 
@@ -3423,75 +3439,83 @@ msgid ""
 "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:64
+#: src/gui/windowmenu.cpp:65
 msgid "BC"
 msgstr "ボット"
 
-#: src/gui/windowmenu.cpp:64
+#: src/gui/windowmenu.cpp:65
 msgid "Bot checker"
 msgstr "ボットチェッカー"
 
-#: src/gui/windowmenu.cpp:66
+#: src/gui/windowmenu.cpp:67
 msgid "ONL"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:66
+#: src/gui/windowmenu.cpp:67
 msgid "Who is online"
 msgstr "誰がオンライン"
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:69
 msgid "KS"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:70
+#: src/gui/windowmenu.cpp:71
 msgid "Smilies"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:73
 msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:72
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "状態"
 
-#: src/gui/windowmenu.cpp:73
+#: src/gui/windowmenu.cpp:74
 msgid "EQU"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:75
+#: src/gui/windowmenu.cpp:76
 msgid "INV"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:80
+#: src/gui/windowmenu.cpp:81
 msgid "SKI"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:87
+#: src/gui/windowmenu.cpp:88
 msgid "SPE"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:92
+#: src/gui/windowmenu.cpp:93
 msgid "SOC"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:94
 msgid "SH"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:93
+#: src/gui/windowmenu.cpp:94
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: src/gui/windowmenu.cpp:95
+#: src/gui/windowmenu.cpp:96
 msgid "SP"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:96
+#: src/gui/windowmenu.cpp:97
 msgid "DR"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:97
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3507,11 +3531,11 @@ msgstr "ログインの変更"
 msgid "Choose World"
 msgstr "世界を選ぶ"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "保存"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr "荷馬車"
 
@@ -3617,7 +3641,7 @@ msgstr ""
 #: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
 #: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
 #: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:357
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "アイテムショートカット: %d"
@@ -3698,198 +3722,202 @@ msgstr ""
 msgid "Who Is Online Window"
 msgstr "オンライン・ウザー・ウインドウ"
 
-#: src/keyboardconfig.cpp:162
-msgid "Previous Social Tab"
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166 src/keyboardconfig.cpp:168
-#: src/keyboardconfig.cpp:170 src/keyboardconfig.cpp:172
-#: src/keyboardconfig.cpp:174 src/keyboardconfig.cpp:176
-#: src/keyboardconfig.cpp:178 src/keyboardconfig.cpp:180
-#: src/keyboardconfig.cpp:182 src/keyboardconfig.cpp:184
-#: src/keyboardconfig.cpp:186 src/keyboardconfig.cpp:188
-#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
-#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
-#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
-#: src/keyboardconfig.cpp:203 src/keyboardconfig.cpp:205
-#: src/keyboardconfig.cpp:207 src/keyboardconfig.cpp:209
-#: src/keyboardconfig.cpp:211 src/keyboardconfig.cpp:213
-#: src/keyboardconfig.cpp:215 src/keyboardconfig.cpp:218
-#: src/keyboardconfig.cpp:221 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:228
-#: src/keyboardconfig.cpp:230 src/keyboardconfig.cpp:232
-#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:236
-#: src/keyboardconfig.cpp:238 src/keyboardconfig.cpp:240
-#: src/keyboardconfig.cpp:242 src/keyboardconfig.cpp:245
-#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
-#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
-#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:257
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:352
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "スマイリーショートカット: %d"
 
-#: src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:261
 msgid "Wear Outfit"
 msgstr "服を着る"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:263
 msgid "Copy Outfit"
 msgstr "服をコピーする"
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:265
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr "トグルチャット"
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr "チャットを上にスクロールする"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr "チャットを下にスクロールする"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr "前のチャットタブ"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr "次のチャットタブ"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:277
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
+#: src/keyboardconfig.cpp:279
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Select OK"
 msgstr "OKを選択する"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Ignore input 1"
 msgstr "インプット１無視"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Ignore input 2"
 msgstr "インプット２無視"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Direct Up"
 msgstr "方向上"
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:293
 msgid "Direct Down"
 msgstr "方向下"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:295
 msgid "Direct Left"
 msgstr "方向 左"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Direct Right"
 msgstr "方向右"
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:298
 msgid "Crazy moves"
 msgstr "クレイジーに移動"
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:300
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:302
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:304
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:306
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:306
+#: src/keyboardconfig.cpp:308
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Use #itenplz spell"
 msgstr "#itenplz は呪文を使う"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Use magic attack"
 msgstr "魔法攻撃を使用"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:316
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:327
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "On / Off audio"
 msgstr "アウディオ　オン/オフ"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:406
+#: src/keyboardconfig.cpp:408
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -5240,19 +5268,19 @@ msgstr ""
 msgid "Failed adding item for unknown reason."
 msgstr "不明な理由でアイテム追加失敗"
 
-#: src/playerrelations.cpp:421
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr "'...'を表示する"
 
-#: src/playerrelations.cpp:441
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr "名前を瞬き"
 
-#: src/playerrelations.cpp:486
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr "フローティング'...'バブル"
 
-#: src/playerrelations.cpp:489
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr "フローティングバブル"
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index c0efca697..fd22f3588 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
+"POT-Creation-Date: 2011-06-11 20:15+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"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
@@ -854,6 +854,28 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -875,14 +897,8 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr ""
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr ""
 
@@ -3502,7 +3518,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3518,11 +3534,11 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 395709c5f..957660f8b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
@@ -921,6 +921,30 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Sluiten"
+
+#: src/gui/didyouknowwindow.cpp:62
+#, fuzzy
+msgid "< Previous"
+msgstr "Vorige"
+
+#: src/gui/didyouknowwindow.cpp:63
+#, fuzzy
+msgid "Next >"
+msgstr "Volgende"
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -942,14 +966,8 @@ msgstr "Afdoen"
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Sluiten"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -3752,7 +3770,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3771,11 +3789,11 @@ msgstr "Veranderen"
 msgid "Choose World"
 msgstr "Kies jouw server"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Opslag"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
@@ -6251,9 +6269,6 @@ msgstr "Onbekend voorwerp"
 #~ msgid "Effect: %s"
 #~ msgstr "Effect: %s"
 
-#~ msgid "Previous"
-#~ msgstr "Vorige"
-
 #~ msgid "New"
 #~ msgstr "Nieuw"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 893b2bf73..18d7af8f7 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -1,22 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011
-# Maarten Vanraes <maarten.vanraes@gmail.com>, 2011
+# 
+# Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011.
+# Maarten Vanraes <maarten.vanraes@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
-"PO-Revision-Date: 2011-06-07 00:00+0000\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"PO-Revision-Date: 2011-06-11 17:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
-"manaplus/team/nl_BE/)\n"
-"Language: nl_BE\n"
+"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/manaplus/team/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1030
@@ -31,7 +30,7 @@ msgstr "ontwijkt"
 msgid "miss"
 msgstr "mist"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
@@ -127,8 +126,8 @@ msgstr "Kan geen lege berichten sturen!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
 "bestaat, of het is jezelf."
@@ -285,8 +284,7 @@ msgstr ""
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
 msgid "General"
@@ -858,6 +856,28 @@ msgstr "Invoer: %d bytes/sec"
 msgid "Out: %d bytes/s"
 msgstr "Uitvoer: %d bytes/sec"
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Sluiten"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -879,14 +899,8 @@ msgstr "Afdoen"
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Sluiten"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventaris"
 
@@ -1421,7 +1435,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:567 src/gui/socialwindow.cpp:1035
 msgid "Leave"
-msgstr ""
+msgstr "Verlaat"
 
 #: src/gui/popupmenu.cpp:702
 msgid "Change guild position"
@@ -2266,21 +2280,21 @@ msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
 
 #: src/gui/setup_video.cpp:705
 msgid "Custom resolution (example: 1024x768)"
-msgstr ""
+msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
 #: src/gui/setup_video.cpp:706
 msgid "Enter new resolution:                "
-msgstr ""
+msgstr "Geef een nieuwe resolutie:                "
 
 #: src/gui/setup_video.cpp:721 src/gui/setup_video.cpp:726
 msgid "Screen Resolution Changed"
-msgstr ""
+msgstr "Scherm Resolutie is gewijzigd"
 
 #: src/gui/setup_video.cpp:724
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
-"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
-"resolutie"
+"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte"
+" resolutie"
 
 #: src/gui/setup_video.cpp:758
 msgid "Particle Effect Settings Changed."
@@ -2323,7 +2337,7 @@ msgstr "Handel aanvragen"
 #: src/gui/shopwindow.cpp:719
 #, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%s wilt %s %s ga je akkoord?"
 
 #: src/gui/skilldialog.cpp:243 src/gui/windowmenu.cpp:81
 msgid "Skills"
@@ -2365,12 +2379,12 @@ msgstr "Guild"
 #: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "gebruiker %s uitgenodigd in guild %s."
 
 #: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
-msgstr ""
+msgstr "Guild %s verlating aangevraagd."
 
 #: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
@@ -2379,16 +2393,16 @@ msgstr ""
 #: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "Wie zou u willen uitnodigen in guild %s?"
 
 #: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr ""
+msgstr "Verlaten Guild?"
 
 #: src/gui/socialwindow.cpp:198
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr ""
+msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
 #: src/gui/socialwindow.cpp:215 src/net/tmwa/gui/partytab.cpp:50
 msgid "Party"
@@ -2397,7 +2411,7 @@ msgstr "Groep"
 #: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
-msgstr ""
+msgstr "Gebruiker %s uitgenodigd in groep."
 
 #: src/gui/socialwindow.cpp:257
 #, c-format
@@ -2456,7 +2470,7 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:1034
 msgid "Invite"
-msgstr ""
+msgstr "Nodig uit"
 
 #: src/gui/socialwindow.cpp:1176
 #, c-format
@@ -2542,11 +2556,11 @@ msgstr ""
 
 #: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
-msgstr ""
+msgstr "Groep Naam"
 
 #: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
-msgstr ""
+msgstr "Kies uw groepsnaam."
 
 #: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
@@ -3085,10 +3099,11 @@ msgid "Change"
 msgstr "Veranderen"
 
 #: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
-"het venster."
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in"
+" het venster."
 
 #: src/gui/tradewindow.cpp:381
 msgid "You don't have enough money."
@@ -3439,7 +3454,8 @@ msgid "Command: /unignore <player>"
 msgstr "Commando: /unignore <speler>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -3518,7 +3534,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3528,17 +3544,17 @@ msgstr ""
 
 #: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr ""
+msgstr "Wijzig Login"
 
 #: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
@@ -4871,8 +4887,8 @@ msgid ""
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 "<beleid> kan een van de volgende zijn om voorwerpdeling in te schakelen: "
-"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no"
-"\", \"false\"."
+"\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", "
+"\"no\", \"false\"."
 
 #: src/net/tmwa/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -5137,7 +5153,8 @@ msgstr "Bericht"
 
 #: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
 "herstellen."
@@ -5331,3 +5348,5 @@ msgstr "Magie %+d"
 #: src/resources/itemdb.cpp:168
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
+
+
diff --git a/po/pl.po b/po/pl.po
index 5b40d7e71..f5e9a9c47 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Konfiguracja"
 
@@ -929,6 +929,30 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Zamknij"
+
+#: src/gui/didyouknowwindow.cpp:62
+#, fuzzy
+msgid "< Previous"
+msgstr "Poprzednia"
+
+#: src/gui/didyouknowwindow.cpp:63
+#, fuzzy
+msgid "Next >"
+msgstr "Następna"
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -950,14 +974,8 @@ msgstr "Zdejmij"
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Zamknij"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inwentarz"
 
@@ -3760,7 +3778,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3779,11 +3797,11 @@ msgstr "Zmień"
 msgid "Choose World"
 msgstr "Wybierz twój serwer"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Magazyn"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
@@ -6330,9 +6348,6 @@ msgstr "Nieznany przedmiot"
 #~ msgid "Effect: %s"
 #~ msgstr "Efekt: %s"
 
-#~ msgid "Previous"
-#~ msgstr "Poprzednia"
-
 #~ msgid "New"
 #~ msgstr "Nowa"
 
diff --git a/po/pt.po b/po/pt.po
index 7fa44606b..1a3d0de10 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,23 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
-#   <freya.df@gmail.com>, 2011
-# freya <freya.df@gmail.com>, 2011
-# Andrei Karas <akaras@inbox.ru>, 2011
+# 
+#   <freya.df@gmail.com>, 2011.
+# freya <freya.df@gmail.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
-"PO-Revision-Date: 2011-06-07 00:00+0000\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"PO-Revision-Date: 2011-06-11 17:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
-"pt/)\n"
-"Language: pt\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:1030
@@ -32,7 +31,7 @@ msgstr "desviou"
 msgid "miss"
 msgstr "errou"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
@@ -128,11 +127,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
-"já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
+" já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -286,8 +285,7 @@ msgstr "Recursos de imagens orfãos:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
 msgid "General"
@@ -859,6 +857,28 @@ msgstr "Entrada: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Fechar"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -880,14 +900,8 @@ msgstr "Desequipar"
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Fechar"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -3087,7 +3101,8 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3435,7 +3450,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -3515,7 +3531,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr "CON"
 
@@ -3531,11 +3547,11 @@ msgstr "Trocar Login"
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Armazém"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr "Carrinho"
 
@@ -4890,7 +4906,8 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr ""
+"Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:110
 msgid ""
@@ -4907,7 +4924,8 @@ msgstr "Comando: /exp"
 #: src/net/tmwa/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do "
+"grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:289
 msgid "Item sharing enabled."
@@ -5141,7 +5159,8 @@ msgstr "Mensagem"
 
 #: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
@@ -5336,3 +5355,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:168
 msgid "Unknown item"
 msgstr "Item desconhecido"
+
+
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7dd53d046..2b95b864c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,25 +1,24 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
-#   <alasmirt@gmail.com>, 2011
-#   <freya.df@gmail.com>, 2011
-# alastrim <alasmirt@gmail.com>, 2011
-# freya <freya.df@gmail.com>, 2011
-# Andrei Karas <akaras@inbox.ru>, 2011
+# 
+#   <alasmirt@gmail.com>, 2011.
+#   <freya.df@gmail.com>, 2011.
+# alastrim <alasmirt@gmail.com>, 2011.
+# freya <freya.df@gmail.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
-"PO-Revision-Date: 2011-06-07 00:00+0000\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"PO-Revision-Date: 2011-06-11 17:16+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
-"manaplus/team/pt_BR/)\n"
-"Language: pt_BR\n"
+"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/manaplus/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1030
@@ -34,7 +33,7 @@ msgstr "desviou"
 msgid "miss"
 msgstr "errou"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
@@ -130,11 +129,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
-"já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
+" já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -288,8 +287,7 @@ msgstr "Recurso de imagem orfão:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
 msgid "General"
@@ -861,6 +859,28 @@ msgstr "Entrada: %d bytes/s"
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Fechar"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -882,14 +902,8 @@ msgstr "Desequipar"
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Fechar"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventário"
 
@@ -3089,7 +3103,8 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3437,7 +3452,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -3517,7 +3533,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr "CON"
 
@@ -3533,11 +3549,11 @@ msgstr "Trocar Login"
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Armazém"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr "Carrinho"
 
@@ -4892,7 +4908,8 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr ""
+"Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:110
 msgid ""
@@ -4909,7 +4926,8 @@ msgstr "Comando: /exp"
 #: src/net/tmwa/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do "
+"grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:289
 msgid "Item sharing enabled."
@@ -5143,7 +5161,8 @@ msgstr "Mensagem"
 
 #: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
@@ -5338,3 +5357,5 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:168
 msgid "Unknown item"
 msgstr "Item desconhecido"
+
+
diff --git a/po/ru.po b/po/ru.po
index ec5d2f168..0abfbda8d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,24 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Necromonger <Necromong@inbox.ru>, 2011
-# Andrei Karas <akaras@inbox.ru>, 2011
+# 
+# Necromonger <Necromong@inbox.ru>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
-"PO-Revision-Date: 2011-06-07 00:05+0000\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
+"PO-Revision-Date: 2011-06-11 17:20+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
-"ru/)\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: src/actorspritemanager.cpp:1030
 msgid "Visible on map"
@@ -32,7 +30,7 @@ msgstr "уворот"
 msgid "miss"
 msgstr "промах"
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
@@ -128,11 +126,11 @@ msgstr "Нельзя отправлять пустые сообщения!"
 #: src/commandhandler.cpp:409
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
-"уже создана, или этот игрок вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
+" уже создана, или этот игрок вы сами."
 
 #: src/commandhandler.cpp:429
 #, c-format
@@ -291,9 +289,7 @@ msgstr "Удаленных изображений:"
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
-"\"0\"."
+msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
 
 #: src/game.cpp:244 src/gui/widgets/chattab.cpp:400
 msgid "General"
@@ -865,6 +861,28 @@ msgstr "Вх.: %d байт/сек."
 msgid "Out: %d bytes/s"
 msgstr "Исх.: %d байт/сек."
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr "Вы знаете?"
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Закрыть"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr "< Предыдущий"
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr "Следующий >"
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr "Автоматически открывать это окно"
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -886,14 +904,8 @@ msgstr "Снять"
 msgid "Help"
 msgstr "Помощь"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Закрыть"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Инвентарь"
 
@@ -2250,8 +2262,8 @@ msgstr "Нет"
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
-"удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
+" удалось!"
 
 #: src/gui/setup_video.cpp:541
 msgid ""
@@ -3097,7 +3109,8 @@ msgid "Change"
 msgstr "Сменить"
 
 #: src/gui/tradewindow.cpp:336
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3440,15 +3453,16 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
-"отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
+" отношений с ним."
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:65
@@ -3521,13 +3535,13 @@ msgstr "БР"
 
 #: src/gui/windowmenu.cpp:98
 msgid "YK"
-msgstr ""
+msgstr "ВЗ"
 
 #: src/gui/windowmenu.cpp:98
 msgid "Did you know"
-msgstr ""
+msgstr "Вы знаете?"
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr "SET"
 
@@ -3543,11 +3557,11 @@ msgstr "Сменить логин"
 msgid "Choose World"
 msgstr "Выберите сервер"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Хранилище"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr "Телега"
 
@@ -3736,7 +3750,7 @@ msgstr "Окно кто онлайн"
 
 #: src/keyboardconfig.cpp:161
 msgid "Did you know Window"
-msgstr ""
+msgstr "Окно \"Вы знаете?\""
 
 #: src/keyboardconfig.cpp:164
 msgid "Previous Social Tab"
@@ -4527,7 +4541,8 @@ msgstr "Неизвестная ошибка сервера чата."
 
 #: src/net/tmwa/charserverhandler.cpp:174
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+msgstr ""
+"Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
 #: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
 msgid "Wrong name."
@@ -4885,8 +4900,7 @@ msgstr "Команда изменяет политику разделения п
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr ""
-"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
+msgstr "<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
 
 #: src/net/tmwa/gui/partytab.cpp:101
 msgid "Command: /item"
@@ -4909,8 +4923,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий "
-"опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
+"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий"
+" опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
 
 #: src/net/tmwa/gui/partytab.cpp:113
 msgid "Command: /exp"
@@ -5149,7 +5163,8 @@ msgstr "Сообщение"
 
 #: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Вы несете груз больший, чем половина вашей грузоподъемности. Не удалось "
 "восстановить здоровье."
@@ -5344,3 +5359,5 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:168
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
+
+
diff --git a/po/sv.po b/po/sv.po
index cbf5f733c..b6f141ed3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-09 20:13+0300\n"
+"POT-Creation-Date: 2011-06-11 20:15+0300\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -32,7 +32,7 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:99
+#: src/client.cpp:776 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Inställningar"
 
@@ -922,6 +922,30 @@ msgstr ""
 msgid "Out: %d bytes/s"
 msgstr ""
 
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:528 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Stäng"
+
+#: src/gui/didyouknowwindow.cpp:62
+#, fuzzy
+msgid "< Previous"
+msgstr "Föregående"
+
+#: src/gui/didyouknowwindow.cpp:63
+#, fuzzy
+msgid "Next >"
+msgstr "Nästa"
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr ""
+
 #: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
 #: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
 #: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
@@ -943,14 +967,8 @@ msgstr "Avrusta"
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/gui/helpwindow.cpp:57 src/gui/inventorywindow.cpp:174
-#: src/gui/npcdialog.cpp:53 src/gui/popupmenu.cpp:528
-#: src/gui/shopwindow.cpp:111
-msgid "Close"
-msgstr "Stäng"
-
 #: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:243
+#: src/inventory.cpp:246
 msgid "Inventory"
 msgstr "Inventarium"
 
@@ -3758,7 +3776,7 @@ msgstr ""
 msgid "Did you know"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:99
+#: src/gui/windowmenu.cpp:100
 msgid "SET"
 msgstr ""
 
@@ -3777,11 +3795,11 @@ msgstr "Ändra"
 msgid "Choose World"
 msgstr "Välj din server"
 
-#: src/inventory.cpp:245
+#: src/inventory.cpp:248
 msgid "Storage"
 msgstr "Lagring"
 
-#: src/inventory.cpp:247
+#: src/inventory.cpp:250
 msgid "Cart"
 msgstr ""
 
@@ -6334,9 +6352,6 @@ msgstr "Okänt föremål"
 #~ msgid "Effect: %s"
 #~ msgstr "Effekt: %s"
 
-#~ msgid "Previous"
-#~ msgstr "Föregående"
-
 #~ msgid "New"
 #~ msgstr "Ny"
 
diff --git a/src/client.cpp b/src/client.cpp
index b87398a0e..02b4dc3af 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1079,6 +1079,8 @@ int Client::exec()
                     mCurrentDialog = NULL;
 
                     logger->log1("State: GAME");
+                    if (Net::getGeneralHandler())
+                        Net::getGeneralHandler()->reloadPartially();
                     game = new Game;
                     break;
 
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index 447acfe01..b9f6edbf6 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -75,7 +75,7 @@ DidYouKnowWindow::DidYouKnowWindow():
     mBrowserBox->setEnableImages(true);
 
     place(0, 0, mScrollArea, 5, 3).setPadding(3);
-    place(0, 3, mOpenAgainCheckBox);
+    place(0, 3, mOpenAgainCheckBox, 5);
     place(1, 4, mButtonPrev, 1);
     place(2, 4, mButtonNext, 1);
     place(4, 4, okButton);
diff --git a/src/main.h b/src/main.h
index b93d363d4..b6c2b858c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -91,8 +91,8 @@
 //define DEBUG_ALPHA_CACHE 1
 //define DEBUG_OPENGL_LEAKS 1
 
-#define SMALL_VERSION "1.1.5.29"
-#define CHECK_VERSION "01.01.05.29"
+#define SMALL_VERSION "1.1.6.12"
+#define CHECK_VERSION "01.01.06.12"
 
 
 #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \
diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h
index f24b6db7f..4d68faffc 100644
--- a/src/net/generalhandler.h
+++ b/src/net/generalhandler.h
@@ -44,6 +44,8 @@ class GeneralHandler
         virtual void flushNetwork() = 0;
 
         virtual void clearHandlers() = 0;
+        virtual void reloadPartially() = 0;
+
 };
 
 } // namespace Net
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 6957d4cb4..7c95033a8 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -209,4 +209,7 @@ void GeneralHandler::event(Mana::Channels channel,
     }
 }
 
+void GeneralHandler::reloadPartially()
+{
+}
 } // namespace ManaServ
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index 946f7d631..17e45947a 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -48,6 +48,8 @@ class GeneralHandler : public Net::GeneralHandler, public Mana::Listener
 
         void reload();
 
+        void reloadPartially();
+
         void unload();
 
         void flushNetwork();
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 9ee8e7a23..c6d98c60b 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -203,6 +203,11 @@ void GeneralHandler::reload()
     static_cast<PartyHandler*>(mPartyHandler.get())->reload();
 }
 
+void GeneralHandler::reloadPartially()
+{
+    static_cast<PartyHandler*>(mPartyHandler.get())->reload();
+}
+
 void GeneralHandler::unload()
 {
     if (mNetwork)
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 516db76c5..bccde03cb 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -61,6 +61,8 @@ class GeneralHandler : public MessageHandler, public Net::GeneralHandler,
 
         void event(Mana::Channels channel, const Mana::Event &event);
 
+        void reloadPartially();
+
     protected:
         MessageHandlerPtr mAdminHandler;
         MessageHandlerPtr mBeingHandler;
author	Aline Ferraz <freya.df@gmail.com>	2011-06-12 14:03:02 -0300
committer	Aline Ferraz <freya.df@gmail.com>	2011-06-12 14:03:02 -0300
commit	a1f01bc3c10d0bf79a617f469247499ed53ddf5e (patch)
tree	54b3b8d5207ca7a47efac138751d14acfc99b1ad
parent	0a9ff93c5bc314ff76a41d104c901349cb037179 (diff)
parent	aaea79df0b87ec528e02743c4324429b20a413ed (diff)
download	manaplus-a1f01bc3c10d0bf79a617f469247499ed53ddf5e.tar.gz manaplus-a1f01bc3c10d0bf79a617f469247499ed53ddf5e.tar.bz2 manaplus-a1f01bc3c10d0bf79a617f469247499ed53ddf5e.tar.xz manaplus-a1f01bc3c10d0bf79a617f469247499ed53ddf5e.zip