diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-04-26 20:30:22 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-04-26 20:30:22 +0300 |
commit | 6b06a89665fdfa9ecc7179bae827cefae3cb1a77 (patch) | |
tree | d90008a75b6d3d883591ccce196b43c94c3cd67c /po/zh_CN.po | |
parent | bcdf34645ff3067d3b4110120b6191af2b0b2e99 (diff) | |
parent | 2ee2f8b060e4fe88feeeba5508189c916e55a70d (diff) | |
download | mv-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.tar.gz mv-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.tar.bz2 mv-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.tar.xz mv-6b06a89665fdfa9ecc7179bae827cefae3cb1a77.zip |
Merge branch 'master' into stablestable
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r-- | po/zh_CN.po | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 71f79778f..7b0f08a4e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,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-03-28 08:14+0000\n" "Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/" @@ -899,25 +899,25 @@ msgstr "" msgid "Environment variables dumped" msgstr "" -#: src/commands.cpp:1348 +#: src/commands.cpp:1349 msgid "Uploaded config into:" msgstr "" -#: src/commands.cpp:1356 +#: src/commands.cpp:1357 msgid "Uploaded server config into:" msgstr "" -#: src/commands.cpp:1364 +#: src/commands.cpp:1365 msgid "Uploaded log into:" msgstr "" #. TRANSLATORS: dump command -#: src/commands.cpp:1485 src/commands.cpp:1494 +#: src/commands.cpp:1486 src/commands.cpp:1495 msgid "Resource images:" msgstr "" #. TRANSLATORS: dump command -#: src/commands.cpp:1488 src/commands.cpp:1497 +#: src/commands.cpp:1489 src/commands.cpp:1498 msgid "Resource orphaned images:" msgstr "" @@ -1667,7 +1667,7 @@ msgstr "" #. 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 "存储" @@ -1732,7 +1732,7 @@ msgstr "检索所有" #. 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 "使用" @@ -1924,7 +1924,7 @@ msgstr "" #. 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 "卸下装备" @@ -1933,7 +1933,7 @@ msgstr "卸下装备" #. 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 "装备" @@ -1941,7 +1941,7 @@ msgstr "装备" #. 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 "掉落... ..." @@ -1956,7 +1956,7 @@ msgstr "所有" #. 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 "丢弃" @@ -3005,7 +3005,7 @@ msgstr "" #. 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 @@ -6649,7 +6649,7 @@ msgid "##1 you try again later." msgstr "" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "已完成" |