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 | |
| parent | bcdf34645ff3067d3b4110120b6191af2b0b2e99 (diff) | |
| parent | 2ee2f8b060e4fe88feeeba5508189c916e55a70d (diff) | |
| download | mv-stable.tar.gz mv-stable.tar.bz2 mv-stable.tar.xz mv-stable.zip | |
Merge branch 'master' into stablestable
41 files changed, 346 insertions, 302 deletions
diff --git a/.gitignore b/.gitignore index 3b37c3ec3..a2a7b8b5b 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,9 @@ Xcode/Release/Manaplus_ssh.txt Xcode/DerivedData/ Xcode/Build/ Xcode/Release/Release* + +/manaplus.depend +/manaplus.layout + +#english po +/po/en.po @@ -1,3 +1,9 @@ +2014-04-26 New release 1.4.4.26 +fix: crash with dragging empty spell. +fix: crash if open storage and start trade. +fix: links drawing over player head. +fix: downlod music option with incomplete configuration. + 2014-04-12 New release 1.4.4.12 fix: possible crash. fix: selection in dropdowns. @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.4.4.12 Date: 2014-04-12 + Version: 1.4.4.26 Date: 2014-04-26 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index b3529373f..0b5162e55 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT
===============
- Version: 1.4.4.12 Date: 2014-04-12
+ Version: 1.4.4.26 Date: 2014-04-26
Development team:
- See AUTHORS file for a list
diff --git a/build/bmakedebug b/build/bmakedebug index 521d88f68..8c3d43089 100755 --- a/build/bmakedebug +++ b/build/bmakedebug @@ -4,12 +4,12 @@ cd .. dir=`pwd` -export CC=gcc-4.8 -export CXX=g++-4.8 +export CC=gcc-4.9 +export CXX=g++-4.9 export LANG=C -export CXXFLAGS="-ggdb3 -Og -pipe -ffast-math \ +export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -fsanitize=address \ -fno-omit-frame-pointer -funswitch-loops \ -Wvariadic-macros -Wvla -Wredundant-decls \ @@ -36,7 +36,9 @@ export CXXFLAGS="-ggdb3 -Og -pipe -ffast-math \ -Wsuggest-attribute=format -Wtype-limits -Wuninitialized \ -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function \ -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -ftrapv \ --fsched-pressure" +-fsched-pressure \ +-Wconditionally-supported -Wdate-time \ +-fno-var-tracking" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/bmakemem b/build/bmakemem index 2ffea4030..143362da0 100755 --- a/build/bmakemem +++ b/build/bmakemem @@ -4,8 +4,8 @@ cd .. dir=`pwd` -export CC=gcc-4.8 -export CXX=g++-4.8 +export CC=gcc-4.9 +export CXX=g++-4.9 export LANG=C @@ -35,7 +35,8 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -Wsuggest-attribute=format -Wtype-limits -Wuninitialized \ -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function \ -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable \ --fsched-pressure" +-fsched-pressure \ +-Wconditionally-supported -Wdate-time" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/packevol b/build/packevol index 60a4363cb..6f5460d33 100755 --- a/build/packevol +++ b/build/packevol @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../libs/dll/ \ - -DPRODUCT_VERSION="1.4.4.12" \ + -DPRODUCT_VERSION="1.4.4.26" \ -DEXESUFFIX=/src \ -DUPX=true \ evol.nsi diff --git a/build/packtmw b/build/packtmw index c6c04f06c..2163d7a41 100755 --- a/build/packtmw +++ b/build/packtmw @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../libs/dll/ \ - -DPRODUCT_VERSION="1.4.4.12" \ + -DPRODUCT_VERSION="1.4.4.26" \ -DEXESUFFIX=/src \ -DUPX=true \ tmw.nsi diff --git a/build/packwin b/build/packwin index 10961c2de..9e647ba64 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../libs/dll/ \ - -DPRODUCT_VERSION="1.4.4.12" \ + -DPRODUCT_VERSION="1.4.4.26" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index d066deb51..baf164eae 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT([ManaPlus], [1.4.4.12], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.4.4.26], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/data/translations/help/ru.po b/data/translations/help/ru.po index 0f755c381..d714cbcf3 100644 --- a/data/translations/help/ru.po +++ b/data/translations/help/ru.po @@ -7,12 +7,13 @@ # Dan Sagunov <danilka.pro@gmail.com>, 2012-2013 # RatreX <ratrex@mail.ru>, 2013 # RatreX <ratrex@mail.ru>, 2013 +# Александр Иванов <bio_editor@mail.ru>, 2014 # lokosha <blashirk@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" -"PO-Revision-Date: 2014-04-07 12:22+0000\n" -"Last-Translator: Alexsl <alexlsh@mail.ru>\n" +"PO-Revision-Date: 2014-04-21 06:26+0000\n" +"Last-Translator: Александр Иванов <bio_editor@mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" "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" msgid "/uploadserverconfig - upload server config into pastebin service." -msgstr "" +msgstr "/uploadserverconfig - загрузить конфигурацию сервера в сервис pastevbin." msgid "/atkhuman - select and attack nearest player." msgstr "/atkhuman - выбрать и атаковать ближайшего игрока." @@ -99,7 +100,7 @@ msgid "\"Select OK\"" msgstr "\"Выбор Ok\"" msgid "/dumpe - dump environment variables into chat." -msgstr "" +msgstr "/dumpe - выгрузить переменные окружения в журнал." msgid "" "If client working very slow, you can improve speed\n" @@ -110,7 +111,7 @@ msgid "\"Enable/disable trading\"" msgstr "\"Разрешение/Запрет торговли\"" msgid "/wait NAME - wait for nick or moster with name." -msgstr "" +msgstr "/wait ИМЯ - подождать персонажа с указанным именем." msgid "##2Trade:##9 enables the ability to trade with others." msgstr "##2Trade:##9 включает возможность торговли с другими игроками." @@ -138,7 +139,7 @@ msgid "" " and open source MMORPG world. The Mana World uses 2D graphics and aims to be\n" " as much diverse and interactive as possible. All content is licensed\n" " under the GPL, making sure this game can't ever run away from you." -msgstr "" +msgstr "##2ManaPlus##0 - это серьезная работа по созданию инновационного\nсвободного MMORPG-клиента с открытым исходным кодом.\nИгра использует 2D графику и нацелена на создание огромных\nи разнообразных интерактивных миров. Лицензия GPL позволяет\nбыть уверенным в том, что игра никогда не отвернется от Вас." msgid "ABOUT MANAPLUS" msgstr "О MANAPLUS" @@ -184,7 +185,7 @@ msgid "/dropn - drop N items from any slot." msgstr "/dropn - бросить N предметов из любого слота." msgid "/enableaway - enable away messages in current tab." -msgstr "" +msgstr "/enableaway - включить уведомления об AFK в этой вкладке." msgid "/enemy NICK - add nick to enemyes list." msgstr "/enemy NICK - добавить ник в список врагов." @@ -200,7 +201,7 @@ msgstr "/outfit next - надеть следующий костюм." msgid "" "/cleangraphics - remove all cached graphics. Usefull for content developers." -msgstr "" +msgstr "/cleangraphics - стереть кэш графики. Удобен для разработчиков контента." msgid "\"Outfit shortcut 3\"" msgstr "\"Наряд 3\"" @@ -238,7 +239,7 @@ msgid "\"Toggle chat\"" msgstr "\"Переключение на чат\"" msgid "/talkpet TEXT - talk from your pet." -msgstr "" +msgstr "/talkpet ТЕКСТ - говорить с помощью вашего животного." msgid "\"Change attack type\"" msgstr "\"Изменение типа атаки\"" @@ -262,10 +263,10 @@ msgid "/disregard NICK - add nick to disregarded list." msgstr "/disregard NICK - добавляет NICK в список нехороших ников." msgid "/enablehighlight - enable highlight in current tab." -msgstr "" +msgstr "/enablehighlight - включит подсветку этой вкладки." msgid "/disableaway - disable away messages in current tab." -msgstr "" +msgstr "/disableaway - выключить уведомления об AFK в этой вкладке." msgid "\"Smilie\"" msgstr "\"Смайлы\"" @@ -306,7 +307,7 @@ msgid "Mana Contributors" msgstr "В разработке Mana принимали участие" msgid "/dumpt - dump tests info into chat." -msgstr "" +msgstr "/dumpt - вывести информацию о тестах в чат." msgid "Different patches" msgstr "Различные патчи" @@ -351,7 +352,7 @@ msgid "/addpriorityattack NAME - add monster to priority attack list." msgstr "/addpriorityattack МОНСТР - добавить монстра в приоритетный список атаки." msgid "For TMW support:" -msgstr "" +msgstr "Для поддержки TMW." msgid "/priceload - load shop price from disc." msgstr "/priceload - загружает список цен с диска." @@ -359,19 +360,19 @@ msgstr "/priceload - загружает список цен с диска." msgid "" " - ##2friend##9: You consider this player a friend. The player may chat,\n" " message your in private, or trade with you at any point." -msgstr "" +msgstr " - ##2друг##9: Вы считаете этого игрока другом. Игрок может писать в чат,\n посылать вам приватные сообщения, торговать с вами в любом месте." msgid "\"Item shortcut 13\"" msgstr "\"Горячая клавиша предмета 13\"" msgid "For other servers may exists other copyrights." -msgstr "" +msgstr "Для других сервисов существуют другие авторские права." msgid "\"Outfit shortcut 13\"" msgstr "\"Наряд 13\"" msgid "/sethome - set home position." -msgstr "" +msgstr "/sethome - установить координаты дома." msgid "" " - ##2allow whispers##9: Do you wish to allow arbitrary players to send\n" @@ -385,10 +386,10 @@ msgid "/present - print visible players number to chat." msgstr "/present - вывести в чат количество игроков в области видимости." msgid "/dumpogl - dump all OpenGL variables into log file." -msgstr "" +msgstr "/dumpogl - выгрузить все переменные OpenGL в журнал." msgid "/emotepet N - use emotion number N from your pet." -msgstr "" +msgstr "/emotepet N - использовать эмоцию номер N вашего питомца." msgid "" "You can do basic searching in help by using command\n" @@ -466,7 +467,7 @@ msgid "" " - ##2disregarded##9: You wish to disregard this player, meaning that his or\n" " her chat messages are not logged and trade requests and whispers are\n" " ignored." -msgstr "" +msgstr " - ##2проигнорированный##9: Вы хотите проигнорировать этого игрока, это означает что его или\n её чат сообщения не будут отображаться, также будут проигнорированы запросы на торговлю и \nприватные сообщения." msgid "\"Debug window\"" msgstr "\"Окно отладки\"" @@ -504,7 +505,7 @@ msgstr "\"Движение влево\"" msgid "" "##9 This file lists all contributors up to the current release. Check the wiki\n" "##9 for the currently active development team." -msgstr "" +msgstr "##9 Этот файл отображает всех разработчиков вплоть до текущей версии. Перейдите на wiki\n##9 чтобы узнать текущий активный состав команды разработчиков." msgid "\"Chat window\"" msgstr "\"Окно чата\"" @@ -528,7 +529,7 @@ msgid "" " - ##2save player list##9: Should your acquaintance list be saved when you\n" " quit the game? If you enable this option, your list will survive when you\n" " quit and re-start." -msgstr "" +msgstr " - ##2сохранить список игрока##9: Следует ли сохранять список знакомств, когда вы\n выходите из игры? Если включить эту опцию, ваш список не сбросится \nпосле выхода или перезапуска." msgid "Other" msgstr "Другое" @@ -603,7 +604,7 @@ msgstr "Вы можете двигаться к Вратам автоматич msgid "" "##2ManaPlus##9 is extended client based on old code from ##2Mana##9 client.\n" " Added many features, improved perfomance, stability, security and more." -msgstr "" +msgstr "##2ManaPlus##9 это расширенный клиент основанный на старом коде клиента ##2Mana##9.\n Добавлено много возможностей, улучшена производительность, стабильность, безопасность и многое другое." msgid "" "You can disable yellow bar,\n" @@ -638,7 +639,7 @@ msgid "" " source MMORPG Client. ManaPlus uses 2D graphics and aims to create a large\n" " and diverse interactive world. It is licensed under the GPL, making\n" " sure this game can't ever run away from you." -msgstr "" +msgstr "##2ManaPlus##9 - это серьезная работа по созданию инновационного\nсвободного MMORPG-клиента с открытым исходным кодом.\nИгра использует 2D графику и нацелена на создание огромных\nи разнообразных интерактивных миров. Лицензия GPL позволяет\nбыть уверенным в том, что игра никогда не отвернется от Вас." msgid "\"Outfit shortcut 6\"" msgstr "\"Наряд 6\"" @@ -659,7 +660,7 @@ msgid "/exp - show party experience sharing options." msgstr "/exp - показать настройки разделения опыта в группе." msgid "/dumpmods - dump all enabled mod names into chat." -msgstr "" +msgstr "/dumpmods - вывести названия всех включенных модов в чат." msgid "INDEX" msgstr "СОДЕРЖАНИЕ" @@ -704,7 +705,7 @@ msgid "/magicattack - attack target with magic." msgstr "/magicattack - атаковать цель с помощью магии." msgid "For ManaPlus Online support:" -msgstr "" +msgstr "Для службы поддержки ManaPlus Online" msgid "\"Set direction right\"" msgstr "\"Установить направление вправо\"" @@ -719,7 +720,7 @@ msgid "/item 1 - enable party item sharing options." msgstr "/item 1 - включить общие предметы в группе." msgid "##9Magic skills can be obtain by doing quests and missions in game." -msgstr "" +msgstr "##9Магические умения могут быть приобретены путем выполнения квестов и миссий в игре." msgid "/erase NICK - add nick to erased list." msgstr "/erase ИГРОК - добавить игрока в список стертых." @@ -754,10 +755,10 @@ msgid "" msgstr " Список игрока отображает все ваши знакомства. Они классифицируются как один\n из следующих:" msgid "/cleanfonts - remove all cached render strings." -msgstr "" +msgstr "/cleanfonts - стереть все кэшированные строки." msgid "/dumpgl - dump OpenGL version into chat." -msgstr "" +msgstr "/dumpgl - вывести версию OpenGL в чат." msgid "MOUSE:" msgstr "МЫШЬ:" @@ -780,7 +781,7 @@ msgid "/dirs - show client dirs in debug chat tab." msgstr "/dirs - показывает расположение директорий вотладочном окне." msgid "/movetohome - move to home position." -msgstr "" +msgstr "/movetohome - телепортироваться домой." msgid "\"Switch quick drop counter\"" msgstr "\"Переключение счётчика быстрого сброса\"" @@ -795,16 +796,16 @@ msgid "\"Change imitation mode\"" msgstr "\"Изменение режима имитации\"" msgid "##9Other skills can be obtain by doing quests and missions in game." -msgstr "" +msgstr "##9Другие умения могут быть получены при выполнении миссий и квестов в игре." msgid "\"Reset video mode to safe value\"" msgstr "\"Сброс режима видео на безопасное значение\"" msgid "/uploadconfig - upload main config into pastebin service." -msgstr "" +msgstr "/uploadconfig - загрузить основную конфигурацию в сервис pastebin." msgid "/testparticle FILENAME - set test particle on player." -msgstr "" +msgstr "/testparticiple ИМЯФАЙЛА - поставить тестовые частицы на игрока. " msgid "\"Bot checker window\"" msgstr "\"Окно детектора ботов\"" @@ -813,7 +814,7 @@ msgid "" " - ##2neutral##9: As far as the game is concerned, this is the same as not\n" " having the player listed: the player may chat with you, but may only trade\n" " or whisper if you have this option allowed for everyone." -msgstr "" +msgstr " - ##2нейтрайльный##9: Касаемо игры, это то же самое, что не\n иметь игрока в списке: игрок может общаться с вами в чате, но торговать\n или слать приватные сообщения только тогда, когда у вас эта опция разрешена для всех." msgid "/url URL - insert url into chat." msgstr "/url URL - вставить url в чат." @@ -840,13 +841,13 @@ msgid "\"Move right\"" msgstr "\"Движение вправо\"" msgid "##2Emote:##9 enables the ability to express emotions." -msgstr "" +msgstr "##2Emote:##9 даёт возможность выражать эмоции." msgid "\"Emote shortcut 8\"" msgstr "\"Смайл 8\"" msgid "For Evol Online support:" -msgstr "" +msgstr "Для службы поддержки Evol Online." msgid "/follow NICK - start follow mode." msgstr "/follow НИК- следовать за данным игроком." @@ -870,7 +871,7 @@ msgid "\"Target NPC\"" msgstr "\"Выбрать NPC\"" msgid "/info - show guild info. Only for native guilds only." -msgstr "" +msgstr "/info - Показывает информацию о гильдии. Только для нативных гильдий." msgid "/neutral NICK - add nick to neutral relation list." msgstr "/neutral ИГРОК - добавить игрока в нейтральный список." @@ -917,7 +918,7 @@ msgid "\"Set direction up\"" msgstr "\"Установить направление вверх\"" msgid "or come visit us on our IRC channel:" -msgstr "" +msgstr "или посетите наш IRC канал." msgid "\"Toggle camera mode\"" msgstr "\"Переключение режима камеры\"" @@ -955,7 +956,7 @@ msgid "/who - print online players number to chat." msgstr "/who - вывести количество пользователей онлайн в чат." msgid "/createitems - open dialog for creating items." -msgstr "" +msgstr "/createitems - открыть диалог создания вещей." msgid "##2Party Level1:##9 enables a char to join a party." msgstr "##2Party Level1:##9 позволяет персонажу присоединяться к группе." @@ -975,7 +976,7 @@ msgstr "В разработке клиентской части принимал msgid "" "Otherwise see the @@team|Development Team@@ section to have a list of\n" " developers and how to contact them." -msgstr "" +msgstr " В противном случае смотрите секцию @@команда|Команда Разработчиков@@, чтобы получить список\n разработчиков и информацию, как с ними связаться." msgid "\"Item shortcut 11\"" msgstr "\"Горячая клавиша предмета 11\"" @@ -1034,7 +1035,7 @@ msgid "Basic skills:" msgstr "Основные умения:" msgid "/uploadlog - upload log into pastebin service." -msgstr "" +msgstr "/uploadlog - загрузить журнал в сервис pastebin." msgid "/leave - leave the party you are in." msgstr "/leave - покинуть группу." @@ -1043,13 +1044,13 @@ msgid "\"Status window\"" msgstr "\"Окно статуса\"" msgid "/notice TEXT - set notice guild text." -msgstr "" +msgstr "/notice ТЕКСТ - установить текст уведомления гильдии." msgid "/friend NICK, /befriend NICK - add nick to friends list." msgstr "/friend ИГРОК, /befriend ИГРОК - добавить игрока в список друзей." msgid "ABOUT THE MANA WORLD" -msgstr "" +msgstr "О THE MANA WORLD" msgid "\"Emote shortcut 14\"" msgstr "\"Смайл 14\"" @@ -1106,7 +1107,7 @@ msgid "\"Quick drop N items from 0 slot\"" msgstr "\"Быстрый сброс N предметов из 0 слота\"" msgid "/disablehighlight - disable highlight in current tab." -msgstr "" +msgstr "/disablehighlight - выключить подсветку этой вкладки." msgid "\"Item shortcut 15\"" msgstr "\"Горячая клавиша предмета 15\"" @@ -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 22:14+0000\n" "Last-Translator: samuraiii <samurai.no.dojo@gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/" @@ -903,25 +903,25 @@ msgstr "%d vteřin" msgid "Environment variables dumped" msgstr "Systémové proměnné uloženy" -#: src/commands.cpp:1348 +#: src/commands.cpp:1349 msgid "Uploaded config into:" msgstr "Nahráno nastavení do:" -#: src/commands.cpp:1356 +#: src/commands.cpp:1357 msgid "Uploaded server config into:" msgstr "Nahráno nastavení serveru do:" -#: src/commands.cpp:1364 +#: src/commands.cpp:1365 msgid "Uploaded log into:" msgstr "Nahrány záznmy do:" #. TRANSLATORS: dump command -#: src/commands.cpp:1485 src/commands.cpp:1494 +#: src/commands.cpp:1486 src/commands.cpp:1495 msgid "Resource images:" msgstr "Resource images:" #. TRANSLATORS: dump command -#: src/commands.cpp:1488 src/commands.cpp:1497 +#: src/commands.cpp:1489 src/commands.cpp:1498 msgid "Resource orphaned images:" msgstr "Resource orphaned images:" @@ -1671,7 +1671,7 @@ msgstr "Přidat vše k obchodu" #. 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 "Uložit" @@ -1736,7 +1736,7 @@ msgstr "Vzít všechny" #. 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 "Použít" @@ -1928,7 +1928,7 @@ msgstr "Chránit předmět" #. 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 "Odebrat z vybavení" @@ -1937,7 +1937,7 @@ msgstr "Odebrat z vybavení" #. 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 "Vybavit" @@ -1945,7 +1945,7 @@ msgstr "Vybavit" #. 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 "Upustit..." @@ -1960,7 +1960,7 @@ msgstr "Upustit vše" #. 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 "Upustit" @@ -3009,7 +3009,7 @@ msgstr "Úroveň: %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 @@ -6674,7 +6674,7 @@ msgid "##1 you try again later." msgstr "##1 aktualizaci později" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Hotovo" @@ -21,7 +21,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: German (http://www.transifex.com/projects/p/manaplus/language/" @@ -912,25 +912,25 @@ msgstr "%d Sekunden" msgid "Environment variables dumped" msgstr "Ausgabe der Umgebungsvariablen" -#: 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 "Bild-Quellen:" #. TRANSLATORS: dump command -#: src/commands.cpp:1488 src/commands.cpp:1497 +#: src/commands.cpp:1489 src/commands.cpp:1498 msgid "Resource orphaned images:" msgstr "Quelle verwaister Bilddataien:" @@ -1681,7 +1681,7 @@ msgstr "Alles zum Handeln hinzufügen" #. 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 "Aufbewahren" @@ -1746,7 +1746,7 @@ msgstr "Alles abholen" #. 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 "Benutzen" @@ -1938,7 +1938,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 "Ablegen" @@ -1947,7 +1947,7 @@ msgstr "Ablegen" #. 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 "Ausrüsten" @@ -1955,7 +1955,7 @@ msgstr "Ausrüsten" #. 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 "Wegwerfen" @@ -1970,7 +1970,7 @@ msgstr "Alles fallenlassen" #. 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 "Wegwerfen" @@ -3019,7 +3019,7 @@ msgstr "Level: %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 @@ -6680,7 +6680,7 @@ msgid "##1 you try again later." msgstr "##1 Du versuchst es später erneut." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Fertig" @@ -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-05 12:21+0000\n" "Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/" @@ -907,25 +907,25 @@ msgstr "%d segundos" msgid "Environment variables dumped" msgstr "Variables de entorno vaciadas" -#: src/commands.cpp:1348 +#: src/commands.cpp:1349 msgid "Uploaded config into:" msgstr "Configuraciones subidas a:" -#: src/commands.cpp:1356 +#: src/commands.cpp:1357 msgid "Uploaded server config into:" msgstr "Configuraciones del servidor subidas a:" -#: src/commands.cpp:1364 +#: src/commands.cpp:1365 msgid "Uploaded log into:" msgstr "Registro subido a:" #. TRANSLATORS: dump command -#: src/commands.cpp:1485 src/commands.cpp:1494 +#: src/commands.cpp:1486 src/commands.cpp:1495 msgid "Resource images:" msgstr "Imágenes de recurso:" #. TRANSLATORS: dump command -#: src/commands.cpp:1488 src/commands.cpp:1497 +#: src/commands.cpp:1489 src/commands.cpp:1498 msgid "Resource orphaned images:" msgstr "Imágenes de recurso huérfano:" @@ -1676,7 +1676,7 @@ msgstr "Agregar todo al intercambio" #. 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 "Almacenar" @@ -1741,7 +1741,7 @@ msgstr "Recuperar todo" #. 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 "Usar" @@ -1933,7 +1933,7 @@ msgstr "Proteger artículo" #. 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 "Quitárselo" @@ -1942,7 +1942,7 @@ msgstr "Quitárselo" #. 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 "Equipar" @@ -1950,7 +1950,7 @@ msgstr "Equipar" #. 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 "Tirar..." @@ -1965,7 +1965,7 @@ msgstr "Tirar todo" #. 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 "Tirar" @@ -3014,7 +3014,7 @@ msgstr "Nivel: %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 @@ -6689,7 +6689,7 @@ msgid "##1 you try again later." msgstr "##1 lo intentes de nuevo más tarde." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Completado" @@ -9,7 +9,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: Finnish (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 "Resurssikuvat:" #. TRANSLATORS: dump command -#: src/commands.cpp:1488 src/commands.cpp:1497 +#: src/commands.cpp:1489 src/commands.cpp:1498 msgid "Resource orphaned images:" msgstr "Orvot resurssikuvat:" @@ -1669,7 +1669,7 @@ msgstr "Lisää kaikki kauppaan" #. 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 "Varastoi" @@ -1734,7 +1734,7 @@ msgstr "Ota kaikki" #. 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 "Käytä" @@ -1926,7 +1926,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 "Poista varuste käytöstä" @@ -1935,7 +1935,7 @@ msgstr "Poista varuste käytöstä" #. 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 "Ota käyttöön" @@ -1943,7 +1943,7 @@ msgstr "Ota käyttöön" #. 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 "Pudota..." @@ -1958,7 +1958,7 @@ msgstr "Pudota kaikki" #. 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 "Pudota" @@ -3007,7 +3007,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 @@ -6656,7 +6656,7 @@ msgid "##1 you try again later." msgstr "##1 yrität myöhemmin uudelleen" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Valmis" @@ -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é" @@ -10,7 +10,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: Indonesian (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 "Sumber gambar" #. TRANSLATORS: dump command -#: src/commands.cpp:1488 src/commands.cpp:1497 +#: src/commands.cpp:1489 src/commands.cpp:1498 msgid "Resource orphaned images:" msgstr "" @@ -1668,7 +1668,7 @@ msgstr "Tambahkan semua ke Penukaran" #. 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 "Simpan" @@ -1733,7 +1733,7 @@ msgstr "Ambil semua" #. 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 "Gunakan" @@ -1925,7 +1925,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 "Lepaskan" @@ -1934,7 +1934,7 @@ msgstr "Lepaskan" #. 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 "Pakai" @@ -1942,7 +1942,7 @@ msgstr "Pakai" #. 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 "Buang..." @@ -1957,7 +1957,7 @@ msgstr "Buang semuanya" #. 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 "Buang" @@ -3006,7 +3006,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 @@ -6650,7 +6650,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 "" @@ -14,7 +14,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: Italian (http://www.transifex.com/projects/p/manaplus/" @@ -904,25 +904,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 "" @@ -1674,7 +1674,7 @@ msgstr "Aggiungi tutti" #. 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 "Magazzino" @@ -1739,7 +1739,7 @@ msgstr "Ritira tutto" #. 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 "Usa" @@ -1931,7 +1931,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 "Togli" @@ -1940,7 +1940,7 @@ msgstr "Togli" #. 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 "Equipaggia" @@ -1948,7 +1948,7 @@ msgstr "Equipaggia" #. 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 "Lascia..." @@ -1963,7 +1963,7 @@ msgstr "Lascia tutto" #. 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 "Lascia" @@ -3012,7 +3012,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 @@ -6668,7 +6668,7 @@ msgid "##1 you try again later." msgstr "##1 riprova più tardi" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Completato" @@ -13,7 +13,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: Japanese (http://www.transifex.com/projects/p/manaplus/" @@ -902,25 +902,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 "リソース孤児イメージ:" @@ -1671,7 +1671,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 "保管" @@ -1736,7 +1736,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 "使用" @@ -1928,7 +1928,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 "取外す" @@ -1937,7 +1937,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 "装着" @@ -1945,7 +1945,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 "落とす..." @@ -1960,7 +1960,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 "落とす" @@ -3009,7 +3009,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 @@ -6657,7 +6657,7 @@ msgid "##1 you try again later." msgstr "##1 しばらくたってからもう一度試してください" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "完了" diff --git a/po/manaplus.pot b/po/manaplus.pot index f111efb4f..560ff84d8 100644 --- a/po/manaplus.pot +++ b/po/manaplus.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-04-13 03:00+0300\n" +"POT-Creation-Date: 2014-04-26 12:00+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -895,25 +895,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 "" @@ -1663,7 +1663,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 "" @@ -1728,7 +1728,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 "" @@ -1920,7 +1920,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 "" @@ -1929,7 +1929,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 "" @@ -1937,7 +1937,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 "" @@ -1952,7 +1952,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 "" @@ -3001,7 +3001,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 @@ -6647,7 +6647,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 "" diff --git a/po/nl_BE.po b/po/nl_BE.po index 0a2a563b4..108953f44 100644 --- a/po/nl_BE.po +++ b/po/nl_BE.po @@ -10,7 +10,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: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/" @@ -900,25 +900,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 "" @@ -1669,7 +1669,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 "Opslaan" @@ -1734,7 +1734,7 @@ msgstr "Haal alles op" #. 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 "Gebruiken" @@ -1926,7 +1926,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 "Afdoen" @@ -1935,7 +1935,7 @@ msgstr "Afdoen" #. 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 "Uitrusten" @@ -1943,7 +1943,7 @@ msgstr "Uitrusten" #. 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 "Neerleggen..." @@ -1958,7 +1958,7 @@ msgstr "Laat alles vallen" #. 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 "Neerleggen" @@ -3007,7 +3007,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 @@ -6661,7 +6661,7 @@ msgid "##1 you try again later." msgstr "##1 probeer later opnieuw." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Voltooid" @@ -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: Polish (http://www.transifex.com/projects/p/manaplus/language/" @@ -903,25 +903,25 @@ msgstr "%d sekund/y" msgid "Environment variables dumped" msgstr "Zmienne środowiskowe zostały zrzucone" -#: 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 "Obrazy źródłowe:" #. TRANSLATORS: dump command -#: src/commands.cpp:1488 src/commands.cpp:1497 +#: src/commands.cpp:1489 src/commands.cpp:1498 msgid "Resource orphaned images:" msgstr "Osierocone obrazy źródłowe:" @@ -1671,7 +1671,7 @@ msgstr "Dodaj wszystko do handlu" #. 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 "Przechowaj" @@ -1736,7 +1736,7 @@ msgstr "Odbierz wszystko" #. 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 "Użyj" @@ -1928,7 +1928,7 @@ msgstr "Chroń przedmiot" #. 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 "Zdejmij" @@ -1937,7 +1937,7 @@ msgstr "Zdejmij" #. 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 "Załóż" @@ -1945,7 +1945,7 @@ msgstr "Załóż" #. 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 "Upuść..." @@ -1960,7 +1960,7 @@ msgstr "Upuść wszystko" #. 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 "Upuść" @@ -3009,7 +3009,7 @@ msgstr "Poziom: %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 @@ -6671,7 +6671,7 @@ msgid "##1 you try again later." msgstr "##1 Spróbuj ponownie później." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Zakończono" @@ -11,7 +11,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: Portuguese (http://www.transifex.com/projects/p/manaplus/" @@ -901,25 +901,25 @@ msgstr "%d segundos" msgid "Environment variables dumped" msgstr "Variáveis de ambiente despejadas" -#: 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 "Recursos de imagens:" #. TRANSLATORS: dump command -#: src/commands.cpp:1488 src/commands.cpp:1497 +#: src/commands.cpp:1489 src/commands.cpp:1498 msgid "Resource orphaned images:" msgstr "Recursos de imagens orfãos:" @@ -1670,7 +1670,7 @@ msgstr "Add. todos na negociação" #. 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 "Armazenar" @@ -1735,7 +1735,7 @@ msgstr "Retirar tudo" #. 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 "Usar" @@ -1927,7 +1927,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 "Desequipar" @@ -1936,7 +1936,7 @@ msgstr "Desequipar" #. 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 "Equipar" @@ -1944,7 +1944,7 @@ msgstr "Equipar" #. 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 "Descartar..." @@ -1959,7 +1959,7 @@ msgstr "Descartar tudo" #. 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 "Descartar" @@ -3008,7 +3008,7 @@ msgstr "Level: %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 @@ -6666,7 +6666,7 @@ msgid "##1 you try again later." msgstr "##1 tente novamente mais tarde." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Concluído" diff --git a/po/pt_BR.po b/po/pt_BR.po index 55f85ba27..8559e4518 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.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-03-28 08:14+0000\n" "Last-Translator: Andrei Karas <akaras@inbox.ru>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" @@ -907,25 +907,25 @@ msgstr "%d Segundos" msgid "Environment variables dumped" msgstr "Variáveis de ambiente despejada" -#: 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 "Recursos de imagem:" #. TRANSLATORS: dump command -#: src/commands.cpp:1488 src/commands.cpp:1497 +#: src/commands.cpp:1489 src/commands.cpp:1498 msgid "Resource orphaned images:" msgstr "Recurso de imagem orfão:" @@ -1676,7 +1676,7 @@ msgstr "Add. todos na negociação" #. 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 "Armazenar" @@ -1741,7 +1741,7 @@ msgstr "Retirar tudo" #. 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 "Usar" @@ -1933,7 +1933,7 @@ msgstr "Proteger item" #. 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 "Desequipar" @@ -1942,7 +1942,7 @@ msgstr "Desequipar" #. 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 "Equipar" @@ -1950,7 +1950,7 @@ msgstr "Equipar" #. 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 "Descartar..." @@ -1965,7 +1965,7 @@ msgstr "Descartar tudo" #. 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 "Descartar" @@ -3014,7 +3014,7 @@ msgstr "Level: %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 @@ -6673,7 +6673,7 @@ msgid "##1 you try again later." msgstr "##1 tente novamente mais tarde." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Concluído" @@ -15,7 +15,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-04 14:48+0000\n" "Last-Translator: Alexsl <alexlsh@mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/" @@ -907,25 +907,25 @@ msgstr "%d секунд" 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 "Удаленных изображений:" @@ -1677,7 +1677,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 "Сохранить" @@ -1742,7 +1742,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 "Использовать" @@ -1934,7 +1934,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 "Снять" @@ -1943,7 +1943,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 "Надеть" @@ -1951,7 +1951,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 "Бросить..." @@ -1966,7 +1966,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 "Бросить" @@ -3015,7 +3015,7 @@ msgstr "Уровень: %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 @@ -6684,7 +6684,7 @@ msgid "##1 you try again later." msgstr "##1 попытаться еще раз немного погодя." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Завершено" @@ -10,7 +10,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: Turkish (http://www.transifex.com/projects/p/manaplus/" @@ -900,25 +900,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 "" @@ -1669,7 +1669,7 @@ msgstr "Tamamını takasa ekle" #. 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 "Sakla" @@ -1734,7 +1734,7 @@ msgstr "Tamamını geri al" #. 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 "Kullan" @@ -1926,7 +1926,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 "Çıkar" @@ -1935,7 +1935,7 @@ msgstr "Çıkar" #. 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 "Donatmak" @@ -1943,7 +1943,7 @@ msgstr "Donatmak" #. 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 "Bırak..." @@ -1958,7 +1958,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 "Bırak" @@ -3007,7 +3007,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 @@ -6658,7 +6658,7 @@ msgid "##1 you try again later." msgstr "##1 daha sonra tekrar deneyiniz." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:948 +#: src/gui/windows/updaterwindow.cpp:938 msgid "Completed" msgstr "Tamamlandı" 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 "已完成" diff --git a/src/being/being.cpp b/src/being/being.cpp index 621b61d02..683bfb6f5 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -441,7 +441,7 @@ void Being::setSpeech(const std::string &text, const std::string &channel, mSpeech.erase(e, 1); mSpeech.erase(start, (position - start) + 1); } - position = mSpeech.find('@'); + position = mSpeech.find("@@"); while (position != std::string::npos) { diff --git a/src/commands.cpp b/src/commands.cpp index de4c03012..3d476f8c6 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -1136,6 +1136,7 @@ impHandler0(error) { const int *const ptr = nullptr; logger->log("test %d", *ptr); + exit(1); } impHandler(url) diff --git a/src/commands.h b/src/commands.h index 6dd688a17..a27f430db 100644 --- a/src/commands.h +++ b/src/commands.h @@ -107,7 +107,7 @@ namespace Commands decHandler(serverIgnoreAll); decHandler(serverUnIgnoreAll); decHandler(setDrop); - decHandler(error); + decHandler(error) __attribute__ ((noreturn)); decHandler(url); decHandler(open); decHandler(dump); diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 46d47ab4a..c7e2b31df 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -270,13 +270,12 @@ void Viewport::logic() BLOCK_START("Viewport::logic") // Make the player follow the mouse position // if the mouse is dragged elsewhere than in a window. - followMouse(); + Gui::getMouseState(&mMouseX, &mMouseY); BLOCK_END("Viewport::logic") } void Viewport::followMouse() { - return; if (!gui) return; const uint8_t button = Gui::getMouseState(&mMouseX, &mMouseY); diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index ee2e35920..f24be7737 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -507,7 +507,7 @@ void ItemContainer::mouseReleased(MouseEvent &event) Net::getInventoryHandler()->moveItem(mSelectedIndex, index); selectNone(); } - else + else if (mInventory) { const DragDropSource src = dragDrop.getSource(); DragDropSource dst = DRAGDROP_SOURCE_EMPTY; diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index f7bc44849..06e9fd459 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -131,6 +131,9 @@ class ItemContainer final : public Widget, bool getClickCount() const A_WARN_UNUSED { return mClicks; } + void unsetInventory() + { mInventory = nullptr; } + private: enum Direction { diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index c2a4b4636..01e5e052d 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -271,7 +271,8 @@ void InventoryWindow::postInit() InventoryWindow::~InventoryWindow() { invInstances.remove(this); - mInventory->removeInventoyListener(this); + if (mInventory) + mInventory->removeInventoyListener(this); if (!invInstances.empty()) invInstances.front()->updateDropButton(); @@ -681,7 +682,10 @@ void InventoryWindow::close() else { if (Net::getInventoryHandler()) + { Net::getInventoryHandler()->closeStorage(Inventory::STORAGE); + Net::getInventoryHandler()->forgotStorage(); + } scheduleDelete(); } } @@ -806,3 +810,14 @@ void InventoryWindow::setVisible(bool visible) mSortDropDown->hideDrop(); Window::setVisible(visible); } + +void InventoryWindow::unsetInventory() +{ + if (mInventory) + { + mInventory->removeInventoyListener(this); + if (mItems) + mItems->unsetInventory(); + } + mInventory = nullptr; +} diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 7e47e0362..10e1e21e2 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -152,6 +152,8 @@ class InventoryWindow final : public Window, void setVisible(bool visible) override final; + void unsetInventory(); + static bool isAnyInputFocused(); private: diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 824d8e0f6..75460cf78 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -840,21 +840,11 @@ void UpdaterWindow::logic() if (mUpdateIndex < mUpdateFiles.size()) { UpdateFile thisFile = mUpdateFiles[mUpdateIndex]; - if (!thisFile.required) + if (thisFile.type == "music" + && !config.getBoolValue("download-music")) { - // This statement checks to see if the file type - // is music, and if download-music is true - // If it fails, this statement returns true, - // and results in not downloading the file - // Else it will ignore the break, - // and download the file. - - if (!(thisFile.type == "music" - && config.getBoolValue("download-music"))) - { - mUpdateIndex++; - break; - } + mUpdateIndex++; + break; } mCurrentFile = thisFile.name; std::string checksum; diff --git a/src/main.h b/src/main.h index 5c47e72ac..047b9c9a2 100644 --- a/src/main.h +++ b/src/main.h @@ -45,8 +45,8 @@ * different interfaces, which have different implementations for each server. */ -#define SMALL_VERSION "1.4.4.12" -#define CHECK_VERSION "01.04.04.12" +#define SMALL_VERSION "1.4.4.26" +#define CHECK_VERSION "01.04.04.26" #ifdef HAVE_CONFIG_H #include "../config.h" diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index f3c8040e1..ea7390ccb 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -486,6 +486,11 @@ void InventoryHandler::processPlayerStorageClose(Net::MessageIn &msg A_UNUSED) { // Storage access has been closed // Storage window deletes itself + if (mStorageWindow) + { + mStorageWindow->unsetInventory(); + mStorageWindow->close(); + } mStorageWindow = nullptr; if (mStorage) @@ -592,9 +597,15 @@ void InventoryHandler::closeStorage() { if (mStorageWindow) { + mStorageWindow->unsetInventory(); mStorageWindow->close(); mStorageWindow = nullptr; } } +void InventoryHandler::forgotStorage() +{ + mStorageWindow = nullptr; +} + } // namespace Ea diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index ac88c1d6c..4546b75bb 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -210,6 +210,8 @@ class InventoryHandler : public Net::InventoryHandler void closeStorage() override final; + void forgotStorage() override final; + Inventory *getStorage() const { return mStorage; } diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 53e7d15b1..42649bae6 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -71,6 +71,8 @@ class InventoryHandler virtual void closeStorage() = 0; + virtual void forgotStorage() = 0; + virtual int convertFromServerSlot(const int eAthenaSlot) const = 0; }; diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp index b1fad932a..cd4f0f2fd 100644 --- a/src/spellmanager.cpp +++ b/src/spellmanager.cpp @@ -399,6 +399,9 @@ void SpellManager::swap(const int id1, const int id2) { TextCommand *const spell1 = mSpells[id1]; TextCommand *const spell2 = mSpells[id2]; + if (!spell1 || !spell2) + return; + // swap in map mSpells[id1] = spell2; mSpells[id2] = spell1; |