summaryrefslogtreecommitdiff
path: root/po/fr.po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-04-26 20:30:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-04-26 20:30:22 +0300
commit6b06a89665fdfa9ecc7179bae827cefae3cb1a77 (patch)
treed90008a75b6d3d883591ccce196b43c94c3cd67c /po/fr.po
parentbcdf34645ff3067d3b4110120b6191af2b0b2e99 (diff)
parent2ee2f8b060e4fe88feeeba5508189c916e55a70d (diff)
downloadmv-stable.tar.gz
mv-stable.tar.bz2
mv-stable.tar.xz
mv-stable.zip
Merge branch 'master' into stablestable
Diffstat (limited to 'po/fr.po')
-rw-r--r--po/fr.po28
1 files changed, 14 insertions, 14 deletions
diff --git a/po/fr.po b/po/fr.po
index bad80e965..4dbf35074 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-04-13 03:00+0300\n"
+"POT-Creation-Date: 2014-04-26 12:00+0300\n"
"PO-Revision-Date: 2014-04-01 07:42+0000\n"
"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
@@ -909,25 +909,25 @@ msgstr "%d secondes"
msgid "Environment variables dumped"
msgstr "Variables d'environnement effacées"
-#: src/commands.cpp:1348
+#: src/commands.cpp:1349
msgid "Uploaded config into:"
msgstr "Config ajouté dans :"
-#: src/commands.cpp:1356
+#: src/commands.cpp:1357
msgid "Uploaded server config into:"
msgstr "Config serveur ajouté dans :"
-#: src/commands.cpp:1364
+#: src/commands.cpp:1365
msgid "Uploaded log into:"
msgstr "Historique ajouté dans :"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1485 src/commands.cpp:1494
+#: src/commands.cpp:1486 src/commands.cpp:1495
msgid "Resource images:"
msgstr "Images des ressources :"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1488 src/commands.cpp:1497
+#: src/commands.cpp:1489 src/commands.cpp:1498
msgid "Resource orphaned images:"
msgstr "Images des ressources non affectées :"
@@ -1679,7 +1679,7 @@ msgstr "Ajouter tout dans l'échange"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1954 src/gui/popups/popupmenu.cpp:2084
#: src/gui/popups/popupmenu.cpp:2125 src/gui/windows/inventorywindow.cpp:222
-#: src/gui/windows/inventorywindow.cpp:744 src/gui/windows/setupwindow.cpp:97
+#: src/gui/windows/inventorywindow.cpp:748 src/gui/windows/setupwindow.cpp:97
msgid "Store"
msgstr "Entreposer"
@@ -1744,7 +1744,7 @@ msgstr "Reprendre tout"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:2046 src/gui/popups/popupmenu.cpp:2824
#: src/gui/windows/inventorywindow.cpp:173
-#: src/gui/windows/inventorywindow.cpp:654 src/gui/windows/skilldialog.cpp:289
+#: src/gui/windows/inventorywindow.cpp:655 src/gui/windows/skilldialog.cpp:289
msgid "Use"
msgstr "Utiliser"
@@ -1936,7 +1936,7 @@ msgstr "Objet protégé"
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2809 src/gui/windows/equipmentwindow.cpp:67
#: src/gui/windows/inventorywindow.cpp:175
-#: src/gui/windows/inventorywindow.cpp:643
+#: src/gui/windows/inventorywindow.cpp:644
msgid "Unequip"
msgstr "Retirer"
@@ -1945,7 +1945,7 @@ msgstr "Retirer"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2815 src/gui/windows/inventorywindow.cpp:171
-#: src/gui/windows/inventorywindow.cpp:648 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:649 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Équiper"
@@ -1953,7 +1953,7 @@ msgstr "Équiper"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2835 src/gui/windows/inventorywindow.cpp:188
-#: src/gui/windows/inventorywindow.cpp:752
+#: src/gui/windows/inventorywindow.cpp:756
msgid "Drop..."
msgstr "Jeter..."
@@ -1968,7 +1968,7 @@ msgstr "Jeter tout"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2844 src/gui/windowmenu.cpp:126
-#: src/gui/windows/inventorywindow.cpp:757
+#: src/gui/windows/inventorywindow.cpp:761
msgid "Drop"
msgstr "Jeter"
@@ -3017,7 +3017,7 @@ msgstr "Niveau : %u"
#. TRANSLATORS: status window label
#: src/gui/widgets/characterdisplay.cpp:136
-#: src/gui/windows/inventorywindow.cpp:567
+#: src/gui/windows/inventorywindow.cpp:568
#: src/gui/windows/statuswindow.cpp:150 src/gui/windows/statuswindow.cpp:313
#: src/gui/windows/statuswindow.cpp:366
#, c-format
@@ -6692,7 +6692,7 @@ msgid "##1 you try again later."
msgstr "##1 Essayes de nouveau plus tard."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:948
+#: src/gui/windows/updaterwindow.cpp:938
msgid "Completed"
msgstr "Terminé"