summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/POTFILES.in2
-rw-r--r--po/ca.po33
-rw-r--r--po/cs.po43
-rw-r--r--po/de.po73
-rw-r--r--po/eo.po73
-rw-r--r--po/es.po75
-rw-r--r--po/fi.po37
-rw-r--r--po/fr.po75
-rw-r--r--po/id.po40
-rw-r--r--po/it.po43
-rw-r--r--po/ja.po40
-rw-r--r--po/manaplus.pot31
-rw-r--r--po/nl.po40
-rw-r--r--po/nl_BE.po40
-rw-r--r--po/pl.po43
-rw-r--r--po/pt.po43
-rw-r--r--po/pt_BR.po73
-rw-r--r--po/ru.po73
-rw-r--r--po/sr.po33
-rw-r--r--po/sv.po43
-rw-r--r--po/sv_SE.po43
-rw-r--r--po/tr.po43
-rw-r--r--po/uk.po46
-rw-r--r--po/zh_CN.po37
-rw-r--r--po/zh_HK.po36
25 files changed, 544 insertions, 614 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 908416ccf..05d244d3c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -194,7 +194,7 @@ src/resources/skill/skilltypelist.h
src/unittests/catch.hpp
src/unittests/doctest.h
src/unittests/endian.cc
-src/unittests/gui/windowmanager_unittest.cc
+src/unittests/gui/windowmanager.cc
src/utils/booleanoptions.h
src/utils/gettext.h
src/utils/stringutils.cpp
diff --git a/po/ca.po b/po/ca.po
index 927e0f3c9..c59aa14d0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
"ca/)\n"
@@ -618,7 +618,7 @@ msgstr "Ajuda"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -630,7 +630,7 @@ msgid "Connecting to server"
msgstr "Connectant al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Iniciant sessió"
@@ -7153,14 +7153,14 @@ msgstr "Per a:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7171,7 +7171,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7181,36 +7181,36 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
msgstr ""
@@ -7224,6 +7224,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9649,7 +9650,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Objecte desconegut"
diff --git a/po/cs.po b/po/cs.po
index 053015df5..ec9ea57f4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
"cs/)\n"
@@ -623,7 +623,7 @@ msgstr "Nápověda"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -635,7 +635,7 @@ msgid "Connecting to server"
msgstr "Připojuji se k serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Přihlašuji se"
@@ -7172,14 +7172,14 @@ msgstr "Komu:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7190,7 +7190,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7200,40 +7200,38 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Vytvořit předměty"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Zaměřit monstrum"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7245,6 +7243,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9674,7 +9673,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Neznámý předmět"
@@ -11032,9 +11031,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Sdílení předmětů povoleno."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/de.po b/po/de.po
index 22c358493..8b89cf24f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -42,8 +42,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
"de/)\n"
@@ -654,7 +654,7 @@ msgstr "Hilfe"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -666,7 +666,7 @@ msgid "Connecting to server"
msgstr "Verbinde zum Server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Anmelden"
@@ -7348,14 +7348,14 @@ msgstr "Nach:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr "Betreff:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr "Geld:"
@@ -7366,7 +7366,7 @@ msgstr "Gegenstand:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr "Nachricht:"
@@ -7376,40 +7376,38 @@ msgid "empty subject"
msgstr "leerer Betreff"
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr "Nachricht anschauen"
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Gegenstände erstellen"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr "Anhang herausnehmen"
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr "Antworten"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr "Zeit:"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr "Von:"
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Monster anvisieren"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7421,6 +7419,7 @@ msgstr "Aktualisieren"
msgid "New"
msgstr "Neu"
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9857,7 +9856,7 @@ msgstr "Verbleibend %s Vermietungszeit für Gegenstand %s."
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Unbekannter Gegenstand"
@@ -11212,45 +11211,39 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:858
-#, fuzzy
msgid "Item attach failed. Weight too big."
-msgstr "Anhängen des Gegenstandes ist fehlgeschlagen."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:862
-#, fuzzy
msgid "Item attach failed. Fatal error."
-msgstr "Anhängen des Gegenstandes ist fehlgeschlagen."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:866
-#, fuzzy
msgid "Item attach failed. No more space."
-msgstr "Anhängen des Gegenstandes ist fehlgeschlagen."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:870
-#, fuzzy
msgid "Item attach failed. Item on tradeable."
-msgstr "Anhängen des Gegenstandes ist fehlgeschlagen."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:874
-#, fuzzy
msgid "Item attach failed. Unknown error."
-msgstr "Anhängen des Gegenstandes ist fehlgeschlagen."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Gegenstand suchen ist fehlgeschlagen."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
-#, fuzzy
msgid "Mail send failed. Fatal error."
-msgstr "Nachricht senden ist fehlgeschlagen."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:886
@@ -11259,9 +11252,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:890
-#, fuzzy
msgid "Mail send failed. Wrong attach found."
-msgstr "Beitreten fehlgeschlagen. Falsche Rasse."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:894
@@ -11270,9 +11262,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:898
-#, fuzzy
msgid "Error on getting attach. No space or weight too high."
-msgstr "Fehler beim erfolgreichen Anhängen des Anhangs."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:902
@@ -11281,15 +11272,13 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:906
-#, fuzzy
msgid "Error on getting money attach."
-msgstr "Fehler beim erfolgreichen Anhängen des Anhangs."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:910
-#, fuzzy
msgid "Error on getting money attach. Too many money."
-msgstr "Fehler beim erfolgreichen Anhängen des Anhangs."
+msgstr ""
#. TRANSLATORS: skill level
#: src/resources/skill/skillinfo.cpp:113
diff --git a/po/eo.po b/po/eo.po
index 7644013bc..17d50a16f 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-22 06:00+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Esperanto (http://www.transifex.com/akaras/manaplus/language/"
"eo/)\n"
@@ -620,7 +620,7 @@ msgstr "Helpo"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -632,7 +632,7 @@ msgid "Connecting to server"
msgstr "Konektanta al servilo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Ensalutanta"
@@ -7280,14 +7280,14 @@ msgstr "Al:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr "Temo:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr "Mono:"
@@ -7298,7 +7298,7 @@ msgstr "Objekto:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr "Mesaĝo:"
@@ -7308,40 +7308,38 @@ msgid "empty subject"
msgstr "malplena temo"
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr "Montri poŝton"
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Krei objektojn"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr "Akiri aldonaĵon"
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr "Respondi"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr "Tempo:"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr "De:"
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Celi monstron"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7353,6 +7351,7 @@ msgstr "Aktualigi"
msgid "New"
msgstr "Nova"
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9784,7 +9783,7 @@ msgstr "Restas %s luotempo por objekto %s."
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Nekonata objekto"
@@ -11119,45 +11118,39 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:858
-#, fuzzy
msgid "Item attach failed. Weight too big."
-msgstr "Malsukcesis kunsendi objekton."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:862
-#, fuzzy
msgid "Item attach failed. Fatal error."
-msgstr "Malsukcesis kunsendi objekton."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:866
-#, fuzzy
msgid "Item attach failed. No more space."
-msgstr "Malsukcesis kunsendi objekton."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:870
-#, fuzzy
msgid "Item attach failed. Item on tradeable."
-msgstr "Malsukcesis kunsendi objekton."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:874
-#, fuzzy
msgid "Item attach failed. Unknown error."
-msgstr "Malsukcesis kunsendi objekton."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Malsukcesis serĉi objekton."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
-#, fuzzy
msgid "Mail send failed. Fatal error."
-msgstr "Malsukcesis sendi mesaĝon."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:886
@@ -11166,9 +11159,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:890
-#, fuzzy
msgid "Mail send failed. Wrong attach found."
-msgstr "Malsukcesis aliĝi al babilĉambro. Malĝusta raso."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:894
@@ -11177,9 +11169,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:898
-#, fuzzy
msgid "Error on getting attach. No space or weight too high."
-msgstr "Eraro ricevante kunsednaĝon."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:902
@@ -11188,15 +11179,13 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:906
-#, fuzzy
msgid "Error on getting money attach."
-msgstr "Eraro ricevante kunsednaĝon."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:910
-#, fuzzy
msgid "Error on getting money attach. Too many money."
-msgstr "Eraro ricevante kunsednaĝon."
+msgstr ""
#. TRANSLATORS: skill level
#: src/resources/skill/skillinfo.cpp:113
diff --git a/po/es.po b/po/es.po
index f2347ea77..5a180f6ad 100644
--- a/po/es.po
+++ b/po/es.po
@@ -29,9 +29,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-22 03:13+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65@gmail.com>\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
"es/)\n"
"Language: es\n"
@@ -640,7 +640,7 @@ msgstr "Ayuda"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -652,7 +652,7 @@ msgid "Connecting to server"
msgstr "Conectando al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Accediendo a la cuenta"
@@ -7334,14 +7334,14 @@ msgstr "Para:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr "Asunto:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr "Dinero:"
@@ -7352,7 +7352,7 @@ msgstr "Artículo:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr "Mensaje:"
@@ -7362,40 +7362,38 @@ msgid "empty subject"
msgstr "asunto vacío"
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr "Ver correo"
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Crear artículos"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr "Adjuntar"
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr "Contestar"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr "Tiempo:"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr "De:"
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Apuntar monstruo"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7407,6 +7405,7 @@ msgstr "Recargar"
msgid "New"
msgstr "Nuevo"
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9844,7 +9843,7 @@ msgstr "Falta %s de tiempo de renta para el artículo %s."
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Elemento desconocido"
@@ -11188,45 +11187,39 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:858
-#, fuzzy
msgid "Item attach failed. Weight too big."
-msgstr "Falló el adjuntar artículo."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:862
-#, fuzzy
msgid "Item attach failed. Fatal error."
-msgstr "Falló el adjuntar artículo."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:866
-#, fuzzy
msgid "Item attach failed. No more space."
-msgstr "Falló el adjuntar artículo."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:870
-#, fuzzy
msgid "Item attach failed. Item on tradeable."
-msgstr "Falló el adjuntar artículo."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:874
-#, fuzzy
msgid "Item attach failed. Unknown error."
-msgstr "Falló el adjuntar artículo."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Búsqueda de artículos fallida."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
-#, fuzzy
msgid "Mail send failed. Fatal error."
-msgstr "Falló el envío de mensaje."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:886
@@ -11235,9 +11228,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:890
-#, fuzzy
msgid "Mail send failed. Wrong attach found."
-msgstr "Error al unirse a la sala. Raza equivocada."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:894
@@ -11246,9 +11238,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:898
-#, fuzzy
msgid "Error on getting attach. No space or weight too high."
-msgstr "Error al adjuntar con éxito."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:902
@@ -11257,15 +11248,13 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:906
-#, fuzzy
msgid "Error on getting money attach."
-msgstr "Error al adjuntar con éxito."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:910
-#, fuzzy
msgid "Error on getting money attach. Too many money."
-msgstr "Error al adjuntar con éxito."
+msgstr ""
#. TRANSLATORS: skill level
#: src/resources/skill/skillinfo.cpp:113
diff --git a/po/fi.po b/po/fi.po
index ace917fa0..64a436818 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
"fi/)\n"
@@ -617,7 +617,7 @@ msgstr "Apua"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -629,7 +629,7 @@ msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Kirjaudun sisään"
@@ -7149,14 +7149,14 @@ msgstr "Vastaanottaja:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7167,7 +7167,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7177,36 +7177,36 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
msgstr ""
@@ -7220,6 +7220,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9646,7 +9647,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Tuntematon tavara"
@@ -11005,9 +11006,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Saaliinjako käytössä."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/fr.po b/po/fr.po
index fb8e0c67b..a02e36562 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -30,9 +30,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-26 10:26+0000\n"
-"Last-Translator: Alige\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
"fr/)\n"
"Language: fr\n"
@@ -643,7 +643,7 @@ msgstr "Aide"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -655,7 +655,7 @@ msgid "Connecting to server"
msgstr "Connexion au serveur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Connexion"
@@ -7354,14 +7354,14 @@ msgstr "Vers :"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr "Sujet :"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr "Argent :"
@@ -7372,7 +7372,7 @@ msgstr "Objet :"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr "Message:"
@@ -7382,40 +7382,38 @@ msgid "empty subject"
msgstr "sujet vide"
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr "Lire tes mails"
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Créer des objets"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr "Ajouter une pièce jointe"
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr "Réponse"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr "Heure :"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr "De :"
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Monstre visé"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7427,6 +7425,7 @@ msgstr "Rafraîchir"
msgid "New"
msgstr "Nouveau"
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9868,7 +9867,7 @@ msgstr "Il reste %s de temps restant pour l'emprunt de l'objet %s."
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Objet inconnu"
@@ -11219,45 +11218,39 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:858
-#, fuzzy
msgid "Item attach failed. Weight too big."
-msgstr "Échec de l'ajout d'objet."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:862
-#, fuzzy
msgid "Item attach failed. Fatal error."
-msgstr "Échec de l'ajout d'objet."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:866
-#, fuzzy
msgid "Item attach failed. No more space."
-msgstr "Échec de l'ajout d'objet."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:870
-#, fuzzy
msgid "Item attach failed. Item on tradeable."
-msgstr "Échec de l'ajout d'objet."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:874
-#, fuzzy
msgid "Item attach failed. Unknown error."
-msgstr "Échec de l'ajout d'objet."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "La recherche d'objets a échoué."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
-#, fuzzy
msgid "Mail send failed. Fatal error."
-msgstr "Echec de l'envoi du message."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:886
@@ -11266,9 +11259,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:890
-#, fuzzy
msgid "Mail send failed. Wrong attach found."
-msgstr "Tu ne peux pas rejoindre ce salon: race incorrecte."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:894
@@ -11277,9 +11269,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:898
-#, fuzzy
msgid "Error on getting attach. No space or weight too high."
-msgstr "Erreur lors de l'obtention d'attacher avec succès."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:902
@@ -11288,15 +11279,13 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:906
-#, fuzzy
msgid "Error on getting money attach."
-msgstr "Erreur lors de l'obtention d'attacher avec succès."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:910
-#, fuzzy
msgid "Error on getting money attach. Too many money."
-msgstr "Erreur lors de l'obtention d'attacher avec succès."
+msgstr ""
#. TRANSLATORS: skill level
#: src/resources/skill/skillinfo.cpp:113
diff --git a/po/id.po b/po/id.po
index 30a59c134..4fe4445c9 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
"id/)\n"
@@ -621,7 +621,7 @@ msgstr "Bantuan"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -633,7 +633,7 @@ msgid "Connecting to server"
msgstr "Terhubung ke server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Masuk"
@@ -7148,14 +7148,14 @@ msgstr "Kepada:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7166,7 +7166,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7176,37 +7176,36 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Proteksi item"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
msgstr ""
@@ -7220,6 +7219,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9643,7 +9643,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr ""
@@ -11001,9 +11001,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Berbagi item diaktifkan."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/it.po b/po/it.po
index c552d0050..0068b5fe1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
"it/)\n"
@@ -628,7 +628,7 @@ msgstr "Aiuto"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -640,7 +640,7 @@ msgid "Connecting to server"
msgstr "Connessione al server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Accesso all'account"
@@ -7175,14 +7175,14 @@ msgstr "A:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7193,7 +7193,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7203,40 +7203,38 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Ignora oggetti"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Seleziona nemico"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7248,6 +7246,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9677,7 +9676,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Oggetto sconosciuto"
@@ -11035,9 +11034,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Gestione in comune oggetti attivata."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/ja.po b/po/ja.po
index f1d84c1a6..04204ae02 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
"ja/)\n"
@@ -621,7 +621,7 @@ msgstr "ヘルプ"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -633,7 +633,7 @@ msgid "Connecting to server"
msgstr "サーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "ログインしています"
@@ -7152,14 +7152,14 @@ msgstr "宛先:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7170,7 +7170,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7180,39 +7180,38 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "モブをターゲット"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7224,6 +7223,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9653,7 +9653,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "不明なアイテム"
@@ -11011,9 +11011,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "アイテム共有モード有効."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/manaplus.pot b/po/manaplus.pot
index c7809be78..693d175a9 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: 2017-08-27 01:44+0300\n"
+"POT-Creation-Date: 2017-08-30 01:33+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"
@@ -615,7 +615,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -627,7 +627,7 @@ msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr ""
@@ -7143,14 +7143,14 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7161,7 +7161,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7171,36 +7171,36 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
msgstr ""
@@ -7214,6 +7214,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9637,7 +9638,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 122fb1a97..2ba18bf05 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
"language/nl_BE/)\n"
@@ -619,7 +619,7 @@ msgstr "Help"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -631,7 +631,7 @@ msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Inloggen"
@@ -7155,14 +7155,14 @@ msgstr "Aan:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7173,7 +7173,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7183,37 +7183,36 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "verkoop voorwerp"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
msgstr ""
@@ -7227,6 +7226,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9656,7 +9656,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Onbekend voorwerp"
@@ -11015,9 +11015,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Voorwerpdeling ingeschakeld."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 122fb1a97..2ba18bf05 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
"language/nl_BE/)\n"
@@ -619,7 +619,7 @@ msgstr "Help"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -631,7 +631,7 @@ msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Inloggen"
@@ -7155,14 +7155,14 @@ msgstr "Aan:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7173,7 +7173,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7183,37 +7183,36 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "verkoop voorwerp"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
msgstr ""
@@ -7227,6 +7226,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9656,7 +9656,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Onbekend voorwerp"
@@ -11015,9 +11015,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Voorwerpdeling ingeschakeld."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/pl.po b/po/pl.po
index 1db11f2fc..925b78d45 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
"pl/)\n"
@@ -629,7 +629,7 @@ msgstr "Pomoc"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -641,7 +641,7 @@ msgid "Connecting to server"
msgstr "Łączenie z serwerem"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Logowanie"
@@ -7178,14 +7178,14 @@ msgstr "Do:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7196,7 +7196,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7206,40 +7206,38 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Utwórz przedmioty"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Naceluj potwora"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7251,6 +7249,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9678,7 +9677,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Nieznany przedmiot"
@@ -11040,9 +11039,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Włączono dzielenie się przedmiotami."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/pt.po b/po/pt.po
index 3be6ad24b..63b1856aa 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
"pt/)\n"
@@ -621,7 +621,7 @@ msgstr "Ajuda"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -633,7 +633,7 @@ msgid "Connecting to server"
msgstr "Conectando ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Efetuando login"
@@ -7169,14 +7169,14 @@ msgstr "Para:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7187,7 +7187,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7197,40 +7197,38 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Ignorar itens"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Monstro alvo"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7242,6 +7240,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9670,7 +9669,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Item desconhecido"
@@ -11029,9 +11028,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Compartilhamento de itens habilitado."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 928cab647..5816a7ca1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -27,8 +27,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
"language/pt_BR/)\n"
@@ -639,7 +639,7 @@ msgstr "Ajuda"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -651,7 +651,7 @@ msgid "Connecting to server"
msgstr "Conectando-se ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Fazendo login"
@@ -7322,14 +7322,14 @@ msgstr "Para:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr "Assunto:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr "Dinheiro:"
@@ -7340,7 +7340,7 @@ msgstr "Item:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr "Mensagem:"
@@ -7350,40 +7350,38 @@ msgid "empty subject"
msgstr "assunto vazio"
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr "Exibir e-mail"
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Criar itens"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr "Se apegue"
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr "Responder"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr "Hora:"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr "De:"
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Monstro alvo"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7395,6 +7393,7 @@ msgstr "Atualizar"
msgid "New"
msgstr "Novo"
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9826,7 +9825,7 @@ msgstr "Faltam %s tempo de aluguel pelo item %s."
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Item desconhecido"
@@ -11167,45 +11166,39 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:858
-#, fuzzy
msgid "Item attach failed. Weight too big."
-msgstr "A anexação do item falhou."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:862
-#, fuzzy
msgid "Item attach failed. Fatal error."
-msgstr "A anexação do item falhou."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:866
-#, fuzzy
msgid "Item attach failed. No more space."
-msgstr "A anexação do item falhou."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:870
-#, fuzzy
msgid "Item attach failed. Item on tradeable."
-msgstr "A anexação do item falhou."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:874
-#, fuzzy
msgid "Item attach failed. Unknown error."
-msgstr "A anexação do item falhou."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Procura de itens falhada."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
-#, fuzzy
msgid "Mail send failed. Fatal error."
-msgstr "A mensagem não foi enviada."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:886
@@ -11214,9 +11207,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:890
-#, fuzzy
msgid "Mail send failed. Wrong attach found."
-msgstr "Sua entrada na sala falhou. Corrida errada."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:894
@@ -11225,9 +11217,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:898
-#, fuzzy
msgid "Error on getting attach. No space or weight too high."
-msgstr "Erro ao anexar com sucesso."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:902
@@ -11236,15 +11227,13 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:906
-#, fuzzy
msgid "Error on getting money attach."
-msgstr "Erro ao anexar com sucesso."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:910
-#, fuzzy
msgid "Error on getting money attach. Too many money."
-msgstr "Erro ao anexar com sucesso."
+msgstr ""
#. TRANSLATORS: skill level
#: src/resources/skill/skillinfo.cpp:113
diff --git a/po/ru.po b/po/ru.po
index 2c76ccc02..289d656da 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
"ru/)\n"
@@ -635,7 +635,7 @@ msgstr "Помощь"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -647,7 +647,7 @@ msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Авторизация"
@@ -7205,14 +7205,14 @@ msgstr "Для:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr "Заголовок:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr "Деньги:"
@@ -7223,7 +7223,7 @@ msgstr "Премет:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr "Сообщение:"
@@ -7233,40 +7233,38 @@ msgid "empty subject"
msgstr "пустой заголовок"
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr "Просмотр почтового сообщения"
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Создание предметов"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr "Получить вложение"
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr "Ответить"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr "Время:"
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr "От:"
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Выделение монстра"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7278,6 +7276,7 @@ msgstr "Обновить"
msgid "New"
msgstr "Новое"
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9708,7 +9707,7 @@ msgstr "Осталось %s арендного времени для %s."
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Неизвестный предмет"
@@ -11046,45 +11045,39 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:858
-#, fuzzy
msgid "Item attach failed. Weight too big."
-msgstr "Ошибка прикрепления предмета."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:862
-#, fuzzy
msgid "Item attach failed. Fatal error."
-msgstr "Ошибка прикрепления предмета."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:866
-#, fuzzy
msgid "Item attach failed. No more space."
-msgstr "Ошибка прикрепления предмета."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:870
-#, fuzzy
msgid "Item attach failed. Item on tradeable."
-msgstr "Ошибка прикрепления предмета."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:874
-#, fuzzy
msgid "Item attach failed. Unknown error."
-msgstr "Ошибка прикрепления предмета."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Предмет не найден."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
-#, fuzzy
msgid "Mail send failed. Fatal error."
-msgstr "Ошибка отправки сообщения."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:886
@@ -11093,9 +11086,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:890
-#, fuzzy
msgid "Mail send failed. Wrong attach found."
-msgstr "Ошибка входа в комнату. Неправильная расса."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:894
@@ -11104,9 +11096,8 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:898
-#, fuzzy
msgid "Error on getting attach. No space or weight too high."
-msgstr "Ошибка получения вложения."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:902
@@ -11115,15 +11106,13 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:906
-#, fuzzy
msgid "Error on getting money attach."
-msgstr "Ошибка получения вложения."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:910
-#, fuzzy
msgid "Error on getting money attach. Too many money."
-msgstr "Ошибка получения вложения."
+msgstr ""
#. TRANSLATORS: skill level
#: src/resources/skill/skillinfo.cpp:113
diff --git a/po/sr.po b/po/sr.po
index c7b4d7d71..b9878dfa7 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
"sr/)\n"
@@ -619,7 +619,7 @@ msgstr "Pomoć"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -631,7 +631,7 @@ msgid "Connecting to server"
msgstr "Povezivanje sa serverom"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Prijavljivanje"
@@ -7151,14 +7151,14 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7169,7 +7169,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7179,36 +7179,36 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
msgstr ""
@@ -7222,6 +7222,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9645,7 +9646,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 6dfd43c4e..194ffd1ce 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
"language/sv_SE/)\n"
@@ -616,7 +616,7 @@ msgstr "Hjälp"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -628,7 +628,7 @@ msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Loggar in"
@@ -7161,14 +7161,14 @@ msgstr "Till:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7179,7 +7179,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7189,40 +7189,38 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Skapa items"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Targeta monster"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7234,6 +7232,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9664,7 +9663,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Okänt item"
@@ -11022,9 +11021,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Item-delning aktiverad."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 6dfd43c4e..194ffd1ce 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
"language/sv_SE/)\n"
@@ -616,7 +616,7 @@ msgstr "Hjälp"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -628,7 +628,7 @@ msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Loggar in"
@@ -7161,14 +7161,14 @@ msgstr "Till:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7179,7 +7179,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7189,40 +7189,38 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Skapa items"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Targeta monster"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7234,6 +7232,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9664,7 +9663,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Okänt item"
@@ -11022,9 +11021,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Item-delning aktiverad."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/tr.po b/po/tr.po
index 8692d7d15..7f13b7ec0 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
"tr/)\n"
@@ -618,7 +618,7 @@ msgstr "Yardım"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -630,7 +630,7 @@ msgid "Connecting to server"
msgstr "Sunucuya bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Giriş yapılıyor"
@@ -7153,14 +7153,14 @@ msgstr "Alıcı:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7171,7 +7171,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7181,40 +7181,38 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Nesneleri görmezden gel"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Canavarı hedef al"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7226,6 +7224,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9651,7 +9650,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Bilinmeyen nesne"
@@ -11009,9 +11008,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Nesne paylaşımı etkinleştirildi."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/uk.po b/po/uk.po
index 1a713ab05..a356613db 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
"uk/)\n"
@@ -622,7 +622,7 @@ msgstr "Довідка"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -634,7 +634,7 @@ msgid "Connecting to server"
msgstr "Очікування відповіді сервера"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "Авторизація..."
@@ -7168,14 +7168,14 @@ msgstr "Для:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7186,7 +7186,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7196,40 +7196,38 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "Створення предметів"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
-msgstr "Вибрати моба"
+msgstr ""
#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:69
@@ -7241,6 +7239,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9666,7 +9665,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "Невідомий предмет"
@@ -11019,15 +11018,14 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:874
-#, fuzzy
msgid "Item attach failed. Unknown error."
-msgstr "Невідома помилка відлову улюбленця: %d."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "Розподіл предметів увімкнено."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a66962fb1..2bfb93143 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
"language/zh_CN/)\n"
@@ -622,7 +622,7 @@ msgstr "帮助"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -634,7 +634,7 @@ msgid "Connecting to server"
msgstr "正在连接服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "登录中"
@@ -7148,14 +7148,14 @@ msgstr "至:"
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7166,7 +7166,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7176,36 +7176,36 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
msgstr ""
@@ -7219,6 +7219,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9644,7 +9645,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr "未知物品"
@@ -11002,9 +11003,9 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:878
-#, fuzzy, c-format
+#, c-format
msgid "Item %s remove failed."
-msgstr "物品共享开启."
+msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:882
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 2622a58be..0a1193817 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2017-08-27 01:44+0300\n"
-"PO-Revision-Date: 2017-08-20 01:25+0000\n"
+"POT-Creation-Date: 2017-08-30 01:33+0300\n"
+"PO-Revision-Date: 2017-08-27 01:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
"language/zh_HK/)\n"
@@ -616,7 +616,7 @@ msgstr "說明"
#: src/gui/popups/popupmenu.cpp:1184 src/gui/windows/didyouknowwindow.cpp:84
#: src/gui/windows/inventorywindow.cpp:274
#: src/gui/windows/inventorywindow.cpp:297
-#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:70
+#: src/gui/windows/maileditwindow.cpp:59 src/gui/windows/mailviewwindow.cpp:62
#: src/gui/windows/npcdialog.cpp:88 src/gui/windows/npcdialog.cpp:133
#: src/gui/windows/questswindow.cpp:80 src/gui/windows/shopwindow.cpp:111
msgid "Close"
@@ -628,7 +628,7 @@ msgid "Connecting to server"
msgstr "正在連接到伺服器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1154 src/unittests/gui/windowmanager_unittest.cc:806
+#: src/client.cpp:1154 src/unittests/gui/windowmanager.cc:806
msgid "Logging in"
msgstr "正在登入"
@@ -7142,14 +7142,14 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:83
+#: src/gui/windows/maileditwindow.cpp:65 src/gui/windows/mailviewwindow.cpp:75
msgid "Subject:"
msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:120
-#: src/gui/windows/mailviewwindow.cpp:273
+#: src/gui/windows/maileditwindow.cpp:67 src/gui/windows/mailviewwindow.cpp:112
+#: src/gui/windows/mailviewwindow.cpp:265
msgid "Money:"
msgstr ""
@@ -7160,7 +7160,7 @@ msgstr ""
#. TRANSLATORS: mail edit window label
#. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:86
+#: src/gui/windows/maileditwindow.cpp:71 src/gui/windows/mailviewwindow.cpp:78
msgid "Message:"
msgstr ""
@@ -7170,37 +7170,36 @@ msgid "empty subject"
msgstr ""
#. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:53
msgid "View mail"
msgstr ""
#. TRANSLATORS: mail view attach / items button
-#: src/gui/windows/mailviewwindow.cpp:66
-#, fuzzy
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get items"
-msgstr "保護物件"
+msgstr ""
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:58
msgid "Get attach"
msgstr ""
#. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:74
+#: src/gui/windows/mailviewwindow.cpp:66
msgid "Reply"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:76
+#: src/gui/windows/mailviewwindow.cpp:68
msgid "Time:"
msgstr ""
#. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:80
+#: src/gui/windows/mailviewwindow.cpp:72
msgid "From:"
msgstr ""
#. TRANSLATORS: mail view attached money button
-#: src/gui/windows/mailviewwindow.cpp:131
+#: src/gui/windows/mailviewwindow.cpp:123
msgid "Get money"
msgstr ""
@@ -7214,6 +7213,7 @@ msgstr ""
msgid "New"
msgstr ""
+#. TRANSLATORS: mail window button
#: src/gui/windows/mailwindow.cpp:76
msgid "Get old"
msgstr ""
@@ -9637,7 +9637,7 @@ msgstr ""
#. TRANSLATORS: unknown item name
#. TRANSLATORS: item name
#: src/net/eathena/inventoryrecv.cpp:1228
-#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:200
+#: src/net/eathena/inventoryrecv.cpp:1361 src/net/eathena/mail2recv.cpp:193
#: src/resources/db/itemdb.cpp:199
msgid "Unknown item"
msgstr ""