summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-18 14:35:27 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-18 14:35:27 +0300
commitd6f5ef3a01f792c441f21e0649a9541d10b89415 (patch)
tree3d9d78787a5fd46a29619cdf53c8bf06b9312b21
parent21f4d82b367750543ebfbc65df23e0863bf48c38 (diff)
downloadmv-d6f5ef3a01f792c441f21e0649a9541d10b89415.tar.gz
mv-d6f5ef3a01f792c441f21e0649a9541d10b89415.tar.bz2
mv-d6f5ef3a01f792c441f21e0649a9541d10b89415.tar.xz
mv-d6f5ef3a01f792c441f21e0649a9541d10b89415.zip
Update translations.
-rw-r--r--po/POTFILES.in2
-rw-r--r--po/ca.po82
-rw-r--r--po/cs.po83
-rw-r--r--po/de.po83
-rw-r--r--po/es.po83
-rw-r--r--po/fi.po82
-rw-r--r--po/fr.po83
-rw-r--r--po/id.po82
-rw-r--r--po/it.po83
-rw-r--r--po/ja.po83
-rw-r--r--po/manaplus.pot82
-rw-r--r--po/nl.po82
-rw-r--r--po/nl_BE.po82
-rw-r--r--po/pl.po83
-rw-r--r--po/pt.po83
-rw-r--r--po/pt_BR.po83
-rw-r--r--po/ru.po83
-rw-r--r--po/sv.po82
-rw-r--r--po/sv_SE.po82
-rw-r--r--po/tr.po82
-rw-r--r--po/uk.po83
-rw-r--r--po/zh_CN.po82
22 files changed, 1021 insertions, 714 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 27c3e82b5..466ebbb1c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -73,6 +73,7 @@ src/gui/widgets/tabs/socialpartytab.h
src/gui/widgets/tabs/socialpickuptab.h
src/gui/widgets/tabs/socialplayerstab.h
src/gui/widgets/tabs/socialtabbase.h
+src/gui/windowmanager_unittest.cc
src/gui/windowmenu.cpp
src/gui/windows/bankwindow.cpp
src/gui/windows/buydialog.cpp
@@ -93,6 +94,7 @@ src/gui/windows/eggselectiondialog.cpp
src/gui/windows/emotewindow.cpp
src/gui/windows/equipmentwindow.cpp
src/gui/windows/helpwindow.cpp
+src/gui/windows/insertcarddialog.cpp
src/gui/windows/inventorywindow.cpp
src/gui/windows/itemamountwindow.cpp
src/gui/windows/killstats.cpp
diff --git a/po/ca.po b/po/ca.po
index 5336a2122..5d3c8a0fa 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-25 11:56+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/"
@@ -34,7 +34,7 @@ msgstr "Arxiu enviat"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -534,7 +534,7 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -546,32 +546,32 @@ msgid "Close"
msgstr "Tancar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Connectant al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Iniciant sessió"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Entrant al mon de joc"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Sol·licitant personatges"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Connectant al servidor de joc"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Canviant servidors de joc"
@@ -585,7 +585,7 @@ msgstr "Canviant servidors de joc"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -602,37 +602,37 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Sol·licitant detalls de registre"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Canvi de contrasenya"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Contrasenya canviada amb èxit!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Canvi de correu"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Correu canviat amb èxit!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Registre anul·lat amb èxit"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Adéu, torna quan vulguis..."
@@ -672,7 +672,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "General"
@@ -1610,11 +1610,16 @@ msgid "Cancel"
msgstr "Cancel·lar"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Pes: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2764,7 +2769,7 @@ msgstr "Max"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preu: %s / Total: %s"
@@ -5063,7 +5068,7 @@ msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5176,7 +5181,7 @@ msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5476,7 +5481,7 @@ msgstr "Canviar contrasenya"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Contrasenya:"
@@ -5518,7 +5523,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Nom:"
@@ -5850,6 +5855,20 @@ msgstr ""
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+msgid "Insert card"
+msgstr ""
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr ""
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6070,18 +6089,18 @@ msgid "Custom update host"
msgstr "Servidor d'actualització personalitzat"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Servidor:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr ""
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr ""
@@ -7320,11 +7339,6 @@ msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr ""
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr ""
@@ -8896,7 +8910,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sense nom"
@@ -8974,7 +8988,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Objecte desconegut"
diff --git a/po/cs.po b/po/cs.po
index 16007c643..3deed9b75 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
@@ -39,7 +39,7 @@ msgstr "Soubor byl uploadován"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -539,7 +539,7 @@ msgstr "Nápověda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -551,32 +551,32 @@ msgid "Close"
msgstr "Zavřít"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Přihlašuji se"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Vyžaduji postavy"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Vyměňuji herní servery"
@@ -590,7 +590,7 @@ msgstr "Vyměňuji herní servery"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -607,37 +607,37 @@ msgid "Error"
msgstr "Chyba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Požaduji registrační detaily"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Změna hesla"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Změna emailu"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Zrušení registrace úspěšné"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Nashledanou, vraťte se kdykoli..."
@@ -677,7 +677,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Obecný"
@@ -1616,11 +1616,16 @@ msgid "Cancel"
msgstr "Zrušit"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Váha: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2771,7 +2776,7 @@ msgstr "Vše"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Cena: %s / Celkem %s"
@@ -5075,7 +5080,7 @@ msgid "Ignore mobs"
msgstr "Ignorovat monstra"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr "Přátelé: %u/%u"
@@ -5188,7 +5193,7 @@ msgid "Ignore items"
msgstr "Ignoruj věci"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr "Viditelní hráči: %d"
@@ -5488,7 +5493,7 @@ msgstr "Změnit heslo"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Heslo:"
@@ -5530,7 +5535,7 @@ msgstr "Nová postava"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Jméno:"
@@ -5867,6 +5872,21 @@ msgstr "Písma"
msgid "Did you know..."
msgstr "Věděl jsi že..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "Insert"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "Insert"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6089,18 +6109,18 @@ msgid "Custom update host"
msgstr "Vlastní host updatů"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Server:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Host updatu: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Otevřít registrační url"
@@ -7342,11 +7362,6 @@ msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "Insert"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "Tab"
@@ -8925,7 +8940,7 @@ msgstr "Moderní OpenGL"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "nepojmenovaný"
@@ -9003,7 +9018,7 @@ msgid "Flee %s"
msgstr "Útěk %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Neznámý předmět"
diff --git a/po/de.po b/po/de.po
index d506a0cd8..b68d13c37 100644
--- a/po/de.po
+++ b/po/de.po
@@ -33,7 +33,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-05-25 01:33+0000\n"
"Last-Translator: Suni <kristin.joris@gmail.com>\n"
"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
@@ -58,7 +58,7 @@ msgstr "Datei hochgeladen"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -559,7 +559,7 @@ msgstr "Hilfe"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -571,32 +571,32 @@ msgid "Close"
msgstr "Schließen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Verbinde zum Server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Anmelden"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Spielfiguren werden abgefragt"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Verbinde zum Spielserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Spielserver wechseln"
@@ -610,7 +610,7 @@ msgstr "Spielserver wechseln"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -627,37 +627,37 @@ msgid "Error"
msgstr "Fehler"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Passwort ändern"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "E-Mail ändern"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Erfolgreich abgemeldet."
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komme jeder Zeit wieder..."
@@ -697,7 +697,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Allgemein"
@@ -1639,11 +1639,16 @@ msgid "Cancel"
msgstr "Abbrechen"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Gewicht: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2795,7 +2800,7 @@ msgstr "Max"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preis: %s / Gesamt: %s"
@@ -5106,7 +5111,7 @@ msgid "Ignore mobs"
msgstr "Monster ignorieren"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr "Freunde: %u/%u"
@@ -5219,7 +5224,7 @@ msgid "Ignore items"
msgstr "Gegenstände ignorieren"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr "Sichtbare Spieler: %d"
@@ -5519,7 +5524,7 @@ msgstr "Passwort ändern"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Passwort:"
@@ -5561,7 +5566,7 @@ msgstr "Neuer Charakter"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Name:"
@@ -5898,6 +5903,21 @@ msgstr "Schriften"
msgid "Did you know..."
msgstr "Wusstest Du schon..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "Einfügen"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "Einfügen"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6118,18 +6138,18 @@ msgid "Custom update host"
msgstr "Benutzerdefinierter Updateserver"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Server:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Updateserver: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Registrierungslink öffnen"
@@ -7373,11 +7393,6 @@ msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "Einfügen"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "Tab"
@@ -8961,7 +8976,7 @@ msgstr "Modernes OpenGL"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "Unbenannt"
@@ -9039,7 +9054,7 @@ msgid "Flee %s"
msgstr "Fliehen %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Unbekannter Gegenstand"
diff --git a/po/es.po b/po/es.po
index 6cb897958..7bf2a1b7a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-25 22:40+0000\n"
"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
@@ -46,7 +46,7 @@ msgstr "Archivo subido"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -546,7 +546,7 @@ msgstr "Ayuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -558,32 +558,32 @@ msgid "Close"
msgstr "Cerrar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Conectando al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Accediendo a la cuenta"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Cargando personajes"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
@@ -597,7 +597,7 @@ msgstr "Cambiando servidores del juego"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -614,37 +614,37 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Cambio de contraseña"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Cambio de Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Registro cancelado"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
@@ -684,7 +684,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd archivoOrigen archivoDestino"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "General"
@@ -1625,11 +1625,16 @@ msgid "Cancel"
msgstr "Cancelar"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Peso: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2781,7 +2786,7 @@ msgstr "Máx"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Precio: %s / Total: %s"
@@ -5088,7 +5093,7 @@ msgid "Ignore mobs"
msgstr "Criaturas ignoradas"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr "Amigos: %u/%u"
@@ -5201,7 +5206,7 @@ msgid "Ignore items"
msgstr "Ignorar Items"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr "Jugadores visibles: %d"
@@ -5505,7 +5510,7 @@ msgstr "Cambiar contraseña"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Contraseña:"
@@ -5547,7 +5552,7 @@ msgstr "Nuevo Personaje"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Nombre:"
@@ -5885,6 +5890,21 @@ msgstr "Fuentes"
msgid "Did you know..."
msgstr "¿Sabías que..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "Insert"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "Insert"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6105,18 +6125,18 @@ msgid "Custom update host"
msgstr "Host de actualización personalizado"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Servidor:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Host de actualización: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Abrir url de registro"
@@ -7362,11 +7382,6 @@ msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "Insert"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "Tab"
@@ -8949,7 +8964,7 @@ msgstr "OpenGL Moderno"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "anónimo"
@@ -9027,7 +9042,7 @@ msgid "Flee %s"
msgstr "Escaparse %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Elemento desconocido"
diff --git a/po/fi.po b/po/fi.po
index d8ffb6185..e56b9e826 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
@@ -34,7 +34,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -533,7 +533,7 @@ msgstr "Apua"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -545,32 +545,32 @@ msgid "Close"
msgstr "Sulje"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Kirjaudun sisään"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
@@ -584,7 +584,7 @@ msgstr "Vaihdan pelipalvelinta"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -601,37 +601,37 @@ msgid "Error"
msgstr "Virhe"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Salasanan vaihto"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Sähköpostin vaihto"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
@@ -671,7 +671,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Yleiset"
@@ -1609,11 +1609,16 @@ msgid "Cancel"
msgstr "Peru"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Paino: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2764,7 +2769,7 @@ msgstr "Max"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Hinta: %s / Kaikkiaan: %s"
@@ -5059,7 +5064,7 @@ msgid "Ignore mobs"
msgstr "Ohitettavat kohteet"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5172,7 +5177,7 @@ msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5472,7 +5477,7 @@ msgstr "Vaihda salasana"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Salasana:"
@@ -5514,7 +5519,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Nimi:"
@@ -5846,6 +5851,20 @@ msgstr ""
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+msgid "Insert card"
+msgstr ""
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr ""
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6066,18 +6085,18 @@ msgid "Custom update host"
msgstr "Käytä omaa päivityspalvelinta"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Palvelin:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr ""
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr ""
@@ -7317,11 +7336,6 @@ msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr ""
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr ""
@@ -8897,7 +8911,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "nimetön"
@@ -8975,7 +8989,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Tuntematon tavara"
diff --git a/po/fr.po b/po/fr.po
index 7c9b66eea..10473657b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-26 23:49+0000\n"
"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
@@ -46,7 +46,7 @@ msgstr "Fichier mis en ligne"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -548,7 +548,7 @@ msgstr "Aide"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -560,32 +560,32 @@ msgid "Close"
msgstr "Fermer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Connexion au serveur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Connexion"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Entrée dans le monde de jeu"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
@@ -599,7 +599,7 @@ msgstr "Changement de serveur de jeu"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -616,37 +616,37 @@ msgid "Error"
msgstr "Erreur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Changement de mot de passe"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Changer d'e-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Désinscription réussie"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "À bientôt, Revenez quand vous voulez..."
@@ -687,7 +687,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Général"
@@ -1630,11 +1630,16 @@ msgid "Cancel"
msgstr "Annuler"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Poids : %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2786,7 +2791,7 @@ msgstr "Max."
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prix : %s / Total : %s"
@@ -5101,7 +5106,7 @@ msgid "Ignore mobs"
msgstr "Ignorer les monstres"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr "Amis : %u/%u"
@@ -5214,7 +5219,7 @@ msgid "Ignore items"
msgstr "Ignorer les objets"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr "Joueurs visibles : %d"
@@ -5514,7 +5519,7 @@ msgstr "Changer le mot de passe"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Mot de passe :"
@@ -5556,7 +5561,7 @@ msgstr "Nouveau Personnage"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Nom :"
@@ -5893,6 +5898,21 @@ msgstr "Polices d'écriture"
msgid "Did you know..."
msgstr "Savais-tu que..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "Insérer"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "Insérer"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6113,18 +6133,18 @@ msgid "Custom update host"
msgstr "Serveur de mise à jour personnalisé"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Serveur :"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Hôte de mise à jour : %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Ouvrir l'URL d'inscription"
@@ -7372,11 +7392,6 @@ msgid "Backspace"
msgstr "Retour arrière"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "Insérer"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "Onglet"
@@ -8963,7 +8978,7 @@ msgstr "OpenGL Moderne"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "anonyme"
@@ -9041,7 +9056,7 @@ msgid "Flee %s"
msgstr "Fuir %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Objet inconnu"
diff --git a/po/id.po b/po/id.po
index 001c3e5b7..6c41e5e97 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
@@ -38,7 +38,7 @@ msgstr "Data telah terunggah"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -537,7 +537,7 @@ msgstr "Bantuan"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -549,32 +549,32 @@ msgid "Close"
msgstr "Tutup"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Terhubung ke server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Masuk"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Memasuki arena permainan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Mengambil karakter"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Terhubung ke server permainan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Mengganti server"
@@ -588,7 +588,7 @@ msgstr "Mengganti server"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -605,37 +605,37 @@ msgid "Error"
msgstr "Kesalahan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Perubahan Sandi"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Perubahan email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat..."
@@ -675,7 +675,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "pewarnacmd sumberpewarnastring datadst"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Umum"
@@ -1614,11 +1614,16 @@ msgid "Cancel"
msgstr "Batal"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Berat: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2769,7 +2774,7 @@ msgstr "Maks"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Harga: %s / Total: %s"
@@ -5061,7 +5066,7 @@ msgid "Ignore mobs"
msgstr "Abaikan mobs"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5174,7 +5179,7 @@ msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5474,7 +5479,7 @@ msgstr "Ganti sandi"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Kata Sandi:"
@@ -5516,7 +5521,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Nama:"
@@ -5848,6 +5853,20 @@ msgstr ""
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+msgid "Insert card"
+msgstr ""
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr ""
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6066,18 +6085,18 @@ msgid "Custom update host"
msgstr "Modifikasi sumber update"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Server:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr ""
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr ""
@@ -7319,11 +7338,6 @@ msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr ""
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr ""
@@ -8895,7 +8909,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
@@ -8973,7 +8987,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr ""
diff --git a/po/it.po b/po/it.po
index c1a10b37e..46d17034c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
@@ -43,7 +43,7 @@ msgstr "File caricato"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -543,7 +543,7 @@ msgstr "Aiuto"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -555,32 +555,32 @@ msgid "Close"
msgstr "Chiudi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Connessione al server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Accesso all'account"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Accesso al gioco"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Caricamento personaggi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Connessione al server del gioco"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Cambiamento server del gioco"
@@ -594,7 +594,7 @@ msgstr "Cambiamento server del gioco"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -611,37 +611,37 @@ msgid "Error"
msgstr "Errore"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Richiesta dettagli di registrazione"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Cambia password"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Password modificata con successo!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Cambia Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Email cambiata con successo!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Annullamento registrazione effettuato con successo"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Addio, torna quando vuoi..."
@@ -681,7 +681,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Generale"
@@ -1622,11 +1622,16 @@ msgid "Cancel"
msgstr "Annulla"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Peso: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2777,7 +2782,7 @@ msgstr "Massimo"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prezzo: %s / Totale: %s"
@@ -5077,7 +5082,7 @@ msgid "Ignore mobs"
msgstr "Ignora mobs"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5190,7 +5195,7 @@ msgid "Ignore items"
msgstr "Ignora oggetti"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5490,7 +5495,7 @@ msgstr "Cambia la Password"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Password:"
@@ -5532,7 +5537,7 @@ msgstr "Nuovo Personaggio"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Nome:"
@@ -5864,6 +5869,21 @@ msgstr ""
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "Insert"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "Insert"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6084,18 +6104,18 @@ msgid "Custom update host"
msgstr "Aggiornamento host"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Server:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr ""
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Apri URL di registrazione"
@@ -7338,11 +7358,6 @@ msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "Insert"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "Tab"
@@ -8921,7 +8936,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "senza nome"
@@ -8999,7 +9014,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Oggetto sconosciuto"
diff --git a/po/ja.po b/po/ja.po
index 7fa411e08..fe7508cc7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
@@ -39,7 +39,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -537,7 +537,7 @@ msgstr "ヘルプ"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -549,32 +549,32 @@ msgid "Close"
msgstr "閉じる"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "サーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "ログインしています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "ゲームの世界に移動しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "キャラクターを呼び出しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "ゲームサーバーに接続しています"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "ゲームサーバーを変更しています"
@@ -588,7 +588,7 @@ msgstr "ゲームサーバーを変更しています"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -605,37 +605,37 @@ msgid "Error"
msgstr "エラー"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "登録内容を呼び出しています"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "パスワード変更"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "パスワードを変更しました!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "メールアドレス変更"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "メールアドレスを変更しました!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "登録を解除しました"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "さようなら また会いましょう..."
@@ -675,7 +675,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "一般"
@@ -1613,11 +1613,16 @@ msgid "Cancel"
msgstr "キャンセル"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "重力: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2768,7 +2773,7 @@ msgstr "最大"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "価格:%s /合計:%s"
@@ -5062,7 +5067,7 @@ msgid "Ignore mobs"
msgstr "無視している敵"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5175,7 +5180,7 @@ msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5475,7 +5480,7 @@ msgstr "パスワードの変更"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "パスワード:"
@@ -5517,7 +5522,7 @@ msgstr "新しいキャラクター"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "名前:"
@@ -5849,6 +5854,21 @@ msgstr ""
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "挿入"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "挿入"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6067,18 +6087,18 @@ msgid "Custom update host"
msgstr "カスタムアップデートホスト"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "サーバー:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "アップデートホスト: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr ""
@@ -7321,11 +7341,6 @@ msgid "Backspace"
msgstr "バックスペース"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "挿入"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "タブ"
@@ -8904,7 +8919,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "名前なし"
@@ -8982,7 +8997,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "不明なアイテム"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index acb2d5000..67b0b6641 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: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+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"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -531,7 +531,7 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -543,32 +543,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr ""
@@ -582,7 +582,7 @@ msgstr ""
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -599,37 +599,37 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr ""
@@ -669,7 +669,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr ""
@@ -1607,11 +1607,16 @@ msgid "Cancel"
msgstr ""
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr ""
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2758,7 +2763,7 @@ msgstr ""
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
@@ -5050,7 +5055,7 @@ msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5163,7 +5168,7 @@ msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5462,7 +5467,7 @@ msgstr ""
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr ""
@@ -5504,7 +5509,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr ""
@@ -5836,6 +5841,20 @@ msgstr ""
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+msgid "Insert card"
+msgstr ""
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr ""
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6055,18 +6074,18 @@ msgid "Custom update host"
msgstr ""
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr ""
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr ""
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr ""
@@ -7299,11 +7318,6 @@ msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr ""
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr ""
@@ -8874,7 +8888,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
@@ -8952,7 +8966,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index f7b02eb03..a84366e4f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr "Bestand is opgeladen"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -535,7 +535,7 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -547,32 +547,32 @@ msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
@@ -586,7 +586,7 @@ msgstr "Wijzigen spelservers"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -603,37 +603,37 @@ msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
@@ -673,7 +673,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Algemeen"
@@ -1613,11 +1613,16 @@ msgid "Cancel"
msgstr "Annuleren"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Gewicht: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2767,7 +2772,7 @@ msgstr "Maximum"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prijs: %s / Totaal: %s"
@@ -5065,7 +5070,7 @@ msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5178,7 +5183,7 @@ msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5478,7 +5483,7 @@ msgstr "Wijzig wachtwoord"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Wachtwoord:"
@@ -5520,7 +5525,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Naam:"
@@ -5852,6 +5857,20 @@ msgstr ""
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+msgid "Insert card"
+msgstr ""
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr ""
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6072,18 +6091,18 @@ msgid "Custom update host"
msgstr "Manuele update server"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Server:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr ""
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr ""
@@ -7325,11 +7344,6 @@ msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr ""
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr ""
@@ -8905,7 +8919,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "naamloos"
@@ -8983,7 +8997,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Onbekend voorwerp"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index f7b02eb03..a84366e4f 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr "Bestand is opgeladen"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -535,7 +535,7 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -547,32 +547,32 @@ msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
@@ -586,7 +586,7 @@ msgstr "Wijzigen spelservers"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -603,37 +603,37 @@ msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
@@ -673,7 +673,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Algemeen"
@@ -1613,11 +1613,16 @@ msgid "Cancel"
msgstr "Annuleren"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Gewicht: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2767,7 +2772,7 @@ msgstr "Maximum"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prijs: %s / Totaal: %s"
@@ -5065,7 +5070,7 @@ msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5178,7 +5183,7 @@ msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5478,7 +5483,7 @@ msgstr "Wijzig wachtwoord"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Wachtwoord:"
@@ -5520,7 +5525,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Naam:"
@@ -5852,6 +5857,20 @@ msgstr ""
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+msgid "Insert card"
+msgstr ""
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr ""
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6072,18 +6091,18 @@ msgid "Custom update host"
msgstr "Manuele update server"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Server:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr ""
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr ""
@@ -7325,11 +7344,6 @@ msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr ""
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr ""
@@ -8905,7 +8919,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "naamloos"
@@ -8983,7 +8997,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Onbekend voorwerp"
diff --git a/po/pl.po b/po/pl.po
index 02bdd8291..18a023ffe 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
@@ -40,7 +40,7 @@ msgstr "Plik wysłano"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -540,7 +540,7 @@ msgstr "Pomoc"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -552,32 +552,32 @@ msgid "Close"
msgstr "Zamknij"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Łączenie z serwerem"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Logowanie"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Wchodzenie do świata gry"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Sprawdzanie postaci"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Łączenie się z serwerem gry"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Zmiana serwera"
@@ -591,7 +591,7 @@ msgstr "Zmiana serwera"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -608,37 +608,37 @@ msgid "Error"
msgstr "Błąd"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Sprawdzanie szczegółów rejestracji"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Zmiana hasła"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Hasło zmienione z powodzeniem!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Zmiana adresu e-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Adres e-mail zmieniony z powodzeniem!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Wyrejestrowano z powodzeniem"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Żegnaj, będziemy czekać na Twój powrót..."
@@ -678,7 +678,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Ogólny"
@@ -1619,11 +1619,16 @@ msgid "Cancel"
msgstr "Anuluj"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Waga: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2774,7 +2779,7 @@ msgstr "Maks."
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Cena: %s/ Razem: %s"
@@ -5077,7 +5082,7 @@ msgid "Ignore mobs"
msgstr "Ignoruj moby"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr "Przyjaciele: %u/%u"
@@ -5190,7 +5195,7 @@ msgid "Ignore items"
msgstr "Ignoruj przedmioty"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr "Widoczni gracze: %d"
@@ -5490,7 +5495,7 @@ msgstr "Zmień hasło"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Hasło:"
@@ -5532,7 +5537,7 @@ msgstr "Nowa postać"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Nazwa:"
@@ -5869,6 +5874,21 @@ msgstr "Czcionki"
msgid "Did you know..."
msgstr "Czy wiesz, że..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "Insert"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "Insert"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6091,18 +6111,18 @@ msgid "Custom update host"
msgstr "Zaawansowane ustawienia aktualizacji"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Serwer:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Host aktualizacji: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Otwórz stronę z rejestracją"
@@ -7345,11 +7365,6 @@ msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "Insert"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "Tab"
@@ -8923,7 +8938,7 @@ msgstr "Nowoczesny OpenGL"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "nienazwany"
@@ -9001,7 +9016,7 @@ msgid "Flee %s"
msgstr "Ominięcie %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Nieznany przedmiot"
diff --git a/po/pt.po b/po/pt.po
index f46762f93..6a26bcf66 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -535,7 +535,7 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -547,32 +547,32 @@ msgid "Close"
msgstr "Fechar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Conectando ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Efetuando login"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Requisitando personagens"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
@@ -586,7 +586,7 @@ msgstr "Mudando servidores do jogo"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -603,37 +603,37 @@ msgid "Error"
msgstr "Erro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
@@ -673,7 +673,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Geral"
@@ -1615,11 +1615,16 @@ msgid "Cancel"
msgstr "Cancelar"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Peso: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2770,7 +2775,7 @@ msgstr "Máximo"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preço: %s / Total: %s"
@@ -5068,7 +5073,7 @@ msgid "Ignore mobs"
msgstr "Ignorar mobs"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5181,7 +5186,7 @@ msgid "Ignore items"
msgstr "Ignorar itens"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5481,7 +5486,7 @@ msgstr "Alterar senha"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Senha:"
@@ -5523,7 +5528,7 @@ msgstr "Novo Pesonagem"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Nome:"
@@ -5860,6 +5865,21 @@ msgstr ""
msgid "Did you know..."
msgstr "Você Sabia..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "Inserir"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "Inserir"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6080,18 +6100,18 @@ msgid "Custom update host"
msgstr "Atualizações customizadas"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Servidor:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Atualizando Servidores: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Abrir URL de cadastro"
@@ -7333,11 +7353,6 @@ msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "Inserir"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "Tab"
@@ -8918,7 +8933,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sem nome"
@@ -8996,7 +9011,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Item desconhecido"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e5c87d747..bb00cb472 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-06-20 11:04+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -47,7 +47,7 @@ msgstr "Arquivo enviado"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -548,7 +548,7 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -560,32 +560,32 @@ msgid "Close"
msgstr "Fechar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Conectando-se ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Fazendo login"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Entrando no mundo do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Requerindo personagens"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Mudando de servidor do jogo"
@@ -599,7 +599,7 @@ msgstr "Mudando de servidor do jogo"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -616,37 +616,37 @@ msgid "Error"
msgstr "Erro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Adeus, volte sempre..."
@@ -686,7 +686,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Geral"
@@ -1628,11 +1628,16 @@ msgid "Cancel"
msgstr "Cancelar"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Peso: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2784,7 +2789,7 @@ msgstr "Máximo"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preço: %s / Total: %s"
@@ -5086,7 +5091,7 @@ msgid "Ignore mobs"
msgstr "Ignorar mobs"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr "Amigos: %u/%u"
@@ -5199,7 +5204,7 @@ msgid "Ignore items"
msgstr "Ignorar itens"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr "Jogadores visíveis: %d"
@@ -5499,7 +5504,7 @@ msgstr "Alterar senha"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Senha:"
@@ -5541,7 +5546,7 @@ msgstr "Novo Personagem"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Nome:"
@@ -5878,6 +5883,21 @@ msgstr "Fontes"
msgid "Did you know..."
msgstr "Você sabia que ..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "Inserir"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "Inserir"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6098,18 +6118,18 @@ msgid "Custom update host"
msgstr "Atualizações customizadas"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Servidor:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Atualizando Servidor: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Abrir endereço de registro"
@@ -7352,11 +7372,6 @@ msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "Inserir"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "Aba"
@@ -8937,7 +8952,7 @@ msgstr "OpenGL Moderno"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sem nome"
@@ -9015,7 +9030,7 @@ msgid "Flee %s"
msgstr "Evasão %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Item desconhecido"
diff --git a/po/ru.po b/po/ru.po
index 127054237..cfe9a1955 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-11 11:22+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
@@ -44,7 +44,7 @@ msgstr "Файл выгружен"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -544,7 +544,7 @@ msgstr "Помощь"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -556,32 +556,32 @@ msgid "Close"
msgstr "Закрыть"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Авторизация"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Входим в игровой мир"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Получение списка персонажей"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Смена игрового сервера"
@@ -595,7 +595,7 @@ msgstr "Смена игрового сервера"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -612,37 +612,37 @@ msgid "Error"
msgstr "Ошибка"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Изменить Пароль"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Сменить Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Email изменен!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Регистрация удалена"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
@@ -682,7 +682,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd файл_строка_цвета файл_назначения"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Общие"
@@ -1624,11 +1624,16 @@ msgid "Cancel"
msgstr "Отмена"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Вес: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2780,7 +2785,7 @@ msgstr "Макс"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Цена: %s / Всего: %s"
@@ -5087,7 +5092,7 @@ msgid "Ignore mobs"
msgstr "Игнорируемые монстры"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr "Друзей: %u/%u"
@@ -5200,7 +5205,7 @@ msgid "Ignore items"
msgstr "Игнорировать предметы"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr "Видимых игроков: %d"
@@ -5500,7 +5505,7 @@ msgstr "Изменить пароль"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Пароль:"
@@ -5542,7 +5547,7 @@ msgstr "Новый персонаж"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Имя:"
@@ -5879,6 +5884,21 @@ msgstr "Шрифты"
msgid "Did you know..."
msgstr "Знаете ли вы..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "Вставка"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "Вставка"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6101,18 +6121,18 @@ msgid "Custom update host"
msgstr "Польз. сайт обновлений"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Сервер:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Сервер обновлений: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Открыть ссылку регистрации"
@@ -7356,11 +7376,6 @@ msgid "Backspace"
msgstr "Удаление влево"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "Вставка"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "Табуляция"
@@ -8937,7 +8952,7 @@ msgstr "Новый OpenGL"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "безымянный"
@@ -9015,7 +9030,7 @@ msgid "Flee %s"
msgstr "Уклонение %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Неизвестный предмет"
diff --git a/po/sv.po b/po/sv.po
index 6ffb326d4..d6a86b6ac 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -532,7 +532,7 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -544,32 +544,32 @@ msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Ändrar spelserver"
@@ -583,7 +583,7 @@ msgstr "Ändrar spelserver"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -600,37 +600,37 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Avregistrering lyckad"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Farväl, kom gärna tillbaka snart igen..."
@@ -670,7 +670,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "General"
@@ -1608,11 +1608,16 @@ msgid "Cancel"
msgstr "Avbryt"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Vikt: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2763,7 +2768,7 @@ msgstr "Max"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Pris: %s / Totalt: %s"
@@ -5062,7 +5067,7 @@ msgid "Ignore mobs"
msgstr "Ignorera mobs"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr "Vänner: %u/%u"
@@ -5175,7 +5180,7 @@ msgid "Ignore items"
msgstr "Ignorera items"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr "Synliga spelare: %d"
@@ -5475,7 +5480,7 @@ msgstr "Ändra Lösenord"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Lösenord:"
@@ -5517,7 +5522,7 @@ msgstr "Ny karaktär"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Namn:"
@@ -5856,6 +5861,20 @@ msgstr "Fonter"
msgid "Did you know..."
msgstr "Viste du att..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+msgid "Insert card"
+msgstr ""
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr ""
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6076,18 +6095,18 @@ msgid "Custom update host"
msgstr "Anpassad uppdatering-host"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Server:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Uppdatera host: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Öppna register-url"
@@ -7330,11 +7349,6 @@ msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr ""
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr ""
@@ -8914,7 +8928,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "Inte namngiven"
@@ -8992,7 +9006,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Okänt item"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 6ffb326d4..d6a86b6ac 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -532,7 +532,7 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -544,32 +544,32 @@ msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Ändrar spelserver"
@@ -583,7 +583,7 @@ msgstr "Ändrar spelserver"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -600,37 +600,37 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Avregistrering lyckad"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Farväl, kom gärna tillbaka snart igen..."
@@ -670,7 +670,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "General"
@@ -1608,11 +1608,16 @@ msgid "Cancel"
msgstr "Avbryt"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Vikt: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2763,7 +2768,7 @@ msgstr "Max"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Pris: %s / Totalt: %s"
@@ -5062,7 +5067,7 @@ msgid "Ignore mobs"
msgstr "Ignorera mobs"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr "Vänner: %u/%u"
@@ -5175,7 +5180,7 @@ msgid "Ignore items"
msgstr "Ignorera items"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr "Synliga spelare: %d"
@@ -5475,7 +5480,7 @@ msgstr "Ändra Lösenord"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Lösenord:"
@@ -5517,7 +5522,7 @@ msgstr "Ny karaktär"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Namn:"
@@ -5856,6 +5861,20 @@ msgstr "Fonter"
msgid "Did you know..."
msgstr "Viste du att..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+msgid "Insert card"
+msgstr ""
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr ""
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6076,18 +6095,18 @@ msgid "Custom update host"
msgstr "Anpassad uppdatering-host"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Server:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Uppdatera host: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Öppna register-url"
@@ -7330,11 +7349,6 @@ msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr ""
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr ""
@@ -8914,7 +8928,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "Inte namngiven"
@@ -8992,7 +9006,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Okänt item"
diff --git a/po/tr.po b/po/tr.po
index 41cbc9dff..896aa0234 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
@@ -35,7 +35,7 @@ msgstr "Dosya yüklendi"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -534,7 +534,7 @@ msgstr "Yardım"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -546,32 +546,32 @@ msgid "Close"
msgstr "Kapat"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Sunucuya bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Giriş yapılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Oyun dünyasına giriliyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Karakterler isteniliyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Oyun sunucusuna bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Oyun sunucusu değiştiriliyor"
@@ -585,7 +585,7 @@ msgstr "Oyun sunucusu değiştiriliyor"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -602,37 +602,37 @@ msgid "Error"
msgstr "Hata"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Kayıt detayları isteniyor"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Şifre Değiştir"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Şifreniz başarı ile değiştirildi!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "E-posta Değiştir"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "E-posta başarı ile değiştirildi!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Kayıt silme başarılı"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "Hoşçakal, tekrar bekleriz..."
@@ -672,7 +672,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd srcdyestring dstfile"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Genel"
@@ -1614,11 +1614,16 @@ msgid "Cancel"
msgstr "İptal"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Ağırlık: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2768,7 +2773,7 @@ msgstr "En Fazla"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Fiyat: %s / Toplam: %s"
@@ -5063,7 +5068,7 @@ msgid "Ignore mobs"
msgstr "Canavarları görmezden gel"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5176,7 +5181,7 @@ msgid "Ignore items"
msgstr "Nesneleri görmezden gel"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5476,7 +5481,7 @@ msgstr "Şifre Değiştir"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Şifre:"
@@ -5518,7 +5523,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "İsim:"
@@ -5850,6 +5855,20 @@ msgstr ""
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+msgid "Insert card"
+msgstr ""
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr ""
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6070,18 +6089,18 @@ msgid "Custom update host"
msgstr "Elle güncelleme sunucusu"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Sunucu:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr ""
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr ""
@@ -7322,11 +7341,6 @@ msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr ""
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr ""
@@ -8898,7 +8912,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "isimsiz"
@@ -8976,7 +8990,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Bilinmeyen nesne"
diff --git a/po/uk.po b/po/uk.po
index 2b68d2eb5..7e5c99a81 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/manaplus/"
@@ -36,7 +36,7 @@ msgstr "Файл завантажено"
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -538,7 +538,7 @@ msgstr "Довідка"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -550,32 +550,32 @@ msgid "Close"
msgstr "Закрити"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "Очікування відповіді сервера"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "Авторизація..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "Поринаємо в ігровий всесвіт..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "Завантаження списку персонажів..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "Приєднання до серверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "Зміна ігрового серверу..."
@@ -589,7 +589,7 @@ msgstr "Зміна ігрового серверу..."
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -606,37 +606,37 @@ msgid "Error"
msgstr "Помилка"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "Запитуємо деталі реєстрації"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "Змінити пароль"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "Пароль змінено!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "Змінити імейл"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "Імейл змінено!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "Акаунт видалено"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "До побачення та вертайтесь."
@@ -676,7 +676,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr "dyecmd файл_рядків_кольору файл_призначення"
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "Загальне"
@@ -1616,11 +1616,16 @@ msgid "Cancel"
msgstr "Скасувати"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "Вага: %s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2771,7 +2776,7 @@ msgstr "Все"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Ціна: %s / Загалом: %s"
@@ -5070,7 +5075,7 @@ msgid "Ignore mobs"
msgstr "Ігноровані"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr "Друзів: %u/%u"
@@ -5183,7 +5188,7 @@ msgid "Ignore items"
msgstr "Ігнорувати предмети"
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr "Видимих гравців: %d"
@@ -5483,7 +5488,7 @@ msgstr "Змінити пароль"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "Пароль:"
@@ -5525,7 +5530,7 @@ msgstr "Новий персонаж"
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "Ім'я:"
@@ -5862,6 +5867,21 @@ msgstr "Шрифти"
msgid "Did you know..."
msgstr "Чи вам відомо..."
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+#, fuzzy
+msgid "Insert card"
+msgstr "Вставити"
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr "Вставити"
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6084,18 +6104,18 @@ msgid "Custom update host"
msgstr "Користувацька адреса оновлень"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "Сервер:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr "Сервер оновлень: %s"
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr "Відкрити посилання реєстрації"
@@ -7337,11 +7357,6 @@ msgid "Backspace"
msgstr "Видалити лівіше"
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr "Вставити"
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr "Табуляція"
@@ -8917,7 +8932,7 @@ msgstr "Новітній OpenGL"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "казна що"
@@ -8995,7 +9010,7 @@ msgid "Flee %s"
msgstr "Ухилення %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "Невідомий предмет"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 702fdb4cd..607498177 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-04 18:40+0300\n"
+"POT-Creation-Date: 2015-07-18 14:24+0300\n"
"PO-Revision-Date: 2015-04-06 11:05+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -40,7 +40,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1425 src/client.cpp:1458
+#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
#: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
#: src/gui/widgets/tabs/setup_theme.cpp:313
@@ -538,7 +538,7 @@ msgstr "帮助"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1343 src/client.cpp:1362
+#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
#: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
#: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:265
@@ -550,32 +550,32 @@ msgid "Close"
msgstr "关闭"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1014
+#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
msgid "Connecting to server"
msgstr "正在连接服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1060
+#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
msgid "Logging in"
msgstr "登录中"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1103
+#: src/client.cpp:1102
msgid "Entering game world"
msgstr "进入游戏世界"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1235
+#: src/client.cpp:1234
msgid "Requesting characters"
msgstr "请求角色"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1274
+#: src/client.cpp:1273
msgid "Connecting to the game server"
msgstr "正在连接游戏服务器"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1285
+#: src/client.cpp:1284
msgid "Changing game servers"
msgstr "正在更改游戏服务器"
@@ -589,7 +589,7 @@ msgstr "正在更改游戏服务器"
#. TRANSLATORS: error header
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: error header
-#: src/client.cpp:1340 src/client.cpp:1359 src/client.cpp:1570
+#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
#: src/gui/windows/changeemaildialog.cpp:166
#: src/gui/windows/changepassworddialog.cpp:156
#: src/gui/windows/charcreatedialog.cpp:378
@@ -606,37 +606,37 @@ msgid "Error"
msgstr "错误"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1378
+#: src/client.cpp:1377
msgid "Requesting registration details"
msgstr "正在请求详细注册信息"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1421
+#: src/client.cpp:1420
msgid "Password Change"
msgstr "更改密码"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1423
+#: src/client.cpp:1422
msgid "Password changed successfully!"
msgstr "密码更改成功!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1454
+#: src/client.cpp:1453
msgid "Email Change"
msgstr "更改电子邮箱地址"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1456
+#: src/client.cpp:1455
msgid "Email changed successfully!"
msgstr "电子邮箱地址更改成功!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1486
+#: src/client.cpp:1485
msgid "Unregister Successful"
msgstr "取消注册成功"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1488
+#: src/client.cpp:1487
msgid "Farewell, come back any time..."
msgstr "再见,欢迎随时回来..."
@@ -676,7 +676,7 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2170
+#: src/game.cpp:252 src/gui/windows/chatwindow.cpp:2172
msgid "General"
msgstr "常规"
@@ -1614,11 +1614,16 @@ msgid "Cancel"
msgstr "取消"
#. TRANSLATORS: popup label
-#: src/gui/popups/itempopup.cpp:204
+#: src/gui/popups/itempopup.cpp:220
#, c-format
msgid "Weight: %s"
msgstr "重量:%s"
+#. TRANSLATORS: popup label
+#: src/gui/popups/itempopup.cpp:285
+msgid "Cards: "
+msgstr ""
+
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
@@ -2768,7 +2773,7 @@ msgstr "最大"
#. TRANSLATORS: sell dialog label
#. TRANSLATORS: buy dialog label
#: src/gui/widgets/selldialog.cpp:130 src/gui/widgets/selldialog.cpp:325
-#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:627
+#: src/gui/windows/buydialog.cpp:255 src/gui/windows/buydialog.cpp:626
#, c-format
msgid "Price: %s / Total: %s"
msgstr "价格:%s / 总价:%s"
@@ -5060,7 +5065,7 @@ msgid "Ignore mobs"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:116
+#: src/gui/widgets/tabs/socialfriendstab.h:114
#, c-format
msgid "Friends: %u/%u"
msgstr ""
@@ -5173,7 +5178,7 @@ msgid "Ignore items"
msgstr ""
#. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:188
#, c-format
msgid "Visible players: %d"
msgstr ""
@@ -5473,7 +5478,7 @@ msgstr "更换密码"
#. TRANSLATORS: register dialog. label.
#. TRANSLATORS: unregister dialog. label.
#: src/gui/windows/changepassworddialog.cpp:68
-#: src/gui/windows/logindialog.cpp:106 src/gui/windows/registerdialog.cpp:76
+#: src/gui/windows/logindialog.cpp:107 src/gui/windows/registerdialog.cpp:76
#: src/gui/windows/unregisterdialog.cpp:67
msgid "Password:"
msgstr "密码:"
@@ -5515,7 +5520,7 @@ msgstr ""
#. TRANSLATORS: login dialog label
#. TRANSLATORS: register dialog. label.
#: src/gui/windows/charcreatedialog.cpp:81
-#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:104
+#: src/gui/windows/editserverdialog.cpp:71 src/gui/windows/logindialog.cpp:105
#: src/gui/windows/registerdialog.cpp:74
msgid "Name:"
msgstr "姓名:"
@@ -5847,6 +5852,20 @@ msgstr ""
msgid "Did you know..."
msgstr ""
+#. TRANSLATORS: insert card dialog name
+#: src/gui/windows/insertcarddialog.cpp:43
+#: src/gui/windows/insertcarddialog.cpp:45
+msgid "Insert card"
+msgstr ""
+
+#. TRANSLATORS: insert card dialog button
+#. TRANSLATORS: input action name
+#. TRANSLATORS: inventory button
+#: src/gui/windows/insertcarddialog.cpp:51 src/input/pages/gui.cpp:121
+#: src/resources/itemtypemapdata.h:97
+msgid "Insert"
+msgstr ""
+
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#. TRANSLATORS: inventory button
@@ -6065,18 +6084,18 @@ msgid "Custom update host"
msgstr "自定义更新主机"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:100
+#: src/gui/windows/logindialog.cpp:101
msgid "Server:"
msgstr "服务器:"
#. TRANSLATORS: login dialog label
-#: src/gui/windows/logindialog.cpp:110
+#: src/gui/windows/logindialog.cpp:111
#, c-format
msgid "Update host: %s"
msgstr ""
#. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:230
+#: src/gui/windows/logindialog.cpp:238
msgid "Open register url"
msgstr ""
@@ -7315,11 +7334,6 @@ msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/input/pages/gui.cpp:121
-msgid "Insert"
-msgstr ""
-
-#. TRANSLATORS: input action name
#: src/input/pages/gui.cpp:127
msgid "Tab"
msgstr ""
@@ -8893,7 +8907,7 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:50 src/resources/db/avatardb.cpp:89
-#: src/resources/db/itemdb.cpp:333 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:334 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:103 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "未知怪兽"
@@ -8971,7 +8985,7 @@ msgid "Flee %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:217
+#: src/resources/db/itemdb.cpp:218
msgid "Unknown item"
msgstr "未知物品"