Update translations.

23 files changed, 2133 insertions, 4041 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 15f1f206c..6ab967731 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,7 +29,6 @@ src/gui/models/sortlistmodelinv.h
 src/gui/models/targettypemodel.h
 src/gui/models/updatetypemodel.h
 src/gui/popups/beingpopup.cpp
-src/gui/popups/createpartypopup.h
 src/gui/popups/itempopup.cpp
 src/gui/popups/popupmenu.cpp
 src/gui/popups/skillpopup.cpp
diff --git a/po/ca.po b/po/ca.po
index 12747d74d..9edd00e57 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Arnau Mas <thealchemist886@gmail.com>, 2013-2016
@@ -10,14 +10,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
-"ca/)\n"
-"Language: ca\n"
+"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -128,8 +127,7 @@ msgstr ""
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr ""
-"No s'ha pogut crear una taula de xiuxiueig  \"%s\"! Probablement ja existeix."
+msgstr "No s'ha pogut crear una taula de xiuxiueig  \"%s\"! Probablement ja existeix."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -1246,7 +1244,8 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
 #. TRANSLATORS: weight message
@@ -1263,7 +1262,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "Per defecte"
 
@@ -3183,39 +3183,33 @@ msgstr "Barra de vida de monstres (segon color)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Barra de vida de monstres"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Barra de vida de monstres (segon color)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Barra de vida de monstres"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Barra de vida de monstres (segon color)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Barra de vida del Jugador"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Barra de vida del Jugador  (segon color)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3535,13 +3529,15 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3552,19 +3548,22 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4005,15 +4004,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Colors"
 
@@ -4037,11 +4036,9 @@ msgstr "Mostra llista de colors del xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4068,11 +4065,9 @@ msgstr "Limitar màxim de caràcters en línia de xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4083,9 +4078,7 @@ msgstr "Limitar màxim de lines de xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4126,8 +4119,8 @@ msgstr "Mostra historial de xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4138,11 +4131,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4153,11 +4144,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4173,13 +4162,9 @@ msgstr "Amaga missatges de botiga"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4192,8 +4177,7 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4212,12 +4196,9 @@ msgstr "Col·loca tots els xiuxiueigs en pestanyes"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4228,8 +4209,7 @@ msgstr "Registra els missatges de màgia en la pestanya del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4242,11 +4222,9 @@ msgstr "Mostra els missatges del servidor en la finestra del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4271,11 +4249,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4286,8 +4262,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4300,9 +4275,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4315,9 +4288,7 @@ msgstr "Permet pestanya de batalla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4343,10 +4314,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4381,8 +4349,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4395,8 +4362,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4409,12 +4375,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4528,9 +4491,7 @@ msgstr "Conflicte de tecla(es) detectat."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Conflicte entre les tecles \"%s\" i \"%s\". Resol-lo, o la jugabilitat por "
-"resultar afectada."
+msgstr "Conflicte entre les tecles \"%s\" i \"%s\". Resol-lo, o la jugabilitat por resultar afectada."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5578,17 +5539,13 @@ msgstr "Res"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Error al canviar al mode finestra, la restauració al mode anterior també ha "
-"fallat!"
+msgstr "Error al canviar al mode finestra, la restauració al mode anterior també ha fallat!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Error al canviar al mode pantalla completa, la restauració al mode anterior "
-"també ha fallat!"
+msgstr "Error al canviar al mode pantalla completa, la restauració al mode anterior també ha fallat!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5629,8 +5586,7 @@ msgstr "La resolució de la pantalla ha canviat"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa."
+msgstr "Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6165,7 +6121,8 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crear"
 
@@ -6282,7 +6239,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6300,7 +6258,8 @@ msgstr "Distribueix %d punts"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6326,7 +6285,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6527,7 +6487,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Connectar"
 
@@ -6596,8 +6557,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -6893,13 +6854,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7320,9 +7283,9 @@ msgstr "Habilitat %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Habilitat %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7607,10 +7570,9 @@ msgstr "No tens diners suficients."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus "
-"d'objecte a la finestra."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus d'objecte a la finestra."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -10664,8 +10626,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Les opcions per a /%s son \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Les opcions per a /%s son \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10721,15 +10682,3 @@ msgstr "Segon  %d"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segons"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Registre anul·lat amb èxit"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Adéu, torna quan vulguis..."
-
-#~ msgid "Unregister"
-#~ msgstr "No registrat"
-
-#~ msgid "Name: %s"
-#~ msgstr "Nom: %s"
diff --git a/po/cs.po b/po/cs.po
index 94fed2253..71db4817d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Pitriss <chytrex@wjake.com>, 2011
@@ -15,14 +15,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
-"cs/)\n"
-"Language: cs\n"
+"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -408,9 +407,8 @@ msgstr "práce"
 
 #. TRANSLATORS: get homunculus xp message
 #: src/being/localplayer.cpp:1150
-#, fuzzy
 msgid "Homun"
-msgstr "Človíček"
+msgstr ""
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1162
@@ -755,8 +753,7 @@ msgstr "     --renderer       : Nastaví typ vykreslování"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Spustit testování ovladačů a automatickou konfiguraci"
+msgstr "  -T --tests          : Spustit testování ovladačů a automatickou konfiguraci"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1253,14 +1250,14 @@ msgstr "Oživ"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "Nesete více než polovinu vaší váhy. Regenerace života nyní není možná."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-"Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
+msgstr "Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1271,7 +1268,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "výchozí"
 
@@ -3191,39 +3189,33 @@ msgstr "Pruh života monster (druhá barva)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Človíček"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Pruh života monster (druhá barva)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Žoldák"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Pruh života monster (druhá barva)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Hráčův pruh života"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Hráčův pruh života (druhá barva)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3297,9 +3289,8 @@ msgstr "Zvíraznění vodní kolize"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Zvíraznění vodní kolize"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3544,13 +3535,15 @@ msgstr "Sdílení předmětů povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Sdílení předmětů zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Sdílení předmětů není možné."
 
@@ -3561,19 +3554,22 @@ msgstr "Stav sdílení předmětů neznámý."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Sdílení zkušeností povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Sdílení zkušeností zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Sdílení zkušeností není možné."
 
@@ -4014,15 +4010,15 @@ msgstr "Chránít zaměření chatu"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Barvy"
 
@@ -4046,11 +4042,9 @@ msgstr "Zobrazit seznam barev"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4077,11 +4071,9 @@ msgstr "Omezit maximum znaků na řádek"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4092,9 +4084,7 @@ msgstr "Omezit počet řádků chatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4135,8 +4125,8 @@ msgstr "Zobrazovat historii chatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4147,11 +4137,9 @@ msgstr "Zobrazit zprávy o připojení party"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4162,11 +4150,9 @@ msgstr "Zobrazit zprávy o připojení gildy"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4182,13 +4168,9 @@ msgstr "Skrýt obchodní zprávy"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4201,8 +4183,7 @@ msgstr "Zobrazit MVP zprávy"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4221,12 +4202,9 @@ msgstr "Všecha šeptání jako záložky"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4237,8 +4215,7 @@ msgstr "Zaznamenávat zprávy o magii v debug záložce"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4251,11 +4228,9 @@ msgstr "Zobrazovat serverové zprávy v debug záložce"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4280,11 +4255,9 @@ msgstr "Povolit GM záložku"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4295,8 +4268,7 @@ msgstr "Povolit záložku jazyka"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4309,9 +4281,7 @@ msgstr "Zobrazit zprávy všech jazyků"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4324,9 +4294,7 @@ msgstr "Zapnout bitevní záložku"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4352,10 +4320,7 @@ msgstr "Změnit velikost záložek pokud nutno"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4390,8 +4355,7 @@ msgstr "Zvýrazňovaná slova (oddělená čárkou)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4404,8 +4368,7 @@ msgstr "Globálně ignorovaná jména (oddělená čárkou)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4418,12 +4381,9 @@ msgstr "Zobrazit knoflík pro smajlíky v chatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4537,9 +4497,7 @@ msgstr "Kolize kláves detekována/y."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřeš jej, neboť se hra může "
-"chovat podivně."
+msgstr "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřeš jej, neboť se hra může chovat podivně."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5087,9 +5045,7 @@ msgstr "HW akcelerace"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr ""
-"Povolit vyrovnávací pamět průhlednosti (Softwarově, může používat hodně "
-"paměti)"
+msgstr "Povolit vyrovnávací pamět průhlednosti (Softwarově, může používat hodně paměti)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5174,15 +5130,12 @@ msgstr "Zapni atlasy textur (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr ""
-"Načítat veškeré obrázky pro mapu do vyrovnávací paměti (může používat více "
-"paměti)"
+msgstr "Načítat veškeré obrázky pro mapu do vyrovnávací paměti (může používat více paměti)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
 msgid "Cache all sounds (can use additional memory)"
-msgstr ""
-"Uchovávat všechny zvuky ve vyrovnávací paměti (může používat více paměti)"
+msgstr "Uchovávat všechny zvuky ve vyrovnávací paměti (může používat více paměti)"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
@@ -5313,9 +5266,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr ""
-"Emulovat prave kliknutí tlačítka myši dlouhým klinutím myši (užitečné pro "
-"dotyková rozhraní)"
+msgstr "Emulovat prave kliknutí tlačítka myši dlouhým klinutím myši (užitečné pro dotyková rozhraní)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5594,16 +5545,13 @@ msgstr "Žádné"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
+msgstr "Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž "
-"selhalo!"
+msgstr "Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž selhalo!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -6179,7 +6127,8 @@ msgstr "Počet:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -6296,7 +6245,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6314,7 +6264,8 @@ msgstr "Rozdělte prosím %d bodů"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6340,7 +6291,8 @@ msgstr "Vzhled:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "P"
 
@@ -6439,12 +6391,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Život: %u/%u\n"
-"Mana: %u/%u\n"
-"Úroveň: %u\n"
-"Zkušenost: %u\n"
-"Peníze: %s"
+msgstr "Život: %u/%u\nMana: %u/%u\nÚroveň: %u\nZkušenost: %u\nPeníze: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6546,7 +6493,8 @@ msgstr "Upravit server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Připojit"
 
@@ -6615,8 +6563,8 @@ msgstr "Písma"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Neznámý"
 
@@ -6914,13 +6862,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7341,9 +7291,9 @@ msgstr "Dovednost %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Dovednost %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7628,7 +7578,8 @@ msgstr "Nemáš dost peněz."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Přidání věci selhalo. Nelze předávat stejný předmět v jednom okně."
 
 #. TRANSLATORS: trade error
@@ -8569,9 +8520,7 @@ msgstr "Vypsat verzi OpenGL do chatu"
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:370
 msgid "Print enabled mods in chat"
-msgstr ""
-"Vypsa\n"
-"t povolené mody do chatu"
+msgstr "Vypsa\nt povolené mody do chatu"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:376
@@ -8900,9 +8849,7 @@ msgstr "Neznámá chyba postavy na serveru."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru "
-"existuje."
+msgstr "Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru existuje."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -9060,9 +9007,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Byl jste dočasně vyloučen ze hry do %s.\n"
-"Prosím kontaktujte GM team přes fórum."
+msgstr "Byl jste dočasně vyloučen ze hry do %s.\nProsím kontaktujte GM team přes fórum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10745,15 +10690,3 @@ msgstr "%d vteřinu"
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Zrušení registrace úspěšné"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Nashledanou, vraťte se kdykoli..."
-
-#~ msgid "Unregister"
-#~ msgstr "Zrušit registraci"
-
-#~ msgid "Name: %s"
-#~ msgstr "Jméno: %s"
diff --git a/po/de.po b/po/de.po
index 128c49e22..5a49326a0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # 3_0_3 <jack@krass.com>, 2011
 # Andrei Karas <akaras@inbox.ru>, 2011
@@ -39,14 +39,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-27 14:32+0000\n"
-"Last-Translator: The Micksha\n"
-"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
-"de/)\n"
-"Language: de\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -135,9 +134,7 @@ msgstr "Log hoch geladen zu:"
 #: src/actions/actions.cpp:1737
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr ""
-"Zuletzt deaktiviert gesehen. Aktiviere in Spieler / Rufe Player ID ab und "
-"prüfe Log."
+msgstr "Zuletzt deaktiviert gesehen. Aktiviere in Spieler / Rufe Player ID ab und prüfe Log."
 
 #. TRANSLATORS: last seen error
 #: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
@@ -159,9 +156,7 @@ msgstr "Kann keine leeren Flüster- oder Channelnachrichten versenden!"
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr ""
-"Kann keinen Flüsterreiter \"%s\" erstellen!  Möglicherweise existiert der "
-"Reiter bereits."
+msgstr "Kann keinen Flüsterreiter \"%s\" erstellen!  Möglicherweise existiert der Reiter bereits."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -435,9 +430,8 @@ msgstr "Job"
 
 #. TRANSLATORS: get homunculus xp message
 #: src/being/localplayer.cpp:1150
-#, fuzzy
 msgid "Homun"
-msgstr "Humunkulus"
+msgstr ""
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1162
@@ -747,8 +741,7 @@ msgstr "  -H --update-host    : Update host benutzen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : Voreingestellten Charakterserver und Charakter wählen"
+msgstr "  -D --default        : Voreingestellten Charakterserver und Charakter wählen"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -758,15 +751,12 @@ msgstr "  -u --skip-update    :  Herunterladen von Updates überspringen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data           : Verzeichnis von dem Spieldaten geladen werden sollen"
+msgstr "  -d --data           : Verzeichnis von dem Spieldaten geladen werden sollen"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -L --localdata-dir  : Verzeichnis das als Lokales Verzeichnis benutzt "
-"werden soll"
+msgstr "  -L --localdata-dir  : Verzeichnis das als Lokales Verzeichnis benutzt werden soll"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -786,8 +776,7 @@ msgstr "     --renderer       : Renderer-Typ setzen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --Tests          : Treibertest und automatische Konfiguration starten"
+msgstr "  -T --Tests          : Treibertest und automatische Konfiguration starten"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1284,17 +1273,14 @@ msgstr "Wiederbeleben"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Du trägst mehr als die Hälfte die du tragen kannst. Du kannst nun deine "
-"Gesundheit nicht mehr regenerieren."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Du trägst mehr als die Hälfte die du tragen kannst. Du kannst nun deine Gesundheit nicht mehr regenerieren."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-"Du trägst weniger als die Hälfte des Gewichts. Du kannst nun deine "
-"Gesundheit regenerieren."
+msgstr "Du trägst weniger als die Hälfte des Gewichts. Du kannst nun deine Gesundheit regenerieren."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1305,7 +1291,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "Standard"
 
@@ -1783,9 +1770,9 @@ msgstr "Stufe: %d"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:274
-#, fuzzy, c-format
+#, c-format
 msgid "Hp: %d/%d"
-msgstr "Lvl: %d / %d"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:284
@@ -3225,39 +3212,33 @@ msgstr "Balken: Monster HP  (Zweite Farbe)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Humunkulus"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Balken: Monster HP  (Zweite Farbe)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Söldner"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Balken: Monster HP  (Zweite Farbe)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Balken: Spieler HP"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Balken: Spieler HP (Zweite Farbe)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3331,9 +3312,8 @@ msgstr "Hervorhebung von Wasser-Kollisionen"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Hervorhebung von Wasser-Kollisionen"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3578,13 +3558,15 @@ msgstr "Teilen von Gegenständen aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Teilen von Gegenständen deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Teilen von Gegenständen nicht möglich."
 
@@ -3595,19 +3577,22 @@ msgstr "Teilen von Gegenständen unbekannt."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Teilen von Erfahrung aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Teilen von Erfahrung deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Teilen von Erfahrung nicht möglich."
 
@@ -4036,11 +4021,7 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr ""
-"Chatfenster wird automatisch versteckt, wenn es nicht benutzt wird.\n"
-"\n"
-"Drücke Enter oder fahre mit der Maus darüber, um es wieder sichtbar zu "
-"machen."
+msgstr "Chatfenster wird automatisch versteckt, wenn es nicht benutzt wird.\n\nDrücke Enter oder fahre mit der Maus darüber, um es wieder sichtbar zu machen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4052,19 +4033,15 @@ msgstr "Chatfokus schützen"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
-msgstr ""
-"Aktiviert den aggressiven Schutz des Eingabefokuses im Chatfenster.\n"
-"\n"
-"Hinweis: Keine anderen Texteingaben können empfangen werden, wenn du im "
-"Chateingabefeld schreibst."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+msgstr "Aktiviert den aggressiven Schutz des Eingabefokuses im Chatfenster.\n\nHinweis: Keine anderen Texteingaben können empfangen werden, wenn du im Chateingabefeld schreibst."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Farben"
 
@@ -4078,10 +4055,7 @@ msgstr "Farben von eingehenden Chatnachrichten entfernen"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr ""
-"Diese Einstellung aktivieren um Farben von eingehenden Chat zu entfernen. "
-"Alle Nachrichten werden die voreingestellte Chattextfarbe benutzen, falls "
-"dies aktiviert ist."
+msgstr "Diese Einstellung aktivieren um Farben von eingehenden Chat zu entfernen. Alle Nachrichten werden die voreingestellte Chattextfarbe benutzen, falls dies aktiviert ist."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4091,18 +4065,10 @@ msgstr "Chatfarben-Liste anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
-msgstr ""
-"Diese Einstellung aktivieren um die Farbauswahl Dropdown-Liste im "
-"Chatfenster anzuzeigen. Das Chatfenster wird die Farbauswahl Dropdown-Liste "
-"anzeigen.\n"
-"\n"
-"Dies erlaubt die einfache Einstellung für die Farbe von ausgehenden "
-"Nachrichten, aber belegt auch etwas Platz im Chatfenster."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+msgstr "Diese Einstellung aktivieren um die Farbauswahl Dropdown-Liste im Chatfenster anzuzeigen. Das Chatfenster wird die Farbauswahl Dropdown-Liste anzeigen.\n\nDies erlaubt die einfache Einstellung für die Farbe von ausgehenden Nachrichten, aber belegt auch etwas Platz im Chatfenster."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
@@ -4113,9 +4079,7 @@ msgstr "Magie- und GM-Befehle in jedem Chatreiter erlauben"
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr ""
-"Diese Einstellung aktivieren, um Zaubersprüche und GM-Befehle in jedem "
-"Reiter ausführen zu können."
+msgstr "Diese Einstellung aktivieren, um Zaubersprüche und GM-Befehle in jedem Reiter ausführen zu können."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4130,17 +4094,10 @@ msgstr "Maximale Zeichen in Chatzeile begrenzen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
-msgstr ""
-"Begrenzt die Anzahl an Buchstaben welche als längste Zeile als Text im Chat "
-"angezeigt werden können.\n"
-"\n"
-"Hinweis: Lange Zeilen können den Klienten langsamer machen. Zeilen die "
-"länger als die Begrenzung sind werden abgeschnitten."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+msgstr "Begrenzt die Anzahl an Buchstaben welche als längste Zeile als Text im Chat angezeigt werden können.\n\nHinweis: Lange Zeilen können den Klienten langsamer machen. Zeilen die länger als die Begrenzung sind werden abgeschnitten."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:110
@@ -4150,15 +4107,10 @@ msgstr "Maximale Zeilen im Chat begrenzen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
-msgstr ""
-"Begrenzt, wieviele Chatzeilen im Rückholspeicher bleiben. Der Chat speichert "
-"angegebene Anzahl von letzten Textzeilen. Die ältesten Zeilen, welche die "
-"Begrenzung überschreiten, werden aus dem Rückholspeicher verworfen."
+msgstr "Begrenzt, wieviele Chatzeilen im Rückholspeicher bleiben. Der Chat speichert angegebene Anzahl von letzten Textzeilen. Die ältesten Zeilen, welche die Begrenzung überschreiten, werden aus dem Rückholspeicher verworfen."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:120
@@ -4176,12 +4128,7 @@ msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
 "Note: chat logs can take noticeable amount of disk space over time."
-msgstr ""
-"Falls du diese Einstellung aktivierst, werden Chatlogs auf die Festplatte "
-"geschrieben.\n"
-"\n"
-"Hinweis: Chatlogs können über die Zeit eine deutliche Menge an "
-"Festplattenspeicher einnehmen."
+msgstr "Falls du diese Einstellung aktivierst, werden Chatlogs auf die Festplatte geschrieben.\n\nHinweis: Chatlogs können über die Zeit eine deutliche Menge an Festplattenspeicher einnehmen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:131
@@ -4191,9 +4138,7 @@ msgstr "Debug-Chatlog aktivieren"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
-msgstr ""
-"Wenn du dies aktivierst, wird der Debug Chatreiter ebenfalls auf der "
-"Festplatte geloggt."
+msgstr "Wenn du dies aktivierst, wird der Debug Chatreiter ebenfalls auf der Festplatte geloggt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:137
@@ -4203,11 +4148,9 @@ msgstr "Chatverlauf anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
-msgstr ""
-"Falls diese Einstellung aktivert ist, wird der Klient alte Logs beim Start "
-"laden anstatt das leere Chatreiter angezeigt werden."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
+msgstr "Falls diese Einstellung aktivert ist, wird der Klient alte Logs beim Start laden anstatt das leere Chatreiter angezeigt werden."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4217,17 +4160,10 @@ msgstr "Gruppennachrichten über Anwesenheit anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
-msgstr ""
-"Falls diese Einstellung aktivert ist, werden Statusänderungen der "
-"Gruppenmitglieder im Gruppenreiter des Chats angezeigt. \n"
-"\n"
-"Dies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn "
-"deine Freunde online kommen."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+msgstr "Falls diese Einstellung aktivert ist, werden Statusänderungen der Gruppenmitglieder im Gruppenreiter des Chats angezeigt. \n\nDies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn deine Freunde online kommen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:152
@@ -4237,17 +4173,10 @@ msgstr "Gildennachrichten über Anwesenheit anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
-"\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
-msgstr ""
-"Falls diese Einstellung aktivert ist, werden Statusänderungen der "
-"Gildenmitglieder im Gildenreiter des Chats angezeigt. \n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"Dies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn "
-"deine Freunde online kommen."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+msgstr "Falls diese Einstellung aktivert ist, werden Statusänderungen der Gildenmitglieder im Gildenreiter des Chats angezeigt. \n\nDies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn deine Freunde online kommen."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4262,22 +4191,10 @@ msgstr "Mitteilungen über Laden verstecken"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
-msgstr ""
-"Falls diese Einstellung aktiviert ist werden keine Nachrichten in Bezug auf "
-"den eingebauten ManaPlus-Shop im Chat angezeigt. Aktiviere diese Einstellung "
-"falls du Shop bezogene Nachrichten sehen willst.\n"
-"\n"
-"Hinweis: Technisch gesehen, wird der ManaPlus-Shop mit gewöhnlichen "
-"Nachrichten mit besonderen Inhalt realisiert. Falls du diese Einstellung, "
-"deaktivierst kannst du diese Nachrichten sehen und  eine Idee davon bekommen "
-"wenn andere Spieler deinen Laden ansehen."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+msgstr "Falls diese Einstellung aktiviert ist werden keine Nachrichten in Bezug auf den eingebauten ManaPlus-Shop im Chat angezeigt. Aktiviere diese Einstellung falls du Shop bezogene Nachrichten sehen willst.\n\nHinweis: Technisch gesehen, wird der ManaPlus-Shop mit gewöhnlichen Nachrichten mit besonderen Inhalt realisiert. Falls du diese Einstellung, deaktivierst kannst du diese Nachrichten sehen und  eine Idee davon bekommen wenn andere Spieler deinen Laden ansehen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:175
@@ -4289,13 +4206,8 @@ msgstr "MVP-Mitteilungen anzeigen"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
-msgstr ""
-"Aktviere diese Einstellung um MVP-Nachrichten vom Server zu erhalten.\n"
-"\n"
-"Hinweis: MVP Nachrichten werden auf den TMV/Evol und ähnlichen Server nicht "
-"benutzt, deshalb macht diese Funktion wenig unterschied."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+msgstr "Aktviere diese Einstellung um MVP-Nachrichten vom Server zu erhalten.\n\nHinweis: MVP Nachrichten werden auf den TMV/Evol und ähnlichen Server nicht benutzt, deshalb macht diese Funktion wenig unterschied."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
@@ -4313,21 +4225,10 @@ msgstr "Alle Flüsternachrichten in Reitern anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
-msgstr ""
-"Falls diese Einstellung aktiviert ist werden alle Flüsternachrichten "
-"(private Nachrichten) in getrennten Reitern, - einen getrennten Reiter für "
-"jeden Spieler -, angezeigt. Falls diese Einstellung deaktivert ist, "
-"erscheinen alle Flüsternachrichten im globalen Reiter.\n"
-"\n"
-"Hinweis:Es ist bekannt, dass es sehr verwirrend sein kann, wenn alle "
-"Flüsternachrichten in einem globalen Reiter angezeigt werden. Überlege also "
-"zweimal ob du diese Funktion deaktivierst."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+msgstr "Falls diese Einstellung aktiviert ist werden alle Flüsternachrichten (private Nachrichten) in getrennten Reitern, - einen getrennten Reiter für jeden Spieler -, angezeigt. Falls diese Einstellung deaktivert ist, erscheinen alle Flüsternachrichten im globalen Reiter.\n\nHinweis:Es ist bekannt, dass es sehr verwirrend sein kann, wenn alle Flüsternachrichten in einem globalen Reiter angezeigt werden. Überlege also zweimal ob du diese Funktion deaktivierst."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:197
@@ -4337,17 +4238,10 @@ msgstr "Magische Nachrichten im Debugreiter aufzeichnen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
-msgstr ""
-"Falls diese Einstellung aktiviert ist werden Zauberspruch aufrufe im "
-"Debugreiter angezeigt. Wenn deaktiviert werden sie stattdessen im globalen "
-"Reiter angezeigt.\n"
-"\n"
-"Hinweis: Dies hat keinen Einfluss darauf wie der Server auf zusamenhängende "
-"Zaubersprüche antwortet."
+msgstr "Falls diese Einstellung aktiviert ist werden Zauberspruch aufrufe im Debugreiter angezeigt. Wenn deaktiviert werden sie stattdessen im globalen Reiter angezeigt.\n\nHinweis: Dies hat keinen Einfluss darauf wie der Server auf zusamenhängende Zaubersprüche antwortet."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:205
@@ -4357,19 +4251,10 @@ msgstr "Servermitteilungen im Debugreiter anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
-msgstr ""
-"Falls diese Einstellung aktiviert ist, werden Servernachrichten im "
-"Debugreiter des Chats angezeigt. Falls deaktiviert, zeigen Servernachrichten "
-"stattdessen im globalen Chat angezeigt. \n"
-"\n"
-"Hinweis: Bezugnehmend auf 4144 - Falls dies deaktiviert wird, könnte es sein "
-"dass du einige Debugnachrichten im Debugreiter vom Klienten verlieren "
-"könntest,  da es sich um gefälschte Servernachrichten handelt."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+msgstr "Falls diese Einstellung aktiviert ist, werden Servernachrichten im Debugreiter des Chats angezeigt. Falls deaktiviert, zeigen Servernachrichten stattdessen im globalen Chat angezeigt. \n\nHinweis: Bezugnehmend auf 4144 - Falls dies deaktiviert wird, könnte es sein dass du einige Debugnachrichten im Debugreiter vom Klienten verlieren könntest,  da es sich um gefälschte Servernachrichten handelt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4383,12 +4268,7 @@ msgid ""
 "words typical for trades will go to Trade tab. This will make General tab "
 "less noisy. If this setting is disabled, all trade related players messages "
 "will stay in General tab."
-msgstr ""
-"Aktiviert den Handelsreiter. Der Handelsreiter ist einfach gesagt ein "
-"Filter. Nachrichten, die typische Wörter zu handeln beinhalten werden im "
-"Handelsreiter angezeigt. Die macht den globalen Reiter ruhiger. Falls diese "
-"Einstellung deaktiviert wird bleiben handelsbezogene Nachrichten im globalen "
-"Reiter."
+msgstr "Aktiviert den Handelsreiter. Der Handelsreiter ist einfach gesagt ein Filter. Nachrichten, die typische Wörter zu handeln beinhalten werden im Handelsreiter angezeigt. Die macht den globalen Reiter ruhiger. Falls diese Einstellung deaktiviert wird bleiben handelsbezogene Nachrichten im globalen Reiter."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:224
@@ -4398,17 +4278,10 @@ msgstr "GM-Reiter einschalten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
-msgstr ""
-"Falls aktiviert, wird der GM-Reiter im Chat auftauchen. Es zeigt Text im "
-"Bezug auf GM-Aktivitäten an.\n"
-"\n"
-"Hinweis: Diese Einstellung macht einen Unterschied für GMs (Game Master) "
-"seit dieser Reiter nur für GMs angezeigt wird."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+msgstr "Falls aktiviert, wird der GM-Reiter im Chat auftauchen. Es zeigt Text im Bezug auf GM-Aktivitäten an.\n\nHinweis: Diese Einstellung macht einen Unterschied für GMs (Game Master) seit dieser Reiter nur für GMs angezeigt wird."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:232
@@ -4418,13 +4291,10 @@ msgstr "Sprachenreiter einschalten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr ""
-"Wenn du dieses Feature aktivierst, wird der Sprachenreiter auftauchen, falls "
-"der Server dieses Merkmal unterstützt."
+msgstr "Wenn du dieses Feature aktivierst, wird der Sprachenreiter auftauchen, falls der Server dieses Merkmal unterstützt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4434,18 +4304,10 @@ msgstr "Alle Sprachnachrichten anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
-msgstr ""
-"Falls diese Einstellung aktiviert ist und der Server verschiedene Reiter für "
-"verschiedene Sprachen unterstützt, wirst du Nachrichten in allen Sprachen "
-"sehen, ungeachtet deiner Spracheinstellungen.\n"
-"\n"
-"Hinweis: Dies funktioniert nur auf Servern die, die Sprachenreiterfunktion "
-"unterstüzen."
+msgstr "Falls diese Einstellung aktiviert ist und der Server verschiedene Reiter für verschiedene Sprachen unterstützt, wirst du Nachrichten in allen Sprachen sehen, ungeachtet deiner Spracheinstellungen.\n\nHinweis: Dies funktioniert nur auf Servern die, die Sprachenreiterfunktion unterstüzen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:250
@@ -4455,17 +4317,10 @@ msgstr "Kampfreiter aktivieren"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
-msgstr ""
-"Falls dies aktiviert ist, wird der Kampfreiter im Chat erscheinen. Dieser "
-"Reiter zeigt kampfbezogene Nachrichten an wie Erhalt von Schaden und "
-"Erfahrung, falls Kampfnachrichten aktiviert sind.\n"
-"\n"
-"Hinweis: Klient muss neu gestartet werden um diese Funktion zu aktivieren."
+msgstr "Falls dies aktiviert ist, wird der Kampfreiter im Chat erscheinen. Dieser Reiter zeigt kampfbezogene Nachrichten an wie Erhalt von Schaden und Erfahrung, falls Kampfnachrichten aktiviert sind.\n\nHinweis: Klient muss neu gestartet werden um diese Funktion zu aktivieren."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:259
@@ -4478,10 +4333,7 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr ""
-"Wenn diese Einstellung aktiviert ist werden Nachrichten in Bezug zum Kampf "
-"wie Erhalt von Schaden oder Erfahrung im Debug- oder im Kampfreiter "
-"angezeigt. Falls deaktiviert werden keine Nachrichten zum Kampf angezeigt."
+msgstr "Wenn diese Einstellung aktiviert ist werden Nachrichten in Bezug zum Kampf wie Erhalt von Schaden oder Erfahrung im Debug- oder im Kampfreiter angezeigt. Falls deaktiviert werden keine Nachrichten zum Kampf angezeigt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4491,19 +4343,10 @@ msgstr "Falls nötig Chatreiter Größe ändern"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
-msgstr ""
-"Falls diese Funktion aktiviert ist, wird der Text im Chat automatisch an das "
-"Aussehen des Chateingabefeldes angepasst sobald du etwas schreibst oder das "
-"Chateingabefeld verschwindet. Wenn deaktiviert, wird das Chateingabefeld "
-"immer seinen Platz belegen, was sonst für Text nützlich sein könnte. "
-"Hinweis: Es geht um sprunghaftes Verhalten des Chats gegen weniger nutzbaren "
-"Platz für Text."
+msgstr "Falls diese Funktion aktiviert ist, wird der Text im Chat automatisch an das Aussehen des Chateingabefeldes angepasst sobald du etwas schreibst oder das Chateingabefeld verschwindet. Wenn deaktiviert, wird das Chateingabefeld immer seinen Platz belegen, was sonst für Text nützlich sein könnte. Hinweis: Es geht um sprunghaftes Verhalten des Chats gegen weniger nutzbaren Platz für Text."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:279
@@ -4525,9 +4368,7 @@ msgstr "Lokale Zeit benutzen"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr ""
-"Wenn dieses Funktion aktiviert ist, benutzen Zeitstempel im Chat die lokale "
-"Zeit. Wenn deaktiviert, wird die Serverzeit benutzt (oftmals ist das GMT+0)."
+msgstr "Wenn dieses Funktion aktiviert ist, benutzen Zeitstempel im Chat die lokale Zeit. Wenn deaktiviert, wird die Serverzeit benutzt (oftmals ist das GMT+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4537,15 +4378,10 @@ msgstr "Wörter hervorheben (Mit Komma trennen)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr ""
-"Hier kannst du ein einige zusätzliche Wörter zur Hervorhebung bestimmen . "
-"Benutze durch Komma getrennte Wörter. \n"
-"\n"
-"Hinweis: Häufige Hervorhebungen sind lästig - benutze sie mit Bedacht."
+msgstr "Hier kannst du ein einige zusätzliche Wörter zur Hervorhebung bestimmen . Benutze durch Komma getrennte Wörter. \n\nHinweis: Häufige Hervorhebungen sind lästig - benutze sie mit Bedacht."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4555,17 +4391,10 @@ msgstr "Globale Nachrichten von Name ignorieren (Mit Komma trennen)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
-msgstr ""
-"Diese Einstellung erlaubt dir einige globale Nachrichten zu ignorieren falls "
-"der bestimmte Sender (NPC, GM) dich zu sehr nervt. Globale Nachrichten "
-"werden stattdessen zum Debugreiter verschoben.\n"
-"\n"
-"Hinweis: Unvorsichtige Verwendung dieser Funktion, kann dazu führen, dass du "
-"wichtige Ankündigungen verpasst!"
+msgstr "Diese Einstellung erlaubt dir einige globale Nachrichten zu ignorieren falls der bestimmte Sender (NPC, GM) dich zu sehr nervt. Globale Nachrichten werden stattdessen zum Debugreiter verschoben.\n\nHinweis: Unvorsichtige Verwendung dieser Funktion, kann dazu führen, dass du wichtige Ankündigungen verpasst!"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:314
@@ -4575,20 +4404,10 @@ msgstr "Emotes im Chat anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
-msgstr ""
-"Falls diese Einstellung aktivert ist wird eine Schaltfläche in der Nähe des "
-"Texteingabefeldes erscheinen. Diese Schaltfläche ruft das Gestaltungsfenster "
-"auf. Dies erlaubt dir Smilies in den Chat einzufügen und deinen Text zu "
-"formatieren.\n"
-"\n"
-"Hinweis: Das Fenster kann auch durch die F1 Taste, während du im Chat "
-"schreibst, aufgerufen werden."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+msgstr "Falls diese Einstellung aktivert ist wird eine Schaltfläche in der Nähe des Texteingabefeldes erscheinen. Diese Schaltfläche ruft das Gestaltungsfenster auf. Dies erlaubt dir Smilies in den Chat einzufügen und deinen Text zu formatieren.\n\nHinweis: Das Fenster kann auch durch die F1 Taste, während du im Chat schreibst, aufgerufen werden."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:324
@@ -4600,10 +4419,7 @@ msgstr "NdT Servernachricht beim Start anzeigen"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr ""
-"Wenn diese Einstellung ausgewählt ist, wird der Klient die Server NdT "
-"(Nachricht des Tages) anzeigen, sobald du auf dem Server bist. Deaktiveren, "
-"um die NdT nicht anzuzeigen."
+msgstr "Wenn diese Einstellung ausgewählt ist, wird der Klient die Server NdT (Nachricht des Tages) anzeigen, sobald du auf dem Server bist. Deaktiveren, um die NdT nicht anzuzeigen."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4704,9 +4520,7 @@ msgstr "Tastenkonflikt erkannt."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder "
-"das Spiel lässt sich nicht richtig steuern."
+msgstr "Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder das Spiel lässt sich nicht richtig steuern."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5091,9 +4905,7 @@ msgstr "Unterstützung für Bots"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr ""
-"Botunterstützung von Gilden aktivieren und serverseitige Gildenunterstüzung "
-"deaktiveren"
+msgstr "Botunterstützung von Gilden aktivieren und serverseitige Gildenunterstüzung deaktiveren"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5256,9 +5068,7 @@ msgstr "Hardwarebeschleunigung"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr ""
-"Transparenz des Zwischenspeichers aktivieren (Software, kann viel Speicher "
-"verbrauchen)"
+msgstr "Transparenz des Zwischenspeichers aktivieren (Software, kann viel Speicher verbrauchen)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5318,9 +5128,7 @@ msgstr "Zwischenspeicher für Wesen deaktivieren (Software)"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr ""
-"Verschiedene Optionen (Aktivieren oder deaktivieren kann die Leistung "
-"verbessern)"
+msgstr "Verschiedene Optionen (Aktivieren oder deaktivieren kann die Leistung verbessern)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5345,15 +5153,12 @@ msgstr "Texturenatlas aktiveren (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr ""
-"Alle Sprites pro Karte zwischenspeichern (Kann zusätzlichen Speicher "
-"verbrauchen)"
+msgstr "Alle Sprites pro Karte zwischenspeichern (Kann zusätzlichen Speicher verbrauchen)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
 msgid "Cache all sounds (can use additional memory)"
-msgstr ""
-"Alle Klänge zwischenspeichern (Kann zusätzlichen Speicher  verbrauchen)"
+msgstr "Alle Klänge zwischenspeichern (Kann zusätzlichen Speicher  verbrauchen)"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
@@ -5763,17 +5568,13 @@ msgstr "Kein(e)"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen "
-"Auflösung schlug fehl!"
+msgstr "Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen Auflösung schlug fehl!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen "
-"Auflösung schlug fehl!"
+msgstr "Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen Auflösung schlug fehl!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5793,9 +5594,7 @@ msgstr "Wechsle zu OpenGL"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:283
 msgid "Applying change to OpenGL requires restart."
-msgstr ""
-"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
-"übernommen."
+msgstr "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung übernommen."
 
 #. TRANSLATORS: resolution question dialog
 #: src/gui/widgets/tabs/setup_video.cpp:368
@@ -5816,9 +5615,7 @@ msgstr "Bildschirmauflösung wurde geändert"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Einige Fenster könnten verschoben werden um in die herabgesetzte Auflösung "
-"zu passen."
+msgstr "Einige Fenster könnten verschoben werden um in die herabgesetzte Auflösung zu passen."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6353,7 +6150,8 @@ msgstr "Menge:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Erstellen"
 
@@ -6470,7 +6268,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6488,7 +6287,8 @@ msgstr "Bitte verteile %d Punkte"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6514,7 +6314,8 @@ msgstr "Schau:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "W"
 
@@ -6613,12 +6414,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"HP: %u/%u\n"
-"MP: %u/%u\n"
-"Level: %u\n"
-"Erfahrung: %u\n"
-"Geld: %s"
+msgstr "HP: %u/%u\nMP: %u/%u\nLevel: %u\nErfahrung: %u\nGeld: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6720,7 +6516,8 @@ msgstr "Server bearbeiten"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6789,8 +6586,8 @@ msgstr "Schriften"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -7086,13 +6883,15 @@ msgstr "Betreff:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Geld:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Gegenstand:"
@@ -7513,9 +7312,9 @@ msgstr "Fähigkeit %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Fähigkeit %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7800,17 +7599,14 @@ msgstr "Du hast nicht genügend Geld."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
-"Gegenstände hinzufügen."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser Gegenstände hinzufügen."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not trade equipped items."
-msgstr ""
-"Gegenstand hinzufügen fehlgeschlagen. Du kannst micht mit ausgerüsteten "
-"Gegenständen handeln."
+msgstr "Gegenstand hinzufügen fehlgeschlagen. Du kannst micht mit ausgerüsteten Gegenständen handeln."
 
 #. TRANSLATORS: updater window name
 #: src/gui/windows/updaterwindow.cpp:171
@@ -9059,8 +8855,7 @@ msgstr "Fenster: Wegwerfen leeren"
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
-"Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
+msgstr "Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -9075,9 +8870,7 @@ msgstr "Unbekannter Charakterserver Fehler."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wird der Name schon "
-"benutzt."
+msgstr "Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wird der Name schon benutzt."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -9130,9 +8923,7 @@ msgstr "Konnte nicht flüstern. Ignoriert von %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr ""
-"Flüsternachricht konnte nicht gesendet werden. Du wirst von allen Spielern "
-"ignoriert."
+msgstr "Flüsternachricht konnte nicht gesendet werden. Du wirst von allen Spielern ignoriert."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9226,11 +9017,10 @@ msgstr "Du wurdest für immer vom Spiel gebannt. Bitte kontaktiere das GM-Team."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-#, fuzzy
 msgid ""
 "Client too old or wrong server type.\n"
 "Please update client on http://manaplus.org"
-msgstr "Klient ist zu alt oder falscher Servertyp."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:146 src/net/eathena/loginrecv.cpp:84
@@ -9238,9 +9028,7 @@ msgstr "Klient ist zu alt oder falscher Servertyp."
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Du wurdest bis %s gebannt.\n"
-"Bitte kontaktiere das GM-Team via der Foren."
+msgstr "Du wurdest bis %s gebannt.\nBitte kontaktiere das GM-Team via der Foren."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10155,23 +9943,17 @@ msgstr "Unbehandelter Pakethandelabbruch mit %s"
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:287
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
-"Gegenstand hinzufügen fehlgeschlagen: Der Handelspartner kann nichts mehr "
-"tragen."
+msgstr "Gegenstand hinzufügen fehlgeschlagen: Der Handelspartner kann nichts mehr tragen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-"Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen freien Platz "
-"in seinem Inventar."
+msgstr "Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen freien Platz in seinem Inventar."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
 msgid "Failed adding item. You can't trade this item."
-msgstr ""
-"Gegenstand hinzufügen fehlgeschlagen. Du kannst diesen Gegenstand nicht "
-"handeln."
+msgstr "Gegenstand hinzufügen fehlgeschlagen. Du kannst diesen Gegenstand nicht handeln."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:299
@@ -10333,18 +10115,14 @@ msgstr "Karte eingesteckt."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr ""
-"Einzahlen fehlgeschlagen. Vielleicht hast du diese Menge an Geld gerade "
-"nicht dabei."
+msgstr "Einzahlen fehlgeschlagen. Vielleicht hast du diese Menge an Geld gerade nicht dabei."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr ""
-"Abheben fehlgeschlagen. Vielleicht hast du gerade diese Menge an Geld nicht "
-"auf der Bank."
+msgstr "Abheben fehlgeschlagen. Vielleicht hast du gerade diese Menge an Geld nicht auf der Bank."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10359,8 +10137,7 @@ msgstr "Erstellen des Verkaufsstandes fehlgeschlagen. Zu viel Gewicht."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:440
 msgid "Buying store create failed. No items in store."
-msgstr ""
-"Erstellen des Verkaufsstandes fehlgeschlagen. Keine Gegenstände im Laden."
+msgstr "Erstellen des Verkaufsstandes fehlgeschlagen. Keine Gegenstände im Laden."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:444
@@ -10387,9 +10164,7 @@ msgstr "Der Handel ist fehlgeschlagen."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr ""
-"Der Handel ist fehlgeschlagen, da die eingegebene Anzahl von Gegenständen "
-"höher ist, als die Anzahl, die der Käufer kaufen will."
+msgstr "Der Handel ist fehlgeschlagen, da die eingegebene Anzahl von Gegenständen höher ist, als die Anzahl, die der Käufer kaufen will."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10414,8 +10189,7 @@ msgstr "Keine passenden Läden wurden gefunden."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:483
 msgid "There are too many results. Please enter more detailed search term."
-msgstr ""
-"Es gibt zu viele Ergebnisse. Bitte einen genaueren Suchbegriff eingeben."
+msgstr "Es gibt zu viele Ergebnisse. Bitte einen genaueren Suchbegriff eingeben."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:488
@@ -10627,15 +10401,12 @@ msgstr "Verbesserung unbekannt für Gegenstand %s."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:650
 msgid "You can't add item to card because weight too high."
-msgstr ""
-"Gegenstand kann nicht zu Karte hinzugefügt werden, da das Gewicht zu hoch "
-"ist."
+msgstr "Gegenstand kann nicht zu Karte hinzugefügt werden, da das Gewicht zu hoch ist."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:654
 msgid "You can't add item to card because too many items."
-msgstr ""
-"Gegenstand kann nicht zu Karte hinzugefügt werden - zu viele Gegenstände."
+msgstr "Gegenstand kann nicht zu Karte hinzugefügt werden - zu viele Gegenstände."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:658
@@ -10809,9 +10580,7 @@ msgstr "Du kannst das Kind nicht adoptieren. Dein Level ist du niedrig."
 #: src/resources/notifications.h:816
 msgid ""
 "Child adoption failed. This player is already married and can't be a baby."
-msgstr ""
-"Adoption fehlgeschlagen. Dieser Spieler ist bereits verheiratet und kann "
-"keine Baby mehr sein."
+msgstr "Adoption fehlgeschlagen. Dieser Spieler ist bereits verheiratet und kann keine Baby mehr sein."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10821,15 +10590,12 @@ msgstr "Standort für Warp Fähigkeit gespeichert."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
 msgid "Error saving location. Not enough skill level."
-msgstr ""
-"Der Standort konnte nicht gespeichert werden. Der Fähigkeitenlevel ist "
-"ungenügend."
+msgstr "Der Standort konnte nicht gespeichert werden. Der Fähigkeitenlevel ist ungenügend."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
 msgid "Error saving location. You do not have warp skill."
-msgstr ""
-"Standort konnte nicht gespeichert werden. Der Skill Level ist ungenügend."
+msgstr "Standort konnte nicht gespeichert werden. Der Skill Level ist ungenügend."
 
 #. TRANSLATORS: skill level
 #: src/resources/skill/skillinfo.cpp:106
@@ -10889,8 +10655,7 @@ msgstr "TargetTrap"
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
+msgstr "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10946,15 +10711,3 @@ msgstr "%d Sekunden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Erfolgreich abgemeldet."
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Leb wohl und komme jeder Zeit wieder..."
-
-#~ msgid "Unregister"
-#~ msgstr "Registrierung aufheben"
-
-#~ msgid "Name: %s"
-#~ msgstr "Name: %s"
diff --git a/po/es.po b/po/es.po
index 57e9a221f..e27a592c0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # 0x0Eddine <salahbubuli44@gmail.com>, 2012,2014-2015
 # Andrei Karas <akaras@inbox.ru>, 2011
@@ -25,14 +25,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-23 00:37+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
-"es/)\n"
-"Language: es\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -121,9 +120,7 @@ msgstr "Registro subido a:"
 #: src/actions/actions.cpp:1737
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr ""
-"Deshabilitada opción para mostrar última vez visto. Habilítala en "
-"Jugadores / \"Registrar ID de jugador y última vez visto\"."
+msgstr "Deshabilitada opción para mostrar última vez visto. Habilítala en Jugadores / \"Registrar ID de jugador y última vez visto\"."
 
 #. TRANSLATORS: last seen error
 #: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
@@ -145,8 +142,7 @@ msgstr "¡No se puede enviar un mensaje vacío como susurro ni al canal!"
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr ""
-"¡No se puede crear la pestaña de susurro \"%s\"! Probablemente ya existe."
+msgstr "¡No se puede crear la pestaña de susurro \"%s\"! Probablemente ya existe."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -420,9 +416,8 @@ msgstr "trabajo"
 
 #. TRANSLATORS: get homunculus xp message
 #: src/being/localplayer.cpp:1150
-#, fuzzy
 msgid "Homun"
-msgstr "Homúnculo"
+msgstr ""
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1162
@@ -742,8 +737,7 @@ msgstr "  -u --skip-update    : Saltarse las descargas de actualización"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data           : Carpeta desde la que se cargan los datos del juego"
+msgstr "  -d --data           : Carpeta desde la que se cargan los datos del juego"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
@@ -753,8 +747,7 @@ msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"     --screenshot-dir : Carpeta donde se guardan las capturas de pantalla"
+msgstr "     --screenshot-dir : Carpeta donde se guardan las capturas de pantalla"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:106
@@ -769,8 +762,7 @@ msgstr "     --renderer: Establecer tipo de renderizador"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Comenzar a probar controladores y auto configurar"
+msgstr "  -T --tests          : Comenzar a probar controladores y auto configurar"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1267,16 +1259,14 @@ msgstr "Revivir"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Estás cargando con más de la mitad de tu peso. Eres incapaz de recobrar la "
-"salud."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Estás cargando con más de la mitad de tu peso. Eres incapaz de recobrar la salud."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-"Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
+msgstr "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1287,7 +1277,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "predeterminado"
 
@@ -1765,9 +1756,9 @@ msgstr "Nivel: %d"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:274
-#, fuzzy, c-format
+#, c-format
 msgid "Hp: %d/%d"
-msgstr "Nvl: %d / %d"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:284
@@ -3207,39 +3198,33 @@ msgstr "Barra de HP del monstruo (segundo color)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Homúnculo"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Barra de HP del monstruo (segundo color)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Mercenario"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Barra de HP del monstruo (segundo color)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Barra de HP del jugador"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Barra de HP del jugador (segundo color)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3313,9 +3298,8 @@ msgstr "Resaltado de colisión en el agua"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Resaltado de colisión en el agua"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3560,13 +3544,15 @@ msgstr "Compartir artículos habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Compartir artículos deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "No se puede compartir artículos."
 
@@ -3577,19 +3563,22 @@ msgstr "Compartir artículos desconocido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "No se puede compartir experiencia."
 
@@ -4018,10 +4007,7 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr ""
-"La ventana del chat será ocultada automáticamente cuando no esté en uso.\n"
-"\n"
-"Presiona Enter o pasa el ratón por encima para mostrarla nuevamente."
+msgstr "La ventana del chat será ocultada automáticamente cuando no esté en uso.\n\nPresiona Enter o pasa el ratón por encima para mostrarla nuevamente."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4033,19 +4019,15 @@ msgstr "Proteger foco del chat"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
-msgstr ""
-"Habilita la protección agresiva del foco de entrada en la ventana del chat.\n"
-"\n"
-"Nota: A ninguna otra entrada de texto se le permitirá recibir el foco de "
-"entrada mientras estés escribiendo en la ventana del chat."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+msgstr "Habilita la protección agresiva del foco de entrada en la ventana del chat.\n\nNota: A ninguna otra entrada de texto se le permitirá recibir el foco de entrada mientras estés escribiendo en la ventana del chat."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Colores"
 
@@ -4059,10 +4041,7 @@ msgstr "Remover los colores de los mensajes recibidos en el chat"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr ""
-"Habilita este ajuste para desnudar los colores de los mensajes que llegan al "
-"chat. Si está habilitado, todos los mensajes usarán el color de texto "
-"predeterminado."
+msgstr "Habilita este ajuste para desnudar los colores de los mensajes que llegan al chat. Si está habilitado, todos los mensajes usarán el color de texto predeterminado."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4072,26 +4051,21 @@ msgstr "Mostrar lista de colores del chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
-"Permitir utilizar los comandos de magia y GM en todas las pestañas del chat"
+msgstr "Permitir utilizar los comandos de magia y GM en todas las pestañas del chat"
 
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr ""
-"Habilita esta configuración para poder escribir hechizos y comandos GM en "
-"cualquier pestaña."
+msgstr "Habilita esta configuración para poder escribir hechizos y comandos GM en cualquier pestaña."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4106,11 +4080,9 @@ msgstr "Límite máx. de caracteres por línea en el chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4121,9 +4093,7 @@ msgstr "Límite máx. de líneas en el chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4154,9 +4124,7 @@ msgstr "Habilitar registro del chat de depuración"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
-msgstr ""
-"Si habilitas esto, el historial de la pestaña de depuración también será "
-"registrada en el disco."
+msgstr "Si habilitas esto, el historial de la pestaña de depuración también será registrada en el disco."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:137
@@ -4166,12 +4134,9 @@ msgstr "Mostrar historial del chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
-msgstr ""
-"Si esta configuración es habilitada, el cliente cargará el contenido de "
-"viejas pestañas del chat desde los registros al inicio en vez de iniciar con "
-"pestañas vacías."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
+msgstr "Si esta configuración es habilitada, el cliente cargará el contenido de viejas pestañas del chat desde los registros al inicio en vez de iniciar con pestañas vacías."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4181,11 +4146,9 @@ msgstr "Mostrar mensajes de conexión de miembros del grupo"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4196,17 +4159,10 @@ msgstr "Mostrar mensajes de conexión de miembros del gremio"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
-msgstr ""
-"Si este ajuste se habilita, se mostrarán los cambios de estado de conexión "
-"de los miembros del gremio en la pestaña Gremio del chat.\n"
-"\n"
-"Esto agrega algunos sonidos extra al chat, pero te permite notar cuando tus "
-"compañeros se conectan."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+msgstr "Si este ajuste se habilita, se mostrarán los cambios de estado de conexión de los miembros del gremio en la pestaña Gremio del chat.\n\nEsto agrega algunos sonidos extra al chat, pero te permite notar cuando tus compañeros se conectan."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4221,13 +4177,9 @@ msgstr "Ocultar mensajes de la tienda"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4240,8 +4192,7 @@ msgstr "Mostrar mensajes MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4260,12 +4211,9 @@ msgstr "Poner todos los susurros en pestañas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4276,8 +4224,7 @@ msgstr "Registrar mensajes de magia en la pestaña del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4290,11 +4237,9 @@ msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4319,11 +4264,9 @@ msgstr "Habilitar pestaña para GM"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4334,15 +4277,10 @@ msgstr "Habilitar pestaña de lenguaje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr ""
-"Si esta característica es habilitada, la pestaña de lenguaje aparecerá si el "
-"servidor la soporta.\n"
-"\n"
-"Nota: Por ahora, sólo es soportado por el servidor Evol."
+msgstr "Si esta característica es habilitada, la pestaña de lenguaje aparecerá si el servidor la soporta.\n\nNota: Por ahora, sólo es soportado por el servidor Evol."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4352,9 +4290,7 @@ msgstr "Mostrar mensajes de todos los lenguajes"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4367,9 +4303,7 @@ msgstr "Habilitar pestaña de batalla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4385,11 +4319,7 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr ""
-"Si se habilitada esta preferencia, los mensajes relacionados a las batallas, "
-"como el daño o ganancia de experiencia, serán mostrados en la pestaña "
-"Depuración o Batalla. Si está deshabilitado, ningún mensaje de batalla será "
-"mostrado."
+msgstr "Si se habilitada esta preferencia, los mensajes relacionados a las batallas, como el daño o ganancia de experiencia, serán mostrados en la pestaña Depuración o Batalla. Si está deshabilitado, ningún mensaje de batalla será mostrado."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4399,10 +4329,7 @@ msgstr "Si hace falta, cambia el tamaño de las pestañas del chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4427,10 +4354,7 @@ msgstr "Usar hora local"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr ""
-"Si esta función es habilitada, las marcas de tiempo en el chat usarán la "
-"hora local. Si es deshabilitado, se usará la hora del servidor (mayormente "
-"es GTM+0)."
+msgstr "Si esta función es habilitada, las marcas de tiempo en el chat usarán la hora local. Si es deshabilitado, se usará la hora del servidor (mayormente es GTM+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4440,15 +4364,10 @@ msgstr "Resaltar palabras (separadas por coma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr ""
-"Aquí puedes especificar algunas palabras extra que también serán resaltadas. "
-"Usa comas para separar las palabras.\n"
-"\n"
-"Nota: Los resaltados frecuentes pueden ser molestos; úsalo con precaución."
+msgstr "Aquí puedes especificar algunas palabras extra que también serán resaltadas. Usa comas para separar las palabras.\n\nNota: Los resaltados frecuentes pueden ser molestos; úsalo con precaución."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4458,8 +4377,7 @@ msgstr "Ignorar nombres globalmente (separados por coma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4472,12 +4390,9 @@ msgstr "Mostrar botón de emoticonos en el chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4490,10 +4405,7 @@ msgstr "Mostrar el mensaje motd del servidor al iniciar"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr ""
-"Si esta configuración es habilitada, el cliente mostrará el MOTD (MDD, "
-"mensaje del día) una vez que te conectes al servidor. Deshabilita para "
-"ocultar el MOTD."
+msgstr "Si esta configuración es habilitada, el cliente mostrará el MOTD (MDD, mensaje del día) una vez que te conectes al servidor. Deshabilita para ocultar el MOTD."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4594,9 +4506,7 @@ msgstr "Detectado conflicto de teclas."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Conflicto con las teclas \"%s\" e \"%s\" . Resuélvelo, o el juego podría "
-"comportarse en un modo extraño."
+msgstr "Conflicto con las teclas \"%s\" e \"%s\" . Resuélvelo, o el juego podría comportarse en un modo extraño."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4966,9 +4876,7 @@ msgstr "NPC"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:295
 msgid "Cycle npc targets"
-msgstr ""
-"Seleccionar cíclicamente los npcs en derredor, no necesariamente al más "
-"cercano"
+msgstr "Seleccionar cíclicamente los npcs en derredor, no necesariamente al más cercano"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:299
@@ -4983,8 +4891,7 @@ msgstr "Soporte de bots"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr ""
-"Habilitar soporte para el bot 'guild' y deshabilitar soporte de gremio nativo"
+msgstr "Habilitar soporte para el bot 'guild' y deshabilitar soporte de gremio nativo"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5207,8 +5114,7 @@ msgstr "Deshabilitar caché de criaturas (Software)"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr ""
-"Opciones diferentes (habitar o deshabilitar puede mejorar el rendimiento)"
+msgstr "Opciones diferentes (habitar o deshabilitar puede mejorar el rendimiento)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5233,8 +5139,7 @@ msgstr "Habilitar atlas de texturas (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr ""
-"Almacenar en caché todos los sprites por mapa (puede usar memoria adicional)"
+msgstr "Almacenar en caché todos los sprites por mapa (puede usar memoria adicional)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
@@ -5370,9 +5275,7 @@ msgstr "Crear capturas de pantalla para cada intercambio completado"
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr ""
-"Emular botón derecho del ratón al mantener clic presionado (útil para "
-"interfaces táctiles)"
+msgstr "Emular botón derecho del ratón al mantener clic presionado (útil para interfaces táctiles)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5651,17 +5554,13 @@ msgstr "Nada"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"¡Fallo al intercambiar al modo de ventana! ¡La restauración al modo anterior "
-"también falló!"
+msgstr "¡Fallo al intercambiar al modo de ventana! ¡La restauración al modo anterior también falló!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"¡Fallo al intercambiar al modo de pantalla completa!  ¡La restauración al "
-"modo anterior también falló!"
+msgstr "¡Fallo al intercambiar al modo de pantalla completa!  ¡La restauración al modo anterior también falló!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5702,8 +5601,7 @@ msgstr "Resolución de pantalla cambiada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
+msgstr "Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6238,7 +6136,8 @@ msgstr "Cantidad:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crear"
 
@@ -6271,17 +6170,13 @@ msgstr "Escribe el nuevo correo dos veces:"
 #: src/gui/windows/changeemaildialog.cpp:137
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
-msgstr ""
-"El nuevo correo electrónico necesita tener al menos %u caracteres de "
-"largitud."
+msgstr "El nuevo correo electrónico necesita tener al menos %u caracteres de largitud."
 
 #. TRANSLATORS: change email error
 #: src/gui/windows/changeemaildialog.cpp:145
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
-msgstr ""
-"El nuevo correo electrónicao necesita tener menos de %u caracteres de "
-"longitud."
+msgstr "El nuevo correo electrónicao necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: change email error
 #: src/gui/windows/changeemaildialog.cpp:153
@@ -6359,7 +6254,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6377,7 +6273,8 @@ msgstr "Por favor, distribuye %d puntos"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6403,7 +6300,8 @@ msgstr "Apariencia:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6502,12 +6400,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"HP: %u/%u\n"
-"Mp: %u/%u\n"
-"Nivel: %u\n"
-"Experiencia: %u\n"
-"Dinero: %s"
+msgstr "HP: %u/%u\nMp: %u/%u\nNivel: %u\nExperiencia: %u\nDinero: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6609,7 +6502,8 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6651,8 +6545,7 @@ msgstr "Versión del paquete:"
 #. TRANSLATORS: edit server dialog error message
 #: src/gui/windows/editserverdialog.cpp:206
 msgid "Please at least type both the address and the port of the server."
-msgstr ""
-"Por favor, por lo menos especifique el nombre y el puerto del servidor."
+msgstr "Por favor, por lo menos especifique el nombre y el puerto del servidor."
 
 #. TRANSLATORS: egg selection dialog name
 #: src/gui/windows/eggselectiondialog.cpp:42
@@ -6679,8 +6572,8 @@ msgstr "Fuentes"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -6976,13 +6869,15 @@ msgstr "Asunto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Dinero:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Artículo:"
@@ -7209,15 +7104,13 @@ msgstr "Correo:"
 #: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
-msgstr ""
-"El nombre de usuario necesita tener al menos %u caracteres de longitud."
+msgstr "El nombre de usuario necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
 #: src/gui/windows/registerdialog.cpp:197
 #, c-format
 msgid "The username needs to be less than %u characters long."
-msgstr ""
-"El nombre de usuario necesita tener menos de %u caracteres de longitud."
+msgstr "El nombre de usuario necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: error message
 #: src/gui/windows/registerdialog.cpp:206
@@ -7405,9 +7298,9 @@ msgstr "Habilidad %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Habilidad %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7692,10 +7585,9 @@ msgstr "No tienes suficiente dinero."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
-"la ventana."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en la ventana."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8949,9 +8841,7 @@ msgstr "Limpiar ventana de drops"
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
-"Acceso denegado. Lo más probable es que hayan muchos jugadores en este "
-"servidor."
+msgstr "Acceso denegado. Lo más probable es que hayan muchos jugadores en este servidor."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -9019,9 +8909,7 @@ msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr ""
-"El susurro no pudo ser enviado. Estás siendo ignorado por todos los "
-"jugadores."
+msgstr "El susurro no pudo ser enviado. Estás siendo ignorado por todos los jugadores."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9111,17 +8999,14 @@ msgstr "Rechazado del servidor."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Has sido proscrito permanentemente del juego. Por favor contacta con el "
-"equipo de GM."
+msgstr "Has sido proscrito permanentemente del juego. Por favor contacta con el equipo de GM."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-#, fuzzy
 msgid ""
 "Client too old or wrong server type.\n"
 "Please update client on http://manaplus.org"
-msgstr "El cliente es muy viejo o el tipo de servidor es incorrecto."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:146 src/net/eathena/loginrecv.cpp:84
@@ -9129,9 +9014,7 @@ msgstr "El cliente es muy viejo o el tipo de servidor es incorrecto."
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Has sido proscrito temporalmente del juego hasta %s.\n"
-"Por favor contacta al equipo de GM a través de los foros."
+msgstr "Has sido proscrito temporalmente del juego hasta %s.\nPor favor contacta al equipo de GM a través de los foros."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10218,18 +10101,14 @@ msgstr "Tarjeta insertada."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr ""
-"Deposito fallido. Probablemente no tengas esta cantidad de dinero contigo en "
-"este momento."
+msgstr "Deposito fallido. Probablemente no tengas esta cantidad de dinero contigo en este momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr ""
-"Retiro fallido. Probablemente no tengas esta cantidad de dinero en el banco "
-"en este momento."
+msgstr "Retiro fallido. Probablemente no tengas esta cantidad de dinero en el banco en este momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10271,15 +10150,12 @@ msgstr "El convenio ha fallado."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr ""
-"El intercambio falló, porque la cantidad de artículos ingresado es más alto "
-"que la que el comprador está dispuesto a comprar."
+msgstr "El intercambio falló, porque la cantidad de artículos ingresado es más alto que la que el comprador está dispuesto a comprar."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
 msgid "The trade failed, because the buyer is lacking required balance."
-msgstr ""
-"El intercambio falló, porque el comprador carece del balance requerido."
+msgstr "El intercambio falló, porque el comprador carece del balance requerido."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:470
@@ -10299,9 +10175,7 @@ msgstr "No se encontraron almacenes coincidentes."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:483
 msgid "There are too many results. Please enter more detailed search term."
-msgstr ""
-"Hay muchos resultados. Por favor, ingresa términos de búsqueda más "
-"detallados."
+msgstr "Hay muchos resultados. Por favor, ingresa términos de búsqueda más detallados."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:488
@@ -10518,8 +10392,7 @@ msgstr "No puedes agregar el artículo a la tarjeta porque pesa demasiado."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:654
 msgid "You can't add item to card because too many items."
-msgstr ""
-"No puedes agregar el artículo a la tarjeta porque hay muchos artículos."
+msgstr "No puedes agregar el artículo a la tarjeta porque hay muchos artículos."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:658
@@ -10693,8 +10566,7 @@ msgstr "Error al adoptar al niño. Tu nivel es muy bajo."
 #: src/resources/notifications.h:816
 msgid ""
 "Child adoption failed. This player is already married and can't be a baby."
-msgstr ""
-"Error al adoptar al niño. Este jugador ya estácasado y no puede ser un bebé."
+msgstr "Error al adoptar al niño. Este jugador ya estácasado y no puede ser un bebé."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10769,8 +10641,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
+msgstr "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10826,15 +10697,3 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Registro cancelado"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Adiós, vuelve cuando quieras..."
-
-#~ msgid "Unregister"
-#~ msgstr "Cancelar Registro"
-
-#~ msgid "Name: %s"
-#~ msgstr "Nombre: %s"
diff --git a/po/fi.po b/po/fi.po
index a9e5ca643..1c83f24e4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011
@@ -10,14 +10,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
-"fi/)\n"
-"Language: fi\n"
+"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -693,8 +692,7 @@ msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
-msgstr ""
-"  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
+msgstr "  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:80
@@ -1246,7 +1244,8 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
 #. TRANSLATORS: weight message
@@ -1263,7 +1262,8 @@ msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "oletus"
 
@@ -3183,39 +3183,33 @@ msgstr "Hirviön VP-palkki (toinen väri)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Hirviön VP-palkki"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Hirviön VP-palkki (toinen väri)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Hirviön VP-palkki"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Hirviön VP-palkki (toinen väri)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Pelaajan VP-palkki"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Pelaajan VP-palkki (toinen väri)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3535,13 +3529,15 @@ msgstr "Saaliinjako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Saaliinjako poistettu käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Saaliinjako ei ole mahdollista."
 
@@ -3552,19 +3548,22 @@ msgstr "Saaliinjaon tila on tuntematon."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Kokemuksen jako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Kokemuksen jako pois käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Kokemuksen jako ei ole mahdollista."
 
@@ -4005,15 +4004,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Värit"
 
@@ -4037,11 +4036,9 @@ msgstr "Näytä keskustelun värilista"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4068,11 +4065,9 @@ msgstr "Keskusteluviestin pituusraja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4083,9 +4078,7 @@ msgstr "Keskusteluvälilehden riviraja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4126,8 +4119,8 @@ msgstr "Näytä keskusteluhistoria"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4138,11 +4131,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4153,11 +4144,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4173,13 +4162,9 @@ msgstr "Piilota kauppaviestit"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4192,8 +4177,7 @@ msgstr "Näytä MVP-viestit"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4212,12 +4196,9 @@ msgstr "Laita kaikki kuiskaukset välilehtiin"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4228,8 +4209,7 @@ msgstr "Kirjaa magiaviestit debug-välilehdelle"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4242,11 +4222,9 @@ msgstr "Näytä palvelinviestit debug-välilehdellä"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4271,11 +4249,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4286,8 +4262,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4300,9 +4275,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4315,9 +4288,7 @@ msgstr "Ota taisteluvälilehti käyttöön"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4343,10 +4314,7 @@ msgstr "Muuta välilehden kokoa tarpeen mukaan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4381,8 +4349,7 @@ msgstr "Korosta sanat (pilkuin erotettu)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4395,8 +4362,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4409,12 +4375,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4528,9 +4491,7 @@ msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
-"ole hyvä ja poista päällekkäisyydet."
+msgstr "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; ole hyvä ja poista päällekkäisyydet."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5625,8 +5586,7 @@ msgstr "Ikkunan koko vaihdettu"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
+msgstr "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6161,7 +6121,8 @@ msgstr "Määrä:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Luo"
 
@@ -6278,7 +6239,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6296,7 +6258,8 @@ msgstr "Jaa %d pistettä"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6322,7 +6285,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6523,7 +6487,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Yhdistä"
 
@@ -6592,8 +6557,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr ""
 
@@ -6889,13 +6854,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7316,9 +7283,9 @@ msgstr "Taito %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Taito %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7603,7 +7570,8 @@ msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #. TRANSLATORS: trade error
@@ -9016,8 +8984,7 @@ msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
+msgstr "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9032,9 +8999,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Pääsysi peliin on väliaikaisesti estetty %s asti.\n"
-"Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
+msgstr "Pääsysi peliin on väliaikaisesti estetty %s asti.\nOle hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9949,8 +9914,7 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:287
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
-"Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
+msgstr "Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
@@ -10662,9 +10626,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
-"\"true\", \"false\", \"1\" tai \"0\"."
+msgstr "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti \"true\", \"false\", \"1\" tai \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10720,15 +10682,3 @@ msgstr "%d sekuntia"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekuntia"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Tietojen poisto onnistui"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Näkemisiin, tule pian takaisin..."
-
-#~ msgid "Unregister"
-#~ msgstr "Poista palvelimelta"
-
-#~ msgid "Name: %s"
-#~ msgstr "Nimi: %s"
diff --git a/po/fr.po b/po/fr.po
index 778f1b6fb..73800bf9b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # adrien vigneron <adrienvigneron@ml1.net>, 2016
 # Alige, 2013-2016
@@ -28,14 +28,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-28 00:03+0000\n"
+"PO-Revision-Date: 2016-08-15 23:26+0000\n"
 "Last-Translator: Alige\n"
-"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
-"fr/)\n"
-"Language: fr\n"
+"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -124,9 +123,7 @@ msgstr "Historique ajouté dans:"
 #: src/actions/actions.cpp:1737
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr ""
-"Dernière fois vu désactivé. Activer dans joueurs / collecter les id des "
-"joueurs et l'historique de vue."
+msgstr "Dernière fois vu désactivé. Activer dans joueurs / collecter les id des joueurs et l'historique de vue."
 
 #. TRANSLATORS: last seen error
 #: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
@@ -148,9 +145,7 @@ msgstr "Impossible d'envoyer un message privé vide ou un message de chaîne !"
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr ""
-"Impossible de créer un onglet de discussion privée \"%s\". Il existe "
-"probablement déjà."
+msgstr "Impossible de créer un onglet de discussion privée \"%s\". Il existe probablement déjà."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -185,8 +180,7 @@ msgstr "Le message ferme la conversation."
 #. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:457
 msgid "Return now toggles chat."
-msgstr ""
-"La touche <Entrée> ferme maintenant la ligne d'entrée de la conversation."
+msgstr "La touche <Entrée> ferme maintenant la ligne d'entrée de la conversation."
 
 #. TRANSLATORS: message from toggle chat command
 #: src/actions/chat.cpp:467
@@ -425,9 +419,8 @@ msgstr "job"
 
 #. TRANSLATORS: get homunculus xp message
 #: src/being/localplayer.cpp:1150
-#, fuzzy
 msgid "Homun"
-msgstr "Homoncule"
+msgstr "Homon"
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1162
@@ -682,8 +675,7 @@ msgstr "  -l --log-file       : fichier journal à utiliser"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr ""
-"  -a --chat-log-dir   : Répertoire de l'historique de conversation à utiliser"
+msgstr "  -a --chat-log-dir   : Répertoire de l'historique de conversation à utiliser"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:61
@@ -738,15 +730,12 @@ msgstr "  -H --update-host    : Utilise cet hôte de mise à jour"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : Choisir le serveur de personnages et le personnage "
-"par défaut"
+msgstr "  -D --default        : Choisir le serveur de personnages et le personnage par défaut"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-"  -u --skip-update    : Ne pas effectuer le téléchargement des mises à jour"
+msgstr "  -u --skip-update    : Ne pas effectuer le téléchargement des mises à jour"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
@@ -756,8 +745,7 @@ msgstr "  -d --data           : Répertoire des données du jeu à charger"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -L --localdata-dir  : Répertoire à utiliser comme répertoire principal"
+msgstr "  -L --localdata-dir  : Répertoire à utiliser comme répertoire principal"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -777,9 +765,7 @@ msgstr "     --renderer       : Définir le type de rendu"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Commencer le test des drivers et la configuration "
-"automatique"
+msgstr "  -T --tests          : Commencer le test des drivers et la configuration automatique"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -807,8 +793,7 @@ msgstr "Impossible de créer le dossier de mises à jour !"
 #: src/dirs.cpp:537 src/dirs.cpp:558
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr ""
-"Erreur: %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
+msgstr "Erreur: %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
 #. TRANSLATORS: directory creation error
 #: src/dirs.cpp:589 src/dirs.cpp:597 src/dirs.cpp:605
@@ -859,8 +844,7 @@ msgstr "La capture d'écran a échoué !"
 #. TRANSLATORS: error message text
 #: src/game.cpp:685
 msgid "The connection to the server was lost."
-msgstr ""
-"La connexion au serveur a été coupée, le programme va maintenant se fermer."
+msgstr "La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
 #. TRANSLATORS: error message header
 #: src/game.cpp:688
@@ -1278,17 +1262,14 @@ msgstr "Ressusciter"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Tu portes plus de la moitié du poids maximal de ton inventaire. Tu n'es plus "
-"en mesure de récupérer ta santé."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Tu portes plus de la moitié du poids maximal de ton inventaire. Tu n'es plus en mesure de récupérer ta santé."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-"Tu portes moins de la moitié du poids maximal de ton inventaire. Tu peux "
-"maintenant récupérer ta santé."
+msgstr "Tu portes moins de la moitié du poids maximal de ton inventaire. Tu peux maintenant récupérer ta santé."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1299,7 +1280,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "défaut"
 
@@ -1777,9 +1759,9 @@ msgstr "Niveau: %d"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:274
-#, fuzzy, c-format
+#, c-format
 msgid "Hp: %d/%d"
-msgstr "Lvl: %d / %d"
+msgstr "Pv : %d/%d"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:284
@@ -3219,39 +3201,33 @@ msgstr "Barre de vie du monstre (Couleur secondaire)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Homoncule"
+msgstr "Bar des PV de l'homoncule"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Barre de vie du monstre (Couleur secondaire)"
+msgstr "Bar des PV de l'homoncule (deuxième couleur)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Mercenaire"
+msgstr "Bar des PV du mercenaire"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Barre de vie du monstre (Couleur secondaire)"
+msgstr "Bar des PV du mercenaire (deuxième couleur)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Barre de vie du Joueur"
+msgstr "Bar des PV de l'élémentaire"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Barre de vie du joueur (Couleur secondaire)"
+msgstr "Bar des PV de l'élémentaire (deuxième couleur) "
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3325,9 +3301,8 @@ msgstr "Mise en évidence des collision de l'eau"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Mise en évidence des collision de l'eau"
+msgstr "Mise en évidence des collision des monstres"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3572,13 +3547,15 @@ msgstr "Partage d'objet activé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Partage d'objet désactivé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
@@ -3589,19 +3566,22 @@ msgstr "Paramètre de partage d'objets inconnu."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
@@ -4030,10 +4010,7 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr ""
-"La fenêtre de conversation sera automatiquement cachée quand inutilisée.\n"
-"\n"
-"Appuie sur Entrée ou passe la souris sur la conversation pour l'afficher."
+msgstr "La fenêtre de conversation sera automatiquement cachée quand inutilisée.\n\nAppuie sur Entrée ou passe la souris sur la conversation pour l'afficher."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4045,20 +4022,15 @@ msgstr "Protéger la concentration de la conversation"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
-msgstr ""
-"Active la protection aggressive de la saisie concentrée dans la fenêtre de "
-"conversation.\n"
-"\n"
-"Note: aucune autre saisie de texte sera acceptée pour recevoir des saisies "
-"de texte lorsque tu écris dans la fenêtre de conversation."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+msgstr "Active la protection aggressive de la saisie concentrée dans la fenêtre de conversation.\n\nNote: aucune autre saisie de texte sera acceptée pour recevoir des saisies de texte lorsque tu écris dans la fenêtre de conversation."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Couleurs"
 
@@ -4072,10 +4044,7 @@ msgstr "Retirer les couleurs des messages des conversations"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr ""
-"Active cette option afin d'enlever les couleurs des messages de conversation "
-"entrants. Tous les messages utiliseront la couleur de conversation par "
-"défaut si ceci est activé."
+msgstr "Active cette option afin d'enlever les couleurs des messages de conversation entrants. Tous les messages utiliseront la couleur de conversation par défaut si ceci est activé."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4085,34 +4054,21 @@ msgstr "Afficher la liste des couleurs de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
-"\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
-msgstr ""
-"Activer cette option pour afficher le menu déroulant de sélection de "
-"couleurs de dans la fenêtre de conversation. La fenêtre de conversation "
-"affichera le menu déroulant de sélection de couleurs.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"Ceci permet de sélectionner la couleur par défaut des messages de "
-"conversation émis, aisément, mais cela occupe de la place dans la fenêtre de "
-"conversation."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+msgstr "Activer cette option pour afficher le menu déroulant de sélection de couleurs de dans la fenêtre de conversation. La fenêtre de conversation affichera le menu déroulant de sélection de couleurs.\n\nCeci permet de sélectionner la couleur par défaut des messages de conversation émis, aisément, mais cela occupe de la place dans la fenêtre de conversation."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
-"Autoriser les messages de magie et commandes des MJ dans tous les onglets de "
-"conversation"
+msgstr "Autoriser les messages de magie et commandes des MJ dans tous les onglets de conversation"
 
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr ""
-"Activer ce paramètre pour être autoriser à écrire Sorts et commande MJ dans "
-"tous les onglets."
+msgstr "Activer ce paramètre pour être autoriser à écrire Sorts et commande MJ dans tous les onglets."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4127,17 +4083,10 @@ msgstr "Limiter le nombre max de car de la ligne de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
-"\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
-msgstr ""
-"Limite le nombre de caractères qui vont être affichés dans les plus grandes "
-"lignes de texte affichées dans la conversation.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: les longues lignes peuvent ralentir le client. Les lignes plus longues "
-"que cette limite seront tronquées."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+msgstr "Limite le nombre de caractères qui vont être affichés dans les plus grandes lignes de texte affichées dans la conversation.\n\nNote: les longues lignes peuvent ralentir le client. Les lignes plus longues que cette limite seront tronquées."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:110
@@ -4147,19 +4096,10 @@ msgstr "Limiter le nombre max de lignes dans les conversations"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
-msgstr ""
-"Limite le nombre de lignes de conversation dans l'espace à remonter. La "
-"conversation garde un nombre spécifique de dernières lignes de texte. Les "
-"plus vieilles lignes qui exéderont cette limite seront supprimées de cette "
-"espace à remonter.\n"
-"\n"
-"Note: garde trop de lignes dans cet espace à remonter peut ralentir le "
-"client."
+msgstr "Limite le nombre de lignes de conversation dans l'espace à remonter. La conversation garde un nombre spécifique de dernières lignes de texte. Les plus vieilles lignes qui exéderont cette limite seront supprimées de cette espace à remonter.\n\nNote: garde trop de lignes dans cet espace à remonter peut ralentir le client."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:120
@@ -4177,12 +4117,7 @@ msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
 "Note: chat logs can take noticeable amount of disk space over time."
-msgstr ""
-"Si tu actives cette option, les historiques de conversation seront "
-"sauvegardés sur le disque.\n"
-"\n"
-"Note: les historiques de conversation peuvent prendre un espace considérable "
-"sur le disque avec le temps."
+msgstr "Si tu actives cette option, les historiques de conversation seront sauvegardés sur le disque.\n\nNote: les historiques de conversation peuvent prendre un espace considérable sur le disque avec le temps."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:131
@@ -4192,9 +4127,7 @@ msgstr "Activer le débogage de l'historique des conversations"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
-msgstr ""
-"Si tu actives ceci, l'historique de l'onglet de conversation de débogage "
-"sera aussi sauvegardé sur le disque."
+msgstr "Si tu actives ceci, l'historique de l'onglet de conversation de débogage sera aussi sauvegardé sur le disque."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:137
@@ -4204,12 +4137,9 @@ msgstr "Afficher l'historique de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
-msgstr ""
-"Si cette option est activée, le client chargera les anciens onglets de "
-"conversation ainsi que leur contenu depuis l'historique au lancement, au "
-"lieu de se lancer avec des onglets vides."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
+msgstr "Si cette option est activée, le client chargera les anciens onglets de conversation ainsi que leur contenu depuis l'historique au lancement, au lieu de se lancer avec des onglets vides."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4219,17 +4149,10 @@ msgstr "Afficher les messages de connexion du groupe"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
-msgstr ""
-"Si cette option est activée, le statut en ligne des membres du groupe "
-"changera et sera affiché dans l'onglet de conversation de groupe.\n"
-"\n"
-"Ceci ajoute des sons supplémentaires à la conversation, mais permet de voir "
-"lorsque vos amis viennent en ligne."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+msgstr "Si cette option est activée, le statut en ligne des membres du groupe changera et sera affiché dans l'onglet de conversation de groupe.\n\nCeci ajoute des sons supplémentaires à la conversation, mais permet de voir lorsque vos amis viennent en ligne."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:152
@@ -4239,17 +4162,10 @@ msgstr "Afficher les messages en ligne de la guilde"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
-"\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
-msgstr ""
-"Si cette option est activée, le statut en ligne des membres de la guilde "
-"changera et sera affiché dans l'onglet de conversation de la guilde.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"Ceci ajoute des sons supplémentaires à la conversation, mais permet de voir "
-"lorsque vos amis viennent en ligne."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+msgstr "Si cette option est activée, le statut en ligne des membres de la guilde changera et sera affiché dans l'onglet de conversation de la guilde.\n\nCeci ajoute des sons supplémentaires à la conversation, mais permet de voir lorsque vos amis viennent en ligne."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4264,22 +4180,10 @@ msgstr "Masquer les messages liés à la boutique"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
-msgstr ""
-"Si cette option est activée, aucun message en relation avec la boutique "
-"intégrée à ManaPlus sera affiché dans la conversation. Désactive cette "
-"option si tu veux voir ces messages en relation avec ta boutique.\n"
-"\n"
-"Note: techniquement, la boutique de ManaPlus implémente d'habitude des "
-"messages privés avec un contenu spécial. Si tu désactive cette option, tu "
-"auras la possibilité de voir ces messages et avoir une idée de quand les "
-"autres joueurs jettent un œil à ta boutique."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+msgstr "Si cette option est activée, aucun message en relation avec la boutique intégrée à ManaPlus sera affiché dans la conversation. Désactive cette option si tu veux voir ces messages en relation avec ta boutique.\n\nNote: techniquement, la boutique de ManaPlus implémente d'habitude des messages privés avec un contenu spécial. Si tu désactive cette option, tu auras la possibilité de voir ces messages et avoir une idée de quand les autres joueurs jettent un œil à ta boutique."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:175
@@ -4291,13 +4195,8 @@ msgstr "Montrer les messages MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
-msgstr ""
-"Activer cette option pour voir les messages MVP du seveur.\n"
-"\n"
-"Note: Les messages MVP se sont pas utilisés sur TMW / Evol / autres "
-"serveurs, cette fonction fait alors très peu de différences."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+msgstr "Activer cette option pour voir les messages MVP du seveur.\n\nNote: Les messages MVP se sont pas utilisés sur TMW / Evol / autres serveurs, cette fonction fait alors très peu de différences."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
@@ -4315,19 +4214,10 @@ msgstr "Placer tous les messages privés dans des onglets"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
-msgstr ""
-"Si cette option est activée, tous les messages privés seront placés dans des "
-"onglets séparés pour chaque joueur. Si cette option est activée, tous les "
-"messages privés seront placés dans l'onglet Général.\n"
-"\n"
-"Note: placer tous les messages privés dans un seul onglet est connu pour "
-"être troublant. Penses-y à deux fois avant de désactiver cette fonction."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+msgstr "Si cette option est activée, tous les messages privés seront placés dans des onglets séparés pour chaque joueur. Si cette option est activée, tous les messages privés seront placés dans l'onglet Général.\n\nNote: placer tous les messages privés dans un seul onglet est connu pour être troublant. Penses-y à deux fois avant de désactiver cette fonction."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:197
@@ -4337,15 +4227,10 @@ msgstr "Effectuer l'historique des messages de magie dans l'onglet de débogage"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
-msgstr ""
-"Si cette option est activée, les messages de sorts seront montrés dans "
-"Debug. Si elle est désactivée, ils apparaîtront dans l'onglet Général.\n"
-"\n"
-"Note: cela n'affecte pas les réponses du serveur en lien avec les sorts."
+msgstr "Si cette option est activée, les messages de sorts seront montrés dans Debug. Si elle est désactivée, ils apparaîtront dans l'onglet Général.\n\nNote: cela n'affecte pas les réponses du serveur en lien avec les sorts."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:205
@@ -4355,18 +4240,10 @@ msgstr "Afficher les messages du serveur dans l'onglet de débogage"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
-msgstr ""
-"Si cette option est activée, les messages du serveur seront montrés dans "
-"l'onglet Debug. Si elle est désactivée, ils apparaîtront dans l'onglet "
-"Général.\n"
-"\n"
-"Note: selon 4144, désactiver ceci ferait disparaître certains messages du "
-"serveur, puisque ceux-ci sont de faux messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+msgstr "Si cette option est activée, les messages du serveur seront montrés dans l'onglet Debug. Si elle est désactivée, ils apparaîtront dans l'onglet Général.\n\nNote: selon 4144, désactiver ceci ferait disparaître certains messages du serveur, puisque ceux-ci sont de faux messages."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4380,13 +4257,7 @@ msgid ""
 "words typical for trades will go to Trade tab. This will make General tab "
 "less noisy. If this setting is disabled, all trade related players messages "
 "will stay in General tab."
-msgstr ""
-"Active l'onglet des échanges. L'onglet d'échange est en quelques sortes un "
-"filtre. Les messages contenants certains mots typiques des échanges iront "
-"directement dans l'onglet des échanges. Ceci fera en sorte que l'onglet "
-"Général sera moins bruyant. Si cette option est désactivée, tous les "
-"échanges en relation avec les messages des joueurs resteront dans l'onglet "
-"Général."
+msgstr "Active l'onglet des échanges. L'onglet d'échange est en quelques sortes un filtre. Les messages contenants certains mots typiques des échanges iront directement dans l'onglet des échanges. Ceci fera en sorte que l'onglet Général sera moins bruyant. Si cette option est désactivée, tous les échanges en relation avec les messages des joueurs resteront dans l'onglet Général."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:224
@@ -4396,17 +4267,10 @@ msgstr "Activer l'onglet de MJ"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
-msgstr ""
-"Si ceci est activé, l'onglet MJ apparaître dans la conversation. Ceci "
-"affichera le text en relation avec l'activité des MJ.\n"
-"\n"
-"Note: cette option fait de la différence seulement pour les MJ (Maîtres "
-"Joueurs) puisque cet onglet ne s'affichera que pour eux."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+msgstr "Si ceci est activé, l'onglet MJ apparaître dans la conversation. Ceci affichera le text en relation avec l'activité des MJ.\n\nNote: cette option fait de la différence seulement pour les MJ (Maîtres Joueurs) puisque cet onglet ne s'affichera que pour eux."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:232
@@ -4416,15 +4280,10 @@ msgstr "Activer l'onglet des langues"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr ""
-"Si cette fonction est activée, l'onglet des langues apparaîtra si le serveur "
-"le permet.\n"
-"\n"
-"Note: Seulement permis par le serveur d'Evol pour l'instant."
+msgstr "Si cette fonction est activée, l'onglet des langues apparaîtra si le serveur le permet.\n\nNote: Seulement permis par le serveur d'Evol pour l'instant."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4434,18 +4293,10 @@ msgstr "Afficher tous les messages de langue"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
-msgstr ""
-"Si cette option est activée et que le serveur permet différentes "
-"conversations pour différentes langues, tu verras les messages de toutes les "
-"langues, peu importe tes préférences de langues.\n"
-"\n"
-"Note: cela fonctionne seulement sur les serveur permettant cette fonction "
-"d'onglets de langue, comme Evol."
+msgstr "Si cette option est activée et que le serveur permet différentes conversations pour différentes langues, tu verras les messages de toutes les langues, peu importe tes préférences de langues.\n\nNote: cela fonctionne seulement sur les serveur permettant cette fonction d'onglets de langue, comme Evol."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:250
@@ -4455,18 +4306,10 @@ msgstr "Activer l'onglet de combat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
-msgstr ""
-"Si cette option est activée, l'onglet des Combats sera affiché dans la "
-"conversation. Cet onglet contriendra certains messages relatifs aux combats, "
-"comme les dégâts et les gains d'expérience, si les messages de combats sont "
-"activés.\n"
-"\n"
-"Note: le redémarrage du client est nécessaire pour prendre effet."
+msgstr "Si cette option est activée, l'onglet des Combats sera affiché dans la conversation. Cet onglet contriendra certains messages relatifs aux combats, comme les dégâts et les gains d'expérience, si les messages de combats sont activés.\n\nNote: le redémarrage du client est nécessaire pour prendre effet."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:259
@@ -4479,10 +4322,7 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr ""
-"Si cette option est activée, les messages relatifs aux combats tel que les "
-"dégâts ou le gain d'expérience sera affiché dans l'onglet de Débogage ou "
-"l'onglet de Combat. Si désactivé, aucun message de combat ne sera affiché."
+msgstr "Si cette option est activée, les messages relatifs aux combats tel que les dégâts ou le gain d'expérience sera affiché dans l'onglet de Débogage ou l'onglet de Combat. Si désactivé, aucun message de combat ne sera affiché."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4492,21 +4332,10 @@ msgstr "Si besoin est, changer la taille des onglets de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
-msgstr ""
-"Si cette fonction est activée, le texte dans la conversation sera "
-"automatique ajusté pour s'adapter aux apparences de champs de saisie de "
-"conversation lorsque tu écriras un message et lorsque le champ de saisie de "
-"conversation disparaîtra. Si désactivé, la zone d'entrée de conversation "
-"occupera toujours sa place, ce qui cependant utilisable pour du texte.\n"
-"\n"
-"Note: c'est principalement à propos d'attitudes nerveuses contre moins "
-"d'espace utilisable pour du texte."
+msgstr "Si cette fonction est activée, le texte dans la conversation sera automatique ajusté pour s'adapter aux apparences de champs de saisie de conversation lorsque tu écriras un message et lorsque le champ de saisie de conversation disparaîtra. Si désactivé, la zone d'entrée de conversation occupera toujours sa place, ce qui cependant utilisable pour du texte.\n\nNote: c'est principalement à propos d'attitudes nerveuses contre moins d'espace utilisable pour du texte."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:279
@@ -4528,10 +4357,7 @@ msgstr "Utiliser l’horaire local"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr ""
-"Si cette fonction est activée, l'horodatage de la conversation utilisera "
-"l'heure locale. Si désactivée, l'heure du server sera utilisée (souvent, "
-"c'est du GMT+0)."
+msgstr "Si cette fonction est activée, l'horodatage de la conversation utilisera l'heure locale. Si désactivée, l'heure du server sera utilisée (souvent, c'est du GMT+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4541,15 +4367,10 @@ msgstr "Mots en surbrillance (séparés par une virgule)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr ""
-"Ici tu peux spécifier sertains mots supplémentaires qui produira un "
-"surlignage. Utilise des virgules pour séparer les mots.\n"
-"\n"
-"Note: les surlignages fréquents sont agaçants - utiliser avec prudence."
+msgstr "Ici tu peux spécifier sertains mots supplémentaires qui produira un surlignage. Utilise des virgules pour séparer les mots.\n\nNote: les surlignages fréquents sont agaçants - utiliser avec prudence."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4559,18 +4380,10 @@ msgstr "Ignorer de multiples noms (séparés par une virgule)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
-msgstr ""
-"Cette option te permet d'ignorer certains messages globaux si l'envoyeur est "
-"particulier (PNJ, MJ) et t'agacent trop. Les messages globaux seront alors "
-"bougés\n"
-"à l'onglet de Débogage.\n"
-"\n"
-"Note: Fais attention lorsque tu utilises cette fonction, tu risques de rater "
-"des annonces importantes !"
+msgstr "Cette option te permet d'ignorer certains messages globaux si l'envoyeur est particulier (PNJ, MJ) et t'agacent trop. Les messages globaux seront alors bougés\nà l'onglet de Débogage.\n\nNote: Fais attention lorsque tu utilises cette fonction, tu risques de rater des annonces importantes !"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:314
@@ -4580,19 +4393,10 @@ msgstr "Afficher le bouton des émoticônes dans la conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
-msgstr ""
-"Si cette option est activée, un bouton apparaîtra près du champ de saisie de "
-"texte. Ce bouton permet d'invoquer la composition de fenêtres, qui permet "
-"d'insérer des sourrires et du formatage de texte facilement.\n"
-"\n"
-"Note: la même fenêtre peut aussi être invoquée par une touche de raccourci "
-"en écrivant, souvent F1 par défault."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+msgstr "Si cette option est activée, un bouton apparaîtra près du champ de saisie de texte. Ce bouton permet d'invoquer la composition de fenêtres, qui permet d'insérer des sourrires et du formatage de texte facilement.\n\nNote: la même fenêtre peut aussi être invoquée par une touche de raccourci en écrivant, souvent F1 par défault."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:324
@@ -4604,10 +4408,7 @@ msgstr "Afficher le message du serveur motd au démarrage"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr ""
-"Si cette option est activée, le client affichera le MDJ (message du jour) du "
-"server une fois que tu te connecteras au serveur. Désactiver pour ne pas "
-"afficher ce MDJ."
+msgstr "Si cette option est activée, le client affichera le MDJ (message du jour) du server une fois que tu te connecteras au serveur. Désactiver pour ne pas afficher ce MDJ."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4708,9 +4509,7 @@ msgstr "Conflit(s) de touche détecté(s)."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Conflit entre les touches \"%s\" and \"%s\". Changes au moins l'une de "
-"celles-ci ou bien attends-toi à un possible comportement étrange du jeu."
+msgstr "Conflit entre les touches \"%s\" and \"%s\". Changes au moins l'une de celles-ci ou bien attends-toi à un possible comportement étrange du jeu."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5095,8 +4894,7 @@ msgstr "Support des bots"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr ""
-"Activer le support du bot de guilde et désactiver le support par défault"
+msgstr "Activer le support du bot de guilde et désactiver le support par défault"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5259,8 +5057,7 @@ msgstr "Accélération matérielle"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr ""
-"Activer le cache d'opacité (Logiciel, peut utiliser beaucoup de mémoire)"
+msgstr "Activer le cache d'opacité (Logiciel, peut utiliser beaucoup de mémoire)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5290,8 +5087,7 @@ msgstr "Meilleure qualité (désactiver pour une meilleure performance)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:101
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr ""
-"Autoriser les correction des champs alpha ( Programme, cela peut être lent)"
+msgstr "Autoriser les correction des champs alpha ( Programme, cela peut être lent)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:106
@@ -5321,8 +5117,7 @@ msgstr "Désactiver la mise en cache des créatures"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr ""
-"Différentes options (activer ou désactiver peut améliorer les performances)"
+msgstr "Différentes options (activer ou désactiver peut améliorer les performances)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5347,9 +5142,7 @@ msgstr "Activer les atlas de textures (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr ""
-"Mettre en cache tous les sprites par carte (peut utiliser de la mémoire "
-"supplémentaire)"
+msgstr "Mettre en cache tous les sprites par carte (peut utiliser de la mémoire supplémentaire)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
@@ -5359,9 +5152,7 @@ msgstr "Mettre tous les sons en cache (peut utiliser plus de mémoire)"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
-msgstr ""
-"Options critiques (NE change PAS si tu ne sais pas ce que tu es en train de "
-"faire)"
+msgstr "Options critiques (NE change PAS si tu ne sais pas ce que tu es en train de faire)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:164
@@ -5471,8 +5262,7 @@ msgstr "Récupérer les ID des joueurs et l'historique de vue"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Use special diagonal speed in players moving"
-msgstr ""
-"Utiliser une vitesse spéciale pour les déplacements diagonaux des joueurs"
+msgstr "Utiliser une vitesse spéciale pour les déplacements diagonaux des joueurs"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:135
@@ -5488,9 +5278,7 @@ msgstr "Créer un imprimé écran pour chaque échange réussi"
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr ""
-"Imiter le clique droit de la souris par un clique long (utile pour les "
-"interfaces tactiles)"
+msgstr "Imiter le clique droit de la souris par un clique long (utile pour les interfaces tactiles)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5769,17 +5557,13 @@ msgstr "Aucun"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
-"également pas accessible !"
+msgstr "Impossible de passer en mode fenêtré, et l'ancienne résolution n'est également pas accessible !"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
-"également pas accessible !"
+msgstr "Impossible de passer en mode plein-écran, et l'ancienne résolution n'est également pas accessible !"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5789,8 +5573,7 @@ msgstr "Passage en plein écran"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:255
 msgid "Restart needed for changes to take effect."
-msgstr ""
-"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
+msgstr "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:281
@@ -5800,8 +5583,7 @@ msgstr "Activation d'OpenGL"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:283
 msgid "Applying change to OpenGL requires restart."
-msgstr ""
-"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
+msgstr "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: resolution question dialog
 #: src/gui/widgets/tabs/setup_video.cpp:368
@@ -5822,9 +5604,7 @@ msgstr "Résolution de l'écran modifiée"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
-"réduite."
+msgstr "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution réduite."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6359,7 +6139,8 @@ msgstr "Montant:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Créer"
 
@@ -6476,7 +6257,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6494,7 +6276,8 @@ msgstr "Distribues %d points"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6520,7 +6303,8 @@ msgstr "Apparence:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6619,12 +6403,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"PV: %u/%u\n"
-"PM: %u/%u\n"
-"Niveau: %u\n"
-"Expérience: %u\n"
-"Argent: %s"
+msgstr "PV: %u/%u\nPM: %u/%u\nNiveau: %u\nExpérience: %u\nArgent: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6726,7 +6505,8 @@ msgstr "Éditer le Serveur"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Connexion..."
 
@@ -6795,8 +6575,8 @@ msgstr "Polices d'écriture"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -7092,13 +6872,15 @@ msgstr "Sujet:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Argent:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Objet:"
@@ -7519,9 +7301,9 @@ msgstr "Compétence %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Compétence %d"
+msgstr "Compétence %u"
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7606,9 +7388,7 @@ msgstr "Choisis le nom de ta guilde."
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
-msgstr ""
-"Tu as reçu une invitation pour rejoindre une guilde mais fais déjà parti "
-"d'une autre."
+msgstr "Tu as reçu une invitation pour rejoindre une guilde mais fais déjà parti d'une autre."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:435
@@ -7624,9 +7404,7 @@ msgstr "Accepter l'invitation dans cette guilde"
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:463
 msgid "Received party request, but one already exists."
-msgstr ""
-"Tu as reçu une invitation pour rejoindre un groupe mais fais déjà parti d'un "
-"autre."
+msgstr "Tu as reçu une invitation pour rejoindre un groupe mais fais déjà parti d'un autre."
 
 #. TRANSLATORS: party invite message
 #: src/gui/windows/socialwindow.cpp:476
@@ -7810,17 +7588,14 @@ msgstr "Tu n'as pas assez d'argent."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"L'objet ne peux pas être ajouté. Tu ne peux pas ajouter deux fois le même "
-"objet dans cette fenêtre."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "L'objet ne peux pas être ajouté. Tu ne peux pas ajouter deux fois le même objet dans cette fenêtre."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not trade equipped items."
-msgstr ""
-"L'ajout de l'objet a échoué. Tu ne peux pas échanger les objets que tu "
-"portes."
+msgstr "L'ajout de l'objet a échoué. Tu ne peux pas échanger les objets que tu portes."
 
 #. TRANSLATORS: updater window name
 #: src/gui/windows/updaterwindow.cpp:171
@@ -9084,9 +8859,7 @@ msgstr "Erreur inconnue du serveur de personnage."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
-"utilisé."
+msgstr "Impossible de créer ce personnage. Il est probable que ce nom soit déjà utilisé."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -9139,9 +8912,7 @@ msgstr "Le message privé n'a pu être envoyé, tu es ignoré par %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr ""
-"Le message privé n'a pas pu être envoyé, tu as été ignoré par tous les "
-"joueurs."
+msgstr "Le message privé n'a pas pu être envoyé, tu as été ignoré par tous les joueurs."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9231,17 +9002,14 @@ msgstr "Rejeté par le serveur."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Tu as été banni de façon permanente du jeu. Merci de contacter l'équipe des "
-"MJs."
+msgstr "Tu as été banni de façon permanente du jeu. Merci de contacter l'équipe des MJs."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-#, fuzzy
 msgid ""
 "Client too old or wrong server type.\n"
 "Please update client on http://manaplus.org"
-msgstr "Le client est trop ancien où le type de serveur n'est pas bon."
+msgstr "Le client est trop ancien où le type de serveur n'est pas bon.\nTu peux mettre à jour le client sur http://manaplus.org"
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:146 src/net/eathena/loginrecv.cpp:84
@@ -9249,9 +9017,7 @@ msgstr "Le client est trop ancien où le type de serveur n'est pas bon."
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Tu as temporairement été banni du jeu jusqu'au %s.\n"
-"Merci de contacter l'équipe des MJs sur le forum."
+msgstr "Tu as temporairement été banni du jeu jusqu'au %s.\nMerci de contacter l'équipe des MJs sur le forum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9854,7 +9620,7 @@ msgstr "Chance"
 #. TRANSLATORS: stats page name
 #: src/resources/db/statdb.cpp:203
 msgid "Extended"
-msgstr ""
+msgstr "Prolongé"
 
 #. TRANSLATORS: inventory type name
 #: src/resources/inventory/inventory.cpp:338
@@ -10171,8 +9937,7 @@ msgstr "Impossible de rajouter un objet. Ton partenaire est surchargé."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-"Impossible de rajouter un objet. Ton partenaire n'a plus de place libre."
+msgstr "Impossible de rajouter un objet. Ton partenaire n'a plus de place libre."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
@@ -10339,18 +10104,14 @@ msgstr "Carte insérée."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr ""
-"Le dépôt a échoué. Tu n'as probablement pas cette quantité d'argent avec toi "
-"en ce moment."
+msgstr "Le dépôt a échoué. Tu n'as probablement pas cette quantité d'argent avec toi en ce moment."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr ""
-"Le retrait a échoué. Tu n'a probablement pas cette quantité d'argent dans la "
-"banque en ce moment."
+msgstr "Le retrait a échoué. Tu n'a probablement pas cette quantité d'argent dans la banque en ce moment."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10365,9 +10126,7 @@ msgstr "La création de magasin d'achat a échoué. Trop de poids."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:440
 msgid "Buying store create failed. No items in store."
-msgstr ""
-"La création de magasin d'achat a échoué. Il n'y aucun article dans le "
-"magasin."
+msgstr "La création de magasin d'achat a échoué. Il n'y aucun article dans le magasin."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:444
@@ -10394,9 +10153,7 @@ msgstr "L'échange a échoué."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr ""
-"L'échange a échoué, parce que le montant de l'article est supérieure à se "
-"que l'acheteur est prêt à acheter."
+msgstr "L'échange a échoué, parce que le montant de l'article est supérieure à se que l'acheteur est prêt à acheter."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10633,14 +10390,12 @@ msgstr "Affinage inconnu pour l'objet %s."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:650
 msgid "You can't add item to card because weight too high."
-msgstr ""
-"Tu ne peux pas ajouter l'objet à la carte car tu soulèves déjà trop de poids."
+msgstr "Tu ne peux pas ajouter l'objet à la carte car tu soulèves déjà trop de poids."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:654
 msgid "You can't add item to card because too many items."
-msgstr ""
-"Tu ne peux pas ajouter l'objet à la carte car tu as déjà trop d'objets."
+msgstr "Tu ne peux pas ajouter l'objet à la carte car tu as déjà trop d'objets."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:658
@@ -10721,8 +10476,7 @@ msgstr "La tentative d'ignorer le joueur a échoué."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:718
 msgid "Player ignore failed. Because too many ignores."
-msgstr ""
-"La tentative d'ignorer le joueur a échoué, tu ignores déjà trop de joueurs."
+msgstr "La tentative d'ignorer le joueur a échoué, tu ignores déjà trop de joueurs."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:722
@@ -10742,9 +10496,7 @@ msgstr "La tentative de retirer le joueur de votre liste d'ignorés a échoué."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:734
 msgid "Unknown player unignore failure."
-msgstr ""
-"La tentative de retirer le joueur de votre liste d'ignorés a échoué pour une "
-"raison inconnue."
+msgstr "La tentative de retirer le joueur de votre liste d'ignorés a échoué pour une raison inconnue."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:738
@@ -10817,9 +10569,7 @@ msgstr "L'adoption d'enfant a échoué. Ton niveau est trop bas."
 #: src/resources/notifications.h:816
 msgid ""
 "Child adoption failed. This player is already married and can't be a baby."
-msgstr ""
-"L'adoption d'enfant a échoué. Ce joueur est déjà marrié et ne peut donc pas "
-"être un bébé."
+msgstr "L'adoption d'enfant a échoué. Ce joueur est déjà marrié et ne peut donc pas être un bébé."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10829,14 +10579,12 @@ msgstr "Position sauvegardée pour la compétence de téléportation."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
 msgid "Error saving location. Not enough skill level."
-msgstr ""
-"Erreur de sauvegarde de position. Tu n'as pas assez de niveaux de compétence."
+msgstr "Erreur de sauvegarde de position. Tu n'as pas assez de niveaux de compétence."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
 msgid "Error saving location. You do not have warp skill."
-msgstr ""
-"Erreur de sauvegarde de position. Tu n'as pas la compétence de téléportation."
+msgstr "Erreur de sauvegarde de position. Tu n'as pas la compétence de téléportation."
 
 #. TRANSLATORS: skill level
 #: src/resources/skill/skillinfo.cpp:106
@@ -10896,8 +10644,7 @@ msgstr "CiblePiège"
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10953,15 +10700,3 @@ msgstr "%d secondes"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Désinscription réussie"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "À bientôt, reviens quand tu veux..."
-
-#~ msgid "Unregister"
-#~ msgstr "Se désinscrire"
-
-#~ msgid "Name: %s"
-#~ msgstr "Nom: %s"
diff --git a/po/id.po b/po/id.po
index 4f05434c5..10ed26142 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # adjieps <adjieps@yahoo.com>, 2011
 # adjieps <adjieps@yahoo.com>, 2011
@@ -14,14 +14,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
-"id/)\n"
-"Language: id\n"
+"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -132,8 +131,7 @@ msgstr ""
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr ""
-"Tidak dapat membuat tab pesan pribadi \"%s\"! Kemungkinan tab sudah ada."
+msgstr "Tidak dapat membuat tab pesan pribadi \"%s\"! Kemungkinan tab sudah ada."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -406,9 +404,8 @@ msgstr "pekerjaan"
 
 #. TRANSLATORS: get homunculus xp message
 #: src/being/localplayer.cpp:1150
-#, fuzzy
 msgid "Homun"
-msgstr "Orang"
+msgstr ""
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1162
@@ -1250,9 +1247,9 @@ msgstr "Hidupkan"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Kamu memmbawa lebih dari separuh beratmu. Kamu tidak bisa regenerasidarah."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Kamu memmbawa lebih dari separuh beratmu. Kamu tidak bisa regenerasidarah."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1268,7 +1265,8 @@ msgstr "Kamu membawa kurang dari separuh beratmu. Kamu bisa regenerasi darah."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "dasar"
 
@@ -3188,39 +3186,33 @@ msgstr "Bar HP monster (warna kedua)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Orang"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Bar HP monster (warna kedua)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Prajurit"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Bar HP monster (warna kedua)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Bar HP pemain"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Bar HP pemain (warna kedua)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3294,9 +3286,8 @@ msgstr "Sorotan bentrokan air"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Sorotan bentrokan air"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3541,13 +3532,15 @@ msgstr "Berbagi item diaktifkan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Berbagi item dimatikan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Tidak bisa berbagi item."
 
@@ -3558,19 +3551,22 @@ msgstr "Berbagi item tidak diketahui."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Berbagi pengalaman diaktifkan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Berbagi pengalaman dimatikan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Tidak bisa berbagi pengalaman."
 
@@ -4011,15 +4007,15 @@ msgstr "Proteksi fokus obrolan"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Warna"
 
@@ -4043,11 +4039,9 @@ msgstr "Tampil daftar warna obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4074,11 +4068,9 @@ msgstr "Batas maksimal karakter di garis obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4089,9 +4081,7 @@ msgstr "Batas maksimal baris di obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4132,8 +4122,8 @@ msgstr "Tampil riwayat obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4144,11 +4134,9 @@ msgstr "Tampil pesan kelompok online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4159,11 +4147,9 @@ msgstr "Tampil pesan guild online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4179,13 +4165,9 @@ msgstr "Sembunyi pesan toko"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4198,8 +4180,7 @@ msgstr "Tampilkan pesan MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4218,12 +4199,9 @@ msgstr "Masukkan semua bisikan kedalam tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4234,8 +4212,7 @@ msgstr "Riwayat pesan sihir di jendela debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4248,11 +4225,9 @@ msgstr "Tujukkan pesan server di jendela debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4277,11 +4252,9 @@ msgstr "Aktifkan tab gm"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4292,8 +4265,7 @@ msgstr "Aktifkan tab bahasa"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4306,9 +4278,7 @@ msgstr "Tampilkan semua bahasa pesan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4321,9 +4291,7 @@ msgstr "Perbolehkan jendela pertarungan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4349,10 +4317,7 @@ msgstr "Atur besar tab obrolan bila dibutuhkan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4387,8 +4352,7 @@ msgstr "Sorot kata (dipisan dengan koma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4401,8 +4365,7 @@ msgstr "Nama abaikan global (dipisah dengan koma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4415,12 +4378,9 @@ msgstr "Tampil tombol emosi di obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -6164,7 +6124,8 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Buat"
 
@@ -6281,7 +6242,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6299,7 +6261,8 @@ msgstr "Tolong distribusikan %d point"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6325,7 +6288,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6526,7 +6490,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Menyambung"
 
@@ -6595,8 +6560,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Tak diketahui"
 
@@ -6890,13 +6855,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7317,9 +7284,9 @@ msgstr "Skill %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Skill %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7604,7 +7571,8 @@ msgstr "Anda tidak memiliki cukup uang."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
@@ -10659,8 +10627,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
+msgstr "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10716,15 +10683,3 @@ msgstr "%d detik"
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Telah tidak terdaftar"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Selamat tinggal, datang kembali setiap saat..."
-
-#~ msgid "Unregister"
-#~ msgstr "Tidak jadi mendaftar"
-
-#~ msgid "Name: %s"
-#~ msgstr "Nama: %s"
diff --git a/po/it.po b/po/it.po
index b9b16e0fb..950a9aa11 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Alessandro Camplese <ale.camplese@gmail.com>, 2013
 # Alessandro Camplese <ale.camplese@gmail.com>, 2013
@@ -20,14 +20,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
-"it/)\n"
-"Language: it\n"
+"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -138,8 +137,7 @@ msgstr ""
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr ""
-"Impossibile creare una scheda sussurro \"%s\"! Probabilmente esiste già."
+msgstr "Impossibile creare una scheda sussurro \"%s\"! Probabilmente esiste già."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -704,9 +702,7 @@ msgstr "  -c --character      : Effettua il Login con questo personaggio"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
-msgstr ""
-"  -s --server         : Effettua il Login con questo nome Server o a questo "
-"indirizzo IP"
+msgstr "  -s --server         : Effettua il Login con questo nome Server o a questo indirizzo IP"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:80
@@ -746,8 +742,7 @@ msgstr "  -L --localdata-dir  : Directory da usare per i dati locali"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
+msgstr "     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:106
@@ -1259,16 +1254,14 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Stai trasportando piu' della meta' del tuo peso. Non puoi piu' rigenerare "
-"vita."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Stai trasportando piu' della meta' del tuo peso. Non puoi piu' rigenerare vita."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-"Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
+msgstr "Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1279,7 +1272,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "Predefinito"
 
@@ -1757,9 +1751,9 @@ msgstr "Livello: %d"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:274
-#, fuzzy, c-format
+#, c-format
 msgid "Hp: %d/%d"
-msgstr "Livello: %d / %d"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:284
@@ -3199,39 +3193,33 @@ msgstr "Barra HP nemici (secondo colore)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Barra HP nemici"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Barra HP nemici (secondo colore)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Barra HP nemici"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Barra HP nemici (secondo colore)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Barra HP giocatore"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Barra HP del giocatore (secondo colore)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3551,13 +3539,15 @@ msgstr "Gestione in comune oggetti attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Gestione in comune oggetti disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Gestione in comune oggetti non puo' essere attivata."
 
@@ -3568,19 +3558,22 @@ msgstr "Oggetti in comune sconosciuti."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Esperienza in comune attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Esperienza in comune disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Esperienza in comune non puo' essere attivata."
 
@@ -4021,15 +4014,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Colori"
 
@@ -4053,11 +4046,9 @@ msgstr "Mostra colori per la chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4084,11 +4075,9 @@ msgstr "Limita un massimo di caratteri per messaggio"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4099,9 +4088,7 @@ msgstr "Limita un massimo di messaggi per la chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4142,8 +4129,8 @@ msgstr "Mostra la storia della chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4154,11 +4141,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4169,11 +4154,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4189,13 +4172,9 @@ msgstr "Nascondi i messaggi del negozio"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4208,8 +4187,7 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4228,12 +4206,9 @@ msgstr "Sposta tutti i sussurri in schede"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4244,8 +4219,7 @@ msgstr "Salva i messaggi delle magie nella debug tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4258,11 +4232,9 @@ msgstr "Mostra i messaggi del server nella chat di debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4287,11 +4259,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4302,8 +4272,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4316,9 +4285,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4331,9 +4298,7 @@ msgstr "Abilita la chat di battaglia"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4359,10 +4324,7 @@ msgstr "Dimensione finestra dialogo dinamica"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4397,8 +4359,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4411,8 +4372,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4425,12 +4385,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4544,9 +4501,7 @@ msgstr "Sono stati rilevati conflitti nei tasti."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare "
-"inconvenienti."
+msgstr "Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare inconvenienti."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5594,17 +5549,13 @@ msgstr "Nessuno"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Cambio verso la modalità finestra fallito e anche il ripristino modalità "
-"precedente è fallito!"
+msgstr "Cambio verso la modalità finestra fallito e anche il ripristino modalità precedente è fallito!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Cambio verso la modalità schermo intero fallito e anche il ripristino della "
-"modalità precedente è fallito!"
+msgstr "Cambio verso la modalità schermo intero fallito e anche il ripristino della modalità precedente è fallito!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5645,9 +5596,7 @@ msgstr "RIsoluzione schermo cambiata"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
-"ridotta."
+msgstr "Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione ridotta."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6182,7 +6131,8 @@ msgstr "Quantita':"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crea"
 
@@ -6299,7 +6249,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6317,7 +6268,8 @@ msgstr "Distribuire %d punti"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6343,7 +6295,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6442,12 +6395,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u%u\n"
-"Mp: %u%u\n"
-"Livello: %u\n"
-"Esperienza: %u\n"
-"Soldi: %s"
+msgstr "Hp: %u%u\nMp: %u%u\nLivello: %u\nEsperienza: %u\nSoldi: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6549,7 +6497,8 @@ msgstr "Modifica Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Connetti"
 
@@ -6618,8 +6567,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr ""
 
@@ -6915,13 +6864,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7342,9 +7293,9 @@ msgstr "Abilità %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Abilità %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7629,10 +7580,9 @@ msgstr "Non hai abbastanza denaro."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
-"finestra."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla finestra."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -9044,9 +8994,7 @@ msgstr "Rifiutato dal server."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Il tuo account è stato bandito permanentemente dal gioco. Contattare il GM "
-"per maggiori informazioni."
+msgstr "Il tuo account è stato bandito permanentemente dal gioco. Contattare il GM per maggiori informazioni."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9061,9 +9009,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Sei stato temporaneamente bannato dal gioco fino a %s.\n"
-"Contatta il team GM sul forum."
+msgstr "Sei stato temporaneamente bannato dal gioco fino a %s.\nContatta il team GM sul forum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10690,9 +10636,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
-"\" (falso), \"1\", \"0\"."
+msgstr "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" (falso), \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10748,15 +10692,3 @@ msgstr "%d secondi"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Annullamento registrazione effettuato con successo"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Addio, torna quando vuoi..."
-
-#~ msgid "Unregister"
-#~ msgstr "Cancella registrazione"
-
-#~ msgid "Name: %s"
-#~ msgstr "Nome: %s"
diff --git a/po/ja.po b/po/ja.po
index c0545930c..3466e32e0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Candy <HarajukuCupcakes@gmail.com>, 2013
@@ -15,14 +15,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
-"ja/)\n"
-"Language: ja\n"
+"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -717,9 +716,7 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : デフォルトで使用するキャラクターサーバーとキャラク"
-"ターを選択する"
+msgstr "  -D --default        : デフォルトで使用するキャラクターサーバーとキャラクターを選択する"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -754,8 +751,7 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
+msgstr "  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1252,7 +1248,8 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "インベントリーが体重の半分以上の為、体力は回復できません."
 
 #. TRANSLATORS: weight message
@@ -1269,7 +1266,8 @@ msgstr "インベントリーが体重の半分以下になった為、体力は
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "デフォルト"
 
@@ -3189,39 +3187,33 @@ msgstr "モンスターのHPバー（二番目の色）"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "モンスターのHPバー"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "モンスターのHPバー（二番目の色）"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "モンスターのHPバー"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "モンスターのHPバー（二番目の色）"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "プレイヤーのHPバー"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "プレイヤーのHPバー（二番目の色）"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3541,13 +3533,15 @@ msgstr "アイテム共有モード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "アイテム共有モード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "アイテム共有モード不可能."
 
@@ -3558,19 +3552,22 @@ msgstr "アイテム共有モード不明."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Expシェアモード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Expシェアモード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Expシェアモード不可能."
 
@@ -4011,15 +4008,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "色"
 
@@ -4043,11 +4040,9 @@ msgstr "チャットの文字色リストを表示"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4074,11 +4069,9 @@ msgstr "チャットで一行に表示する最大文字数を制限する"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4089,9 +4082,7 @@ msgstr "チャットで表示する最大行数を制限する"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4132,8 +4123,8 @@ msgstr "チャット履歴を表示"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4144,11 +4135,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4159,11 +4148,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4179,13 +4166,9 @@ msgstr "売買メッセージを隠す"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4198,8 +4181,7 @@ msgstr "MVPメッセージを表示する"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4218,12 +4200,9 @@ msgstr "ささやきををタブで表示する"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4234,8 +4213,7 @@ msgstr "デバッグタブに呪文をログする"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4248,11 +4226,9 @@ msgstr "デバッグタブにサーバーメッセージをログする"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4277,11 +4253,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4292,8 +4266,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4306,9 +4279,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4321,9 +4292,7 @@ msgstr "バトルタブを有効"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4349,10 +4318,7 @@ msgstr "チャットタブをリサイズする"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4387,8 +4353,7 @@ msgstr "文字をハイライト (コンマで区切る)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4401,8 +4366,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4415,12 +4379,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4534,9 +4495,7 @@ msgstr "ショートカットキーが重複しています."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
-"ん."
+msgstr "\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれません."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -6166,7 +6125,8 @@ msgstr "量:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "作成"
 
@@ -6283,7 +6243,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6301,7 +6262,8 @@ msgstr "%d ポイントを振り分けてください"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6327,7 +6289,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "友達"
 
@@ -6528,7 +6491,8 @@ msgstr "サーバー編集"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "接続"
 
@@ -6597,8 +6561,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr ""
 
@@ -6892,13 +6856,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7319,9 +7285,9 @@ msgstr "スキル %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "スキル %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7606,10 +7572,9 @@ msgstr "GP不足です."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
-"加することは出来ません."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追加することは出来ません."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8878,9 +8843,7 @@ msgstr "不明なキャラクターサーバーエラー."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
-"れています."
+msgstr "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含まれています."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -9038,9 +9001,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"あなたは%sまでゲームから追放されました。\n"
-"GMにご連絡下さい."
+msgstr "あなたは%sまでゲームから追放されました。\nGMにご連絡下さい."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10667,9 +10628,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", "
-"\"0\"."
+msgstr "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10725,15 +10684,3 @@ msgstr "%d秒"
 #, c-format
 msgid "%d seconds"
 msgstr "%d秒"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "登録を解除しました"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "さようなら　また会いましょう..."
-
-#~ msgid "Unregister"
-#~ msgstr "登録解除"
-
-#~ msgid "Name: %s"
-#~ msgstr "名前: %s"
diff --git a/po/nl.po b/po/nl.po
index ed4d1903a..01c89d562 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Elvano Miok <prd.studio@gmail.com>, 2012,2015
 # Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011
@@ -12,14 +12,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
-"language/nl_BE/)\n"
-"Language: nl_BE\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -1247,10 +1246,9 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
-"herstellen."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven herstellen."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1266,7 +1264,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "standaard"
 
@@ -3186,39 +3185,33 @@ msgstr "Monster Levenspuntenbalk(tweede kleur)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Monster Levenspuntenbalk"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Monster Levenspuntenbalk(tweede kleur)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Monster Levenspuntenbalk"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Monster Levenspuntenbalk(tweede kleur)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Speler Levenspuntenbalk"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Speler Levenspuntenbalk"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3292,9 +3285,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Poortmarkering"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3539,13 +3531,15 @@ msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
@@ -3556,19 +3550,22 @@ msgstr "Voorwerpdeling onbekend."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
@@ -4009,15 +4006,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -4041,11 +4038,9 @@ msgstr "Toon chat kleurenlijst"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4072,11 +4067,9 @@ msgstr "Limiteer max karakters in chat lijn"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4087,9 +4080,7 @@ msgstr "Limiteer max lijnen in chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4130,8 +4121,8 @@ msgstr "Toon chat geschiedenis"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4142,11 +4133,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4157,11 +4146,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4177,13 +4164,9 @@ msgstr "Verberg verkoop boodschappen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4196,8 +4179,7 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4216,12 +4198,9 @@ msgstr "Plaats alle persoonlijke berichten in tabs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4232,8 +4211,7 @@ msgstr "Hou magie berichten bij in de 'Debug' tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4246,11 +4224,9 @@ msgstr "Toon server berichten in de debug tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4275,11 +4251,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4290,8 +4264,7 @@ msgstr "Taal tab aanzetten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4304,9 +4277,7 @@ msgstr "Toon alle taal berichten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4319,9 +4290,7 @@ msgstr "Schakel de gevechtstab in"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4347,10 +4316,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4385,8 +4351,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4399,8 +4364,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4413,12 +4377,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5580,17 +5541,13 @@ msgstr "Geen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
-"faalde ook!"
+msgstr "Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus faalde ook!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
-"modus faalde ook!"
+msgstr "Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5631,9 +5588,7 @@ msgstr "Scherm Resolutie is gewijzigd"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
-"resolutie."
+msgstr "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte resolutie."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6168,7 +6123,8 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -6285,7 +6241,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6303,7 +6260,8 @@ msgstr "Nog %d punten te verdelen"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6329,7 +6287,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6530,7 +6489,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6599,8 +6559,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -6896,13 +6856,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7323,9 +7285,9 @@ msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Vaardigheid %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7610,10 +7572,9 @@ msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
-"het venster."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8867,9 +8828,7 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
-"Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
-"server."
+msgstr "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze server."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -9042,9 +9001,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Je bent tijdelijk geband van het spel tot %s.\n"
-"Neem aub contact op met het GM team via de forums."
+msgstr "Je bent tijdelijk geband van het spel tot %s.\nNeem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9969,8 +9926,7 @@ msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
 msgid "Failed adding item. You can't trade this item."
-msgstr ""
-"Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
+msgstr "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:299
@@ -10672,8 +10628,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10729,15 +10684,3 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Registratie ongedaan gemaakt!"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Tot ziens..."
-
-#~ msgid "Unregister"
-#~ msgstr "Registreren"
-
-#~ msgid "Name: %s"
-#~ msgstr "Naam: %s"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index ed4d1903a..01c89d562 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Elvano Miok <prd.studio@gmail.com>, 2012,2015
 # Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011
@@ -12,14 +12,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
-"language/nl_BE/)\n"
-"Language: nl_BE\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -1247,10 +1246,9 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
-"herstellen."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven herstellen."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1266,7 +1264,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "standaard"
 
@@ -3186,39 +3185,33 @@ msgstr "Monster Levenspuntenbalk(tweede kleur)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Monster Levenspuntenbalk"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Monster Levenspuntenbalk(tweede kleur)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Monster Levenspuntenbalk"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Monster Levenspuntenbalk(tweede kleur)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Speler Levenspuntenbalk"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Speler Levenspuntenbalk"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3292,9 +3285,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Poortmarkering"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3539,13 +3531,15 @@ msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
@@ -3556,19 +3550,22 @@ msgstr "Voorwerpdeling onbekend."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
@@ -4009,15 +4006,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -4041,11 +4038,9 @@ msgstr "Toon chat kleurenlijst"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4072,11 +4067,9 @@ msgstr "Limiteer max karakters in chat lijn"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4087,9 +4080,7 @@ msgstr "Limiteer max lijnen in chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4130,8 +4121,8 @@ msgstr "Toon chat geschiedenis"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4142,11 +4133,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4157,11 +4146,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4177,13 +4164,9 @@ msgstr "Verberg verkoop boodschappen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4196,8 +4179,7 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4216,12 +4198,9 @@ msgstr "Plaats alle persoonlijke berichten in tabs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4232,8 +4211,7 @@ msgstr "Hou magie berichten bij in de 'Debug' tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4246,11 +4224,9 @@ msgstr "Toon server berichten in de debug tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4275,11 +4251,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4290,8 +4264,7 @@ msgstr "Taal tab aanzetten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4304,9 +4277,7 @@ msgstr "Toon alle taal berichten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4319,9 +4290,7 @@ msgstr "Schakel de gevechtstab in"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4347,10 +4316,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4385,8 +4351,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4399,8 +4364,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4413,12 +4377,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -5580,17 +5541,13 @@ msgstr "Geen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
-"faalde ook!"
+msgstr "Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus faalde ook!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
-"modus faalde ook!"
+msgstr "Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5631,9 +5588,7 @@ msgstr "Scherm Resolutie is gewijzigd"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
-"resolutie."
+msgstr "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte resolutie."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6168,7 +6123,8 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -6285,7 +6241,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6303,7 +6260,8 @@ msgstr "Nog %d punten te verdelen"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6329,7 +6287,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6530,7 +6489,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6599,8 +6559,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -6896,13 +6856,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7323,9 +7285,9 @@ msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Vaardigheid %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7610,10 +7572,9 @@ msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
-"het venster."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8867,9 +8828,7 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
-"Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
-"server."
+msgstr "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze server."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -9042,9 +9001,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Je bent tijdelijk geband van het spel tot %s.\n"
-"Neem aub contact op met het GM team via de forums."
+msgstr "Je bent tijdelijk geband van het spel tot %s.\nNeem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9969,8 +9926,7 @@ msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
 msgid "Failed adding item. You can't trade this item."
-msgstr ""
-"Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
+msgstr "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:299
@@ -10672,8 +10628,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10729,15 +10684,3 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Registratie ongedaan gemaakt!"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Tot ziens..."
-
-#~ msgid "Unregister"
-#~ msgstr "Registreren"
-
-#~ msgid "Name: %s"
-#~ msgstr "Naam: %s"
diff --git a/po/pl.po b/po/pl.po
index d10f7b67e..70bead115 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Avenn <avenn3@gmail.com>, 2013-2014
@@ -15,16 +15,14 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
-"pl/)\n"
-"Language: pl\n"
+"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:164
@@ -1252,16 +1250,14 @@ msgstr "Wskrześ"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-"Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać "
-"zdrowie."
+msgstr "Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać zdrowie."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1272,7 +1268,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "domyślnie"
 
@@ -3192,39 +3189,33 @@ msgstr "Pasek życia potwora (drugi kolor)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Pasek życia potwora"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Pasek życia potwora (drugi kolor)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Pasek życia potwora"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Pasek życia potwora (drugi kolor)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Pasek życia gracza"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Pasek życia gracza (drugi kolor)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3298,9 +3289,8 @@ msgstr "Podświetlenie przeszkód wodnych"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Podświetlenie przeszkód wodnych"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3545,13 +3535,15 @@ msgstr "Włączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Wyłączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Nie można włączyć dzielenia się przedmiotami."
 
@@ -3562,23 +3554,24 @@ msgstr "Stan dzielenia się przedmiotami nieznany."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Podział doświadczenia włączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Podział doświadczenia wyłączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
-msgstr ""
-"Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica "
-"poziomów jest większa niż 10."
+msgstr "Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica poziomów jest większa niż 10."
 
 #. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/chat/partytab.cpp:165
@@ -4017,15 +4010,15 @@ msgstr "Podtrzymuj skupienie na pasek czatu."
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Kolory"
 
@@ -4049,11 +4042,9 @@ msgstr "Pokazuj listę kolorów czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4080,11 +4071,9 @@ msgstr "Limit znaków w wierszu czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4095,9 +4084,7 @@ msgstr "Limit wierszy w czacie"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4138,8 +4125,8 @@ msgstr "Pokazuj historię czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4150,11 +4137,9 @@ msgstr "Pokazuj wiadomości online drużyny"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4165,11 +4150,9 @@ msgstr "Pokazuj wiadomości online gildii"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4185,13 +4168,9 @@ msgstr "Ukryj wiadomości od sklepów"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4204,8 +4183,7 @@ msgstr "Pokazuj wiadomości MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4224,12 +4202,9 @@ msgstr "Umieść wszystkie szepty w zakładkach"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4240,8 +4215,7 @@ msgstr "Loguj powiadomienia o magii w zakładce Debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4254,11 +4228,9 @@ msgstr "Pokazuj wiadomości serwera w zakładce Debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4283,11 +4255,9 @@ msgstr "Aktywuj zakładkę GM"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4298,8 +4268,7 @@ msgstr "Aktywuj zakładkę \"języki\""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4312,9 +4281,7 @@ msgstr "Pokaż wiadomości ze wszystkich języków"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4327,9 +4294,7 @@ msgstr "Włącz zakładkę bitewną"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4355,10 +4320,7 @@ msgstr "Jeśli potrzeba, zmień rozmiar zakładek czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4393,8 +4355,7 @@ msgstr "Podświetlaj słowa (oddzielaj przecinkiem)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4407,8 +4368,7 @@ msgstr "Ignoruj imienia globalnie (oddzielone przecinkiem)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4421,12 +4381,9 @@ msgstr "Pokazuj przycisk emotek w czacie"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4540,9 +4497,7 @@ msgstr "Wykryto konflikt klawiszy."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
-"się problemy."
+msgstr "Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić się problemy."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5311,9 +5266,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr ""
-"Emuluj prawy przycisk myszki poprzez długie wciśnięcie lewego przycisku "
-"(przydatne dla ekranów dotykowych)"
+msgstr "Emuluj prawy przycisk myszki poprzez długie wciśnięcie lewego przycisku (przydatne dla ekranów dotykowych)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5592,16 +5545,13 @@ msgstr "Brak"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
+msgstr "Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego "
-"stanu!"
+msgstr "Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego stanu!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5642,9 +5592,7 @@ msgstr "Rozdzielczość zmieniona"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Niektóre okna mogą być przesunięte aby dopasować się do niższej "
-"rozdzielczości."
+msgstr "Niektóre okna mogą być przesunięte aby dopasować się do niższej rozdzielczości."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6179,7 +6127,8 @@ msgstr "Ilość:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Utwórz"
 
@@ -6296,7 +6245,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6314,7 +6264,8 @@ msgstr "Proszę wykorzystać %d punktów"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6340,7 +6291,8 @@ msgstr "Wygląd:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6439,12 +6391,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"PŻ: %u/%u\n"
-"PM: %u/%u\n"
-"Poziom: %u\n"
-"Doświadczenie: %u\n"
-"Pieniądze: %s"
+msgstr "PŻ: %u/%u\nPM: %u/%u\nPoziom: %u\nDoświadczenie: %u\nPieniądze: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6546,7 +6493,8 @@ msgstr "Edytuj serwer"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Połącz"
 
@@ -6615,8 +6563,8 @@ msgstr "Czcionki"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "nieznane"
 
@@ -6914,13 +6862,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7341,9 +7291,9 @@ msgstr "Umiejętność %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Umiejętność %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7628,10 +7578,9 @@ msgstr "Nie masz wystarczającej ilości pieniędzy."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
-"rodzaj przedmiotu w okienku."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam rodzaj przedmiotu w okienku."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -9058,9 +9007,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Dostałeś/aś tymczasowego bana do %s.\n"
-"Prosimy o kontakt z drużyną GM-ów przez fora."
+msgstr "Dostałeś/aś tymczasowego bana do %s.\nProsimy o kontakt z drużyną GM-ów przez fora."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9941,9 +9888,7 @@ msgstr "Dodaj amunicję do ekwipunku."
 #: src/resources/notifications.h:262
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr ""
-"Handlowania z %s nie jest możliwe. Postać z którą handlujesz jest zbyt "
-"daleko."
+msgstr "Handlowania z %s nie jest możliwe. Postać z którą handlujesz jest zbyt daleko."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:267
@@ -9982,9 +9927,7 @@ msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz jest przeciąż
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-"Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w "
-"inwentarzu."
+msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w inwentarzu."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
@@ -10747,15 +10690,3 @@ msgstr "%d sekund/y"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Wyrejestrowano z powodzeniem"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Żegnaj, będziemy czekać na Twój powrót..."
-
-#~ msgid "Unregister"
-#~ msgstr "Wyrejestruj"
-
-#~ msgid "Name: %s"
-#~ msgstr "Imię: %s"
diff --git a/po/pt.po b/po/pt.po
index b6d11abfc..d67f9ceff 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # freya <freya.df@gmail.com>, 2013
@@ -14,14 +14,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
-"pt/)\n"
-"Language: pt\n"
+"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -717,9 +716,7 @@ msgstr "  -H --update-host : Usar este host de update"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : Escolhe um personagem e um servidor de personagem "
-"padrão"
+msgstr "  -D --default        : Escolhe um personagem e um servidor de personagem padrão"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -729,14 +726,12 @@ msgstr "  -u --skip-update    : Não faz downloads de atualização"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
+msgstr "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
+msgstr "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -756,8 +751,7 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --testes          : Começar a testar drivers para auto configuração"
+msgstr "  -T --testes          : Começar a testar drivers para auto configuração"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1254,17 +1248,14 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Você está carregando mais que a metade de seu peso. Você não poderá mais "
-"recuperar HP."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Você está carregando mais que a metade de seu peso. Você não poderá mais recuperar HP."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-"Você está carregando menos da metade de seu peso. Você vai recuperar-se "
-"novamente."
+msgstr "Você está carregando menos da metade de seu peso. Você vai recuperar-se novamente."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1275,7 +1266,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "padrão"
 
@@ -3195,39 +3187,33 @@ msgstr "Barra de HP do inimigo (segunda cor)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Barra de HP"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Barra de HP do inimigo (segunda cor)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Barra de HP"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Barra de HP do inimigo (segunda cor)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Barra de HP do jogador"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Barra de HP do jogador (segunda cor)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3301,9 +3287,8 @@ msgstr "Destaque de colisão na água"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Destaque de colisão na água"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3548,13 +3533,15 @@ msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -3565,19 +3552,22 @@ msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4018,15 +4008,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Cores"
 
@@ -4050,11 +4040,9 @@ msgstr "Mostrar lista de cores do chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4081,11 +4069,9 @@ msgstr "Limite de caracteres na linha de chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4096,9 +4082,7 @@ msgstr "Limite de linhas máximas no chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4139,8 +4123,8 @@ msgstr "Mostrar mensagens antigas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4151,11 +4135,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4166,11 +4148,9 @@ msgstr "Mostrar mensagens online da Guilda"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4186,13 +4166,9 @@ msgstr "Esconder mensagens de loja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4205,8 +4181,7 @@ msgstr "Ver mensagens MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4225,12 +4200,9 @@ msgstr "Deixar as mensagens privadas em abas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4241,8 +4213,7 @@ msgstr "Salvar comandos de feitiços na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4255,11 +4226,9 @@ msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4284,11 +4253,9 @@ msgstr "Habilitar aba de gm"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4299,8 +4266,7 @@ msgstr "Habilitar aba de linguagem"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4313,9 +4279,7 @@ msgstr "Mostrar todas mensagens de linguagem"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4328,9 +4292,7 @@ msgstr "Habilitar aba de batalha"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4356,10 +4318,7 @@ msgstr "Redimensionar as abas de chat caso precisar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4394,8 +4353,7 @@ msgstr "Palavras Destacadas (separadas por vírgulas)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4408,8 +4366,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4422,12 +4379,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4541,9 +4495,7 @@ msgstr "Conflitos de teclas detectado."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
-"comprometer a jogabilidade."
+msgstr "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não comprometer a jogabilidade."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5591,16 +5543,13 @@ msgstr "Nenhum"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
+msgstr "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Falha ao mudar para o modo tela cheia e falha na restauração do modo "
-"anterior!"
+msgstr "Falha ao mudar para o modo tela cheia e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5641,8 +5590,7 @@ msgstr "Resolução de tela alterada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
+msgstr "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6177,7 +6125,8 @@ msgstr "Quantidade:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Criar"
 
@@ -6294,7 +6243,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6312,7 +6262,8 @@ msgstr "Por favor distribua %d pontos"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6338,7 +6289,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "A"
 
@@ -6437,12 +6389,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u\n"
-"Mp: %u/%u\n"
-"Nível: %u\n"
-"Experiência: %u\n"
-"Dinheiro: %s"
+msgstr "Hp: %u/%u\nMp: %u/%u\nNível: %u\nExperiência: %u\nDinheiro: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6544,7 +6491,8 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6613,8 +6561,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr ""
 
@@ -6910,13 +6858,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7337,9 +7287,9 @@ msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Habilidade %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7624,9 +7574,9 @@ msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -9038,9 +8988,7 @@ msgstr "Rejeitado pelo servidor."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Você foi permanentemente banido(a) do jogo. Por favor entre em contato com "
-"algum GM."
+msgstr "Você foi permanentemente banido(a) do jogo. Por favor entre em contato com algum GM."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9055,9 +9003,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Você banido(a) do jogo até %s.\n"
-"Por favor entre em contato com algum GM através do fórum."
+msgstr "Você banido(a) do jogo até %s.\nPor favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9938,8 +9884,7 @@ msgstr ""
 #: src/resources/notifications.h:262
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr ""
-"Negociação com %s é impossível. O parceiro de negócios está muito longe."
+msgstr "Negociação com %s é impossível. O parceiro de negócios está muito longe."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:267
@@ -10685,8 +10630,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10742,15 +10686,3 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Registro cancelado com sucesso"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Tchau, volte sempre..."
-
-#~ msgid "Unregister"
-#~ msgstr "Cancelar Registro"
-
-#~ msgid "Name: %s"
-#~ msgstr "Nome: %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e925bf610..7a1159be5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # alastrim <alasmirt@gmail.com>, 2013
 # alastrim <alasmirt@gmail.com>, 2011-2012
@@ -14,7 +14,7 @@
 # freya <freya.df@gmail.com>, 2011-2012
 # freya <freya.df@gmail.com>, 2011,2013
 # Xtreem <guilhermegg11@hotmail.com>, 2014-2015
-# sem nome <cpntb1@ymail.com>, 2014
+# Jesusaves <cpntb1@ymail.com>, 2014
 # Luciano Zago <lcnzg7@gmail.com>, 2013,2015
 # María Luciana Rolón <luxlloth@gmail.com>, 2012
 # María Luciana Rolón <luxlloth@gmail.com>, 2012
@@ -27,14 +27,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
-"language/pt_BR/)\n"
-"Language: pt_BR\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -123,9 +122,7 @@ msgstr "Registro enviado em:"
 #: src/actions/actions.cpp:1737
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr ""
-"Visto pela última vez desativado. Ativar em jogadores / recolher id de "
-"jogadores e log visto."
+msgstr "Visto pela última vez desativado. Ativar em jogadores / recolher id de jogadores e log visto."
 
 #. TRANSLATORS: last seen error
 #: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
@@ -147,9 +144,7 @@ msgstr "Não é possível enviar mensages privadas ou de canal vazias!"
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr ""
-"Não foi possível criar uma aba de mensagem privada \"%s\"! Provavelmente ela "
-"já existe."
+msgstr "Não foi possível criar uma aba de mensagem privada \"%s\"! Provavelmente ela já existe."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -423,9 +418,8 @@ msgstr "profissão"
 
 #. TRANSLATORS: get homunculus xp message
 #: src/being/localplayer.cpp:1150
-#, fuzzy
 msgid "Homun"
-msgstr "Homúnculos"
+msgstr ""
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1162
@@ -735,9 +729,7 @@ msgstr "  -H --update-host    : Usar este host de update"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : Escolhe um personagem e um servidor de personagem "
-"padrão"
+msgstr "  -D --default        : Escolhe um personagem e um servidor de personagem padrão"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -747,14 +739,12 @@ msgstr "  -u --skip-update    : Não faz downloads de atualização"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
+msgstr "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
+msgstr "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -1271,17 +1261,14 @@ msgstr "Reviver"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Você está carregando mais que a metade de seu peso. Você não poderá mais "
-"recuperar HP."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Você está carregando mais que a metade de seu peso. Você não poderá mais recuperar HP."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-"Você está carregando menos ou metade de seu peso. Você pode recuperar-se "
-"novamente."
+msgstr "Você está carregando menos ou metade de seu peso. Você pode recuperar-se novamente."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1292,7 +1279,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "padrão"
 
@@ -1770,9 +1758,9 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:274
-#, fuzzy, c-format
+#, c-format
 msgid "Hp: %d/%d"
-msgstr "Lvl: %d / %d"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:284
@@ -3212,39 +3200,33 @@ msgstr "Barra de HP do inimigo (segunda cor)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Homúnculos"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Barra de HP do inimigo (segunda cor)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Mercenario(s)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Barra de HP do inimigo (segunda cor)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Barra de HP do jogador"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Barra de HP do jogador (segunda cor)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3318,9 +3300,8 @@ msgstr "Destaque de colisão de água"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Destaque de colisão de água"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3565,13 +3546,15 @@ msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -3582,19 +3565,22 @@ msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4023,10 +4009,7 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr ""
-"O bate-papo será automaticamente fechado quando não estiver em uso.\n"
-"\n"
-"Pressione enter ou passe o cursor para exibir o bate-papo novamente."
+msgstr "O bate-papo será automaticamente fechado quando não estiver em uso.\n\nPressione enter ou passe o cursor para exibir o bate-papo novamente."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4038,19 +4021,15 @@ msgstr "Proteger foco do chat"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
-msgstr ""
-"Permite a proteção agressiva de foco de entrada na janela de bate-papo.\n"
-"\n"
-"Nota: não há outras entradas de texto serão autorizados a receber a entrada "
-"de texto quando você digitar na janela de bate-papo."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+msgstr "Permite a proteção agressiva de foco de entrada na janela de bate-papo.\n\nNota: não há outras entradas de texto serão autorizados a receber a entrada de texto quando você digitar na janela de bate-papo."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Cores"
 
@@ -4064,10 +4043,7 @@ msgstr "Remover mensagens coloridas do chat"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr ""
-"Ative esta configuração para tirar as cores de mensagens de bate-papo "
-"recebidas. Todas as mensagens de bate-papo irão usar a cor padrão caso seja "
-"habilitado."
+msgstr "Ative esta configuração para tirar as cores de mensagens de bate-papo recebidas. Todas as mensagens de bate-papo irão usar a cor padrão caso seja habilitado."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4077,17 +4053,10 @@ msgstr "Mostrar lista de cores do chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
-msgstr ""
-"Ative esta configuração para mostrar a seleção de cor drop-down na janela de "
-"bate-papo. A janela de chat irá exibir a seleção de cor drop-down.\n"
-"\n"
-"Isto permite selecionar a cor padrão de mensagens de bate-papo de saída "
-"facilmente, mas também ocupa algum espaço na janela de bate-papo."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+msgstr "Ative esta configuração para mostrar a seleção de cor drop-down na janela de bate-papo. A janela de chat irá exibir a seleção de cor drop-down.\n\nIsto permite selecionar a cor padrão de mensagens de bate-papo de saída facilmente, mas também ocupa algum espaço na janela de bate-papo."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
@@ -4098,9 +4067,7 @@ msgstr "Permitir feitiços e comandos de GM em todas abas"
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr ""
-"Habilite essa configuração para ser capaz de escrever magias e comandos da "
-"GM em qualquer guia."
+msgstr "Habilite essa configuração para ser capaz de escrever magias e comandos da GM em qualquer guia."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4115,16 +4082,10 @@ msgstr "Limite de caracteres na linha de chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
-msgstr ""
-"Limite quantos caracteres serão exibidos em linhas de texto no bate-papo.\n"
-"\n"
-"Nota: linhas longas podem deixar o cliente mais lento. Linhas mais longas do "
-"que esse limite serão cortadas."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+msgstr "Limite quantos caracteres serão exibidos em linhas de texto no bate-papo.\n\nNota: linhas longas podem deixar o cliente mais lento. Linhas mais longas do que esse limite serão cortadas."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:110
@@ -4134,17 +4095,10 @@ msgstr "Limite de linhas máximas no chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
-msgstr ""
-"Limita o número de linhas de bate-papo que ficam no rolamento da aba de bate-"
-"papo. Mantém o número especificado de últimas linhas do texto. Linhas mais "
-"antigas que excedem esse limite são descartadas.\n"
-"\n"
-"Nota: mantendo muitas linhas na rolagem podem deixar o cliente lento."
+msgstr "Limita o número de linhas de bate-papo que ficam no rolamento da aba de bate-papo. Mantém o número especificado de últimas linhas do texto. Linhas mais antigas que excedem esse limite são descartadas.\n\nNota: mantendo muitas linhas na rolagem podem deixar o cliente lento."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:120
@@ -4162,11 +4116,7 @@ msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
 "Note: chat logs can take noticeable amount of disk space over time."
-msgstr ""
-"Caso habilite esta configuração, os registros de bate-papo serão gravados no "
-"disco.\n"
-"\n"
-"Nota: Com o passar do tempo isto pode consumir muito espaço do disco."
+msgstr "Caso habilite esta configuração, os registros de bate-papo serão gravados no disco.\n\nNota: Com o passar do tempo isto pode consumir muito espaço do disco."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:131
@@ -4186,12 +4136,9 @@ msgstr "Mostrar mensagens antigas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
-msgstr ""
-"Caso esta configuração esteja ativada, o cliente irá carregar conteúdo de "
-"abas de bate-papo a partir de registros em vez de começar com abas de bate-"
-"papo vazias."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
+msgstr "Caso esta configuração esteja ativada, o cliente irá carregar conteúdo de abas de bate-papo a partir de registros em vez de começar com abas de bate-papo vazias."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4201,17 +4148,10 @@ msgstr "Mostrar mensagens de membros do grupo online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
-msgstr ""
-"Caso esta configuração seja habilitada, sempre que um membro do seu grupo "
-"entrar ou sair do jogo uma mensagem será exibida na aba de grupo .\n"
-"\n"
-"Isso adiciona alguma interferência na conversa, mas permite ver quando seus "
-"amigos estão online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+msgstr "Caso esta configuração seja habilitada, sempre que um membro do seu grupo entrar ou sair do jogo uma mensagem será exibida na aba de grupo .\n\nIsso adiciona alguma interferência na conversa, mas permite ver quando seus amigos estão online."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:152
@@ -4221,17 +4161,10 @@ msgstr "Mostrar mensagens de guildas online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
-msgstr ""
-"Caso esta configuração seja habilitada, sempre que um membro da sua guilda "
-"entrar ou sair do jogo uma mensagem será exibida na aba de guilda .\n"
-"\n"
-"Isso adiciona alguma interferência na conversa, mas permite ver quando seus "
-"amigos estão online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+msgstr "Caso esta configuração seja habilitada, sempre que um membro da sua guilda entrar ou sair do jogo uma mensagem será exibida na aba de guilda .\n\nIsso adiciona alguma interferência na conversa, mas permite ver quando seus amigos estão online."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4246,21 +4179,10 @@ msgstr "Esconder mensagens de loja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
-msgstr ""
-"Se essa configuração for ativada, não serão exibidas mensagens relacionadas "
-"a loja pessoal do ManaPlus será exibido no chat. Desabilite esta "
-"configuração caso queira ver as mensagens relacionadas a loja.\n"
-"Nota: tecnicamente, a loja do ManaPlus foi implementado como mensagens "
-"privadas habituais com conteúdo especial. Se você desabilitar essa "
-"configuração, você será capaz de ver essas mensagens e obter uma ideia de "
-"quando os jogadores estão  olhando sua loja."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+msgstr "Se essa configuração for ativada, não serão exibidas mensagens relacionadas a loja pessoal do ManaPlus será exibido no chat. Desabilite esta configuração caso queira ver as mensagens relacionadas a loja.\nNota: tecnicamente, a loja do ManaPlus foi implementado como mensagens privadas habituais com conteúdo especial. Se você desabilitar essa configuração, você será capaz de ver essas mensagens e obter uma ideia de quando os jogadores estão  olhando sua loja."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:175
@@ -4272,13 +4194,8 @@ msgstr "Ver Mensagens MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
-msgstr ""
-"Habilite essa configuração para ver as mensagens de MVP server..\n"
-"\n"
-"Nota: As mensagens MVP não são usados no TMW / Evol / etc servidores, por "
-"isso este recurso geralmente faz pouca diferença."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+msgstr "Habilite essa configuração para ver as mensagens de MVP server..\n\nNota: As mensagens MVP não são usados no TMW / Evol / etc servidores, por isso este recurso geralmente faz pouca diferença."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
@@ -4296,20 +4213,10 @@ msgstr "Deixar as mensagens privadas em abas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
-"\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
-msgstr ""
-"Caso esta configuração esteja ativa, todos os whispers (mensagens privadas) "
-"serão colocados em abas separadas, uma aba para cada jogador. Se essa "
-"configuração for desativada, todos os whispers aparecerão na aba geral "
-"Geral.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Nota: Pense duas vezes antes de desabilitar esse recurso. Receber todos os "
-"whispers na aba geral pode ser bastante confuso."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+msgstr "Caso esta configuração esteja ativa, todos os whispers (mensagens privadas) serão colocados em abas separadas, uma aba para cada jogador. Se essa configuração for desativada, todos os whispers aparecerão na aba geral Geral.\n\nNota: Pense duas vezes antes de desabilitar esse recurso. Receber todos os whispers na aba geral pode ser bastante confuso."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:197
@@ -4319,16 +4226,10 @@ msgstr "Salvar comandos de feitiços na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
-msgstr ""
-"Se essa configuração for habilitada, a conjuração de feitiço será exibido na "
-"aba Debug. Se desativado, eles serão exibidos na aba Geral.\n"
-"\n"
-"Nota: Isto não afeta no feitiço, apenas muda a aba que ele é exibido quando "
-"conjurado.."
+msgstr "Se essa configuração for habilitada, a conjuração de feitiço será exibido na aba Debug. Se desativado, eles serão exibidos na aba Geral.\n\nNota: Isto não afeta no feitiço, apenas muda a aba que ele é exibido quando conjurado.."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:205
@@ -4338,19 +4239,10 @@ msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
-"\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
-msgstr ""
-"Se essa configuração for habilitada, as mensagens do servidor serão exibidas "
-"na aba de depuração do bate-papo. Se desativada, as mensagens do servidor "
-"irão aparecer na aba geral do bate-papo.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Nota: de acordo com o 4144, a desativação disto também poderia fazer com que "
-"você perca algumas mensagens de depuração do cliente uma vez que estas são "
-"as mensagens do servidor falso."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+msgstr "Se essa configuração for habilitada, as mensagens do servidor serão exibidas na aba de depuração do bate-papo. Se desativada, as mensagens do servidor irão aparecer na aba geral do bate-papo.\n\nNota: de acordo com o 4144, a desativação disto também poderia fazer com que você perca algumas mensagens de depuração do cliente uma vez que estas são as mensagens do servidor falso."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4364,12 +4256,7 @@ msgid ""
 "words typical for trades will go to Trade tab. This will make General tab "
 "less noisy. If this setting is disabled, all trade related players messages "
 "will stay in General tab."
-msgstr ""
-"Permite a aba de comércio. A aba de comércio é basicamente um filtro. "
-"Mensagens contendo palavras típicas de comércio vão automaticamente para a "
-"aba de comércio. Isso fará com que a aba geral fique menos poluída. Se essa "
-"configuração for desativada, todas as mensagens relacionadas com o comércio "
-"irão ser exibidas na aba geral."
+msgstr "Permite a aba de comércio. A aba de comércio é basicamente um filtro. Mensagens contendo palavras típicas de comércio vão automaticamente para a aba de comércio. Isso fará com que a aba geral fique menos poluída. Se essa configuração for desativada, todas as mensagens relacionadas com o comércio irão ser exibidas na aba geral."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:224
@@ -4379,17 +4266,10 @@ msgstr "Habilitar aba de gm"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
-"\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
-msgstr ""
-"Se ativado, a aba GM irá aparecer no chat. Ela exibe o texto relacionado a "
-"GMs.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Nota: essa configuração só faz diferença para GMs (Game Masters) já que esta "
-"aba só aparece para GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+msgstr "Se ativado, a aba GM irá aparecer no chat. Ela exibe o texto relacionado a GMs.\n\nNota: essa configuração só faz diferença para GMs (Game Masters) já que esta aba só aparece para GMs."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:232
@@ -4399,15 +4279,10 @@ msgstr "Habilitar aba de idiomas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr ""
-"Se esse recurso for ativado, a aba idioma ira aparecer se o servidor tiver "
-"suporte para idiomas.\n"
-"\n"
-"Nota: apenas o servidor Evol tem suporte para isto ate o momento."
+msgstr "Se esse recurso for ativado, a aba idioma ira aparecer se o servidor tiver suporte para idiomas.\n\nNota: apenas o servidor Evol tem suporte para isto ate o momento."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4417,18 +4292,10 @@ msgstr "Mostrar mensagens de todos idiomas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
-msgstr ""
-"0Se essa configuração ativada e o  servidor tiver suporte para diferentes "
-"idiomas, você verá mensagens para todos os idiomas, independentemente do "
-"idioma preferencial.\n"
-"\n"
-"Nota: isto só funciona em servidores que suportam múltiplos abas de idiomas, "
-"como o Evol."
+msgstr "0Se essa configuração ativada e o  servidor tiver suporte para diferentes idiomas, você verá mensagens para todos os idiomas, independentemente do idioma preferencial.\n\nNota: isto só funciona em servidores que suportam múltiplos abas de idiomas, como o Evol."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:250
@@ -4438,17 +4305,10 @@ msgstr "Habilitar aba de batalha"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
-msgstr ""
-"Se essa configuração for ativada, a aba Batalha aparecerá no chat. Esta aba "
-"irá conter mensagens relacionadas a batalhas, como ganho de danos e "
-"experiência, se as mensagens de batalha  forem ativadas.\n"
-"\n"
-"Nota: É necessário reiniciar o cliente para as alterações terem efeito."
+msgstr "Se essa configuração for ativada, a aba Batalha aparecerá no chat. Esta aba irá conter mensagens relacionadas a batalhas, como ganho de danos e experiência, se as mensagens de batalha  forem ativadas.\n\nNota: É necessário reiniciar o cliente para as alterações terem efeito."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:259
@@ -4461,10 +4321,7 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr ""
-"Se essa configuração for ativada, mensagens relacionadas a batalha como "
-"danos ou ganho de experiência será exibido na aba de depuração ou Batalha. "
-"Se desativado, nenhuma mensagem de batalha será exibida."
+msgstr "Se essa configuração for ativada, mensagens relacionadas a batalha como danos ou ganho de experiência será exibido na aba de depuração ou Batalha. Se desativado, nenhuma mensagem de batalha será exibida."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4474,10 +4331,7 @@ msgstr "Redimensionar aba de chat caso precisar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4502,10 +4356,7 @@ msgstr "Usar tempo local"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr ""
-"Se esse recurso for ativado, o bate-papo irá utilizar o hora local quando "
-"for exibir a hora que a mensagem foi recebida ou enviada. Se desativado, o "
-"tempo do servidor será usado (normalmente é o GMT+0)."
+msgstr "Se esse recurso for ativado, o bate-papo irá utilizar o hora local quando for exibir a hora que a mensagem foi recebida ou enviada. Se desativado, o tempo do servidor será usado (normalmente é o GMT+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4515,15 +4366,10 @@ msgstr "Palavras destacadas (separadas em vírgulas)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr ""
-"Aqui você pode especificar algumas palavras extras que também serão exibidas "
-"com destaque. Use vírgula para separar uma palavra de outra.\n"
-"\n"
-"Nota: Isto pode ser irritante - use este recurso com sabedoria."
+msgstr "Aqui você pode especificar algumas palavras extras que também serão exibidas com destaque. Use vírgula para separar uma palavra de outra.\n\nNota: Isto pode ser irritante - use este recurso com sabedoria."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4533,17 +4379,10 @@ msgstr "Nomes globais à ignorar (separados por virgula)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
-msgstr ""
-"Esta configuração permite ignorar algumas mensagens globais se determinado "
-"remetente (NPC, GM) é muito irritante. O anuncio será movido para a aba de "
-"depuração instantaneamente.\n"
-"\n"
-"Nota: o uso descuidado deste recurso pode fazer com que você perca anúncios "
-"importantes!"
+msgstr "Esta configuração permite ignorar algumas mensagens globais se determinado remetente (NPC, GM) é muito irritante. O anuncio será movido para a aba de depuração instantaneamente.\n\nNota: o uso descuidado deste recurso pode fazer com que você perca anúncios importantes!"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:314
@@ -4553,19 +4392,10 @@ msgstr "Mostrar botão de emoticon no chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
-msgstr ""
-"Se essa configuração for ativada, o botão aparecerá perto do campo de "
-"entrada de texto. Este botão permite abrir a janela de edição, o que permite "
-"a inclusão de sorrisos e formatação de texto facilmente.\n"
-"\n"
-"Nota: mesma janela também pode ser aberta pelo atalho durante a digitação, "
-"normalmente F1 por padrão."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+msgstr "Se essa configuração for ativada, o botão aparecerá perto do campo de entrada de texto. Este botão permite abrir a janela de edição, o que permite a inclusão de sorrisos e formatação de texto facilmente.\n\nNota: mesma janela também pode ser aberta pelo atalho durante a digitação, normalmente F1 por padrão."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:324
@@ -4577,10 +4407,7 @@ msgstr "Mostrar mensagem do dia ao começar"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr ""
-"Se essa configuração for ativada, o cliente irá exibir MOTD  do servidor "
-"(mensagem do dia) uma vez que você se conectar ao servidor. Desative-a para "
-"esconder não ter a MOTD exibida."
+msgstr "Se essa configuração for ativada, o cliente irá exibir MOTD  do servidor (mensagem do dia) uma vez que você se conectar ao servidor. Desative-a para esconder não ter a MOTD exibida."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4681,9 +4508,7 @@ msgstr "Conflitos de teclas detectado."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
-"comprometer a jogabilidade."
+msgstr "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não comprometer a jogabilidade."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5231,8 +5056,7 @@ msgstr "Aceleração por HW"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr ""
-"Habilitar cache de transparência (Software, pode se usar muita memória)"
+msgstr "Habilitar cache de transparência (Software, pode se usar muita memória)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5317,8 +5141,7 @@ msgstr "Ativar atlas de textura (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr ""
-"Guardar todos os sprites do mapa em cache (pode usar memória adicional)"
+msgstr "Guardar todos os sprites do mapa em cache (pode usar memória adicional)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
@@ -5454,9 +5277,7 @@ msgstr "Tira uma foto da tela a cada negociação completa."
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr ""
-"Simular clique com o botão direito por clique prolongado com o botão "
-"esquerdo (útil para interfaces de toque)"
+msgstr "Simular clique com o botão direito por clique prolongado com o botão esquerdo (útil para interfaces de toque)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5735,16 +5556,13 @@ msgstr "Nenhum"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
+msgstr "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Falha ao mudar para o modo tela cheia e falha na restauração do modo "
-"anterior!"
+msgstr "Falha ao mudar para o modo tela cheia e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5785,8 +5603,7 @@ msgstr "Resolução de tela alterada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
+msgstr "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6321,7 +6138,8 @@ msgstr "Quantidade:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Criar"
 
@@ -6438,7 +6256,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6456,7 +6275,8 @@ msgstr "Por favor distribua %d pontos"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6482,7 +6302,8 @@ msgstr "Aparência:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "A"
 
@@ -6581,12 +6402,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u\n"
-"Mp: %u/%u\n"
-"Nível: %u\n"
-"Experiência: %u\n"
-"Dinheiro: %s"
+msgstr "Hp: %u/%u\nMp: %u/%u\nNível: %u\nExperiência: %u\nDinheiro: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6688,7 +6504,8 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6757,8 +6574,8 @@ msgstr "Fontes"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -7054,13 +6871,15 @@ msgstr "Assunto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Dinheiro:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Item:"
@@ -7481,9 +7300,9 @@ msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Habilidade %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7768,9 +7587,9 @@ msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -9092,8 +8911,7 @@ msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr ""
-"Mensagem privada não pode ser enviada, ignorado por todos os jogadores."
+msgstr "Mensagem privada não pode ser enviada, ignorado por todos os jogadores."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9183,17 +9001,14 @@ msgstr "Rejeitado pelo servidor."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Você foi permanentemente banido(a) do jogo. Por favor entre em contato com "
-"algum GM."
+msgstr "Você foi permanentemente banido(a) do jogo. Por favor entre em contato com algum GM."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-#, fuzzy
 msgid ""
 "Client too old or wrong server type.\n"
 "Please update client on http://manaplus.org"
-msgstr "Cliente muito antigo ou tipo errado de servidor."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:146 src/net/eathena/loginrecv.cpp:84
@@ -9201,9 +9016,7 @@ msgstr "Cliente muito antigo ou tipo errado de servidor."
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Você banido do jogo até %s.\n"
-"Por favor entre em contato com algum GM através do fórum."
+msgstr "Você banido do jogo até %s.\nPor favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10084,8 +9897,7 @@ msgstr "Equipe a munição primeiro."
 #: src/resources/notifications.h:262
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr ""
-"Negociação com %s não é possível. O parceiro de negócios está muito longe."
+msgstr "Negociação com %s não é possível. O parceiro de negócios está muito longe."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:267
@@ -10291,18 +10103,14 @@ msgstr "Carta inserida."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr ""
-"Depósito falhou. Você provavelmente não tem esta quantia de dinheiro com "
-"você no momento."
+msgstr "Depósito falhou. Você provavelmente não tem esta quantia de dinheiro com você no momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr ""
-"Saque falhou. Você provavelmente não tem esta quantia de dinheiro no banco "
-"neste momento."
+msgstr "Saque falhou. Você provavelmente não tem esta quantia de dinheiro no banco neste momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10344,9 +10152,7 @@ msgstr "A negociação falhou."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr ""
-"A negociação falhou, porque a quantidade de itens digitada é maior do que o "
-"comprador pretende adquirir."
+msgstr "A negociação falhou, porque a quantidade de itens digitada é maior do que o comprador pretende adquirir."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10762,8 +10568,7 @@ msgstr "Adoção da criança falhou. Seu nível é muito baixo."
 #: src/resources/notifications.h:816
 msgid ""
 "Child adoption failed. This player is already married and can't be a baby."
-msgstr ""
-"Adoção da criança falhou. Esse jogador já está casado e não pode ter um bebê."
+msgstr "Adoção da criança falhou. Esse jogador já está casado e não pode ter um bebê."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10838,8 +10643,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10895,15 +10699,3 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Registro cancelado com sucesso"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Adeus, volte sempre..."
-
-#~ msgid "Unregister"
-#~ msgstr "Cancelar Registro"
-
-#~ msgid "Name: %s"
-#~ msgstr "Nome: %s"
diff --git a/po/ru.po b/po/ru.po
index 89404e738..62c40f827 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Alexandr Uspensky <AlexandrUSP@yandex.com>, 2015
 # Alexsl <alexlsh@mail.ru>, 2013-2015
@@ -22,17 +22,14 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 12:57+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
-"ru/)\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:164
@@ -120,9 +117,7 @@ msgstr "Информация о выгруженном логе:"
 #: src/actions/actions.cpp:1737
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr ""
-"Сбор информации о пользователя отключен. Включите его в игроки / собирать ид "
-"игроков и лог встреч."
+msgstr "Сбор информации о пользователя отключен. Включите его в игроки / собирать ид игроков и лог встреч."
 
 #. TRANSLATORS: last seen error
 #: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
@@ -420,9 +415,8 @@ msgstr "работа"
 
 #. TRANSLATORS: get homunculus xp message
 #: src/being/localplayer.cpp:1150
-#, fuzzy
 msgid "Homun"
-msgstr "Гомункул"
+msgstr ""
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1162
@@ -732,8 +726,7 @@ msgstr "  -H --update-host    : Использовать этот узел об�
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
+msgstr "  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -768,8 +761,7 @@ msgstr "     --renderer       : Устанавливает тип рендера
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
+msgstr "  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1266,17 +1258,14 @@ msgstr "Оживить"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье "
-"восстанавливаться не будет."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье восстанавливаться не будет."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-"Вес предметов составляет менее половины допустимого. Теперь Вы можете "
-"восстанавливаться."
+msgstr "Вес предметов составляет менее половины допустимого. Теперь Вы можете восстанавливаться."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1287,7 +1276,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "По умолчанию"
 
@@ -1765,9 +1755,9 @@ msgstr "Уровень: %d"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:274
-#, fuzzy, c-format
+#, c-format
 msgid "Hp: %d/%d"
-msgstr "Ур.: %d / %d"
+msgstr ""
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:284
@@ -3207,39 +3197,33 @@ msgstr "Полоса жизни монстров (второй цвет)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Гомункул"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Полоса жизни монстров (второй цвет)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Наемник"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Полоса жизни монстров (второй цвет)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Полоса жизни игрока"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Полоса жизни игрока (второй цвет)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3313,9 +3297,8 @@ msgstr "Подсветка клеток с водой"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Подсветка клеток с водой"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3560,13 +3543,15 @@ msgstr "Обмен предметами включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Обмен предметами выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Обмен предметами невозможен."
 
@@ -3577,19 +3562,22 @@ msgstr "Статус обмена предметами неизвестен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Обмен опытом включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Обмен опытом выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Обмен опытом невозможен."
 
@@ -4018,10 +4006,7 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr ""
-"Окно чата будет автоматически скрыто, когда не используется.\n"
-"\n"
-"Нажмите Enter или наведите курсор, чтобы показать чат снова."
+msgstr "Окно чата будет автоматически скрыто, когда не используется.\n\nНажмите Enter или наведите курсор, чтобы показать чат снова."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4033,19 +4018,15 @@ msgstr "Защитить фокус чата"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
-msgstr ""
-"Включает принудительную защиту ввода в окне чата.\n"
-"\n"
-"Примечание: другие текстовые поля будут недоступны для ввода пока Вы "
-"набираете текст в окне чата."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+msgstr "Включает принудительную защиту ввода в окне чата.\n\nПримечание: другие текстовые поля будут недоступны для ввода пока Вы набираете текст в окне чата."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Цвета"
 
@@ -4059,9 +4040,7 @@ msgstr "Удалить цвета из полученных сообщений �
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr ""
-"Отключает цветные сообщения чата. Если опция включена, все сообщения будут "
-"такого же цвета как и основной текст чата."
+msgstr "Отключает цветные сообщения чата. Если опция включена, все сообщения будут такого же цвета как и основной текст чата."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4071,11 +4050,9 @@ msgstr "Показать список цветов чата"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4087,8 +4064,7 @@ msgstr "Разрешить магические и администраторс�
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr ""
-"Включите эту опцию, чтобы писать заклинания и GM команды в любой вкладке."
+msgstr "Включите эту опцию, чтобы писать заклинания и GM команды в любой вкладке."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4103,11 +4079,9 @@ msgstr "Ограничить число символов в строке чат�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4118,9 +4092,7 @@ msgstr "Ограничить число строк в чате"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4161,8 +4133,8 @@ msgstr "Показать историю чата"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4173,11 +4145,9 @@ msgstr "Показывать информацию о подключениях в
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4188,11 +4158,9 @@ msgstr "Показывать информацию о подключениях в
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4208,13 +4176,9 @@ msgstr "Скрыть сообщения магазина"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4227,8 +4191,7 @@ msgstr "Показывать MVP сообщения"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4247,12 +4210,9 @@ msgstr "Личные сообщения во вкладках"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4263,8 +4223,7 @@ msgstr "Оставлять сообщения магии на вкладке о�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4277,11 +4236,9 @@ msgstr "Показывать сообщения сервера на вкладк
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4306,11 +4263,9 @@ msgstr "Включить страницу чата для гм"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4321,8 +4276,7 @@ msgstr "Включить в чате закладку для языка"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4335,9 +4289,7 @@ msgstr "Показывать сообщения на всех языках"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4350,9 +4302,7 @@ msgstr "Включить вкладку боя"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4378,10 +4328,7 @@ msgstr "Подгонять размер чата"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4416,8 +4363,7 @@ msgstr "Подсвечиваемые слова (разделенные запя
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4430,8 +4376,7 @@ msgstr "Игнорировать глобальные сообщения с им
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4444,12 +4389,9 @@ msgstr "Показывать кнопку эмоций в чате"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4462,9 +4404,7 @@ msgstr "Показывать motd сообщение сервера"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr ""
-"Если включена эта опция, то при подключении к серверу будет отображаться "
-"MOTD - сообщение/совет дня. Отключите, чтобы не показывать MOTD."
+msgstr "Если включена эта опция, то при подключении к серверу будет отображаться MOTD - сообщение/совет дня. Отключите, чтобы не показывать MOTD."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4565,9 +4505,7 @@ msgstr "Обнаружен(ы) конфликт(ы) клавиш."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
-"вести."
+msgstr "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно вести."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5115,9 +5053,7 @@ msgstr "Аппаратное ускорение"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr ""
-"Включить кеш прозрачности (программный режим, может использовать много "
-"памяти)"
+msgstr "Включить кеш прозрачности (программный режим, может использовать много памяти)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5147,9 +5083,7 @@ msgstr "Улучшение качества (выключите для лучш�
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:101
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr ""
-"Включить исправление альфа канала (программный режим, может быть очень "
-"медленным)"
+msgstr "Включить исправление альфа канала (программный режим, может быть очень медленным)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:106
@@ -5164,8 +5098,7 @@ msgstr "Включить перестановку спрайтов (нужен �
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:115
 msgid "Small memory (enable for lower memory usage)"
-msgstr ""
-"Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
+msgstr "Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:120
@@ -5180,8 +5113,7 @@ msgstr "Выключить кеширование сущностей (прогр
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr ""
-"Разные настройки (включение или выключение может улучшить производительность)"
+msgstr "Разные настройки (включение или выключение может улучшить производительность)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5216,8 +5148,7 @@ msgstr "Кешировать все звуки (может использова�
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
-msgstr ""
-"Очень важные настройки (НЕ МЕНЯЙТЕ если вы не уверены в том, что вы делаете)"
+msgstr "Очень важные настройки (НЕ МЕНЯЙТЕ если вы не уверены в том, что вы делаете)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:164
@@ -5622,17 +5553,13 @@ msgstr "Нет"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
-"удалось!"
+msgstr "Не удалось переключиться в оконный режим. Восстановить старый режим также не удалось!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
-"также не удалось!"
+msgstr "Не удалось переключиться в полноэкранный режим. Восстановить старый режим также не удалось!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5673,9 +5600,7 @@ msgstr "Разрешение экрана изменено"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
-"разрешении."
+msgstr "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем разрешении."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -6210,7 +6135,8 @@ msgstr "Количество:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Создать"
 
@@ -6327,7 +6253,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6345,7 +6272,8 @@ msgstr "Распределите очки (%d)"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6371,7 +6299,8 @@ msgstr "Внешность:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "Д"
 
@@ -6470,12 +6399,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u\n"
-"Mp: %u/%u\n"
-"Уровень: %u\n"
-"Опыт: %u\n"
-"Деньги: %s"
+msgstr "Hp: %u/%u\nMp: %u/%u\nУровень: %u\nОпыт: %u\nДеньги: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6577,7 +6501,8 @@ msgstr "Редактирование сервера"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Соединиться"
 
@@ -6646,8 +6571,8 @@ msgstr "Шрифты"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Неизвестный"
 
@@ -6947,13 +6872,15 @@ msgstr "Заголовок:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Деньги:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Премет:"
@@ -7374,9 +7301,9 @@ msgstr "Навык %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Навык %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7661,10 +7588,9 @@ msgstr "У вас недостаточно денег."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
-"объектов более одного раза."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид объектов более одного раза."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8918,8 +8844,7 @@ msgstr "Очистить окно бросания"
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
-"В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
+msgstr "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -8934,8 +8859,7 @@ msgstr "Неизвестная ошибка сервера персонажей.
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Невозможно создать персонажа. Скорее всего, такое имя уже используется."
+msgstr "Невозможно создать персонажа. Скорее всего, такое имя уже используется."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -9082,11 +9006,10 @@ msgstr "Вас навсегда забанили. Пожалуйста, свяж
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
-#, fuzzy
 msgid ""
 "Client too old or wrong server type.\n"
 "Please update client on http://manaplus.org"
-msgstr "Клиент устарел или неправильный тип сервера."
+msgstr ""
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:146 src/net/eathena/loginrecv.cpp:84
@@ -9094,8 +9017,7 @@ msgstr "Клиент устарел или неправильный тип се�
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
+msgstr "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10189,8 +10111,7 @@ msgstr "Ошибка перемещения денег в банк. Возмож
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr ""
-"Ошибка перемещения денег из банка. Возможно у вас нет столько денег в банке."
+msgstr "Ошибка перемещения денег из банка. Возможно у вас нет столько денег в банке."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10232,9 +10153,7 @@ msgstr "Сделка провалена."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr ""
-"Сделка провалена потому, что указанное количество больще чем покупатель "
-"хочет купить."
+msgstr "Сделка провалена потому, что указанное количество больще чем покупатель хочет купить."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10557,8 +10476,7 @@ msgstr "Ошибка игнорирования игрока."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:718
 msgid "Player ignore failed. Because too many ignores."
-msgstr ""
-"Ошибка игнорирования игрока потому, что слишком много игнорируемых игроков."
+msgstr "Ошибка игнорирования игрока потому, что слишком много игнорируемых игроков."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:722
@@ -10651,8 +10569,7 @@ msgstr "Ошибка принятия ребенка. Ваш уровень сл
 #: src/resources/notifications.h:816
 msgid ""
 "Child adoption failed. This player is already married and can't be a baby."
-msgstr ""
-"Ошибка принятия ребенка: этот игрок уже женат, и не может быть ребенком."
+msgstr "Ошибка принятия ребенка: этот игрок уже женат, и не может быть ребенком."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10727,9 +10644,7 @@ msgstr "Ловушка"
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
-"\"0\"."
+msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10785,15 +10700,3 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Регистрация удалена"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Хорошо, возвращайтесь в любое время..."
-
-#~ msgid "Unregister"
-#~ msgstr "Удалить регистрацию"
-
-#~ msgid "Name: %s"
-#~ msgstr "Имя: %s"
diff --git a/po/sr.po b/po/sr.po
index 533ed6114..0576ffe1a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Aleksandar Djokic <inactive+Cyberdjox@transifex.com>, 2013
 # Aleksandar Djokic <inactive+Cyberdjox@transifex.com>, 2013
@@ -10,16 +10,14 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
-"sr/)\n"
-"Language: sr\n"
+"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:164
@@ -1247,7 +1245,8 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
 #. TRANSLATORS: weight message
@@ -1264,7 +1263,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "standardno"
 
@@ -3530,13 +3530,15 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3547,19 +3549,22 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4000,15 +4005,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Boje"
 
@@ -4032,11 +4037,9 @@ msgstr "Prikaži listu boja za ćaskanje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4063,11 +4066,9 @@ msgstr "Ograniči maksimalan broj karaktera u jednoj liniji za ćaskanje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4078,9 +4079,7 @@ msgstr "Ograniči maksimalan broj linija za ćaskanje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4121,8 +4120,8 @@ msgstr "Prikaži istoriju ćaskanja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4133,11 +4132,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4148,11 +4145,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4168,13 +4163,9 @@ msgstr "Sakrij poruke prodavnica"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4187,8 +4178,7 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4207,12 +4197,9 @@ msgstr "Stavi sva šaputanja u kartice"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4223,8 +4210,7 @@ msgstr "Spasi poruke vezane za magiju u debug kartici"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4237,11 +4223,9 @@ msgstr "Prikaži serverske poruke na debug kartici"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4266,11 +4250,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4281,8 +4263,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4295,9 +4276,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4310,9 +4289,7 @@ msgstr "Uključi karticu za bitku"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4338,10 +4315,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4376,8 +4350,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4390,8 +4363,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4404,12 +4376,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4523,9 +4492,7 @@ msgstr ""
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Konflikt tastera između \"%s\" i \"%s\". Treba da se reši ovo, u suprotnom "
-"tok igre će biti čudan i nedefinisan."
+msgstr "Konflikt tastera između \"%s\" i \"%s\". Treba da se reši ovo, u suprotnom tok igre će biti čudan i nedefinisan."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -6155,7 +6122,8 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
 
@@ -6272,7 +6240,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
@@ -6290,7 +6259,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
@@ -6316,7 +6286,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6517,7 +6488,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Koncija"
 
@@ -6586,8 +6558,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr ""
 
@@ -6885,13 +6857,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7312,9 +7286,9 @@ msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Veštine"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7599,7 +7573,8 @@ msgstr ""
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
@@ -10710,9 +10685,3 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
-
-#~ msgid "Unregister Successful"
-#~ msgstr "De-registracija je uspela"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Zbogom, vrati se kad god poželiš..."
diff --git a/po/sv.po b/po/sv.po
index 45d7d9e00..2887f550b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Kristoffer Frisell <kristoffer@frisell.it>, 2013
 msgid ""
@@ -9,14 +9,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
-"language/sv_SE/)\n"
-"Language: sv_SE\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -672,8 +671,7 @@ msgstr "  -h --help           : Visa hjälp"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-"  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
+msgstr "  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:68
@@ -748,9 +746,7 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Börja testning av drivrutiner och automat-"
-"configurering"
+msgstr "  -T --tests          : Börja testning av drivrutiner och automat-configurering"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1247,7 +1243,8 @@ msgstr "Återuppliva"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
@@ -1264,7 +1261,8 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "standard"
 
@@ -3184,39 +3182,33 @@ msgstr "Monster HP bar (färg två)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Monster HP bar"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Monster HP bar (färg två)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Monster HP bar"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Monster HP bar (färg två)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Spelare HP bar"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Spelare HP bar (färg två)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3290,9 +3282,8 @@ msgstr "Luftkollisions-highlightning"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Luftkollisions-highlightning"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3537,13 +3528,15 @@ msgstr "Item-delning aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Item-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Item-delning är inte möjlig."
 
@@ -3554,19 +3547,22 @@ msgstr "Item-delning okänd."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Exp-delning är aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Exp-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Exp-delning är inte möjlig."
 
@@ -4007,15 +4003,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Färger"
 
@@ -4039,11 +4035,9 @@ msgstr "Visa chat-färglistan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4070,11 +4064,9 @@ msgstr "Begränsa max-tecken i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4085,9 +4077,7 @@ msgstr "Begränsa max-rader i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4128,8 +4118,8 @@ msgstr "Visa chat-historik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4140,11 +4130,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4155,11 +4143,9 @@ msgstr "Visa online-meddelande för guild"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4175,13 +4161,9 @@ msgstr "Dölj shop-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4194,8 +4176,7 @@ msgstr "Visa MVP-meddelanden"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4214,12 +4195,9 @@ msgstr "Lägg alla viskningar i flikar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4230,8 +4208,7 @@ msgstr "Logga magic messages i log-tabben"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4244,11 +4221,9 @@ msgstr "Visa servermeddelanden i log-fliken"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4273,11 +4248,9 @@ msgstr "Aktivera GM-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4288,8 +4261,7 @@ msgstr "Aktivera språk-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4302,9 +4274,7 @@ msgstr "Visa alla språk-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4317,9 +4287,7 @@ msgstr "Aktivera battle-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4345,10 +4313,7 @@ msgstr "Ändra storlek på chat-flikarna om det behövs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4383,8 +4348,7 @@ msgstr "Highlighta ord (separerat med komma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4397,8 +4361,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4411,12 +4374,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4530,9 +4490,7 @@ msgstr "Tangent-konflikt(er) uppmärksammade."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet "
-"uppföra sig konstigt."
+msgstr "Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet uppföra sig konstigt."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4917,8 +4875,7 @@ msgstr "Bots support"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr ""
-"Aktivera support för guild-bot och avaktivera grund-supporten för guild"
+msgstr "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5581,17 +5538,13 @@ msgstr "Ingen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Misslyckades att ändra till fönster-läge och återställandet av det gamla "
-"läget misslyckades också!"
+msgstr "Misslyckades att ändra till fönster-läge och återställandet av det gamla läget misslyckades också!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Misslyckades att ändra till fullskärms-läge och återställandet av det gamla "
-"läget misslyckades också!"
+msgstr "Misslyckades att ändra till fullskärms-läge och återställandet av det gamla läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -6167,7 +6120,8 @@ msgstr "Antal:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Skapa"
 
@@ -6284,7 +6238,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6302,7 +6257,8 @@ msgstr "Vänligen distribuera %d poäng"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6328,7 +6284,8 @@ msgstr "Utseende:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6427,12 +6384,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u⏎\n"
-"Mp: %u/%u⏎\n"
-"Level: %u⏎\n"
-"Experience: %u⏎\n"
-"Money: %s"
+msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6534,7 +6486,8 @@ msgstr "Editera Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Anslut"
 
@@ -6576,9 +6529,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog error message
 #: src/gui/windows/editserverdialog.cpp:206
 msgid "Please at least type both the address and the port of the server."
-msgstr ""
-"Snälla, kan du inte bara vara vänlig och skriva in både adress och port till "
-"servern."
+msgstr "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till servern."
 
 #. TRANSLATORS: egg selection dialog name
 #: src/gui/windows/eggselectiondialog.cpp:42
@@ -6605,8 +6556,8 @@ msgstr "Fonter"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr ""
 
@@ -6902,13 +6853,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7329,9 +7282,9 @@ msgstr "Skill %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Skill %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7616,10 +7569,9 @@ msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
-"fönstret."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i fönstret."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8888,9 +8840,7 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är "
-"taget."
+msgstr "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är taget."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -9033,8 +8983,7 @@ msgstr "Nekad från servern."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
+msgstr "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9049,9 +8998,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-"
-"teamet via forumet."
+msgstr "Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-teamet via forumet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10678,9 +10625,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", "
-"\"0\"."
+msgstr "Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10736,15 +10681,3 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Avregistrering lyckad"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Farväl, kom gärna tillbaka snart igen..."
-
-#~ msgid "Unregister"
-#~ msgstr "Avregistrera"
-
-#~ msgid "Name: %s"
-#~ msgstr "Namn: %s"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 45d7d9e00..2887f550b 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Kristoffer Frisell <kristoffer@frisell.it>, 2013
 msgid ""
@@ -9,14 +9,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
-"language/sv_SE/)\n"
-"Language: sv_SE\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -672,8 +671,7 @@ msgstr "  -h --help           : Visa hjälp"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-"  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
+msgstr "  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:68
@@ -748,9 +746,7 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
-"  -T --tests          : Börja testning av drivrutiner och automat-"
-"configurering"
+msgstr "  -T --tests          : Börja testning av drivrutiner och automat-configurering"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1247,7 +1243,8 @@ msgstr "Återuppliva"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
@@ -1264,7 +1261,8 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "standard"
 
@@ -3184,39 +3182,33 @@ msgstr "Monster HP bar (färg två)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Monster HP bar"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Monster HP bar (färg två)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Monster HP bar"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Monster HP bar (färg två)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Spelare HP bar"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Spelare HP bar (färg två)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3290,9 +3282,8 @@ msgstr "Luftkollisions-highlightning"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Luftkollisions-highlightning"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3537,13 +3528,15 @@ msgstr "Item-delning aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Item-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Item-delning är inte möjlig."
 
@@ -3554,19 +3547,22 @@ msgstr "Item-delning okänd."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Exp-delning är aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Exp-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Exp-delning är inte möjlig."
 
@@ -4007,15 +4003,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Färger"
 
@@ -4039,11 +4035,9 @@ msgstr "Visa chat-färglistan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4070,11 +4064,9 @@ msgstr "Begränsa max-tecken i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4085,9 +4077,7 @@ msgstr "Begränsa max-rader i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4128,8 +4118,8 @@ msgstr "Visa chat-historik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4140,11 +4130,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4155,11 +4143,9 @@ msgstr "Visa online-meddelande för guild"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4175,13 +4161,9 @@ msgstr "Dölj shop-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4194,8 +4176,7 @@ msgstr "Visa MVP-meddelanden"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4214,12 +4195,9 @@ msgstr "Lägg alla viskningar i flikar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4230,8 +4208,7 @@ msgstr "Logga magic messages i log-tabben"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4244,11 +4221,9 @@ msgstr "Visa servermeddelanden i log-fliken"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4273,11 +4248,9 @@ msgstr "Aktivera GM-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4288,8 +4261,7 @@ msgstr "Aktivera språk-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4302,9 +4274,7 @@ msgstr "Visa alla språk-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4317,9 +4287,7 @@ msgstr "Aktivera battle-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4345,10 +4313,7 @@ msgstr "Ändra storlek på chat-flikarna om det behövs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4383,8 +4348,7 @@ msgstr "Highlighta ord (separerat med komma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4397,8 +4361,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4411,12 +4374,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4530,9 +4490,7 @@ msgstr "Tangent-konflikt(er) uppmärksammade."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet "
-"uppföra sig konstigt."
+msgstr "Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet uppföra sig konstigt."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4917,8 +4875,7 @@ msgstr "Bots support"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr ""
-"Aktivera support för guild-bot och avaktivera grund-supporten för guild"
+msgstr "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5581,17 +5538,13 @@ msgstr "Ingen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Misslyckades att ändra till fönster-läge och återställandet av det gamla "
-"läget misslyckades också!"
+msgstr "Misslyckades att ändra till fönster-läge och återställandet av det gamla läget misslyckades också!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Misslyckades att ändra till fullskärms-läge och återställandet av det gamla "
-"läget misslyckades också!"
+msgstr "Misslyckades att ändra till fullskärms-läge och återställandet av det gamla läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -6167,7 +6120,8 @@ msgstr "Antal:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Skapa"
 
@@ -6284,7 +6238,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6302,7 +6257,8 @@ msgstr "Vänligen distribuera %d poäng"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6328,7 +6284,8 @@ msgstr "Utseende:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "F"
 
@@ -6427,12 +6384,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u⏎\n"
-"Mp: %u/%u⏎\n"
-"Level: %u⏎\n"
-"Experience: %u⏎\n"
-"Money: %s"
+msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6534,7 +6486,8 @@ msgstr "Editera Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Anslut"
 
@@ -6576,9 +6529,7 @@ msgstr ""
 #. TRANSLATORS: edit server dialog error message
 #: src/gui/windows/editserverdialog.cpp:206
 msgid "Please at least type both the address and the port of the server."
-msgstr ""
-"Snälla, kan du inte bara vara vänlig och skriva in både adress och port till "
-"servern."
+msgstr "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till servern."
 
 #. TRANSLATORS: egg selection dialog name
 #: src/gui/windows/eggselectiondialog.cpp:42
@@ -6605,8 +6556,8 @@ msgstr "Fonter"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr ""
 
@@ -6902,13 +6853,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7329,9 +7282,9 @@ msgstr "Skill %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Skill %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7616,10 +7569,9 @@ msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
-"fönstret."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i fönstret."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -8888,9 +8840,7 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är "
-"taget."
+msgstr "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är taget."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -9033,8 +8983,7 @@ msgstr "Nekad från servern."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
+msgstr "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9049,9 +8998,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-"
-"teamet via forumet."
+msgstr "Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-teamet via forumet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10678,9 +10625,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", "
-"\"0\"."
+msgstr "Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10736,15 +10681,3 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Avregistrering lyckad"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Farväl, kom gärna tillbaka snart igen..."
-
-#~ msgid "Unregister"
-#~ msgstr "Avregistrera"
-
-#~ msgid "Name: %s"
-#~ msgstr "Namn: %s"
diff --git a/po/tr.po b/po/tr.po
index 79efc2c7b..f2b219307 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Oben Devin Çetiner <hiironohige@gmail.com>, 2012
@@ -11,14 +11,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
-"tr/)\n"
-"Language: tr\n"
+"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -1246,17 +1245,14 @@ msgstr "Dirilt"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Ağırlığının yarısından daha ağır eşya taşıyorsun. Kendiliğinden "
-"iyileşemiyorsun."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Ağırlığının yarısından daha ağır eşya taşıyorsun. Kendiliğinden iyileşemiyorsun."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr ""
-"Ağırlığının yarısından daha hafif eşya taşıyorsun. Kendiliğinden "
-"iyileşebiliyorsun."
+msgstr "Ağırlığının yarısından daha hafif eşya taşıyorsun. Kendiliğinden iyileşebiliyorsun."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1267,7 +1263,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "varsayılan"
 
@@ -3187,39 +3184,33 @@ msgstr "Canavar HP çubuğu (ikinci renk)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Canavar HP çubuğu"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Canavar HP çubuğu (ikinci renk)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Canavar HP çubuğu"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Canavar HP çubuğu (ikinci renk)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Oyuncu HP çubuğu"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Oyuncu HP çubuğu (ikinci renk)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3293,9 +3284,8 @@ msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Varsayılan çarpışma belirginleştirilmesi"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3540,13 +3530,15 @@ msgstr "Nesne paylaşımı etkinleştirildi."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Nesne paylaşımı devre dışı bırakıldı."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Nesne paylaşımı mümkün değil."
 
@@ -3557,19 +3549,22 @@ msgstr "Nesne paylaşımı bilinmiyor."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4010,15 +4005,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Renkler"
 
@@ -4042,18 +4037,15 @@ msgstr "Sohbet renkleri listesini göster"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
-"Bütün sohbet pencerelerinde büyü ve GM komutlarının kullanılmasına izin ver"
+msgstr "Bütün sohbet pencerelerinde büyü ve GM komutlarının kullanılmasına izin ver"
 
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:92
@@ -4074,11 +4066,9 @@ msgstr "Sohbet satırında bulunacak en yüksek harf sayısını sınırla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4089,9 +4079,7 @@ msgstr "Sohbette görünülecek en yüksek satır sayısını sınırla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4132,8 +4120,8 @@ msgstr "Sohbet geçmişini göster"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4144,11 +4132,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4159,11 +4145,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4179,13 +4163,9 @@ msgstr "Alışveriş mesajlarını gizle"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4198,8 +4178,7 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4218,12 +4197,9 @@ msgstr "Bütün fısıltıları sekmelere koy"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4234,8 +4210,7 @@ msgstr "Büyü mesajlarını hata ayıklama sekmesinde kayıt altına al"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4248,11 +4223,9 @@ msgstr "Sunucu mesajlarını hata ayıklama sekmesinde göster"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4277,11 +4250,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4292,8 +4263,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4306,9 +4276,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4321,9 +4289,7 @@ msgstr "Savaş sekmesini etkinleştir"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4349,10 +4315,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4387,8 +4350,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4401,8 +4363,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4415,12 +4376,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4534,9 +4492,7 @@ msgstr "Tuş çatışması tespit edildi."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"\"%s\" ve \"%s\" tuşları çakıştı. Çakışmayı giderin, yoksa oynanabilirlikte "
-"gariplikler meydana gelebilir."
+msgstr "\"%s\" ve \"%s\" tuşları çakıştı. Çakışmayı giderin, yoksa oynanabilirlikte gariplikler meydana gelebilir."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -6166,7 +6122,8 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Oluştur"
 
@@ -6283,7 +6240,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6301,7 +6259,8 @@ msgstr "Lütfen %d puanı dağıt"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6327,7 +6286,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6528,7 +6488,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -6597,8 +6558,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr ""
 
@@ -6894,13 +6855,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7321,9 +7284,9 @@ msgstr "Yetenek %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Yetenek %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7608,10 +7571,9 @@ msgstr "Yeterli paran yok."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Nesne eklemesi başarısız oldu. Pencerede aynı tür nesneyi üst üste "
-"koyamazsınız."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Nesne eklemesi başarısız oldu. Pencerede aynı tür nesneyi üst üste koyamazsınız."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -10665,8 +10627,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"/%s ayar seçenekleri \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\" 'dir."
+msgstr "/%s ayar seçenekleri \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\" 'dir."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10722,15 +10683,3 @@ msgstr "%d saniye"
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyeler"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Kayıt silme başarılı"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "Hoşçakal, tekrar bekleriz..."
-
-#~ msgid "Unregister"
-#~ msgstr "Kaydı Sil"
-
-#~ msgid "Name: %s"
-#~ msgstr "İsim: %s"
diff --git a/po/uk.po b/po/uk.po
index 0fed80efa..04248cea8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # tivasyk <tivasyk@gmail.com>, 2010
 # William Lee <v4r@trioptimum.com>, 2014
@@ -11,16 +11,14 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
-"uk/)\n"
-"Language: uk\n"
+"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:164
@@ -130,9 +128,7 @@ msgstr ""
 #: src/actions/chat.cpp:315
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr ""
-"Неможливо створити вкладку для спілкування з гравцем \"%s\" - або така вже "
-"існує, або ви намагаєтесь перешіптуватись сам із собою :P ."
+msgstr "Неможливо створити вкладку для спілкування з гравцем \"%s\" - або така вже існує, або ви намагаєтесь перешіптуватись сам із собою :P ."
 
 #. TRANSLATORS: create party message
 #. TRANSLATORS: chat error message
@@ -407,9 +403,8 @@ msgstr "робота"
 
 #. TRANSLATORS: get homunculus xp message
 #: src/being/localplayer.cpp:1150
-#, fuzzy
 msgid "Homun"
-msgstr "Гомункул"
+msgstr ""
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1162
@@ -679,8 +674,7 @@ msgstr "  -h --help           : Показати ще раз цю довідку
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
-"  -C --config-file    : Файл, з якого необхідно завантажити налаштування"
+msgstr "  -C --config-file    : Файл, з якого необхідно завантажити налаштування"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:68
@@ -715,8 +709,7 @@ msgstr "  -p --port           : Порт логіну"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
-msgstr ""
-"  -H --update-host    : Сервер, з якого необхідно завантажити оновлення"
+msgstr "  -H --update-host    : Сервер, з якого необхідно завантажити оновлення"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
@@ -1253,10 +1246,9 @@ msgstr "Опритомнити"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
-"Ви навантажені більше, ніж на половину максимально дозволенного. Тепер ви не "
-"зможете відновлюватися."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr "Ви навантажені більше, ніж на половину максимально дозволенного. Тепер ви не зможете відновлюватися."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1272,7 +1264,8 @@ msgstr "Ви навантажені менш, ніж на половину. Те
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "за замовчуванням"
 
@@ -3192,39 +3185,33 @@ msgstr "Рівень здоров'я мобу (другий колір)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "Гомункул"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "Рівень здоров'я мобу (другий колір)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "Крамарі"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "Рівень здоров'я мобу (другий колір)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "Рядок здоров'я гравця"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "Здоров'я гравця (другий колір)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3298,9 +3285,8 @@ msgstr "Підсвічення зіткнень біля води"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:392
-#, fuzzy
 msgid "Monster collision highlight"
-msgstr "Підсвічення зіткнень біля води"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:398
@@ -3545,13 +3531,15 @@ msgstr "Розподіл предметів увімкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Розподіл предметів вимкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Неможливо ввімкнути розподіл предметів."
 
@@ -3562,19 +3550,22 @@ msgstr "Невідомий стан розподілу предметів."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Розподіл досвіду ввімкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Розподіл досвіду вимкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Неможливо ввімкнути розподіл досвіду."
 
@@ -4015,15 +4006,15 @@ msgstr "Захищати фокус чату"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Кольори"
 
@@ -4047,11 +4038,9 @@ msgstr "Показувати список кольорів чату"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4078,11 +4067,9 @@ msgstr "Обмежити кількість символів у повідомл
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4093,9 +4080,7 @@ msgstr "Обмежити кількість рядків вікна чату"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4136,8 +4121,8 @@ msgstr "Показувати історію чату"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4148,11 +4133,9 @@ msgstr "Сповіщати про появлення членів групи"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4163,11 +4146,9 @@ msgstr "Сповіщати про появлення членів гільдії
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4183,13 +4164,9 @@ msgstr "Не показувати робочі повідомлення крам
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4202,8 +4179,7 @@ msgstr "Показувати MVP повідомлення"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4222,12 +4198,9 @@ msgstr "Шепіт (приватне спілкування) в окремих �
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4238,8 +4211,7 @@ msgstr "Лог магії у вкладці зневадження"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4252,11 +4224,9 @@ msgstr "Показувати сповіщення сервера у вкладц
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4281,11 +4251,9 @@ msgstr "Ввімкнути ГМ вкладку"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4296,8 +4264,7 @@ msgstr "Ввімкнути вкладку для мови"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4310,9 +4277,7 @@ msgstr "Показувати повідомлення на всіх мовах"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4325,9 +4290,7 @@ msgstr "Ввімкнути вкладку бійки"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4353,10 +4316,7 @@ msgstr "Змінювати розмір вкладок чату за потре�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4391,8 +4351,7 @@ msgstr "Підсвічувані слова (відокремлені комам
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4405,8 +4364,7 @@ msgstr "Ігнорування глобальні повідомлення ві�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4419,12 +4377,9 @@ msgstr "Показати кнопку смайликів у чаті"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4538,9 +4493,7 @@ msgstr "Деякі клавіші дублюють одна одну."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Клавіші \"%s\" та \"%s\" конфліктують. Необхідно усунути повтори,інакше "
-"керування може бути ускладненим."
+msgstr "Клавіші \"%s\" та \"%s\" конфліктують. Необхідно усунути повтори,інакше керування може бути ускладненим."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5148,9 +5101,7 @@ msgstr "Вимкнути кешування істот"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr ""
-"Різні налаштунки (ввімкнення чи вимкнення може призвести до кращої "
-"продуктивності)"
+msgstr "Різні налаштунки (ввімкнення чи вимкнення може призвести до кращої продуктивності)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5185,8 +5136,7 @@ msgstr "Занести в кеш всі звуки (може забрати до
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
-msgstr ""
-"Критичні налаштунки (НІ В ЯКОМУ РАЗУ не чіпайте, якщо не впевнені, що робите)"
+msgstr "Критичні налаштунки (НІ В ЯКОМУ РАЗУ не чіпайте, якщо не впевнені, що робите)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:164
@@ -5312,9 +5262,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr ""
-"Емуляція правого кліку миші подовженим лівим кліком (вживане на тач "
-"інтерфейсах)"
+msgstr "Емуляція правого кліку миші подовженим лівим кліком (вживане на тач інтерфейсах)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -6175,7 +6123,8 @@ msgstr "Кількість:"
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Створити"
 
@@ -6292,7 +6241,8 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6310,7 +6260,8 @@ msgstr "Будь ласка, розподіліть %d балів"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6336,7 +6287,8 @@ msgstr "Вигляд:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr "П"
 
@@ -6435,12 +6387,7 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr ""
-"Hp: %u/%u\n"
-"Mp: %u/%u\n"
-"Рівень: %u\n"
-"Досвід: %u\n"
-"Кошти: %s"
+msgstr "Hp: %u/%u\nMp: %u/%u\nРівень: %u\nДосвід: %u\nКошти: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6542,7 +6489,8 @@ msgstr "Редагувати сервер"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "З'єднання"
 
@@ -6611,8 +6559,8 @@ msgstr "Шрифти"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr "Невідомий"
 
@@ -6910,13 +6858,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7337,9 +7287,9 @@ msgstr "Вміння %d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "Вміння %d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7624,7 +7574,8 @@ msgstr "У тебе недостатньо коштів."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Не вдається додати предмет. Не можна накладати предмети одного типу."
 
 #. TRANSLATORS: trade error
@@ -9052,9 +9003,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"Вас було тимчасово забанено до %s.\n"
-"Звертайтесь до команди ГМ'ів на форумі."
+msgstr "Вас було тимчасово забанено до %s.\nЗвертайтесь до команди ГМ'ів на форумі."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10681,9 +10630,7 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Можливими опціями для /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", "
-"\"0\"."
+msgstr "Можливими опціями для /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10739,15 +10686,3 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "Акаунт видалено"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "До побачення та вертайтесь."
-
-#~ msgid "Unregister"
-#~ msgstr "Видалити"
-
-#~ msgid "Name: %s"
-#~ msgstr "Ім'я: %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9bfc116eb..92f8ad065 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # colorful <colorfullife81@gmail.com>, 2011
@@ -16,14 +16,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
-"language/zh_CN/)\n"
-"Language: zh_CN\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -1250,7 +1249,8 @@ msgstr ""
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）."
 
 #. TRANSLATORS: weight message
@@ -1267,7 +1267,8 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "默认"
 
@@ -3187,39 +3188,33 @@ msgstr "怪物的HP指示栏(第二个颜色)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "怪物的HPl"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "怪物的HP指示栏(第二个颜色)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "怪物的HPl"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "怪物的HP指示栏(第二个颜色)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "玩家惠普酒吧"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "玩家HP指示栏(第二个颜色)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3539,13 +3534,15 @@ msgstr "物品共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "物品共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "物品共享不可能."
 
@@ -3556,19 +3553,22 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "经验共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能."
 
@@ -4009,15 +4009,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "颜色"
 
@@ -4041,11 +4041,9 @@ msgstr "显示聊天颜色列表"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4072,11 +4070,9 @@ msgstr "文字数量超过限制"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4087,9 +4083,7 @@ msgstr "限制聊天的最大"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4130,8 +4124,8 @@ msgstr "显示聊天记录"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4142,11 +4136,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4157,11 +4149,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4177,13 +4167,9 @@ msgstr "隐藏商店消息"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4196,8 +4182,7 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4216,12 +4201,9 @@ msgstr "将所有密语放于标签夜"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4232,8 +4214,7 @@ msgstr "在调试页记录魔法信息"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4246,11 +4227,9 @@ msgstr "在调试选项卡中显示服务器的消息"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4275,11 +4254,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4290,8 +4267,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4304,9 +4280,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4319,9 +4293,7 @@ msgstr "启用战斗“选项卡"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4347,10 +4319,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4385,8 +4354,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4399,8 +4367,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4413,12 +4380,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -6162,7 +6126,8 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立"
 
@@ -6279,7 +6244,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6297,7 +6263,8 @@ msgstr "请分发%d点数"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6323,7 +6290,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6524,7 +6492,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "连接"
 
@@ -6593,8 +6562,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr ""
 
@@ -6888,13 +6857,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7315,9 +7286,9 @@ msgstr "技能为%d"
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "技能为%d"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7602,7 +7573,8 @@ msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品."
 
 #. TRANSLATORS: trade error
@@ -9030,9 +9002,7 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr ""
-"你被暂时禁止进入游戏直到%s.\n"
-"请通过论坛联系GM组."
+msgstr "你被暂时禁止进入游戏直到%s.\n请通过论坛联系GM组."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10715,15 +10685,3 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
-
-#~ msgid "Unregister Successful"
-#~ msgstr "取消注册成功"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "再见，欢迎随时回来..."
-
-#~ msgid "Unregister"
-#~ msgstr "注销"
-
-#~ msgid "Name: %s"
-#~ msgstr "姓名: %s"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index bf26c92b3..df772841c 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Pak Long Wu <paklongwu1006@gmail.com>, 2015
@@ -10,14 +10,13 @@ msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-07-20 09:26+0000\n"
+"PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
-"language/zh_HK/)\n"
-"Language: zh_HK\n"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -401,9 +400,8 @@ msgstr "勞動值"
 
 #. TRANSLATORS: get homunculus xp message
 #: src/being/localplayer.cpp:1150
-#, fuzzy
 msgid "Homun"
-msgstr "小矮人"
+msgstr ""
 
 #. TRANSLATORS: get hp message
 #: src/being/localplayer.cpp:1162
@@ -1245,7 +1243,8 @@ msgstr "復活"
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "您在攜帶超過體重一半的物品.你將無法回復生命值."
 
 #. TRANSLATORS: weight message
@@ -1262,7 +1261,8 @@ msgstr "您在攜帶少於體重一半的物品.你可以回復生命值了."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663
+#: src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "默認"
 
@@ -3182,39 +3182,33 @@ msgstr "怪物生命值欄 (顏色二`)"
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:287
-#, fuzzy
 msgid "Homunculus HP bar"
-msgstr "小矮人"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:293
-#, fuzzy
 msgid "Homunculus HP bar (second color)"
-msgstr "怪物生命值欄 (顏色二`)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:299
-#, fuzzy
 msgid "Mercenary HP bar"
-msgstr "傭兵"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:305
-#, fuzzy
 msgid "Mercenary HP bar (second color)"
-msgstr "怪物生命值欄 (顏色二`)"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:312
-#, fuzzy
 msgid "Elemental HP bar"
-msgstr "玩家生命值欄"
+msgstr ""
 
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
-#, fuzzy
 msgid "Elemental HP bar (second color)"
-msgstr "玩家生命值欄 (顏色二)"
+msgstr ""
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3534,13 +3528,15 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104
+#: src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109
+#: src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3551,19 +3547,22 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150
+#: src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155
+#: src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160
+#: src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4004,15 +4003,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you "
-"typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86
+#: src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr ""
 
@@ -4036,11 +4035,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat "
-"window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but "
-"also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4067,11 +4064,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed "
-"in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will "
-"be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4082,9 +4077,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
-"specified number of last lines of text. Oldest lines exceeding this limit "
-"are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4125,8 +4118,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on "
-"startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on"
+" startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4137,11 +4130,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be "
-"shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4152,11 +4143,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be "
-"shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies "
-"are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4172,13 +4161,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will "
-"be displayed in chat. Disable this setting if you want to see shop-related "
-"messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with "
-"special content. If you disable this setting, you will be able to see these "
-"messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4191,8 +4176,7 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
-"usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4211,12 +4195,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in "
-"separate tabs, separate tab for each player. If this setting disabled, all "
-"whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. "
-"Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4227,8 +4208,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If "
-"disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4241,11 +4221,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of "
-"chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some "
-"debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4270,11 +4248,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM "
-"activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this "
-"tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4285,8 +4261,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this "
-"feature.\n"
+"If this feature enabled, language tab will appear if server supports this feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4299,9 +4274,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different "
-"languages, you will see messages for all languages, regardless of your "
-"language preferences.\n"
+"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4314,9 +4287,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will "
-"contain messages related to battles, like damage and experience gain, if "
-"battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4342,10 +4313,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to "
-"adapt to appearance of chat input field when you typing message and when "
-"input field of chat disappears. If disabled, chat input area will always "
-"occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4380,8 +4348,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. "
-"Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4394,8 +4361,7 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender "
-"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4408,12 +4374,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This "
-"button allows one to invoke composing window, which allows one to insert "
-"smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by "
-"default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -6157,7 +6120,8 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
+#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立隊伍"
 
@@ -6274,7 +6238,8 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230
+#: src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
@@ -6292,7 +6257,8 @@ msgstr "請分配%d點數"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232
+#: src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
@@ -6318,7 +6284,8 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251
+#: src/gui/windows/socialwindow.cpp:73
 msgid "F"
 msgstr ""
 
@@ -6519,7 +6486,8 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57
+#: src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr ""
 
@@ -6588,8 +6556,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672
+#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
 msgid "Unknown"
 msgstr ""
 
@@ -6883,13 +6851,15 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61
+#: src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63
+#: src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7310,9 +7280,9 @@ msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
 #: src/gui/windows/skilldialog.cpp:416
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %u"
-msgstr "技能"
+msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
@@ -7597,7 +7567,8 @@ msgstr ""
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的物品."
 
 #. TRANSLATORS: trade error
@@ -10708,15 +10679,3 @@ msgstr "%d 秒"
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒"
-
-#~ msgid "Unregister Successful"
-#~ msgstr "取消註冊成功"
-
-#~ msgid "Farewell, come back any time..."
-#~ msgstr "再見了，隨時回來吧..."
-
-#~ msgid "Unregister"
-#~ msgstr "註冊"
-
-#~ msgid "Name: %s"
-#~ msgstr "名字：%s"