Update french and russian translations.

15 files changed, 159 insertions, 450 deletions

diff --git a/po/da.po b/po/da.po
index 85ba5f1da..374549f7c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4965,17 +4965,17 @@ msgid "M.Defense"
 msgstr "M.Forsvar:"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% præcission:"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Evade"
 msgstr "% Undgå angreb."
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Critical"
 msgstr "Kritisk sår"
 
diff --git a/po/de.po b/po/de.po
index a6c5c33be..efeb000e6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4938,17 +4938,14 @@ msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, c-format
 msgid "% Evade"
 msgstr "% Evade"
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, c-format
 msgid "% Critical"
 msgstr "% Critical"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index e3cc3296e..56b9b8ccd 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4963,17 +4963,17 @@ msgid "M.Defense"
 msgstr "M.Defense:"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% Accuracy:"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Evade"
 msgstr "% Evade:"
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Critical"
 msgstr "Critical Hit"
 
diff --git a/po/es.po b/po/es.po
index c582911e9..40c9de420 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4673,17 +4673,15 @@ msgid "M.Defense"
 msgstr "Defensa M."
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% Presición"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, c-format
 msgid "% Evade"
 msgstr "% Evasión"
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, c-format
 msgid "% Critical"
 msgstr "% Crítico"
 
diff --git a/po/fr.po b/po/fr.po
index 084f580b0..92e35ee66 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-05-09 01:25+0300\n"
-"PO-Revision-Date: 2011-04-30 10:43+0000\n"
+"PO-Revision-Date: 2011-05-09 04:21+0000\n"
 "Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
-"Language-Team: French <>\n"
-"Language: fr\n"
+"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:1022
@@ -126,11 +126,11 @@ msgstr "Vous ne pouvez pas envoyer des messages privés vides."
 #: src/commandhandler.cpp:397
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
-"\". Soit elle existe déjà, soit il s'agit de vous même."
+"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom "
+"\"%s\". Soit elle existe déjà, soit il s'agit de vous même."
 
 #: src/commandhandler.cpp:417
 #, c-format
@@ -263,26 +263,23 @@ msgid "font cache size"
 msgstr "Cache de polices"
 
 #: src/commandhandler.cpp:1082
-#, fuzzy
 msgid "Cache size:"
-msgstr "Cache de polices"
+msgstr "Dimension du cache :"
 
 #: src/commandhandler.cpp:1085
-#, fuzzy
 msgid "Created:"
 msgstr "Créé : "
 
 #: src/commandhandler.cpp:1086
-#, fuzzy
 msgid "Deleted:"
-msgstr "Effacé : "
+msgstr "Effacé :"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
-"\", \"false\", \"1\", \"0\"."
+"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", "
+"\"true\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
 msgid "General"
@@ -595,19 +592,16 @@ msgid "Change Email"
 msgstr "Modifier l'adresse e-mail"
 
 #: src/gui/charselectdialog.cpp:252
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Cheveux incorrects."
+msgstr "Mot de passe incorrect"
 
 #: src/gui/charselectdialog.cpp:285
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "La suppression du personnage n'a pu s'effectuer."
+msgstr "Entrer le mot de passe pour éliminer le personnage"
 
 #: src/gui/charselectdialog.cpp:285
-#, fuzzy
 msgid "Enter password:"
-msgstr "Mauvais mot de passe."
+msgstr "Entrer le mot de passe :"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
@@ -726,14 +720,12 @@ msgid "Map"
 msgstr "Carte"
 
 #: src/gui/debugwindow.cpp:69
-#, fuzzy
 msgid "Target"
-msgstr "Cible :"
+msgstr "Cible"
 
 #: src/gui/debugwindow.cpp:70
-#, fuzzy
 msgid "Net"
-msgstr "Suivant"
+msgstr "Net"
 
 #: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
 #: src/gui/debugwindow.cpp:236
@@ -791,9 +783,8 @@ msgid "%d FPS"
 msgstr "%d FPS"
 
 #: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
-#, fuzzy
 msgid "Textures count:"
-msgstr "Nombre d'acteurs sur la carte :"
+msgstr "Comptage des trames :"
 
 #: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
 msgid "Cursor:"
@@ -830,26 +821,23 @@ msgstr "Choisir la Guilde :"
 
 #: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
 #: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
-#, fuzzy
 msgid "Attack delay:"
-msgstr "Temps de l'attaque"
+msgstr "Retard attaque :"
 
 #: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
 #: src/gui/debugwindow.cpp:336
-#, fuzzy
 msgid "Minimal hit:"
-msgstr "Mini carte :"
+msgstr "Coup Mini :"
 
 #: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
 #: src/gui/debugwindow.cpp:337
 msgid "Maximum hit:"
-msgstr ""
+msgstr "Coup Maxi :"
 
 #: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
 #: src/gui/debugwindow.cpp:338
-#, fuzzy
 msgid "Critical hit:"
-msgstr "Coup critique"
+msgstr "Coup Critique :"
 
 #: src/gui/debugwindow.cpp:372
 #, c-format
@@ -1277,26 +1265,24 @@ msgstr "Échange"
 
 #: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
 msgid "Whisper"
-msgstr ""
+msgstr "Message privé"
 
 #: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
 msgid "Heal"
-msgstr ""
+msgstr "Soigner"
 
 #: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
 #: src/gui/popupmenu.cpp:589
-#, fuzzy
 msgid "Be friend"
-msgstr "ami"
+msgstr "Être ami"
 
 #: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
 #: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
 #: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
 #: src/gui/popupmenu.cpp:623
-#, fuzzy
 msgid "Disregard"
-msgstr "Négligé"
+msgstr "Eviter"
 
 #: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
 #: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
@@ -1304,18 +1290,16 @@ msgstr "Négligé"
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
 #: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
 #: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
-#, fuzzy
 msgid "Erase"
-msgstr "Effacé"
+msgstr "Eliminer"
 
 #: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
 #: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
 #: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
 #: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
 #: src/gui/popupmenu.cpp:621
-#, fuzzy
 msgid "Unignore"
-msgstr "Ignorer"
+msgstr "Ne plus ignorer"
 
 #: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
 #: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
@@ -1326,89 +1310,75 @@ msgstr "Ignorer complètement"
 
 #: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
 #: src/gui/popupmenu.cpp:633
-#, fuzzy
 msgid "Follow"
-msgstr "Suivre : "
+msgstr "Suivre"
 
 #: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
 #: src/gui/popupmenu.cpp:634
-#, fuzzy
 msgid "Imitation"
-msgstr "Imitation: "
+msgstr "Imiter"
 
 #: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
-#, fuzzy
 msgid "Invite to party"
-msgstr "Inviter un joueur dans le groupe"
+msgstr "Inviter dans le groupe"
 
 #: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
 #: src/gui/popupmenu.cpp:659
-#, fuzzy
 msgid "Kick from party"
-msgstr "@@kick party|Renvoyer du groupe@@"
+msgstr "Sortir du groupe"
 
 #: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
 #: src/gui/popupmenu.cpp:673
-#, fuzzy
 msgid "Kick from guild"
-msgstr "Vous avez été renvoyé de la guilde."
+msgstr "Sortir de la guilde"
 
 #: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
 #: src/gui/popupmenu.cpp:675
-#, fuzzy
 msgid "Change pos in guild"
-msgstr "@@guild-pos|Changer de position dans la guilde >@@"
+msgstr "Changer la position dans la guilde"
 
 #: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
 #: src/gui/popupmenu.cpp:681
-#, fuzzy
 msgid "Invite to guild"
-msgstr "Inviter le membre de la guilde"
+msgstr "Inviter dans la guilde"
 
 #: src/gui/popupmenu.cpp:232
-#, fuzzy
 msgid "Kick player"
-msgstr "Joueur MVP"
+msgstr "Sortir le joueur"
 
 #: src/gui/popupmenu.cpp:234
 msgid "Nuke"
-msgstr ""
+msgstr "Anihiller"
 
 #: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
 msgid "Undress"
-msgstr ""
+msgstr "Déshabiller"
 
 #: src/gui/popupmenu.cpp:267
 msgid "Kick"
-msgstr ""
+msgstr "Sortir"
 
 #: src/gui/popupmenu.cpp:278
-#, fuzzy
 msgid "Remove from attack list"
-msgstr "@@remove attack|Enlever de la liste d'attaque@@"
+msgstr "Enlever de la liste d'attaque"
 
 #: src/gui/popupmenu.cpp:284
-#, fuzzy
 msgid "Add to priority attack list"
-msgstr "@@add attack priority|Ajouter à la liste des priorités d'attaque@@"
+msgstr "Ajouter à la liste de priorités d'attaque"
 
 #: src/gui/popupmenu.cpp:286
-#, fuzzy
 msgid "Add to attack list"
-msgstr "@@add attack|Ajouter à la liste d'attaque@@"
+msgstr "Ajouter à la liste d'attaque"
 
 #: src/gui/popupmenu.cpp:289
-#, fuzzy
 msgid "Add to ignore list"
-msgstr "Ajouter tout dans l'échange"
+msgstr "Ajouter à la liste d'ignorés"
 
 #: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
-#, fuzzy
 msgid "Add name to chat"
-msgstr "Ajouter à la conversation"
+msgstr "Ajouter le nom dans la boite de dialogue"
 
 #: src/gui/popupmenu.cpp:450
-#, fuzzy
 msgid "Pick up"
 msgstr "Ramasser"
 
@@ -1422,9 +1392,8 @@ msgid "Map Item"
 msgstr "Objet de carte"
 
 #: src/gui/popupmenu.cpp:469
-#, fuzzy
 msgid "Rename"
-msgstr "Enlève le nom"
+msgstr "Renommer"
 
 #: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
 #: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
@@ -1432,22 +1401,20 @@ msgid "Remove"
 msgstr "Enlever"
 
 #: src/gui/popupmenu.cpp:484
-#, fuzzy
 msgid "Load old outfits"
-msgstr "Charger les anciens raccourcis d'objets"
+msgstr "Charger les anciennes tenues"
 
 #: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Sortilèges"
 
 #: src/gui/popupmenu.cpp:502
-#, fuzzy
 msgid "Load old spells"
-msgstr "@@load old spells|Charger les anciens sorts@@"
+msgstr "Charger les anciens sorts"
 
 #: src/gui/popupmenu.cpp:503
 msgid "Edit spell"
-msgstr ""
+msgstr "Éditer le sortilège"
 
 #: src/gui/popupmenu.cpp:529
 msgid "Disable highlight"
@@ -2526,8 +2493,8 @@ msgstr "Choisissez le nom de la guilde."
 #: src/gui/socialwindow.cpp:1293
 msgid "Received guild request, but one already exists."
 msgstr ""
-"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
-"dans une."
+"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà"
+" dans une."
 
 #: src/gui/socialwindow.cpp:1299
 #, c-format
@@ -3116,7 +3083,8 @@ msgid "Change"
 msgstr "Changer"
 
 #: src/gui/trade.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
 "dans cette fenêtre."
@@ -3354,7 +3322,8 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:65
 msgid "This command shows the users in this channel."
-msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr ""
+"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:69
 msgid "Command: /topic <message>"
@@ -3464,8 +3433,10 @@ msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:62
 msgid "BC"
@@ -3935,8 +3906,8 @@ msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
-"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
-"des touches ou attendez vous à un possible comportement étrange du jeu."
+"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une"
+" des touches ou attendez vous à un possible comportement étrange du jeu."
 
 #: src/localplayer.cpp:344
 msgid "You were killed by "
@@ -4092,7 +4063,8 @@ msgstr ""
 
 #: src/main.cpp:69
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr ""
+"      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
 #: src/main.cpp:70
 msgid "     --safemode       : Start game in safe mode"
@@ -5171,16 +5143,18 @@ msgstr "Message"
 
 #: src/net/tmwa/playerhandler.cpp:341
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
-"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
-"en mesure de regagner vos points de vie."
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus"
+" en mesure de regagner vos points de vie."
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid ""
+"You are carrying less than half your weight. You are can regain health."
 msgstr ""
-"Vous portez moins de la moitié du poids de votre inventaire.Vous pouvez vous "
-"régénérez de nouveau."
+"Vous portez moins de la moitié du poids de votre inventaire.Vous pouvez vous"
+" régénérez de nouveau."
 
 #: src/net/tmwa/playerhandler.cpp:456
 #, c-format
@@ -5370,111 +5344,3 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Objet inconnu"
-
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Echange@@"
-
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Attaque@@"
-
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@whisper|Chuchoter@@"
-
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@heal|Soigner@@"
-
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@friend|Être ami@@"
-
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Ecarter@@"
-
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@ignore|Ignorer@@"
-
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@erase|Effacer@@"
-
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Ne plus ignorer@@"
-
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Complètement ignorer@@"
-
-#~ msgid "@@follow|Follow@@"
-#~ msgstr "@@follow|Suivre@@"
-
-#~ msgid "@@imitation|Imitation@@"
-#~ msgstr "@@imitation|Imitation@@"
-
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "@@party|Inviter dans le groupe@@"
-
-#~ msgid "@@guild-kick|Kick from guild@@"
-#~ msgstr "@@guild-kick|Renvoyer de la guilde@@"
-
-#~ msgid "@@guild|Invite to guild@@"
-#~ msgstr "@@guild|Inviter dans la guilde@@"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Renvoyer un joueur@@"
-
-#~ msgid "@@nuke|Nuke@@"
-#~ msgstr "@@nuke|Atomiser@@"
-
-#~ msgid "@@move|Move@@"
-#~ msgstr "@@move|Bouger@@"
-
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@undress|Déshabiller@@"
-
-#~ msgid "@@buy|Buy@@"
-#~ msgstr "@@buy|Acheter@@"
-
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@sell|Vendre@@"
-
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@talk|Parler@@"
-
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Renvoyer@@"
-
-#~ msgid "@@add attack ignore|Add to ignore list@@"
-#~ msgstr "@@add attack ignore|Ajouter à la liste d'ignorés@@"
-
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Ajouter le nom dans la boite de dialogue@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Annuler@@"
-
-#~ msgid "@@player_%u|%s >@@"
-#~ msgstr "@@player_%u|%s >@@"
-
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Ramasser@@"
-
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Ajouter au dialogue@@"
-
-#~ msgid "@@rename map|Rename@@"
-#~ msgstr "@@rename map|Renommer la carte@@"
-
-#~ msgid "@@remove map|Remove@@"
-#~ msgstr "@@remove map|Retirer@@"
-
-#~ msgid "@@load old outfits|Load old outfits@@"
-#~ msgstr "@@load old outfits|Charger les anciennes tenues@@"
-
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@edit spell|Editer le sort@@"
-
-#~ msgid "@@chat close|Close@@"
-#~ msgstr "@@chat close|Fermer le dialogue@@"
-
-#~ msgid "@@leave party|Leave@@"
-#~ msgstr "@@leave party|Quitter le groupe@@"
-
-#~ msgid "@@guild-pos-%d|%s@@"
-#~ msgstr "@@guild-pos-%d|%s@@"
diff --git a/po/hr.po b/po/hr.po
index 04b34ee7d..6eb3dd6e0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4959,17 +4959,17 @@ msgid "M.Defense"
 msgstr "M.Obrana:"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% Preciznost:"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Evade"
 msgstr "% Izbjegavanje:"
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Critical"
 msgstr "Kritični Udarac"
 
diff --git a/po/hu.po b/po/hu.po
index 9c8acf2a7..ae4ccee22 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4966,17 +4966,17 @@ msgid "M.Defense"
 msgstr "Mágikus védelem:"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Accuracy"
 msgstr "Találati esély (%):"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Evade"
 msgstr "Kitérés (%):"
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Critical"
 msgstr "Kritikális ütéskor"
 
diff --git a/po/it.po b/po/it.po
index de713c844..31814bc4e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4662,17 +4662,14 @@ msgid "M.Defense"
 msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, c-format
 msgid "% Accuracy"
 msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, c-format
 msgid "% Evade"
 msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, c-format
 msgid "% Critical"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 9d9c3076a..c46ce418f 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4968,17 +4968,17 @@ msgid "M.Defense"
 msgstr "Magische Verdediging:"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid:"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Evade"
 msgstr "% Ontwijking:"
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Critical"
 msgstr "Kritieke aanval"
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 72051c3e7..a9b08542b 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -4667,17 +4667,14 @@ msgid "M.Defense"
 msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, c-format
 msgid "% Accuracy"
 msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, c-format
 msgid "% Evade"
 msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, c-format
 msgid "% Critical"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 4b92e76fe..bbcb7c189 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4971,17 +4971,17 @@ msgid "M.Defense"
 msgstr "Obrona M.:"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% Celność:"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Evade"
 msgstr "% Unik:"
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Critical"
 msgstr "Uderzenie Krytyczne"
 
diff --git a/po/pt.po b/po/pt.po
index 5077efb79..532e782fe 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4670,17 +4670,14 @@ msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7306ad066..de3e6fb77 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4670,17 +4670,14 @@ msgid "M.Defense"
 msgstr "Def. Mágica"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
diff --git a/po/ru.po b/po/ru.po
index 168f84a3f..bd005d839 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,21 +2,20 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-05-09 01:25+0300\n"
-"PO-Revision-Date: 2011-04-27 21:03+0000\n"
+"PO-Revision-Date: 2011-05-09 02:30+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Russian <>\n"
-"Language: ru\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: src/actorspritemanager.cpp:1022
 msgid "Visible on map"
@@ -126,11 +125,11 @@ msgstr "Нельзя отправлять пустые сообщения!"
 #: src/commandhandler.cpp:397
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
-"уже создана, или этот игрок вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
+" уже создана, или этот игрок вы сами."
 
 #: src/commandhandler.cpp:417
 #, c-format
@@ -267,26 +266,21 @@ msgid "font cache size"
 msgstr "размер кеша шрифта"
 
 #: src/commandhandler.cpp:1082
-#, fuzzy
 msgid "Cache size:"
-msgstr "размер кеша шрифта"
+msgstr "Размер кеша:"
 
 #: src/commandhandler.cpp:1085
-#, fuzzy
 msgid "Created:"
-msgstr "Создано: "
+msgstr "Создано:"
 
 #: src/commandhandler.cpp:1086
-#, fuzzy
 msgid "Deleted:"
-msgstr "Удалено: "
+msgstr "Удалено:"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
-"\"0\"."
+msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:398
 msgid "General"
@@ -598,19 +592,16 @@ msgid "Change Email"
 msgstr "Сменить адрес E-mail"
 
 #: src/gui/charselectdialog.cpp:252
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Некорректный тип волос."
+msgstr "Нправильный пароль"
 
 #: src/gui/charselectdialog.cpp:285
-#, fuzzy
 msgid "Enter password for deleting character"
-msgstr "Невозможно удалить персонажа."
+msgstr "Введите пароль для удаления персонажа"
 
 #: src/gui/charselectdialog.cpp:285
-#, fuzzy
 msgid "Enter password:"
-msgstr "Неверный пароль"
+msgstr "Введите пароль:"
 
 #: src/gui/charselectdialog.cpp:407 src/gui/serverdialog.cpp:268
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
@@ -729,14 +720,12 @@ msgid "Map"
 msgstr "Карта"
 
 #: src/gui/debugwindow.cpp:69
-#, fuzzy
 msgid "Target"
-msgstr "Цель:"
+msgstr "Цель"
 
 #: src/gui/debugwindow.cpp:70
-#, fuzzy
 msgid "Net"
-msgstr "Следующий"
+msgstr "Сеть"
 
 #: src/gui/debugwindow.cpp:133 src/gui/debugwindow.cpp:207
 #: src/gui/debugwindow.cpp:236
@@ -794,9 +783,8 @@ msgid "%d FPS"
 msgstr "%d FPS"
 
 #: src/gui/debugwindow.cpp:175 src/gui/debugwindow.cpp:227
-#, fuzzy
 msgid "Textures count:"
-msgstr "Кол-во. объектов:"
+msgstr "Количество текстур:"
 
 #: src/gui/debugwindow.cpp:205 src/gui/debugwindow.cpp:234
 msgid "Cursor:"
@@ -833,26 +821,23 @@ msgstr "Гильдия цели:"
 
 #: src/gui/debugwindow.cpp:260 src/gui/debugwindow.cpp:320
 #: src/gui/debugwindow.cpp:325 src/gui/debugwindow.cpp:335
-#, fuzzy
 msgid "Attack delay:"
-msgstr "Задержка атаки"
+msgstr "Задержка атаки:"
 
 #: src/gui/debugwindow.cpp:261 src/gui/debugwindow.cpp:310
 #: src/gui/debugwindow.cpp:336
-#, fuzzy
 msgid "Minimal hit:"
-msgstr "МиниКарта:"
+msgstr "Минимальный удар:"
 
 #: src/gui/debugwindow.cpp:262 src/gui/debugwindow.cpp:312
 #: src/gui/debugwindow.cpp:337
 msgid "Maximum hit:"
-msgstr ""
+msgstr "Максимальный удар:"
 
 #: src/gui/debugwindow.cpp:263 src/gui/debugwindow.cpp:314
 #: src/gui/debugwindow.cpp:338
-#, fuzzy
 msgid "Critical hit:"
-msgstr "Критический удар"
+msgstr "Критический удар:"
 
 #: src/gui/debugwindow.cpp:372
 #, c-format
@@ -1280,26 +1265,24 @@ msgstr "Торговать"
 
 #: src/gui/popupmenu.cpp:125 src/gui/popupmenu.cpp:342
 msgid "Whisper"
-msgstr ""
+msgstr "Приват"
 
 #: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:582
 msgid "Heal"
-msgstr ""
+msgstr "Лечить"
 
 #: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:348
 #: src/gui/popupmenu.cpp:589
-#, fuzzy
 msgid "Be friend"
-msgstr "друг"
+msgstr "Подружиться"
 
 #: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:174 src/gui/popupmenu.cpp:350
 #: src/gui/popupmenu.cpp:356 src/gui/popupmenu.cpp:375
 #: src/gui/popupmenu.cpp:591 src/gui/popupmenu.cpp:599
 #: src/gui/popupmenu.cpp:623
-#, fuzzy
 msgid "Disregard"
-msgstr "Пренебрегаемый"
+msgstr "Пренебреч"
 
 #: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:151
 #: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:167
@@ -1307,18 +1290,16 @@ msgstr "Пренебрегаемый"
 #: src/gui/popupmenu.cpp:365 src/gui/popupmenu.cpp:370
 #: src/gui/popupmenu.cpp:594 src/gui/popupmenu.cpp:602
 #: src/gui/popupmenu.cpp:610 src/gui/popupmenu.cpp:616
-#, fuzzy
 msgid "Erase"
-msgstr "Стерт"
+msgstr "Стереть"
 
 #: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:165
 #: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:362
 #: src/gui/popupmenu.cpp:369 src/gui/popupmenu.cpp:374
 #: src/gui/popupmenu.cpp:607 src/gui/popupmenu.cpp:615
 #: src/gui/popupmenu.cpp:621
-#, fuzzy
 msgid "Unignore"
-msgstr "Игнорировать"
+msgstr "Не игнорировать"
 
 #: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:176
 #: src/gui/popupmenu.cpp:364 src/gui/popupmenu.cpp:377
@@ -1329,91 +1310,77 @@ msgstr "@@ignore|Полностью игнорировать@@"
 
 #: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:385
 #: src/gui/popupmenu.cpp:633
-#, fuzzy
 msgid "Follow"
-msgstr "Следование: "
+msgstr "Следовать"
 
 #: src/gui/popupmenu.cpp:186 src/gui/popupmenu.cpp:386
 #: src/gui/popupmenu.cpp:634
-#, fuzzy
 msgid "Imitation"
-msgstr "Имитация: "
+msgstr "Имитировать"
 
 #: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:654
-#, fuzzy
 msgid "Invite to party"
-msgstr "Пригласить пользователя в группу"
+msgstr "Пригласить в группу"
 
 #: src/gui/popupmenu.cpp:201 src/gui/popupmenu.cpp:395
 #: src/gui/popupmenu.cpp:659
-#, fuzzy
 msgid "Kick from party"
-msgstr "@@kick party|Вышвырнуть из группы@@"
+msgstr "Выкинуть из группы"
 
 #: src/gui/popupmenu.cpp:216 src/gui/popupmenu.cpp:406
 #: src/gui/popupmenu.cpp:673
-#, fuzzy
 msgid "Kick from guild"
-msgstr "Вы были кикнуты из гильдии."
+msgstr "Выкинуть из гильдии"
 
 #: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:408
 #: src/gui/popupmenu.cpp:675
-#, fuzzy
 msgid "Change pos in guild"
-msgstr "@@guild-pos|Сменить статус в гильдии >@@"
+msgstr "Сменить позицию в гильдии"
 
 #: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:413
 #: src/gui/popupmenu.cpp:681
-#, fuzzy
 msgid "Invite to guild"
-msgstr "Приглашение игрока в Гильдию"
+msgstr "Пригласить в гильдию"
 
 #: src/gui/popupmenu.cpp:232
-#, fuzzy
 msgid "Kick player"
-msgstr "Игрок MVP."
+msgstr "Кикнуть игрока"
 
 #: src/gui/popupmenu.cpp:234
 msgid "Nuke"
-msgstr ""
+msgstr "Уничтожить"
 
 #: src/gui/popupmenu.cpp:236 src/gui/popupmenu.cpp:636
 msgid "Undress"
-msgstr ""
+msgstr "Раздеть"
 
 #: src/gui/popupmenu.cpp:267
 msgid "Kick"
-msgstr ""
+msgstr "Кикнуть"
 
 #: src/gui/popupmenu.cpp:278
-#, fuzzy
 msgid "Remove from attack list"
-msgstr "@@remove attack|Удалить из списка атак@@"
+msgstr "Удалить из списка атаки"
 
 #: src/gui/popupmenu.cpp:284
-#, fuzzy
 msgid "Add to priority attack list"
-msgstr "@@add attack priority|Добавить в список приортетных атак@@"
+msgstr "Добавить в приоритетный список"
 
 #: src/gui/popupmenu.cpp:286
-#, fuzzy
 msgid "Add to attack list"
-msgstr "@@add attack|Добавить к списку атак@@"
+msgstr "Добавить в список атаки"
 
 #: src/gui/popupmenu.cpp:289
-#, fuzzy
 msgid "Add to ignore list"
-msgstr "Добавить к торговле все"
+msgstr "Добавить в список игнорирования"
 
 #: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:424
-#, fuzzy
 msgid "Add name to chat"
-msgstr "Добавить в чат"
+msgstr "Добавить имя в чат"
 
 #: src/gui/popupmenu.cpp:450
-#, fuzzy
 msgid "Pick up"
-msgstr "Поднятие предметов"
+msgstr "Поднять"
 
 #: src/gui/popupmenu.cpp:451 src/gui/popupmenu.cpp:1530
 #: src/gui/popupmenu.cpp:1598 src/gui/popupmenu.cpp:1636
@@ -1425,9 +1392,8 @@ msgid "Map Item"
 msgstr "Элмент карты"
 
 #: src/gui/popupmenu.cpp:469
-#, fuzzy
 msgid "Rename"
-msgstr "Скрывать имя"
+msgstr "Переименовать"
 
 #: src/gui/popupmenu.cpp:470 src/gui/popupmenu.cpp:1750
 #: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1773
@@ -1435,22 +1401,20 @@ msgid "Remove"
 msgstr "Удалить"
 
 #: src/gui/popupmenu.cpp:484
-#, fuzzy
 msgid "Load old outfits"
-msgstr "Загрузить старые горячие клавиши предметов"
+msgstr "Загрузить старые наряды"
 
 #: src/gui/popupmenu.cpp:500 src/gui/windowmenu.cpp:93
 msgid "Spells"
 msgstr "Заклинания"
 
 #: src/gui/popupmenu.cpp:502
-#, fuzzy
 msgid "Load old spells"
-msgstr "@@load old spells|Загрузить старые заклинания@@"
+msgstr "Загрузить старые заклинания"
 
 #: src/gui/popupmenu.cpp:503
 msgid "Edit spell"
-msgstr ""
+msgstr "Изменить заклинание"
 
 #: src/gui/popupmenu.cpp:529
 msgid "Disable highlight"
@@ -2266,8 +2230,8 @@ msgstr "Нет"
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
-"удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
+" удалось!"
 
 #: src/gui/setup_video.cpp:539
 msgid ""
@@ -3112,7 +3076,8 @@ msgid "Change"
 msgstr "Сменить"
 
 #: src/gui/trade.cpp:314
-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 ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3447,15 +3412,16 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:123
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
-"отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
+" отношений с ним."
 
 #: src/gui/widgets/whispertab.cpp:128
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:62
@@ -4518,7 +4484,8 @@ msgstr "Неизвестная ошибка сервера чата."
 
 #: src/net/tmwa/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+msgstr ""
+"Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
 #: src/net/tmwa/charserverhandler.cpp:176 src/net/tmwa/loginhandler.cpp:194
 msgid "Wrong name."
@@ -4876,8 +4843,7 @@ msgstr "Команда изменяет политику разделения п
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr ""
-"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
+msgstr "<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
 
 #: src/net/tmwa/gui/partytab.cpp:99
 msgid "Command: /item"
@@ -4900,8 +4866,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий "
-"опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
+"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий"
+" опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
 
 #: src/net/tmwa/gui/partytab.cpp:111
 msgid "Command: /exp"
@@ -5140,13 +5106,15 @@ msgstr "Сообщение"
 
 #: src/net/tmwa/playerhandler.cpp:341
 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 ""
 "Вы несете груз больший, чем половина вашей грузоподъемности. Не удалось "
 "восстановить здоровье."
 
 #: src/net/tmwa/playerhandler.cpp:351
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid ""
+"You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Вы несете груз меньше, чем половина вашей грузоподъемности. Вы можете "
 "восстановить здоровье."
@@ -5335,111 +5303,3 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
-
-#~ msgid "@@trade|Trade@@"
-#~ msgstr "@@trade|Торговать@@"
-
-#~ msgid "@@attack|Attack@@"
-#~ msgstr "@@attack|Атаковать@@"
-
-#~ msgid "@@whisper|Whisper@@"
-#~ msgstr "@@whisper|Шептать@@"
-
-#~ msgid "@@heal|Heal@@"
-#~ msgstr "@@heal|Лечить@@"
-
-#~ msgid "@@friend|Be friend@@"
-#~ msgstr "@@friend|Подружиться@@"
-
-#~ msgid "@@disregard|Disregard@@"
-#~ msgstr "@@disregard|Пренебреч@@"
-
-#~ msgid "@@ignore|Ignore@@"
-#~ msgstr "@@unignore|Игнорировать@@"
-
-#~ msgid "@@erase|Erase@@"
-#~ msgstr "@@erase|Стереть@@"
-
-#~ msgid "@@unignore|Unignore@@"
-#~ msgstr "@@unignore|Не игнорировать@@"
-
-#~ msgid "@@ignore|Completely ignore@@"
-#~ msgstr "@@ignore|Полностью игнорировать@@"
-
-#~ msgid "@@follow|Follow@@"
-#~ msgstr "@@follow|Следовать@@"
-
-#~ msgid "@@imitation|Imitation@@"
-#~ msgstr "@@imitation|Имитация@@"
-
-#~ msgid "@@party|Invite to party@@"
-#~ msgstr "@@party|Пригласить в группу@@"
-
-#~ msgid "@@guild-kick|Kick from guild@@"
-#~ msgstr "@@guild-kick|Выкинуть из гильдии@@"
-
-#~ msgid "@@guild|Invite to guild@@"
-#~ msgstr "@@guild|Пригласить в гильдию@@"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Вышвырнуть игрока@@"
-
-#~ msgid "@@nuke|Nuke@@"
-#~ msgstr "@@nuke|Уничтожить@@"
-
-#~ msgid "@@move|Move@@"
-#~ msgstr "@@move|Двигаться@@"
-
-#~ msgid "@@undress|Undress@@"
-#~ msgstr "@@undress|Раздеть@@"
-
-#~ msgid "@@buy|Buy@@"
-#~ msgstr "@@buy|Купить@@"
-
-#~ msgid "@@sell|Sell@@"
-#~ msgstr "@@sell|Продать@@"
-
-#~ msgid "@@talk|Talk@@"
-#~ msgstr "@@talk|Говорить@@"
-
-#~ msgid "@@admin-kick|Kick@@"
-#~ msgstr "@@admin-kick|Вышвырнуть игрока@@"
-
-#~ msgid "@@add attack ignore|Add to ignore list@@"
-#~ msgstr "@@add attack ignore|Добавить в список игнорирования@@"
-
-#~ msgid "@@name|Add name to chat@@"
-#~ msgstr "@@name|Добавить имя в чат@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Отмена@@"
-
-#~ msgid "@@player_%u|%s >@@"
-#~ msgstr "@@player_%u|%s >@@"
-
-#~ msgid "@@pickup|Pick up@@"
-#~ msgstr "@@pickup|Поднять@@"
-
-#~ msgid "@@chat|Add to chat@@"
-#~ msgstr "@@chat|Добавить в чат@@"
-
-#~ msgid "@@rename map|Rename@@"
-#~ msgstr "@@rename map|Переименовать@@"
-
-#~ msgid "@@remove map|Remove@@"
-#~ msgstr "@@remove map|Удалить@@"
-
-#~ msgid "@@load old outfits|Load old outfits@@"
-#~ msgstr "@@load old outfits|Загрузить старые наряды@@"
-
-#~ msgid "@@edit spell|Edit spell@@"
-#~ msgstr "@@edit spell|Изменить заклинание@@"
-
-#~ msgid "@@chat close|Close@@"
-#~ msgstr "@@chat close|Закрыть@@"
-
-#~ msgid "@@leave party|Leave@@"
-#~ msgstr "@@leave party|Покинуть@@"
-
-#~ msgid "@@guild-pos-%d|%s@@"
-#~ msgstr "@@guild-pos-%d|%s@@"
diff --git a/po/sv.po b/po/sv.po
index d0e6d17c4..31b1ddf06 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4973,17 +4973,17 @@ msgid "M.Defense"
 msgstr "M. försvar:"
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Accuracy"
 msgstr "% Träffsäkerhet:"
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Evade"
 msgstr "% Kringgå:"
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy, c-format
+#, fuzzy
 msgid "% Critical"
 msgstr "Kritisk träff"