diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-04-13 22:54:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-04-13 22:54:28 +0300 |
| commit | bcdf34645ff3067d3b4110120b6191af2b0b2e99 (patch) | |
| tree | 428493a138f0fdaebd4c915153f0dcdcbaedf76d | |
| parent | a93d1e06f928f6e4e1c7f3c58ddb7ae3676c1c63 (diff) | |
| parent | b64a1f46b930516927b1290c1d6771b491b84958 (diff) | |
| download | plus-bcdf34645ff3067d3b4110120b6191af2b0b2e99.tar.gz plus-bcdf34645ff3067d3b4110120b6191af2b0b2e99.tar.bz2 plus-bcdf34645ff3067d3b4110120b6191af2b0b2e99.tar.xz plus-bcdf34645ff3067d3b4110120b6191af2b0b2e99.zip | |
Merge branch 'master' into stable
104 files changed, 1079 insertions, 885 deletions
@@ -1,3 +1,11 @@ +2014-04-12 New release 1.4.4.12 +fix: possible crash. +fix: selection in dropdowns. +fix: redraw graphics on game window resize. +add: improve online list update speed. +add: slider step in char creation dialog. +add: improved gui draw speed. + 2014-03-29 New release 1.4.3.29 fix: memory leak on window resize. fix: crash with map layer patches. @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.4.3.29 Date: 2014-03-29 + Version: 1.4.4.12 Date: 2014-04-12 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 652fc44c2..b3529373f 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT
===============
- Version: 1.4.3.29 Date: 2014-03-29
+ Version: 1.4.4.12 Date: 2014-04-12
Development team:
- See AUTHORS file for a list
diff --git a/build/bmakedebug b/build/bmakedebug index 2254234d0..521d88f68 100755 --- a/build/bmakedebug +++ b/build/bmakedebug @@ -35,7 +35,8 @@ export CXXFLAGS="-ggdb3 -Og -pipe -ffast-math \ -Woverlength-strings -Wpedantic -Wsign-compare -Wsizeof-pointer-memaccess \ -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" +-Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -ftrapv \ +-fsched-pressure" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/bmake b/build/bmakemem index 0e6761bb7..2ffea4030 100755 --- a/build/bmake +++ b/build/bmakemem @@ -34,7 +34,8 @@ export CXXFLAGS="-ggdb3 -O2 -pipe -ffast-math \ -Woverlength-strings -Wpedantic -Wsign-compare -Wsizeof-pointer-memaccess \ -Wsuggest-attribute=format -Wtype-limits -Wuninitialized \ -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function \ --Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable" +-Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable \ +-fsched-pressure" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/bmakespeed b/build/bmakespeed index 5f182c815..56a563247 100755 --- a/build/bmakespeed +++ b/build/bmakespeed @@ -13,7 +13,7 @@ export CXXFLAGS="-ggdb3 -O5 -pipe -ffast-math \ -funswitch-loops -pedantic -Wall \ -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \ -funsafe-loop-optimizations -flto -fwhole-program \ --march=native" +-march=native -fsched-pressure" autoreconf -i ./configure --prefix=$dir/run \ diff --git a/build/packevol b/build/packevol index 464f241c0..60a4363cb 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.3.29" \ + -DPRODUCT_VERSION="1.4.4.12" \ -DEXESUFFIX=/src \ -DUPX=true \ evol.nsi diff --git a/build/packtmw b/build/packtmw index bc75db779..c6c04f06c 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.3.29" \ + -DPRODUCT_VERSION="1.4.4.12" \ -DEXESUFFIX=/src \ -DUPX=true \ tmw.nsi diff --git a/build/packwin b/build/packwin index ba4cc5f87..10961c2de 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.3.29" \ + -DPRODUCT_VERSION="1.4.4.12" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index 47680404f..d066deb51 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT([ManaPlus], [1.4.3.29], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.4.4.12], [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 655ad7b2b..0f755c381 100644 --- a/data/translations/help/ru.po +++ b/data/translations/help/ru.po @@ -1,6 +1,7 @@ # en# # Translators: # Alexandr Uspensky <AlexandrUSP@yandex.com>, 2012 +# Alexsl <alexlsh@mail.ru>, 2014 # Andrei Karas <akaras@inbox.ru>, 2012-2014 # BoBaH <BoBaH4spam@ukr.net>, 2012 # Dan Sagunov <danilka.pro@gmail.com>, 2012-2013 @@ -10,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" -"PO-Revision-Date: 2014-03-09 22:58+0000\n" -"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" +"PO-Revision-Date: 2014-04-07 12:22+0000\n" +"Last-Translator: Alexsl <alexlsh@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" @@ -23,7 +24,7 @@ msgid "/uploadserverconfig - upload server config into pastebin service." msgstr "" msgid "/atkhuman - select and attack nearest player." -msgstr "" +msgstr "/atkhuman - выбрать и атаковать ближайшего игрока." msgid "\"Outfit shortcut 12\"" msgstr "\"Наряд 12\"" @@ -39,7 +40,7 @@ msgstr "Вы можете имитировать других игроков, в msgid "" " - ##2allow trading##9: Do you wish to allow trade requests from arbitrary\n" " players?" -msgstr "" +msgstr "- ##2allow trading##9: Хотите ли вы принимать предложения о торговле\nот любых игроков?" msgid "\"Emote shortcut 9\"" msgstr "\"Смайл 9\"" @@ -68,7 +69,7 @@ msgid "Content devs" msgstr "Разработчики контента" msgid "Guild chat commands" -msgstr "" +msgstr "Команды чата гильдии" msgid "/away, /away MSG - set away mode." msgstr "/away, /away СООБЩЕНИЕ - установить режим отсутствия." @@ -83,13 +84,13 @@ msgid "\"Emote shortcut 2\"" msgstr "\"Смайл 2\"" msgid "/announce MESSAGE - show global message." -msgstr "" +msgstr "/announce MESSAGE - показать глобальное сообщение." msgid "/serverunignoreall - unignore all whispers on server side." msgstr "/serverunignoreall - отключить игнорирование всех\nприватных сообщений на сервере." msgid "/createparty NAME - create party with selected name." -msgstr "/createparty " +msgstr "/createparty NAME - создать группу с выбранным названием." msgid "/heal NICK - heal nick." msgstr "/heal ИГРОК - лечить игрока." @@ -112,7 +113,7 @@ msgid "/wait NAME - wait for nick or moster with name." msgstr "" msgid "##2Trade:##9 enables the ability to trade with others." -msgstr "" +msgstr "##2Trade:##9 включает возможность торговли с другими игроками." msgid "\"Use magic attack\"" msgstr "\"Использование магической атаки\"" @@ -164,7 +165,7 @@ msgid "\"Change move type\"" msgstr "\"Изменение типа движения\"" msgid "Tabs" -msgstr "" +msgstr "Вкладки" msgid "\"Outfit shortcut 4\"" msgstr "\"Наряд 4\"" @@ -180,13 +181,13 @@ msgid "Download" msgstr "Скачать" msgid "/dropn - drop N items from any slot." -msgstr "" +msgstr "/dropn - бросить N предметов из любого слота." msgid "/enableaway - enable away messages in current tab." msgstr "" msgid "/enemy NICK - add nick to enemyes list." -msgstr "" +msgstr "/enemy NICK - добавить ник в список врагов." msgid "Support" msgstr "Поддержка" @@ -213,13 +214,13 @@ msgid "" msgstr "/msg ИГРОК текст, /whisper ИГРОК текст, /w ИГРОК текст - шептать игроку." msgid "/movetotarget - move to target position." -msgstr "" +msgstr "/movetotarget - идти к целевой позиции." msgid "/outfit prev - wear previous outfit." msgstr "/outfit prev - надеть предыдущий костюм." msgid "##2Party level2:##9 enables a char to create a party." -msgstr "" +msgstr "##2Party level2:##9 позволяет персонажу создавать группу." msgid "/target NICK - select nick as target. Can be monster or player nick." msgstr "/target ИМЯ - выделить существо как цель. Может быть монстром или игроком." @@ -341,7 +342,7 @@ msgid "" msgstr " По любым вопросам об игре в первую очередь обратитесь к FAQ.\nЕсли не удается найти решение вопроса, то пожалуйста, обращайтесь\nв раздел Ошибок/Тех.поддержки (Bugs/Support) нашего форума:" msgid "/help - show this help." -msgstr "" +msgstr "/help - показать справку." msgid "\"Outfit shortcut 7\"" msgstr "\"Наряд 7\"" @@ -375,13 +376,13 @@ msgstr "" msgid "" " - ##2allow whispers##9: Do you wish to allow arbitrary players to send\n" " private messages to you in-game?" -msgstr "" +msgstr "- ##2allow whispers##9: Хотите ли вы разрешить любым игрокам отправлять\nвам личные сообщения?" msgid "\"Copy outfit\"" msgstr "\"Копировать наряд\"" msgid "/present - print visible players number to chat." -msgstr "" +msgstr "/present - вывести в чат количество игроков в области видимости." msgid "/dumpogl - dump all OpenGL variables into log file." msgstr "" @@ -459,7 +460,7 @@ msgid "\"Target player\"" msgstr "\"Выбор игрока\"" msgid "/invite NICK - invite a player to your party." -msgstr "" +msgstr "/invite NICK - пригласить игрока в свою группу." msgid "" " - ##2disregarded##9: You wish to disregard this player, meaning that his or\n" @@ -582,7 +583,7 @@ msgid "/emote N - use emotion number N." msgstr "/emote N - использовать эмоцию N." msgid "/item 0 - disable party item sharing options." -msgstr "" +msgstr "/item 0 - отключить общие предметы в группе." msgid "\"Target closest monster\"" msgstr "\"Прицел на ближайшего монстра\"" @@ -591,7 +592,7 @@ msgid "\"Outfits window\"" msgstr "\"Окно нарядов\"" msgid "Party chat commands" -msgstr "" +msgstr "Команды чата группы" msgid "" "You can walk to warps automatically.\n" @@ -655,7 +656,7 @@ msgid "/where - print current player position to chat." msgstr "/where - вывести текущее положение игрока в чат." msgid "/exp - show party experience sharing options." -msgstr "" +msgstr "/exp - показать настройки разделения опыта в группе." msgid "/dumpmods - dump all enabled mod names into chat." msgstr "" @@ -700,7 +701,7 @@ msgid "\"Attack\"" msgstr "\"Атака\"" msgid "/magicattack - attack target with magic." -msgstr "" +msgstr "/magicattack - атаковать цель с помощью магии." msgid "For ManaPlus Online support:" msgstr "" @@ -715,7 +716,7 @@ msgid "DOWNLOADS" msgstr "ЗАГРУЗКИ" msgid "/item 1 - enable party item sharing options." -msgstr "" +msgstr "/item 1 - включить общие предметы в группе." msgid "##9Magic skills can be obtain by doing quests and missions in game." msgstr "" @@ -736,7 +737,7 @@ msgid "\"Change pickup type\"" msgstr "\"Изменение типа подбора предметов\"" msgid "/item - show party item sharing options." -msgstr "" +msgstr "/item - показать настройки общих предметов в группе." msgid "move key" msgstr "\"Кнопка движения\"" @@ -745,7 +746,7 @@ msgid "\"Emote shortcut 5\"" msgstr "\"Смайл 5\"" msgid "/open URL - open url in browser." -msgstr "" +msgstr "/open URL - открыть url в браузере." msgid "" " The player list lists all of your acquaintances. They are categorised as one\n" @@ -815,7 +816,7 @@ msgid "" msgstr "" msgid "/url URL - insert url into chat." -msgstr "" +msgstr "/url URL - вставить url в чат." msgid "\"Help window\"" msgstr "\"Окно помощи\"" @@ -886,7 +887,7 @@ msgstr "\"Смайл 1\"" msgid "" " - ##2ignored##9: You wish to completely ignore this player. You will not\n" " even see floating text for him or her anymore, nor emotions." -msgstr "" +msgstr "- ##2ignored##9: Вы желаете полностью игнорировать этого игрока. Вы \nбольше не увидите у него/неё даже всплывающие сообщения и смайлы." msgid "/me text - send text to chat as /me command in irc." msgstr "/me текст - отправить текст в чат как командой /me в IRC" @@ -957,7 +958,7 @@ msgid "/createitems - open dialog for creating items." msgstr "" msgid "##2Party Level1:##9 enables a char to join a party." -msgstr "" +msgstr "##2Party Level1:##9 позволяет персонажу присоединяться к группе." msgid "\"Outfit shortcut 5\"" msgstr "\"Наряд 5\"" @@ -991,10 +992,10 @@ msgid "" msgstr "Все о желтой панели вы можете прочесть здесь:\n@@http://manaplus.org/yellowbar|http://manaplus.org/yellowbar@@" msgid "/drop - drop N items from 0 slot." -msgstr "" +msgstr "/drop - бросить N предметов из слота 0." msgid "/kick NICK - kick someone from the party you are in." -msgstr "" +msgstr "/kick NICK - выгнать кого либо из своей группы." msgid "\"Outfit shortcut 11\"" msgstr "\"Наряд 11\"" @@ -1027,7 +1028,7 @@ msgid "Art or images contributors" msgstr "Художники" msgid "/exp 0 - disable party experience sharing options." -msgstr "" +msgstr "/exp 0 - отключить разделение опыта в группе." msgid "Basic skills:" msgstr "Основные умения:" @@ -1036,7 +1037,7 @@ msgid "/uploadlog - upload log into pastebin service." msgstr "" msgid "/leave - leave the party you are in." -msgstr "" +msgstr "/leave - покинуть группу." msgid "\"Status window\"" msgstr "\"Окно статуса\"" @@ -1096,7 +1097,7 @@ msgid "\"Use #itenplz spell\"" msgstr "\"Использование заклинания #itenplz\"" msgid "/exp 1 - enable party experience sharing options." -msgstr "" +msgstr "/exp 1 - включить разделение опыта в группе." msgid "/undress NICK - remove all clothes from nick. Local effect only." msgstr "/undress NICK - снять всю одежду с NICK. Только местное действие." @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -52,12 +52,12 @@ msgid "miss" msgstr "minutí" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "I" @@ -2698,7 +2698,7 @@ msgstr "Page down" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2786,7 +2786,7 @@ msgstr "Smajlíci" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Chat" @@ -3128,107 +3128,107 @@ msgid "Sfx volume" msgstr "Hlasitost efektů" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Hlasitost hudby" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "Povolit vytlumení muziky" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "Frekvence zvuku" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "mono" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "stereo" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "surround" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "surround+center+lfe" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "Kanály zvuku" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "Zvukové efekty" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "Zvuk informačního dialogu" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "Zvuk požadavkového dialogu" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "Zvuk šeptané zprávy" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "Zvuk zprávy Gildy / Party" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "Zvuk zvýrazněné zprávy" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "Zvuk globálního oznámení" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "Zvuk chybového oznámení" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "Zvuk požadavku na obchod" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "Zvuk zobrazení okna" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "Zvuk zavření okna" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Povolit mumble hlasový chat" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Stáhnout hudbu" @@ -3687,7 +3687,7 @@ msgstr "Cyklovat zaměřená monstra" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Mapa" @@ -5365,19 +5365,19 @@ msgid "Enter password:" msgstr "Zadej heslo:" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Přítomni: %s; %d hráčů je přítomno." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Šeptání pro %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "mazlíček patřící %s" @@ -6659,27 +6659,27 @@ msgid "Show all news (can be slow)" msgstr "Zobrazit všecky novinky (může být pomalé)" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 Proces aktualizace není kompletní." #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 silně doporučujeme zkusit" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 aktualizaci později" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Hotovo" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Kdo je online - Obnovuji" @@ -6694,12 +6694,12 @@ msgid "Who Is Online - " msgstr "Kdo je online - " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Kdo je online - chyba" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Kdo je přihlášený - " @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -61,12 +61,12 @@ msgid "miss" msgstr "verfehlt" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "I" @@ -2708,7 +2708,7 @@ msgstr "Seite runter" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2796,7 +2796,7 @@ msgstr "Gefühle" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Chat" @@ -3138,107 +3138,107 @@ msgid "Sfx volume" msgstr "Lautstärke der Klangeffekte" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Lautstärke der Musik" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "Aktiviere Musik Fade-Out" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "Tonfrequenz" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "Mono" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "Stereo" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "Surround" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "Surround+Mittig+lfe" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "Tonkanäle" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "Geräuscheffekte" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "Informationsdialog-Geräusch" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "Anfragedialog-Geräusch" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "Flüsternachricht-Geräusch" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "Gilde/Gruppe-Nachrichten-Geräusch" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "Hebe Nachrichtengeräusch hervor" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "Globale-Nachricht-Geräusch" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "Fehlernachricht-Geräusch" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "Handelsanfrage-Geräusch" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "Fenster-anzeigen-Geräusch" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "Fenster-verbergen-Geräusch" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "\"mumble voice chat\" einschalten" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Lade Musik herunter" @@ -3697,7 +3697,7 @@ msgstr "Durch die Angriffsziele wechseln" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Karte" @@ -5368,19 +5368,19 @@ msgid "Enter password:" msgstr "Gib dein Passwort ein:" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Anwesend: %s ; %d Spieler sind anwesend." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Flüstern zu %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6665,27 +6665,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 Update wurde nicht erfolgreich abgeschlossen." #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 Es wird dringend empfohlen," #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 Du versuchst es später erneut." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Fertig" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Wer ist Online - Aktualisiere" @@ -6700,12 +6700,12 @@ msgid "Who Is Online - " msgstr "Wer ist Online " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Wer ist Online - Fehler" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Wer ist Online - Aktualisiere" @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" -"PO-Revision-Date: 2014-03-28 08:14+0000\n" -"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" +"POT-Creation-Date: 2014-04-13 03: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/" "language/es/)\n" "Language: es\n" @@ -57,12 +57,12 @@ msgid "miss" msgstr "falla" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "I" @@ -1606,19 +1606,19 @@ msgstr "Cambiar posición del gremio" #. TRANSLATORS: popup menu header #: src/gui/popups/popupmenu.cpp:852 msgid "window" -msgstr "" +msgstr "ventana" #. TRANSLATORS: popup menu item #. TRANSLATORS: unlock window #: src/gui/popups/popupmenu.cpp:867 msgid "Unlock" -msgstr "" +msgstr "Desbloquear" #. TRANSLATORS: popup menu item #. TRANSLATORS: lock window #: src/gui/popups/popupmenu.cpp:873 msgid "Lock" -msgstr "" +msgstr "Bloquear" #. TRANSLATORS: number of chars in string should be near original #: src/gui/popups/popupmenu.cpp:1374 @@ -2703,7 +2703,7 @@ msgstr "Page down" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2791,7 +2791,7 @@ msgstr "Emotes" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Chat" @@ -3133,107 +3133,107 @@ msgid "Sfx volume" msgstr "Volumen de efectos de sonido" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Volumen de música" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "Habilitar desvanecimiento en la música" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "Frequencia de Audio" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "mono" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "Estereo" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "surround" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "surround+center+lfe" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "Canales de Audio" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "Efectos de sonido" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "Sonido de diálogo de información" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "Sonido de diálogo de petición" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "Sonido de susurro" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "Sonido de mensajes de Gremio / Grupo" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "Sonido de mensaje resaltado" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "Sonido de mensaje global" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "Sonido de mensaje de error" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "Sonido de petición de intercambio" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "Mostrar ventana de sonido" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "Ocultar ventana de sonido" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Habilitar el chat de voz de mumble" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Descargar música" @@ -3693,7 +3693,7 @@ msgstr "Apuntar cíclicamente a los monstruos, no necesariamente al más cercano #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Mapa" @@ -3770,7 +3770,7 @@ msgstr "Corregir posición automáticamente" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_other.cpp:186 msgid "Show server side position" -msgstr "" +msgstr "Mostrar posición del lado del servidor" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_other.cpp:190 @@ -3964,7 +3964,7 @@ msgstr "Habilitar el ataque del lado del servidor" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_other.cpp:342 msgid "Hide support page link on error" -msgstr "" +msgstr "Ocultar enlace a página de soporte al ocurrir un error" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_other.cpp:346 @@ -4230,6 +4230,8 @@ msgstr "Usar velocidad diagonal especial en movimiento de jugadores" msgid "" "Emulate right mouse button by long mouse click (useful for touch interfaces)" msgstr "" +"Emular botón derecho del ratón al mantener clic presionado (útil para " +"interfaces táctiles)" #. TRANSLATORS: relations table header #. TRANSLATORS: bot checker window table header @@ -5375,19 +5377,19 @@ msgid "Enter password:" msgstr "Ingrese contraseña:" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jugadores están presentes." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Susurrando a %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "Mascota de %s" @@ -6672,27 +6674,27 @@ msgid "Show all news (can be slow)" msgstr "Mostrar todas las noticias (puede ser lento)" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 El proceso de actualización está incompleto." #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 Se recomienda encarecidamente que" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 lo intentes de nuevo más tarde." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Completado" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Quién está conectado - Actualizando" @@ -6707,12 +6709,12 @@ msgid "Who Is Online - " msgstr "Quién está conectado - " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Quién está conectado - error" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Quién está conectado - Actualizar" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -49,12 +49,12 @@ msgid "miss" msgstr "huti" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "P" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "-" @@ -2696,7 +2696,7 @@ msgstr "" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2784,7 +2784,7 @@ msgstr "" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Keskustelu" @@ -3126,107 +3126,107 @@ msgid "Sfx volume" msgstr "Äänitehosteiden voimakkuus" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Musiikin voimakkuus" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Ota muminaäänikeskustelu käyttöön" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Lataa musiikki" @@ -3685,7 +3685,7 @@ msgstr "Vaihda hirviökohteita syklissä" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Kartta" @@ -5349,19 +5349,19 @@ msgid "Enter password:" msgstr "Salasana:" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Läsnä: %s; %d pelaajaa paikalla." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Kuiskaat pelaajalle %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6641,27 +6641,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 Päivitysprosessi keskeytyi" #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 Suosittelemme vahvasti että" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 yrität myöhemmin uudelleen" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Valmis" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Kuka on linjoila - päivitän" @@ -6676,12 +6676,12 @@ msgid "Who Is Online - " msgstr "Kuka on linjoilla - " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Kuka on linjoilla - virhe" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Kuka on linjoilla - päivitä" @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" -"PO-Revision-Date: 2014-03-28 08:14+0000\n" -"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" +"POT-Creation-Date: 2014-04-13 03: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/" "fr/)\n" "Language: fr\n" @@ -57,12 +57,12 @@ msgid "miss" msgstr "raté" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "I" @@ -2706,7 +2706,7 @@ msgstr "Page suivante" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2794,7 +2794,7 @@ msgstr "Emoticônes" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Conversation" @@ -3136,107 +3136,107 @@ msgid "Sfx volume" msgstr "Volume des effets sonores" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Volume de la musique" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "Activer l'effacement de la musique" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "Fréquence audio" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "mono" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "stéréo" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "surround" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "surround+centre+lfe" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "Canaux audio" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "Effets de Son" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "Son des informations" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "Son des requêtes" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "Son des messages de chuchotements" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "Son des messages de Groupe / Guilde" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "Son des surlignages" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "Son des messages globaux" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "Son des messages d'erreur" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "Son des demandes d'échange" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "Afficher le son des fenêtres" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "Cacher le son des fenêtres" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Activer le chat avec mumble" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Télécharger la musique" @@ -3695,7 +3695,7 @@ msgstr "Sélectionner les monstres par ordre de distance" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Carte" @@ -3772,7 +3772,7 @@ msgstr "Auto-correction de position" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_other.cpp:186 msgid "Show server side position" -msgstr "" +msgstr "Afficher la position du côté du serveur" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_other.cpp:190 @@ -5379,19 +5379,19 @@ msgid "Enter password:" msgstr "Entrer le mot de passe :" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Présents : %s ; %d joueurs sont présents." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Message envoyé à %s : %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "%s du familier" @@ -6677,27 +6677,27 @@ msgid "Show all news (can be slow)" msgstr "Afficher toutes les nouvelles (peut être lent)" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 Le processus de mise à jour n'est pas achevé" #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 Il est fortement recommandé de" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 Essayes de nouveau plus tard." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Terminé" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Qui est en ligne - Mise à jour" @@ -6712,12 +6712,12 @@ msgid "Who Is Online - " msgstr "Qui est en ligne - " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Qui est en ligne - Erreur" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Qui est en ligne - Mise à jour" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -50,12 +50,12 @@ msgid "miss" msgstr "Luput" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "l" @@ -2695,7 +2695,7 @@ msgstr "" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2783,7 +2783,7 @@ msgstr "" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Obrolan" @@ -3125,107 +3125,107 @@ msgid "Sfx volume" msgstr "Volume sfx" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Volume Musik" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Perbolehkan gumaman obrolan suara" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Unduh musik" @@ -3682,7 +3682,7 @@ msgstr "Siklus target monster" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Peta" @@ -5345,19 +5345,19 @@ msgid "Enter password:" msgstr "Masukkan sandi" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Kehadiran: %s; %d pemain yang hadir." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Berbisik ke %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6635,27 +6635,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "" #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "" @@ -6670,12 +6670,12 @@ msgid "Who Is Online - " msgstr "" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "" @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -54,12 +54,12 @@ msgid "miss" msgstr "Mancato" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "I" @@ -2701,7 +2701,7 @@ msgstr "Page down" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2789,7 +2789,7 @@ msgstr "Faccine" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Chat" @@ -3131,107 +3131,107 @@ msgid "Sfx volume" msgstr "Volume effetti sonori" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Volume musica" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "Frequenza audio" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "mono" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "stereo" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "surround" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "Canali audio" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "Effetti sonori" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "Suono per il sussurro" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "Suono per i messaggi globali" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "Suono per gli errori" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "Suono per la richiesta di scambio" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "Mostra finestra dell'audio" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "Nascondi finestra dell'audio" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Abilita chat vocale mumble" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Scarica musica" @@ -3690,7 +3690,7 @@ msgstr "Ciclo di target sui nemici" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Mappa" @@ -5359,19 +5359,19 @@ msgid "Enter password:" msgstr "Digitare password:" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Presente: %s; %d giocatori sono presenti." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Sussurra a %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6653,27 +6653,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 L'aggiornamento è stato completato." #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 È fortemente raccomandato" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 riprova più tardi" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Completato" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Chi è online - Aggiornamento in corso" @@ -6688,12 +6688,12 @@ msgid "Who Is Online - " msgstr "Chi è online - " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Chi è online - errore" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Chi è online - aggiornamento" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -53,12 +53,12 @@ msgid "miss" msgstr "ミス" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "I" @@ -2698,7 +2698,7 @@ msgstr "ページ下へ" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2786,7 +2786,7 @@ msgstr "スマイリー" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "チャット" @@ -3128,107 +3128,107 @@ msgid "Sfx volume" msgstr "Sfx音量" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "音楽の音量" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "周波数を自動設定" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "モノ" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "ステレオ" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "サラウンド" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "自動チャンネル" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "音響効果" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "インフォメーションダイアログ音" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "リクエストダイアログ音" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "ささやきメッセージ音" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "ギルド/パーティメッセージ音" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "メッセージ音をハイライト" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "グローバルメッセージ音" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "エラーメッセージ音" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "トレードリクエスト音" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "窓の音を有効" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "窓の音を無効" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Mumble Voice Chatを有効にする" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "音楽をダウンロードする" @@ -3687,7 +3687,7 @@ msgstr "選択したモンスターを円で表示" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "マップ" @@ -5350,19 +5350,19 @@ msgid "Enter password:" msgstr "パスワードを入力して下さい:" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "現在: %s; %d プレイヤーがいます" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "%sにささやき中:%s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6642,27 +6642,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 アップデートは完了していません" #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 する事を強く推奨します" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 しばらくたってからもう一度試してください" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "完了" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "オンラインリスト - アップデート中" @@ -6677,12 +6677,12 @@ msgid "Who Is Online - " msgstr "オンラインリスト - " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "オンラインリスト - エラー" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "オンラインリスト - アップデート" diff --git a/po/manaplus.pot b/po/manaplus.pot index d05e0f098..f111efb4f 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-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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" @@ -47,12 +47,12 @@ msgid "miss" msgstr "" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "" @@ -2690,7 +2690,7 @@ msgstr "" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2778,7 +2778,7 @@ msgstr "" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "" @@ -3120,107 +3120,107 @@ msgid "Sfx volume" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "" @@ -3677,7 +3677,7 @@ msgstr "" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "" @@ -5340,19 +5340,19 @@ msgid "Enter password:" msgstr "" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6632,27 +6632,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "" #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "" @@ -6667,12 +6667,12 @@ msgid "Who Is Online - " msgstr "" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "" diff --git a/po/nl_BE.po b/po/nl_BE.po index 637ff995d..0a2a563b4 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-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -50,12 +50,12 @@ msgid "miss" msgstr "mist" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "I" @@ -2696,7 +2696,7 @@ msgstr "" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2784,7 +2784,7 @@ msgstr "" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Chat" @@ -3126,107 +3126,107 @@ msgid "Sfx volume" msgstr "Volume van geluiden" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Muziek volume" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Zet mumble voice chat aan" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Download muziek" @@ -3683,7 +3683,7 @@ msgstr "Doorloop monsterdoelwitten" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Map" @@ -5352,19 +5352,19 @@ msgid "Enter password:" msgstr "Geef wachtwoord:" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Aanwezig: %s; %d speler zijn aanwezig." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Fluisteren naar %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6646,27 +6646,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 Het updateproces is onvolledig." #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 Het is ten sterkste aanbevolen dat" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 probeer later opnieuw." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Voltooid" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Wie Is Online - Bijwerken" @@ -6681,12 +6681,12 @@ msgid "Who Is Online - " msgstr "Wie Is Online - " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Wie Is Online - fout" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Wie Is Online - Bijgewerkt" @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -53,12 +53,12 @@ msgid "miss" msgstr "Pudło!" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "I" @@ -2698,7 +2698,7 @@ msgstr "Page down" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2786,7 +2786,7 @@ msgstr "Emotki" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Czat" @@ -3128,107 +3128,107 @@ msgid "Sfx volume" msgstr "Głośność efektów dźwiękowych" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Głośność muzyki" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "Aktywuj ściszanie się muzyki" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "Częstotliwość audio" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "mono" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "stereo" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "surround" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "surround+center+lfe" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "Kanały audio" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "Efekty dźwiękowe" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "Dźwięk okienka informacyjnego" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "Dźwięk wzywania okienka" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "Dźwięk szeptów" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "Dźwięk wiadomości z gildii/ drużyny" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "Dźwięk podświetlanej wiadomości" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "Dźwięk globalnej wiadomości" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "Dźwięk wiadomosci o błędzie" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "Dźwięk powiadomienia o handlu" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "Pokaż okno dźwięku" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "Ukryj okno dźwięku" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Włącz integrację z Mumble" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Ściągnij muzykę" @@ -3687,7 +3687,7 @@ msgstr "Przewijaj namierzanie potworów" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Mapa" @@ -5360,19 +5360,19 @@ msgid "Enter password:" msgstr "Wprowadź hasło:" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "%s obecny/a. %d graczy online." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Szepczesz do %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6656,27 +6656,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 Proces aktualizacji jest niekompletny." #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 Jest mocno zalecane abyś" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 Spróbuj ponownie później." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Zakończono" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Kto jest online- aktualizacja" @@ -6691,12 +6691,12 @@ msgid "Who Is Online - " msgstr "Gracze online- " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Gracze online- błąd" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Gracze online- aktualizacja" @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -51,12 +51,12 @@ msgid "miss" msgstr "errou" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "l" @@ -2697,7 +2697,7 @@ msgstr "Page down" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2785,7 +2785,7 @@ msgstr "Emoções" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Chat" @@ -3127,107 +3127,107 @@ msgid "Sfx volume" msgstr "Volume Sfx" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Volume da Música" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "Habilitar desaparecimento gradual de música " #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "Frequência de Áudio" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "mono" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "stereo" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "surround" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "surround+center+lfe" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "Canais de áudio" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "Efeitos de som" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "Som do diálogo de informação" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "Som de pedidos" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "Som de mensagens de susurros" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "Som de mensagem de Guilda / Grupo " #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "Destacar som de mensagens" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "Som de mensagens globais" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "Som de mensagens de erro" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "Som de pedidos de troca" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "Mostrar som de janela" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "Ocultar som de janela" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Habilitar o chat de voz mumble \"requer aplicativo mumble\"" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Baixar músicas" @@ -3686,7 +3686,7 @@ msgstr "Alvo de monstros em ciclo" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Mapa" @@ -5358,19 +5358,19 @@ msgid "Enter password:" msgstr "Entre com a senha" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jogadores estão presentes." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Enviando MP para %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6651,27 +6651,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 O processo de update está incompleto." #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 É altamente recomendado que" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 tente novamente mais tarde." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Concluído" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" @@ -6686,12 +6686,12 @@ msgid "Who Is Online - " msgstr "Quem está online - " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Quem está online - Erro" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" diff --git a/po/pt_BR.po b/po/pt_BR.po index 8d51b40ce..55f85ba27 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-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -57,12 +57,12 @@ msgid "miss" msgstr "errou" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "I" @@ -2703,7 +2703,7 @@ msgstr "Page down" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2791,7 +2791,7 @@ msgstr "Emoções" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Chat" @@ -3133,107 +3133,107 @@ msgid "Sfx volume" msgstr "Volume Sfx" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Volume da Música" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "Habilitar desaparecimento gradual da música" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "Freqüência de áudio" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "mono" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "estereo" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "surrond" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "surrond+center+lfe" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "Canais de Áudio" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "Efeitos de som" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "Som de dialogo de informação" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "Requisitar som de dialogo" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "Som de mensagem de susurros" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "Som de mensagem Guilda / Grupo " #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "Destacar som de mensagem " #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "Som de anuncios globais" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "Som de mensagem de erro" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "Som de convites de troca" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "Mostrar som de janela" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "Ocultar som de janela" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Habilitar o chat de voz mumble (requer aplicativo mumble)" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Baixar músicas" @@ -3692,7 +3692,7 @@ msgstr "Alvo de monstros em ciclo" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Mapa" @@ -5365,19 +5365,19 @@ msgid "Enter password:" msgstr "Entre com a senha:" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Presentes: %s; %d jogadores estão presentes." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Enviando MP para %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6658,27 +6658,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 O processo de update está incompleto." #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 É altamente recomendado que" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 tente novamente mais tarde." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Concluído" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Quem está online - Atualizando" @@ -6693,12 +6693,12 @@ msgid "Who Is Online - " msgstr "Quem está online - " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Quem está online - Erro" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Quem está online - Atualizado" @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Alexsl <alexlsh@mail.ru>, 2013 +# Alexsl <alexlsh@mail.ru>, 2013-2014 # Andrei Karas <akaras@inbox.ru>, 2011-2014 # Александр Иванов <bio_editor@mail.ru>, 2013 # Александр Иванов <bio_editor@mail.ru>, 2013 @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" -"PO-Revision-Date: 2014-03-28 09:21+0000\n" -"Last-Translator: Andrei Karas <akaras@inbox.ru>\n" +"POT-Creation-Date: 2014-04-13 03: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/" "language/ru/)\n" "Language: ru\n" @@ -56,12 +56,12 @@ msgid "miss" msgstr "промах" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "О" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "Б" @@ -687,7 +687,7 @@ msgstr "%s не существует, и не может быть создано #: src/client.cpp:2219 #, c-format msgid "Invalid update host: %s." -msgstr "Некорректный сервер обновленмй: %s." +msgstr "Некорректный сервер обновлений: %s." #. TRANSLATORS: update server initialisation error #: src/client.cpp:2260 src/client.cpp:2267 @@ -939,7 +939,7 @@ msgstr "" #: src/dyetool/dyemain.cpp:49 msgid "dyecmd srcfile dyestring dstfile" -msgstr "dyecmd исходныйфайл строкацвета файлназначения" +msgstr "dyecmd исходный_файл строка_цвета файл_назначения" #: src/dyetool/dyemain.cpp:50 msgid "or" @@ -947,7 +947,7 @@ msgstr "или" #: src/dyetool/dyemain.cpp:51 msgid "dyecmd srcdyestring dstfile" -msgstr "dyecmd файлстрокацвета файлназначения" +msgstr "dyecmd файл_строка_цвета файл_назначения" #. TRANSLATORS: chat tab header #: src/game.cpp:270 src/gui/widgets/tabs/chattab.cpp:463 @@ -1359,7 +1359,7 @@ msgstr "Продать" #: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:376 #: src/gui/popups/popupmenu.cpp:2722 msgid "Add comment" -msgstr "Добавить коментарий" +msgstr "Добавить комментарий" #. TRANSLATORS: remove monster from attack list #. TRANSLATORS: popup menu item @@ -2704,7 +2704,7 @@ msgstr "Страница вниз" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2792,7 +2792,7 @@ msgstr "Смайлы" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Чат" @@ -3134,107 +3134,107 @@ msgid "Sfx volume" msgstr "Громкость эффектов" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Громкость музыки" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "Включить плавный переход музыки" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "Частота аудио" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "моно" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "стерео" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "окружение" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "окружение+центр+lfe" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "Аудио каналы" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "Звуковые эффекты" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "Звук информационного диалога" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "Звук вопроса" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" -msgstr "Звук криватного сообщения" +msgstr "Звук приватного сообщения" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "Звук сообщения в гильдии или группе" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "Звук подсветки" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "Звук глобального сообщения" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "Звук ошибки" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "Звук обмена" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "Звук открытия окна" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "Звук закрытия окна" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "Включить голосовой чат mumble" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Скачать музыку" @@ -3310,7 +3310,7 @@ msgstr "Включить лог чата" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_chat.cpp:100 msgid "Enable debug chat Log" -msgstr "Включить логирование чата отладки" +msgstr "Вести лог чата отладки" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_chat.cpp:104 @@ -3320,7 +3320,7 @@ msgstr "Показать историю чата" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_chat.cpp:108 msgid "Show party online messages" -msgstr "Показывать информацию о подкючениях в чате группы" +msgstr "Показывать информацию о подключениях в чате группы" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_chat.cpp:112 @@ -3651,12 +3651,12 @@ msgstr "выс." #. TRANSLATORS: screen density type #: src/gui/widgets/tabs/setup_other.cpp:83 msgid "xhigh" -msgstr "большой2" +msgstr "большой_2" #. TRANSLATORS: screen density type #: src/gui/widgets/tabs/setup_other.cpp:85 msgid "xxhigh" -msgstr "большой3" +msgstr "большой_3" #. TRANSLATORS: misc tab in settings #: src/gui/widgets/tabs/setup_other.cpp:95 @@ -3693,7 +3693,7 @@ msgstr "Прокручивать прицел по монстрам" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Карта" @@ -3891,7 +3891,7 @@ msgstr "NPC" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_other.cpp:276 msgid "Cycle npc targets" -msgstr "Прокручивать прицел по НИП" +msgstr "Прокручивать прицел по НИП (NPC)" #. TRANSLATORS: settings option #: src/gui/widgets/tabs/setup_other.cpp:280 @@ -4463,7 +4463,7 @@ msgstr "Безопасный шрифт" #. TRANSLATORS: theme settings label #: src/gui/widgets/tabs/setup_theme.cpp:243 msgid "Npc font" -msgstr "Шрифт НИП" +msgstr "Шрифт НИП (NPC)" #. TRANSLATORS: theme settings label #: src/gui/widgets/tabs/setup_theme.cpp:247 @@ -4618,7 +4618,7 @@ msgstr "Найти лучший режим" #. TRANSLATORS: video settings checkbox #: src/gui/widgets/tabs/setup_video.cpp:211 msgid "Show cursor" -msgstr "Показывать курсов" +msgstr "Показывать курсор" #. TRANSLATORS: video settings checkbox #: src/gui/widgets/tabs/setup_video.cpp:214 @@ -5132,7 +5132,7 @@ msgstr "Новый адрес email должен содержать не мен #: src/gui/windows/changeemaildialog.cpp:147 #, c-format msgid "The new email address needs to be less than %u characters long." -msgstr "Пароль должен содержать менее %u символов." +msgstr "Новый адрес email должен содержать не более %u символов." #. TRANSLATORS: change email error #: src/gui/windows/changeemaildialog.cpp:155 @@ -5178,7 +5178,7 @@ msgstr "Пароль должен содержать не менее %u симв #: src/gui/windows/changepassworddialog.cpp:135 #, c-format msgid "The new password needs to be less than %u characters long." -msgstr "Пароль не должен содержать не более %u символов." +msgstr "Пароль должен содержать не более %u символов." #. TRANSLATORS: change password error #: src/gui/windows/changepassworddialog.cpp:143 @@ -5373,19 +5373,19 @@ msgid "Enter password:" msgstr "Введите пароль:" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Присутствуют: %s; Всего %d игроков." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "Вы прошептали %s: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "животное %s'а" @@ -5496,7 +5496,7 @@ msgstr "%d FPS (мобильный OpenGL)" #: src/gui/windows/debugwindow.cpp:229 #, c-format msgid "%d FPS (SDL2 default)" -msgstr "%d FPS (SDL2 поумолчанию)" +msgstr "%d FPS (SDL2 по_умолчанию)" #. TRANSLATORS: debug window label #: src/gui/windows/debugwindow.cpp:254 src/gui/windows/debugwindow.cpp:324 @@ -6669,27 +6669,27 @@ msgid "Show all news (can be slow)" msgstr "Показать все новости (может быть медленным)" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 Процесс обновления не завершен." #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 Настоятельно рекомендуется" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 попытаться еще раз немного погодя." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Завершено" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Кто онлайн - обновление" @@ -6704,12 +6704,12 @@ msgid "Who Is Online - " msgstr "Кто онлайн - " #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Кто онлайн - ошибка" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Кто онлайн - обновление" @@ -7590,7 +7590,7 @@ msgstr "%s покинул Вашу гильдию." #. TRANSLATORS: notification message #: src/notifications.h:188 msgid "You were kicked from guild." -msgstr "Вы были кикнуты из гильдии." +msgstr "Вас выгнали из гильдии." #. TRANSLATORS: notification message #: src/notifications.h:191 @@ -7830,7 +7830,7 @@ msgstr "Программно" #: src/render/rendererslistsdl2.h:47 src/render/rendererslistsdl2.h:81 #: src/render/rendererslistsdl2.h:118 msgid "SDL2 default" -msgstr "SDL2 поумолчанию" +msgstr "SDL2 по_умолчанию" #. TRANSLATORS: draw backend #: src/render/rendererslistsdl2.h:49 src/render/rendererslistsdl2.h:87 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: ManaPlus\n" "Report-Msgid-Bugs-To: akaras@inbox.ru\n" -"POT-Creation-Date: 2014-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -50,12 +50,12 @@ msgid "miss" msgstr "ıskalandı" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "" @@ -2696,7 +2696,7 @@ msgstr "" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2784,7 +2784,7 @@ msgstr "" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "Sohbet" @@ -3126,107 +3126,107 @@ msgid "Sfx volume" msgstr "SFX ses seviyesi" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "Müzik ses seviyesi" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "Lonca / Grup mesaj sesi" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "Takas isteği sesi" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "mumble sesli sohbeti etkinleştir" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "Müziği indir" @@ -3686,7 +3686,7 @@ msgstr "Canavar hedeflerini sırayla değiştir" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "Harita" @@ -5349,19 +5349,19 @@ msgid "Enter password:" msgstr "" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "Mevcut: %s; %d oyuncu mevcut." #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "%s 'e fısıldanıyor: %s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6643,27 +6643,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 Güncelleme işlemi tamamlanamadı." #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 Şiddetle tavsiye edilir ki" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "##1 daha sonra tekrar deneyiniz." #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "Tamamlandı" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "Kimler Online - Güncelleniyor" @@ -6678,12 +6678,12 @@ msgid "Who Is Online - " msgstr "Kimler Online -" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "Kimler Online - hata" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "Kimler Online - Güncelle" diff --git a/po/zh_CN.po b/po/zh_CN.po index 8752cff98..71f79778f 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-03-29 13:57+0300\n" +"POT-Creation-Date: 2014-04-13 03: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/" @@ -52,12 +52,12 @@ msgid "miss" msgstr "失误" #. TRANSLATORS: this away status writed in player nick -#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:838 +#: src/being/being.cpp:1794 src/gui/windows/whoisonline.cpp:839 msgid "A" msgstr "A" #. TRANSLATORS: this inactive status writed in player nick -#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:843 +#: src/being/being.cpp:1799 src/gui/windows/whoisonline.cpp:844 msgid "I" msgstr "I" @@ -2694,7 +2694,7 @@ msgstr "" #. TRANSLATORS: char create dialog button #. TRANSLATORS: register dialog. button. #: src/gui/setupactiondata.h:1876 src/gui/setupactiondata.h:2021 -#: src/gui/widgets/tabs/setup_audio.cpp:147 +#: src/gui/widgets/tabs/setup_audio.cpp:149 #: src/gui/widgets/tabs/setup_chat.cpp:180 #: src/gui/widgets/tabs/setup_other.cpp:335 #: src/gui/widgets/tabs/setup_visual.cpp:190 @@ -2782,7 +2782,7 @@ msgstr "" #. TRANSLATORS: settings tab name #. TRANSLATORS: chat window name #: src/gui/setupactiondata.h:2019 src/gui/widgets/tabs/setup_chat.cpp:41 -#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:154 +#: src/gui/windowmenu.cpp:85 src/gui/windows/chatwindow.cpp:156 msgid "Chat" msgstr "聊天" @@ -3124,107 +3124,107 @@ msgid "Sfx volume" msgstr "音效声量" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:79 +#: src/gui/widgets/tabs/setup_audio.cpp:80 msgid "Music volume" msgstr "音乐声量" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:83 +#: src/gui/widgets/tabs/setup_audio.cpp:85 msgid "Enable music fade out" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:87 +#: src/gui/widgets/tabs/setup_audio.cpp:89 msgid "Audio frequency" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:91 +#: src/gui/widgets/tabs/setup_audio.cpp:93 msgid "mono" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:93 +#: src/gui/widgets/tabs/setup_audio.cpp:95 msgid "stereo" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:95 +#: src/gui/widgets/tabs/setup_audio.cpp:97 msgid "surround" msgstr "" #. TRANSLATORS: audio type -#: src/gui/widgets/tabs/setup_audio.cpp:97 +#: src/gui/widgets/tabs/setup_audio.cpp:99 msgid "surround+center+lfe" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:99 +#: src/gui/widgets/tabs/setup_audio.cpp:101 msgid "Audio channels" msgstr "" #. TRANSLATORS: settings group -#: src/gui/widgets/tabs/setup_audio.cpp:104 +#: src/gui/widgets/tabs/setup_audio.cpp:106 msgid "Sound effects" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:107 +#: src/gui/widgets/tabs/setup_audio.cpp:109 msgid "Information dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:111 +#: src/gui/widgets/tabs/setup_audio.cpp:113 msgid "Request dialog sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:115 +#: src/gui/widgets/tabs/setup_audio.cpp:117 msgid "Whisper message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:119 +#: src/gui/widgets/tabs/setup_audio.cpp:121 msgid "Guild / Party message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:123 +#: src/gui/widgets/tabs/setup_audio.cpp:125 msgid "Highlight message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:127 +#: src/gui/widgets/tabs/setup_audio.cpp:129 msgid "Global message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:131 +#: src/gui/widgets/tabs/setup_audio.cpp:133 msgid "Error message sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:135 +#: src/gui/widgets/tabs/setup_audio.cpp:137 msgid "Trade request sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:139 +#: src/gui/widgets/tabs/setup_audio.cpp:141 msgid "Show window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:143 +#: src/gui/widgets/tabs/setup_audio.cpp:145 msgid "Hide window sound" msgstr "" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:151 +#: src/gui/widgets/tabs/setup_audio.cpp:153 msgid "Enable mumble voice chat" msgstr "启用语音聊天" #. TRANSLATORS: settings option -#: src/gui/widgets/tabs/setup_audio.cpp:156 +#: src/gui/widgets/tabs/setup_audio.cpp:158 msgid "Download music" msgstr "下载音乐" @@ -3681,7 +3681,7 @@ msgstr "" #. TRANSLATORS: mini map window name #: src/gui/widgets/tabs/setup_other.cpp:127 src/gui/windowmenu.cpp:102 #: src/gui/windows/debugwindow.cpp:73 src/gui/windows/minimap.cpp:52 -#: src/gui/windows/minimap.cpp:114 +#: src/gui/windows/minimap.cpp:118 msgid "Map" msgstr "地图" @@ -5344,19 +5344,19 @@ msgid "Enter password:" msgstr "输入密码：" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:703 +#: src/gui/windows/chatwindow.cpp:701 #, c-format msgid "Present: %s; %d players are present." msgstr "" #. TRANSLATORS: chat message -#: src/gui/windows/chatwindow.cpp:1135 +#: src/gui/windows/chatwindow.cpp:1133 #, c-format msgid "Whispering to %s: %s" msgstr "对%s密语到：%s" #. TRANSLATORS: owners pet name. For example: 4144's pet -#: src/gui/windows/chatwindow.cpp:1579 +#: src/gui/windows/chatwindow.cpp:1577 #, c-format msgid "%s's pet" msgstr "" @@ -6634,27 +6634,27 @@ msgid "Show all news (can be slow)" msgstr "" #. TRANSLATORS: update message -#: src/gui/windows/updaterwindow.cpp:758 +#: src/gui/windows/updaterwindow.cpp:766 msgid "##1 The update process is incomplete." msgstr "##1 更新过程不完整。" #. TRANSLATORS: Continues "The update process is incomplete.". -#: src/gui/windows/updaterwindow.cpp:760 +#: src/gui/windows/updaterwindow.cpp:768 msgid "##1 It is strongly recommended that" msgstr "##1 强烈建议" #. TRANSLATORS: Begins "It is strongly recommended that". -#: src/gui/windows/updaterwindow.cpp:762 +#: src/gui/windows/updaterwindow.cpp:770 msgid "##1 you try again later." msgstr "" #. TRANSLATORS: updater window label -#: src/gui/windows/updaterwindow.cpp:940 +#: src/gui/windows/updaterwindow.cpp:948 msgid "Completed" msgstr "已完成" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:616 +#: src/gui/windows/whoisonline.cpp:81 src/gui/windows/whoisonline.cpp:617 msgid "Who Is Online - Updating" msgstr "谁在线 - 更新" @@ -6669,12 +6669,12 @@ msgid "Who Is Online - " msgstr "谁在线 -" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:631 +#: src/gui/windows/whoisonline.cpp:632 msgid "Who Is Online - error" msgstr "谁在线 - 错误" #. TRANSLATORS: who is online window name -#: src/gui/windows/whoisonline.cpp:673 +#: src/gui/windows/whoisonline.cpp:674 msgid "Who Is Online - Update" msgstr "谁在线 - 更新" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 961fb7abd..20500cdcb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -726,6 +726,7 @@ SET(SRCS render/graphics_drawImageRect.hpp render/nullopenglgraphics.cpp render/nullopenglgraphics.h + render/opengldebug.h render/openglgraphicsdef.hpp render/openglgraphicsdefadvanced.hpp render/renderers.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 942ac7244..72a28fb0b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -806,6 +806,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ render/graphics_drawImageRect.hpp \ render/nullopenglgraphics.cpp \ render/nullopenglgraphics.h \ + render/opengldebug.h \ render/openglgraphicsdef.hpp \ render/openglgraphicsdefadvanced.hpp \ render/renderers.cpp \ diff --git a/src/being/being.cpp b/src/being/being.cpp index be4d8b903..621b61d02 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -1668,7 +1668,7 @@ void Being::drawSpeech(const int offsetX, const int offsetY) // Draw speech above this being if (mSpeechTime == 0) { - if (mSpeechBubble->isVisible()) + if (mSpeechBubble->isVisibleLocal()) mSpeechBubble->setVisible(false); } else if (mSpeechTime > 0 && (speech == NAME_IN_BUBBLE || @@ -2003,7 +2003,7 @@ void Being::setSprite(const unsigned int slot, const int id, else { const ItemInfo &info = ItemDB::get(id); - const std::string filename = info.getSprite(mGender, mSubType); + const std::string &filename = info.getSprite(mGender, mSubType); AnimatedSprite *equipmentSprite = nullptr; if (!isTempSprite && mType == PLAYER) diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index c774b985b..b75ee0ebd 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -3639,7 +3639,7 @@ void LocalPlayer::checkNewName(Being *const being) if (!being) return; - const std::string nick = being->getName(); + const std::string &nick = being->getName(); if (being->getType() == ActorSprite::PLAYER) { const Guild *const guild = getGuild(); diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp index 4404791ca..06815baeb 100644 --- a/src/being/playerrelations.cpp +++ b/src/being/playerrelations.cpp @@ -586,7 +586,7 @@ bool PlayerRelationsManager::isGoodName(Being *const being) const if (being->getGoodStatus() != -1) return (being->getGoodStatus() == 1); - const std::string name = being->getName(); + const std::string &name = being->getName(); const size_t size = name.size(); if (size < 3) diff --git a/src/client.cpp b/src/client.cpp index 9aded7682..9b5f2c956 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1282,7 +1282,7 @@ int Client::gameExec() theme->setMinimumOpacity(0.8F); loginData.updateType - = serverConfig.getValue("updateType", 1); + = serverConfig.getValue("updateType", 0); mSearchHash = Net::Download::adlerBuffer( const_cast<char*>(mCurrentServer.hostname.c_str()), diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index b40f8df57..30d50340a 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -816,6 +816,42 @@ void GraphicsManager::initOpenGLFunctions() mSupportDebug = 0; } + if (supportExtension("GL_GREMEDY_frame_terminator")) + { + logger->log1("found GL_GREMEDY_frame_terminator"); + assignFunction(glFrameTerminator, "glFrameTerminatorGREMEDY"); + } + if (supportExtension("GL_EXT_debug_label")) + { + logger->log1("found GL_EXT_debug_label"); + assignFunction(glLabelObject, "glLabelObjectEXT"); + if (!mglLabelObject) + assignFunction(glLabelObject, "glLabelObject"); + if (!mglLabelObject) + assignFunction(glLabelObject, "glObjectLabel"); + assignFunction(glGetObjectLabel, "glGetObjectLabelEXT"); + if (!mglGetObjectLabel) + assignFunction(glGetObjectLabel, "glGetObjectLabel"); + } + if (supportExtension("GL_GREMEDY_string_marker")) + { + logger->log1("found GL_GREMEDY_string_marker"); + assignFunction(glPushGroupMarker, "glStringMarkerGREMEDY"); + } + else if (supportExtension("GL_EXT_debug_marker")) + { + logger->log1("found GL_EXT_debug_marker"); + assignFunction(glInsertEventMarker, "glInsertEventMarkerEXT"); + if (!mglInsertEventMarker) + assignFunction(glInsertEventMarker, "glInsertEventMarker"); + assignFunction(glPushGroupMarker, "glPushGroupMarkerEXT"); + if (!mglPushGroupMarker) + assignFunction(glPushGroupMarker, "glPushGroupMarker"); + assignFunction(glPopGroupMarker, "glPopGroupMarkerEXT"); + if (!mglPopGroupMarker) + assignFunction(glPopGroupMarker, "glPopGroupMarker"); + } + #ifdef WIN32 assignFunction(wglGetExtensionsString, "wglGetExtensionsStringARB"); #endif diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 9a50583b9..4ad1138eb 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -535,6 +535,8 @@ void Gui::videoResized() const top->setSize(mainGraphics->mWidth, mainGraphics->mHeight); top->adjustAfterResize(oldWidth, oldHeight); } + + Widget::distributeWindowResizeEvent(); } void Gui::setUseCustomCursor(const bool customCursor) @@ -1301,6 +1303,7 @@ void Gui::distributeKeyEvent(KeyEvent &event) const void Gui::distributeKeyEventToGlobalKeyListeners(KeyEvent& event) { + BLOCK_START("Gui::distributeKeyEventToGlobalKeyListeners") const unsigned int eventType = event.getType(); FOR_EACH (KeyListenerListIterator, it, mKeyListeners) { @@ -1319,6 +1322,7 @@ void Gui::distributeKeyEventToGlobalKeyListeners(KeyEvent& event) if (event.isConsumed()) break; } + BLOCK_END("Gui::distributeKeyEventToGlobalKeyListeners") } void Gui::handleModalMouseInputFocus() diff --git a/src/gui/models/iconsmodel.h b/src/gui/models/iconsmodel.h index c3031169c..b462f8a23 100644 --- a/src/gui/models/iconsmodel.h +++ b/src/gui/models/iconsmodel.h @@ -48,7 +48,7 @@ class IconsModel final : public ListModel continue; const ItemInfo &info = (*i->second); - const std::string name = info.getName(); + const std::string &name = info.getName(); if (name != "unnamed" && !info.getName().empty() && info.getName() != "unnamed") { diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h index 808ae0f04..83d9f0776 100644 --- a/src/gui/models/itemsmodel.h +++ b/src/gui/models/itemsmodel.h @@ -50,7 +50,7 @@ class ItemsModal final : public ListModel continue; const ItemInfo &info = *i->second; - const std::string name = info.getName(); + const std::string &name = info.getName(); if (name != "unnamed" && !info.getName().empty() && info.getName() != "unnamed") { diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 330df1a6c..c8416f66d 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -814,7 +814,7 @@ void PopupMenu::showChangePos(const int x, const int y) const Guild *const guild = player_node->getGuild(); if (guild) { - const PositionsMap map = guild->getPositions(); + const PositionsMap &map = guild->getPositions(); FOR_EACH (PositionsMap::const_iterator, itr, map) { mBrowserBox->addRow(strprintf("@@guild-pos-%u|%s@@", @@ -2164,7 +2164,7 @@ void PopupMenu::showPopup(const int x, const int y, Button *const button) if (!btn || btn->getActionEventId() == "SET") continue; - if (btn->isVisible()) + if (btn->isVisibleLocal()) { mBrowserBox->addRow(strprintf("@@hide button_%s|%s %s (%s)@@", // TRANSLATORS: popup menu item @@ -2209,7 +2209,7 @@ void PopupMenu::showPopup(const int x, const int y, const ProgressBar *const b) if (!bar) continue; - if (bar->isVisible()) + if (bar->isVisibleLocal()) { cnt ++; onlyBar = bar; @@ -2225,7 +2225,7 @@ void PopupMenu::showPopup(const int x, const int y, const ProgressBar *const b) if (!bar || bar == onlyBar) continue; - if (bar->isVisible()) + if (bar->isVisibleLocal()) { mBrowserBox->addRow(strprintf("@@hide bar_%s|%s %s@@", // TRANSLATORS: popup menu item diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 6fa007e06..1b1955647 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -1126,6 +1126,19 @@ void Theme::loadColors(std::string file) } } +#define loadGrid() \ + { \ + const ImageRect &rect = skin->getBorder(); \ + for (int f = start; f <= end; f ++) \ + { \ + if (rect.grid[f]) \ + { \ + image.grid[f] = rect.grid[f]; \ + image.grid[f]->incRef(); \ + } \ + } \ + } + void Theme::loadRect(ImageRect &image, const std::string &name, const std::string &name2, @@ -1135,15 +1148,7 @@ void Theme::loadRect(ImageRect &image, Skin *const skin = load(name, name2, false); if (skin) { - const ImageRect &rect = skin->getBorder(); - for (int f = start; f <= end; f ++) - { - if (rect.grid[f]) - { - image.grid[f] = rect.grid[f]; - image.grid[f]->incRef(); - } - } + loadGrid(); unload(skin); } } @@ -1156,17 +1161,7 @@ Skin *Theme::loadSkinRect(ImageRect &image, { Skin *const skin = load(name, name2); if (skin) - { - const ImageRect &rect = skin->getBorder(); - for (int f = start; f <= end; f ++) - { - if (rect.grid[f]) - { - image.grid[f] = rect.grid[f]; - image.grid[f]->incRef(); - } - } - } + loadGrid(); return skin; } diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index df97a5673..46d47ab4a 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -276,6 +276,7 @@ void Viewport::logic() void Viewport::followMouse() { + return; if (!gui) return; const uint8_t button = Gui::getMouseState(&mMouseX, &mMouseY); @@ -667,7 +668,10 @@ void Viewport::walkByMouse(const MouseEvent &event) void Viewport::mouseDragged(MouseEvent &event) { if (event.getSource() != this || event.isConsumed()) + { + mPlayerFollowMouse = false; return; + } if (mMouseClicked) { if (abs(event.getX() - mMousePressX) > 32 @@ -879,13 +883,16 @@ void Viewport::mouseMoved(MouseEvent &event A_UNUSED) if (!mMap || !player_node || !actorManager) return; + if (mMouseDirectionMove) + mPlayerFollowMouse = false; + const int x = mMouseX + mPixelViewX; const int y = mMouseY + mPixelViewY; ActorSprite::Type type = ActorSprite::UNKNOWN; + mHoverBeing = actorManager->findBeingByPixel(x, y, true); if (mHoverBeing) type = mHoverBeing->getType(); - mHoverBeing = actorManager->findBeingByPixel(x, y, true); if (mHoverBeing && (type == Being::PLAYER || type == Being::NPC diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 9411c2249..ecb92f876 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -99,13 +99,16 @@ void AvatarListBox::draw(Graphics *graphics) return; } + const Widget *const parent = mParent; + if (!parent) + return; + AvatarListModel *const model = static_cast<AvatarListModel *const>( mListModel); updateAlpha(); Font *const font = getFont(); const int fontHeight = getFont()->getHeight(); - const Widget *const parent = mParent; const std::string name = player_node->getName(); // Draw the list elements @@ -155,7 +158,7 @@ void AvatarListBox::draw(Graphics *graphics) a->getHp(), a->getMaxHp()); } const bool isPoison = a->getPoison(); - if (a->getMaxHp() && (isPoison || parent)) + if (a->getMaxHp()) { const int themeColor = (isPoison ? Theme::PROG_HP_POISON : Theme::PROG_HP); @@ -182,28 +185,25 @@ void AvatarListBox::draw(Graphics *graphics) a->getDamageHp()); } - if (parent) - { - const int themeColor = (a->getPoison() - ? Theme::PROG_HP_POISON : Theme::PROG_HP); - Color color = Theme::getProgressColor(themeColor, 1); - color.a = 80; - graphics->setColor(color); - graphics->fillRectangle(Rect(mPadding, y + mPadding, - parent->getWidth() * a->getDamageHp() / 1024 - - 2 * mPadding, fontHeight)); + const int themeColor = (a->getPoison() + ? Theme::PROG_HP_POISON : Theme::PROG_HP); + Color color = Theme::getProgressColor(themeColor, 1); + color.a = 80; + graphics->setColor(color); + graphics->fillRectangle(Rect(mPadding, y + mPadding, + parent->getWidth() * a->getDamageHp() / 1024 + - 2 * mPadding, fontHeight)); - if (a->getLevel() > 1) - { - graphics->setColor(mForegroundColor); - int minHp = 40 + ((a->getLevel() - 1) * 5); - if (minHp < 0) - minHp = 40; - - graphics->drawLine(parent->getWidth()*minHp / 1024 - + mPadding, y + mPadding, - parent->getWidth() * minHp / 1024, y + fontHeight); - } + if (a->getLevel() > 1) + { + graphics->setColor(mForegroundColor); + int minHp = 40 + ((a->getLevel() - 1) * 5); + if (minHp < 0) + minHp = 40; + + graphics->drawLine(parent->getWidth()*minHp / 1024 + + mPadding, y + mPadding, + parent->getWidth() * minHp / 1024, y + fontHeight); } } else @@ -307,8 +307,7 @@ void AvatarListBox::draw(Graphics *graphics) if (useCaching) graphics->drawTileCollection(&vertexes); - if (parent) - setWidth(parent->getWidth() - 10); + setWidth(parent->getWidth() - 10); BLOCK_END("AvatarListBox::draw") } diff --git a/src/gui/widgets/basiccontainer.cpp b/src/gui/widgets/basiccontainer.cpp index 00386a725..4803373f2 100644 --- a/src/gui/widgets/basiccontainer.cpp +++ b/src/gui/widgets/basiccontainer.cpp @@ -298,7 +298,7 @@ void BasicContainer::drawChildren(Graphics* graphics) FOR_EACH (WidgetListConstIterator, iter, mWidgets) { Widget *const widget = *iter; - if (widget->isVisible()) + if (widget->isVisibleLocal()) { // If the widget has a frame, // draw it before drawing the widget diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 054a338aa..b1f41e23e 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -127,7 +127,6 @@ Button::Button(const Widget2 *const widget) : mYOffset(0), mImageWidth(0), mImageHeight(0), - mRedraw(true), mStick(false), mPressed(false) { @@ -169,7 +168,6 @@ Button::Button(const Widget2 *const widget, mYOffset(0), mImageWidth(0), mImageHeight(0), - mRedraw(true), mStick(false), mPressed(false) { @@ -217,7 +215,6 @@ Button::Button(const Widget2 *const widget, mYOffset(0), mImageWidth(imageWidth), mImageHeight(imageHeight), - mRedraw(true), mStick(false), mPressed(false) { @@ -265,7 +262,6 @@ Button::Button(const Widget2 *const widget, mYOffset(0), mImageWidth(imageWidth), mImageHeight(imageHeight), - mRedraw(true), mStick(false), mPressed(false) { @@ -313,7 +309,6 @@ Button::Button(const Widget2 *const widget, mYOffset(0), mImageWidth(0), mImageHeight(0), - mRedraw(true), mStick(false), mPressed(false) { diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index 57a024195..015faf009 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -335,7 +335,6 @@ class Button final : public Widget, int mYOffset; int mImageWidth; int mImageHeight; - bool mRedraw; bool mStick; bool mPressed; }; diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 06dcecab0..765ff13ec 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -189,7 +189,7 @@ void CheckBox::drawBox(Graphics *const graphics) const ImageRect &rect = mSkin->getBorder(); int index = 0; - if (mEnabled && isVisible()) + if (mEnabled && mVisible) { if (mSelected) { diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 6ae892c81..3e77a65a5 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -28,6 +28,8 @@ #include "input/inputmanager.h" +#include "render/opengldebug.h" + #include "resources/image.h" #include "resources/imagehelper.h" #include "resources/resourcemanager.h" @@ -111,6 +113,7 @@ void Desktop::widgetResized(const Event &event A_UNUSED) void Desktop::draw(Graphics *graphics) { BLOCK_START("Desktop::draw") + GLDEBUG_START("Desktop::draw") const Rect &rect = mDimension; const int width = rect.width; @@ -144,6 +147,7 @@ void Desktop::draw(Graphics *graphics) } Container::draw(graphics); + GLDEBUG_END() BLOCK_END("Desktop::draw") } diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp index 789d3e1aa..cbdd50cab 100644 --- a/src/gui/widgets/emotepage.cpp +++ b/src/gui/widgets/emotepage.cpp @@ -42,8 +42,7 @@ EmotePage::EmotePage(const Widget2 *const widget) : mEmotes(ResourceManager::getInstance()->getImageSet( "graphics/sprites/chatemotes.png", emoteWidth, emoteHeight)), mVertexes(new ImageCollection), - mSelectedIndex(-1), - mRedraw(true) + mSelectedIndex(-1) { addMouseListener(this); addWidgetListener(this); diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h index 769e004bc..6aca546ca 100644 --- a/src/gui/widgets/emotepage.h +++ b/src/gui/widgets/emotepage.h @@ -58,7 +58,6 @@ class EmotePage final : public Widget, ImageSet *mEmotes; ImageCollection *mVertexes; int mSelectedIndex; - bool mRedraw; }; #endif // GUI_WIDGETS_EMOTEPAGE_H diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index c41e32854..341204505 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -275,7 +275,7 @@ void ListBox::mouseWheelMovedDown(MouseEvent &event A_UNUSED) void ListBox::mousePressed(MouseEvent &event) { mPressedIndex = getSelectionByMouse(event.getY()); - if (mPressedIndex != -1) + if (mMouseConsume && mPressedIndex != -1) event.consume(); } diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 2116de113..3c10a721f 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -43,8 +43,7 @@ Popup::Popup(const std::string &name, mMinHeight(40), mMaxWidth(mainGraphics->mWidth), mMaxHeight(mainGraphics->mHeight), - mVertexes(new ImageCollection), - mRedraw(true) + mVertexes(new ImageCollection) { logger->log("Popup::Popup(\"%s\")", name.c_str()); diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 01247cf61..5067b4658 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -187,7 +187,6 @@ class Popup : public Container, int mMaxHeight; /**< Maximum popup height */ ImageCollection *mVertexes; - bool mRedraw; }; #endif // GUI_WIDGETS_POPUP_H diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp index fa0616fd2..c203f59c6 100644 --- a/src/gui/widgets/popuplist.cpp +++ b/src/gui/widgets/popuplist.cpp @@ -43,6 +43,8 @@ PopupList::PopupList(DropDown *const widget, mModal(modal) { mListBox->postInit(); + mListBox->setMouseConsume(false); + mScrollArea->setMouseConsume(false); mAllowLogic = false; setFocusable(true); diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index ea4ef11bd..4c82fe20c 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -56,8 +56,7 @@ ProgressBar::ProgressBar(const Widget2 *const widget, mFillPadding(3), mFillImage(false), mSmoothProgress(true), - mSmoothColorChange(true), - mRedraw(true) + mSmoothColorChange(true) { mBackgroundColor = Theme::getProgressColor(backColor >= 0 ? backColor : 0, mProgress); diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index fef9bf11d..e45bc4abb 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -159,7 +159,6 @@ class ProgressBar final : public Widget, bool mFillImage; bool mSmoothProgress; bool mSmoothColorChange; - bool mRedraw; }; #endif // GUI_WIDGETS_PROGRESSBAR_H diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index 643517f77..27be9434b 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -176,7 +176,7 @@ void RadioButton::drawBox(Graphics* graphics) const ImageRect &rect = mSkin->getBorder(); int index = 0; - if (mEnabled && isVisible()) + if (mEnabled && mVisible) { if (mSelected) { diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index 2efa144c9..b748e30a1 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -131,8 +131,7 @@ ScrollArea::ScrollArea(Widget2 *const widget2, mIsVerticalMarkerDragged(false), mIsHorizontalMarkerDragged(false), mOpaque(true), - mHasMouse(false), - mRedraw(true) + mHasMouse(false) { setContent(widget); addMouseListener(this); @@ -866,7 +865,7 @@ void ScrollArea::mouseReleased(MouseEvent& event) } mClickX = 0; mClickY = 0; - if (dx || dy) + if (mMouseConsume && (dx || dy)) event.consume(); } } @@ -876,7 +875,8 @@ void ScrollArea::mouseReleased(MouseEvent& event) mRightButtonPressed = false; mIsHorizontalMarkerDragged = false; mIsVerticalMarkerDragged = false; - event.consume(); + if (mMouseConsume) + event.consume(); mRedraw = true; } diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index d3d71b65a..0d540c399 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -586,7 +586,6 @@ class ScrollArea final : public BasicContainer, bool mOpaque; bool mHasMouse; - bool mRedraw; }; #endif // GUI_WIDGETS_SCROLLAREA_H diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 4c32b0572..87bc2baa5 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -713,8 +713,11 @@ SetupItemSlider::SetupItemSlider(const std::string &restrict text, const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - const double min, const double max, - const int width, const bool onTheFly, + const double min, + const double max, + const double step, + const int width, + const bool onTheFly, const bool mainConfig) : SetupItem(text, description, keyName, parent, eventName, mainConfig), mHorizont(nullptr), @@ -722,6 +725,7 @@ SetupItemSlider::SetupItemSlider(const std::string &restrict text, mSlider(nullptr), mMin(min), mMax(max), + mStep(step), mWidth(width), mOnTheFly(onTheFly) { @@ -734,7 +738,9 @@ SetupItemSlider::SetupItemSlider(const std::string &restrict text, const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - const double min, const double max, + const double min, + const double max, + const double step, const std::string &restrict def, const int width, const bool onTheFly, @@ -745,6 +751,7 @@ SetupItemSlider::SetupItemSlider(const std::string &restrict text, mSlider(nullptr), mMin(min), mMax(max), + mStep(step), mWidth(width), mOnTheFly(onTheFly) { @@ -766,7 +773,7 @@ void SetupItemSlider::createControls() mHorizont = new HorizontContainer(this, 32, 2); mLabel = new Label(this, mText); - mSlider = new Slider(this, mMin, mMax); + mSlider = new Slider(this, mMin, mMax, mStep); mSlider->setActionEventId(mEventName); mSlider->addActionListener(mParent); mSlider->setValue(atof(mValue.c_str())); @@ -823,7 +830,9 @@ SetupItemSlider2::SetupItemSlider2(const std::string &restrict text, const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - const int min, const int max, + const int min, + const int max, + const int step, SetupItemNames *restrict const values, const bool onTheFly, const bool mainConfig, @@ -836,6 +845,7 @@ SetupItemSlider2::SetupItemSlider2(const std::string &restrict text, mValues(values), mMin(min), mMax(max), + mStep(step), mInvertValue(0), mInvert(false), mOnTheFly(onTheFly), @@ -850,10 +860,13 @@ SetupItemSlider2::SetupItemSlider2(const std::string &restrict text, const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - const int min, const int max, + const int min, + const int max, + const int step, SetupItemNames *restrict const values, const std::string &restrict def, - const bool onTheFly, const bool mainConfig, + const bool onTheFly, + const bool mainConfig, const bool doNotAlign) : SetupItem(text, description, keyName, parent, eventName, def, mainConfig), mHorizont(nullptr), @@ -863,6 +876,7 @@ SetupItemSlider2::SetupItemSlider2(const std::string &restrict text, mValues(values), mMin(min), mMax(max), + mStep(step), mInvertValue(0), mInvert(false), mOnTheFly(onTheFly), @@ -890,7 +904,7 @@ void SetupItemSlider2::createControls() mLabel = new Label(this, mText); mLabel2 = new Label(this, ""); mLabel2->setWidth(width); - mSlider = new Slider(this, mMin, mMax); + mSlider = new Slider(this, mMin, mMax, mStep); mSlider->setActionEventId(mEventName); mSlider->addActionListener(mParent); mSlider->setValue(atof(mValue.c_str())); diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 7dee860be..03681ad90 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -350,19 +350,25 @@ class SetupItemSlider final : public SetupItem const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - const double min, const double max, - const int width = 150, const bool onTheFly = false, - const bool mainConfig = true); + const double min, + const double max, + const double step, + const int width, + const bool onTheFly, + const bool mainConfig); SetupItemSlider(const std::string &restrict text, const std::string &restrict description, const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - const double min, const double max, - const std::string &restrict def, const int width = 150, - const bool onTheFly = false, - const bool mainConfig = true); + const double min, + const double max, + const double step, + const std::string &restrict def, + const int width, + const bool onTheFly, + const bool mainConfig); A_DELETE_COPY(SetupItemSlider) @@ -386,6 +392,7 @@ class SetupItemSlider final : public SetupItem Slider *mSlider; double mMin; double mMax; + double mStep; int mWidth; bool mOnTheFly; }; @@ -402,23 +409,23 @@ class SetupItemSlider2 final : public SetupItem const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - const int min, const int max, + const int min, const int max, const int step, SetupItemNames *restrict const values, - const bool onTheFly = false, - const bool mainConfig = true, - const bool doNotAlign = false); + const bool onTheFly, + const bool mainConfig, + const bool doNotAlign); SetupItemSlider2(const std::string &restrict text, const std::string &restrict description, const std::string &restrict keyName, SetupTabScroll *restrict const parent, const std::string &restrict eventName, - const int min, const int max, + const int min, const int max, const int step, SetupItemNames *restrict const values, const std::string &restrict def, - const bool onTheFly = false, - const bool mainConfig = true, - const bool doNotAlign = false); + const bool onTheFly, + const bool mainConfig, + const bool doNotAlign); A_DELETE_COPY(SetupItemSlider2) @@ -448,6 +455,7 @@ class SetupItemSlider2 final : public SetupItem SetupItemNames *mValues; int mMin; int mMax; + int mStep; int mInvertValue; bool mInvert; bool mOnTheFly; diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index 49be84b88..e789c863d 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -42,8 +42,7 @@ ShortcutContainer::ShortcutContainer(Widget2 *const widget) : mBoxHeight(1), mGridWidth(1), mGridHeight(1), - mVertexes(new ImageCollection), - mRedraw(true) + mVertexes(new ImageCollection) { mAllowLogic = false; } diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index 81392097b..d4d4ac4bf 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -93,9 +93,6 @@ class ShortcutContainer : public Widget, void drawBackground(Graphics *g); - void setRedraw(bool b) - { mRedraw = b; } - protected: /** * Constructor. Initializes the shortcut container. @@ -121,7 +118,6 @@ class ShortcutContainer : public Widget, int mGridWidth; int mGridHeight; ImageCollection *mVertexes; - bool mRedraw; }; #endif // GUI_WIDGETS_SHORTCUTCONTAINER_H diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index e440631ad..a08d94440 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -91,38 +91,38 @@ static std::string const data[2] = }; Slider::Slider(Widget2 *const widget, - const double scaleEnd) : + const double scaleEnd, + const double stepLength) : Widget(widget), MouseListener(), KeyListener(), mValue(0), - mStepLength(scaleEnd / 10), + mStepLength(stepLength), mScaleStart(0), mScaleEnd(scaleEnd), mOrientation(HORIZONTAL), mVertexes(new ImageCollection), mMarkerLength(10), - mHasMouse(false), - mRedraw(true) + mHasMouse(false) { init(); } Slider::Slider(Widget2 *const widget, const double scaleStart, - const double scaleEnd) : + const double scaleEnd, + const double stepLength) : Widget(widget), MouseListener(), KeyListener(), mValue(scaleStart), - mStepLength((scaleEnd - scaleStart) / 10), + mStepLength(stepLength), mScaleStart(scaleStart), mScaleEnd(scaleEnd), mOrientation(HORIZONTAL), mVertexes(new ImageCollection), mMarkerLength(10), - mHasMouse(false), - mRedraw(true) + mHasMouse(false) { init(); } @@ -368,7 +368,6 @@ void Slider::mousePressed(MouseEvent &event) setValue(markerPositionToValue(x - mMarkerLength / 2)); else setValue(markerPositionToValue(height - y - mMarkerLength / 2)); - distributeActionEvent(); } } @@ -450,18 +449,13 @@ void Slider::setValue(const double value) { mRedraw = true; if (value > mScaleEnd) - { mValue = mScaleEnd; - return; - } - - if (value < mScaleStart) - { + else if (value < mScaleStart) mValue = mScaleStart; - return; - } - - mValue = value; + else + mValue = value; + mValue = static_cast<int>((mValue - mScaleStart) / mStepLength) + * mStepLength + mScaleStart; } double Slider::markerPositionToValue(const int v) const diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h index 164048020..3cd43493e 100644 --- a/src/gui/widgets/slider.h +++ b/src/gui/widgets/slider.h @@ -98,15 +98,17 @@ class Slider final : public Widget, /** * Constructor with scale start equal to 0. */ - explicit Slider(Widget2 *const widget, - const double scaleEnd = 1.0); + Slider(Widget2 *const widget, + const double scaleEnd, + const double stepLength); /** * Constructor. */ Slider(Widget2 *const widget, const double scaleStart, - const double scaleEnd); + const double scaleEnd, + const double stepLength); A_DELETE_COPY(Slider) @@ -349,7 +351,6 @@ class Slider final : public Widget, int mMarkerLength; bool mHasMouse; - bool mRedraw; }; #endif // GUI_WIDGETS_SLIDER_H diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index cf55fa10b..cd439a95a 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -570,7 +570,7 @@ void TabbedArea::adjustTabPositions() maxTabHeight = tab->getHeight(); } - int x = (mEnableScrollButtons && mArrowButton[0]->isVisible()) + int x = (mEnableScrollButtons && mArrowButton[0]->isVisibleLocal()) ? mArrowButton[0]->getWidth() : 0; for (size_t i = mTabScrollIndex; i < sz; ++i) { diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp index 89a9594c1..707a4f2b9 100644 --- a/src/gui/widgets/tabs/setup_audio.cpp +++ b/src/gui/widgets/tabs/setup_audio.cpp @@ -73,11 +73,13 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemSlider(_("Sfx volume"), "", "sfxVolume", - this, "sfxVolumeEvent", 0, soundManager.getMaxVolume(), 150, true); + this, "sfxVolumeEvent", 0, soundManager.getMaxVolume(), 1, + 150, true, true); // TRANSLATORS: settings option new SetupItemSlider(_("Music volume"), "", "musicVolume", - this, "musicVolumeEvent", 0, soundManager.getMaxVolume(), 150, true); + this, "musicVolumeEvent", 0, soundManager.getMaxVolume(), 1, + 150, true, true); // TRANSLATORS: settings option new SetupItemCheckBox(_("Enable music fade out"), "", @@ -97,7 +99,7 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) : mChannelsList->push_back(_("surround+center+lfe")); // TRANSLATORS: settings option new SetupItemSlider2(_("Audio channels"), "", "audioChannels", this, - "audioChannels", 1, 4, mChannelsList); + "audioChannels", 1, 4, 1, mChannelsList, false, true, false); // TRANSLATORS: settings group diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index 00537ad05..53260ff01 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -61,23 +61,23 @@ Setup_Colors::Setup_Colors(const Widget2 *const widget) : mSelected(-1), // TRANSLATORS: colors tab. label. mGradTypeLabel(new Label(this, _("Type:"))), - mGradTypeSlider(new Slider(this, 0, 3)), + mGradTypeSlider(new Slider(this, 0.0, 3.0, 1.0)), mGradTypeText(new Label(this)), // TRANSLATORS: colors tab. label. mGradDelayLabel(new Label(this, _("Delay:"))), - mGradDelaySlider(new Slider(this, 20, 100)), + mGradDelaySlider(new Slider(this, 20.0, 100.0, 1.0)), mGradDelayText(new TextField(this)), // TRANSLATORS: colors tab. label. mRedLabel(new Label(this, _("Red:"))), - mRedSlider(new Slider(this, 0, 255)), + mRedSlider(new Slider(this, 0.0, 255.0, 1.0)), mRedText(new TextField(this)), // TRANSLATORS: colors tab. label. mGreenLabel(new Label(this, _("Green:"))), - mGreenSlider(new Slider(this, 0, 255)), + mGreenSlider(new Slider(this, 0.0, 255.0, 1.0)), mGreenText(new TextField(this)), // TRANSLATORS: colors tab. label. mBlueLabel(new Label(this, _("Blue:"))), - mBlueSlider(new Slider(this, 0, 255)), + mBlueSlider(new Slider(this, 0.0, 255.0, 1.0)), mBlueText(new TextField(this)) { mColorBox->postInit(); diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index a29e0d797..74ee7a3dc 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -212,7 +212,7 @@ void Setup_Input::cancel() void Setup_Input::action(const ActionEvent &event) { - const std::string id = event.getId(); + const std::string &id = event.getId(); if (event.getSource() == mKeyList) { diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index dfe14fa2c..7d6ac9fc3 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -192,9 +192,9 @@ Setup_Video::Setup_Video(const Widget2 *const widget) : mOpenGLDropDown(new DropDown(widget, mOpenGLListModel)), // TRANSLATORS: video settings checkbox mFpsCheckBox(new CheckBox(this, _("FPS limit:"))), - mFpsSlider(new Slider(this, 2, 160)), + mFpsSlider(new Slider(this, 2.0, 160.0, 1.0)), mFpsLabel(new Label(this)), - mAltFpsSlider(new Slider(this, 2, 160)), + mAltFpsSlider(new Slider(this, 2.0, 160.0, 1.0)), // TRANSLATORS: video settings label mAltFpsLabel(new Label(this, _("Alt FPS limit: "))), #if !defined(ANDROID) && !defined(__APPLE__) diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp index eb6591f9f..fa4e2f4ef 100644 --- a/src/gui/widgets/tabs/setup_visual.cpp +++ b/src/gui/widgets/tabs/setup_visual.cpp @@ -139,7 +139,7 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemSlider(_("Gui opacity"), "", "guialpha", - this, "guialphaEvent", 0.1, 1.0, 150, true); + this, "guialphaEvent", 0.1, 1.0, 0.1, 150, true, true); mSpeachList->fillFromArray(&speachList[0], speachListSize); // TRANSLATORS: settings option @@ -164,8 +164,8 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) : // TRANSLATORS: particle details mParticleList->push_back(_("max")); (new SetupItemSlider2(_("Particle detail"), "", "particleEmitterSkip", - this, "particleEmitterSkipEvent", 0, 3, - mParticleList, true))->setInvertValue(3); + this, "particleEmitterSkipEvent", 0, 3, 1, + mParticleList, true, true, false))->setInvertValue(3); mParticleTypeList->fillFromArray(&particleTypeList[0], particleTypeListSize); @@ -183,7 +183,7 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) : // TRANSLATORS: settings option new SetupItemSlider(_("Gamma"), "", "gamma", - this, "gammeEvent", 1, 20, 350, true); + this, "gammeEvent", 1, 20, 1, 350, true, true); // TRANSLATORS: settings group diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp index c2a6c0207..e31bc9ef1 100644 --- a/src/gui/widgets/tabs/tab.cpp +++ b/src/gui/widgets/tabs/tab.cpp @@ -113,7 +113,6 @@ Tab::Tab(const Widget2 *const widget) : mVertexes(new ImageCollection), mImage(nullptr), mMode(0), - mRedraw(true), mHasMouse(false) { init(); diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h index a0afa6fcd..4a88a5400 100644 --- a/src/gui/widgets/tabs/tab.h +++ b/src/gui/widgets/tabs/tab.h @@ -228,7 +228,6 @@ class Tab : public BasicContainer, ImageCollection *mVertexes; Image *mImage; int mMode; - bool mRedraw; protected: bool mHasMouse; diff --git a/src/gui/widgets/widget.cpp b/src/gui/widgets/widget.cpp index aa3e6254b..43c8df92f 100644 --- a/src/gui/widgets/widget.cpp +++ b/src/gui/widgets/widget.cpp @@ -107,7 +107,9 @@ Widget::Widget(const Widget2 *const widget) : mTabIn(true), mTabOut(true), mEnabled(true), - mAllowLogic(true) + mAllowLogic(true), + mMouseConsume(true), + mRedraw(true) { mWidgets.push_back(this); mWidgetsSet.insert(this); @@ -349,6 +351,12 @@ void Widget::setFont(Font *const font) fontChanged(); } +void Widget::distributeWindowResizeEvent() +{ + FOR_EACH (std::list<Widget*>::const_iterator, iter, mWidgets) + (*iter)->windowResized(); +} + bool Widget::widgetExists(const Widget* widget) { return mWidgetsSet.find(const_cast<Widget*>(widget)) @@ -504,3 +512,8 @@ void Widget::showPart(const Rect &rectangle) if (mParent) mParent->showWidgetPart(this, rectangle); } + +void Widget::windowResized() +{ + mRedraw = true; +} diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h index de5a79502..f3e2fdb66 100644 --- a/src/gui/widgets/widget.h +++ b/src/gui/widgets/widget.h @@ -399,6 +399,9 @@ class Widget : public Widget2 bool isVisible() const A_WARN_UNUSED { return mVisible && (!mParent || mParent->isVisible()); } + bool isVisibleLocal() const A_WARN_UNUSED + { return mVisible; } + /** * Sets the base color of the widget. * @@ -1006,9 +1009,22 @@ class Widget : public Widget2 */ virtual void showPart(const Rect &rectangle); - bool isAllowLogic() const + bool isAllowLogic() const A_WARN_UNUSED { return mAllowLogic; } + void setMouseConsume(const bool b) + { mMouseConsume = b; } + + bool isMouseConsume() const A_WARN_UNUSED + { return mMouseConsume; } + + void setRedraw(const bool b) + { mRedraw = b; } + + static void distributeWindowResizeEvent(); + + void windowResized(); + protected: /** * Distributes an action event to all action listeners @@ -1219,6 +1235,10 @@ class Widget : public Widget2 bool mAllowLogic; + bool mMouseConsume; + + bool mRedraw; + /** * Holds the global font used by the widget. */ diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 9e032f75b..c7212314d 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -109,7 +109,6 @@ Window::Window(const std::string &caption, const bool modal, mDefaultY(0), mDefaultWidth(0), mDefaultHeight(0), - mRedraw(true), mLastRedraw(true), mGrip(nullptr), mParent(parent), @@ -1218,13 +1217,6 @@ bool Window::isResizeAllowed(const MouseEvent &event) const return false; } -int Window::getGuiAlpha() const -{ - const float alpha = std::max(client->getGuiAlpha(), - theme->getMinimumOpacity()); - return static_cast<int>(alpha * 255.0F); -} - Layout &Window::getLayout() { if (!mLayout) diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index dfd1f63b7..1795f2843 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -448,11 +448,6 @@ class Window : public BasicContainer2, */ void setModal(const bool modal); - /** - * Gets the alpha value used by the window, in a GUIChan usable format. - */ - int getGuiAlpha() const A_WARN_UNUSED; - Rect getWindowArea() const A_WARN_UNUSED; bool isResizeAllowed(const MouseEvent &event) const A_WARN_UNUSED; @@ -633,7 +628,6 @@ class Window : public BasicContainer2, int mDefaultY; /**< Default window Y position */ int mDefaultWidth; /**< Default window width */ int mDefaultHeight; /**< Default window height */ - bool mRedraw; bool mLastRedraw; private: diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 910bba705..c3b52ed59 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -185,7 +185,7 @@ WindowMenu::~WindowMenu() Button *const btn = dynamic_cast<Button*>(*it); if (!btn) continue; - if (!btn->isVisible()) + if (!btn->isVisibleLocal()) delete btn; } delete_all(mButtonTexts); @@ -328,7 +328,7 @@ void WindowMenu::updateButtons() Button *const btn = dynamic_cast<Button *const>(*it); if (!btn) continue; - if (btn->isVisible()) + if (btn->isVisibleLocal()) { btn->setPosition(x, mPadding); add(btn); @@ -396,7 +396,7 @@ void WindowMenu::saveButtons() const FOR_EACH (std::vector <Button*>::const_iterator, it, mButtons) { const Button *const btn = dynamic_cast<const Button *const>(*it); - if (btn && !btn->isVisible()) + if (btn && !btn->isVisibleLocal()) { config.setValue("windowmenu" + toString(i), btn->getActionEventId()); diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index 8bece77ef..e86bf344e 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -224,7 +224,7 @@ void BuyDialog::init() getOptionBool("showbackground"), "buy_background.xml"); mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); - mSlider = new Slider(this, 1.0); + mSlider = new Slider(this, 1.0, 1.0); mQuantityLabel = new Label(this, strprintf( "%d / %d", mAmountItems, mMaxItems)); mQuantityLabel->setAlignment(Graphics::CENTER); diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index ce9ec84e8..0f4086a0b 100644 --- a/src/gui/windows/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -119,8 +119,8 @@ void ChangeEmailDialog::action(const ActionEvent &event) else if (eventId == "change_email") { const std::string username = mLoginData->username.c_str(); - const std::string newFirstEmail = mFirstEmailField->getText(); - const std::string newSecondEmail = mSecondEmailField->getText(); + const std::string &newFirstEmail = mFirstEmailField->getText(); + const std::string &newSecondEmail = mSecondEmailField->getText(); logger->log("ChangeEmailDialog::Email change, Username is %s", username.c_str()); diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index 051fa6434..eb7380f20 100644 --- a/src/gui/windows/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -98,9 +98,9 @@ void ChangePasswordDialog::action(const ActionEvent &event) else if (eventId == "change_password") { const std::string username = mLoginData->username.c_str(); - const std::string oldPassword = mOldPassField->getText(); - const std::string newFirstPass = mFirstPassField->getText(); - const std::string newSecondPass = mSecondPassField->getText(); + const std::string &oldPassword = mOldPassField->getText(); + const std::string &newFirstPass = mFirstPassField->getText(); + const std::string &newSecondPass = mSecondPassField->getText(); logger->log("ChangePasswordDialog::Password change, Username is %s", username.c_str()); diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 42bbb4b88..0fe412e5c 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -321,7 +321,7 @@ CharCreateDialog::~CharCreateDialog() void CharCreateDialog::action(const ActionEvent &event) { - const std::string id = event.getId(); + const std::string &id = event.getId(); if (id == "create") { if (getName().length() >= 4) @@ -514,9 +514,8 @@ void CharCreateDialog::setAttributes(const StringVect &labels, mAttributeLabel[i]->adjustSize(); add(mAttributeLabel[i]); - mAttributeSlider[i] = new Slider(this, min, max); - mAttributeSlider[i]->setDimension(Rect(140, y + i * 24, - 150, 12)); + mAttributeSlider[i] = new Slider(this, min, max, 1.0); + mAttributeSlider[i]->setDimension(Rect(140, y + i * 24, 150, 12)); mAttributeSlider[i]->setActionEventId("statslider"); mAttributeSlider[i]->addActionListener(this); add(mAttributeSlider[i]); diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 8d1d3e046..be2daf6a9 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -62,6 +62,8 @@ #include "gui/widgets/tabs/tradetab.h" #include "gui/widgets/tabs/whispertab.h" +#include "render/opengldebug.h" + #include "net/chathandler.h" #include "net/playerhandler.h" #include "net/net.h" @@ -314,14 +316,10 @@ void ChatWindow::loadGMCommands() void ChatWindow::updateTabsMargin() { - if (mColorPicker->isVisible()) - { + if (mColorPicker->isVisibleLocal()) mChatTabs->setRightMargin(mColorPicker->getWidth() + 16 + 8); - } else - { mChatTabs->setRightMargin(8); - } } void ChatWindow::adjustTabSize() @@ -339,7 +337,7 @@ void ChatWindow::adjustTabSize() mChatInput->setPosition(frame, y); mChatTabs->setWidth(awFrame2); const int height = ah - frame2 - (inputHeight + frame2); - if (mChatInput->isVisible() || !config.getBoolValue("hideChatInput")) + if (mChatInput->isVisibleLocal() || !config.getBoolValue("hideChatInput")) mChatTabs->setHeight(height); else mChatTabs->setHeight(height + inputHeight); @@ -362,7 +360,7 @@ void ChatWindow::adjustTabSize() y -= 2; } mChatInput->setWidth(w); - mChatButton->setVisible(mChatInput->isVisible()); + mChatButton->setVisible(mChatInput->isVisibleLocal()); mChatButton->setPosition(x, y); } else @@ -514,7 +512,7 @@ void ChatWindow::action(const ActionEvent &event) { if (emoteWindow) { - if (emoteWindow->isVisible()) + if (emoteWindow->isVisibleLocal()) emoteWindow->hide(); else emoteWindow->show(); @@ -553,7 +551,7 @@ void ChatWindow::action(const ActionEvent &event) } } - if (mColorPicker && mColorPicker->isVisible() + if (mColorPicker && mColorPicker->isVisibleLocal() != config.getBoolValue("showChatColorsList")) { mColorPicker->setVisible(config.getBoolValue( @@ -839,12 +837,12 @@ void ChatWindow::keyPressed(KeyEvent &event) return; } else if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL) && - mChatInput->isVisible()) + mChatInput->isVisibleLocal()) { mChatInput->processVisible(false); } else if (actionId == static_cast<int>(Input::KEY_CHAT_PREV_HISTORY) && - mChatInput->isVisible()) + mChatInput->isVisibleLocal()) { const ChatTab *const tab = getFocused(); if (tab && tab->hasRows()) @@ -876,7 +874,7 @@ void ChatWindow::keyPressed(KeyEvent &event) } } else if (actionId == static_cast<int>(Input::KEY_CHAT_NEXT_HISTORY) && - mChatInput->isVisible()) + mChatInput->isVisibleLocal()) { const ChatTab *const tab = getFocused(); if (tab && tab->hasRows()) @@ -915,7 +913,7 @@ void ChatWindow::keyPressed(KeyEvent &event) { if (emoteWindow) { - if (emoteWindow->isVisible()) + if (emoteWindow->isVisibleLocal()) emoteWindow->hide(); else emoteWindow->show(); @@ -1023,7 +1021,7 @@ void ChatWindow::processEvent(const Channels channel, void ChatWindow::addInputText(const std::string &text, const bool space) { const int caretPos = mChatInput->getCaretPosition(); - const std::string inputText = mChatInput->getText(); + const std::string &inputText = mChatInput->getText(); std::ostringstream ss; ss << inputText.substr(0, caretPos) << text; @@ -1277,7 +1275,7 @@ void ChatWindow::autoComplete() { const int caretPos = mChatInput->getCaretPosition(); int startName = 0; - const std::string inputText = mChatInput->getText(); + const std::string &inputText = mChatInput->getText(); std::string name = inputText.substr(0, caretPos); for (int f = caretPos - 1; f > -1; f --) @@ -1645,7 +1643,7 @@ void ChatWindow::updateOnline(std::set<std::string> &onlinePlayers) const } else { - const std::string nick = tab->getNick(); + const std::string &nick = tab->getNick(); if (actorManager) { const Being *const being = actorManager->findBeingByName( @@ -1871,7 +1869,11 @@ void ChatWindow::draw(Graphics* graphics) { BLOCK_START("ChatWindow::draw") if (!mAutoHide || mHaveMouse) + { + GLDEBUG_START("ChatWindow::draw"); Window::draw(graphics); + GLDEBUG_END(); + } BLOCK_END("ChatWindow::draw") } diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 472057060..9c2e039f9 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -100,7 +100,7 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent, mItem(item), mItemIcon(new Icon(this, item ? item->getImage() : nullptr)), mItemPopup(new ItemPopup), - mItemAmountSlide(new Slider(this, 1.0, maxRange)), + mItemAmountSlide(new Slider(this, 1.0, maxRange, 1.0)), mItemPriceSlide(nullptr), mItemDropDown(nullptr), mItemsModal(nullptr), @@ -136,7 +136,7 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent, mItemPriceTextField->setWidth(35); mItemPriceTextField->addKeyListener(this); - mItemPriceSlide = new Slider(this, 1.0, 10000000); + mItemPriceSlide = new Slider(this, 1.0, 10000000, 1.0); mItemPriceSlide->setHeight(10); mItemPriceSlide->setActionEventId("slidePrice"); mItemPriceSlide->addActionListener(this); diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 9be6d7304..70a2361cd 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -89,7 +89,12 @@ Minimap::~Minimap() config.setValue(getWindowName() + "Show", mShow); config.removeListeners(this); CHECKLISTENERS + deleteMapImage(); + delete2(mTextPopup); +} +void Minimap::deleteMapImage() +{ if (mMapImage) { if (mCustomMapImage) @@ -98,7 +103,6 @@ Minimap::~Minimap() mMapImage->decRef(); mMapImage = nullptr; } - delete2(mTextPopup); } void Minimap::setMap(const Map *const map) @@ -115,16 +119,7 @@ void Minimap::setMap(const Map *const map) } setCaption(caption); - - // Adapt the image - if (mMapImage) - { - if (mCustomMapImage) - delete mMapImage; - else - mMapImage->decRef(); - mMapImage = nullptr; - } + deleteMapImage(); if (map) { diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h index e8fff5144..18a8a0a8b 100644 --- a/src/gui/windows/minimap.h +++ b/src/gui/windows/minimap.h @@ -73,6 +73,8 @@ class Minimap final : public Window, public ConfigListener void optionChanged(const std::string &name); private: + void deleteMapImage(); + float mWidthProportion; float mHeightProportion; Image *mMapImage; diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 885ea619b..93a6a6a10 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -162,7 +162,7 @@ MiniStatusWindow::~MiniStatusWindow() ProgressBar *bar = *it; if (!bar) continue; - if (!bar->isVisible()) + if (!bar->isVisibleLocal()) delete bar; } mBars.clear(); @@ -200,7 +200,7 @@ void MiniStatusWindow::updateBars() ProgressBar *const bar = *it; if (!bar) continue; - if (bar->isVisible()) + if (bar->isVisibleLocal()) { bar->setPosition(x, 0); add(bar); @@ -507,7 +507,7 @@ void MiniStatusWindow::saveBars() const FOR_EACH (ProgressBarVectorCIter, it, mBars) { const ProgressBar *const bar = *it; - if (!bar->isVisible()) + if (!bar->isVisibleLocal()) { config.setValue("ministatus" + toString(i), bar->getActionEventId()); diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index b1355ba46..601101bef 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -227,7 +227,7 @@ void OutfitWindow::save() const void OutfitWindow::action(const ActionEvent &event) { - const std::string eventId = event.getId(); + const std::string &eventId = event.getId(); if (eventId == "next") { next(); diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index 55a328fa8..6d3cf9d9f 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -182,7 +182,7 @@ void RegisterDialog::action(const ActionEvent &event) } else if (eventId == "register" && canSubmit()) { - const std::string user = mUserField->getText(); + const std::string &user = mUserField->getText(); logger->log("RegisterDialog::register Username is %s", user.c_str()); std::string errorMsg; diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp index 604caa72e..1b9f1ec85 100644 --- a/src/gui/windows/selldialog.cpp +++ b/src/gui/windows/selldialog.cpp @@ -100,7 +100,7 @@ void SellDialog::init() getOptionBool("showbackground"), "sell_background.xml"); mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); - mSlider = new Slider(this, 1.0); + mSlider = new Slider(this, 1.0, 1.0); mQuantityLabel = new Label(this, strprintf( "%d / %d", mAmountItems, mMaxItems)); diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp index bb309c6f1..3d8627add 100644 --- a/src/gui/windows/unregisterdialog.cpp +++ b/src/gui/windows/unregisterdialog.cpp @@ -111,7 +111,7 @@ void UnRegisterDialog::action(const ActionEvent &event) else if (eventId == "unregister") { const std::string username = mLoginData->username.c_str(); - const std::string password = mPasswordField->getText(); + const std::string &password = mPasswordField->getText(); logger->log("UnregisterDialog::unregistered, Username is %s", username.c_str()); diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index cd0e7e0d8..824d8e0f6 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -407,6 +407,14 @@ void UpdaterWindow::loadPatch() "##6ManaPlus %s##0", line), true); } } + if (!serverVersion && config.getIntValue("runcount") > 10) + { + mBrowserBox->addRow("", true); + mBrowserBox->addRow("", true); + mBrowserBox->addRow(" ##1[@@http://steamcommunity.com/" + "sharedfiles/filedetails/?id=232178669|" + "Vote for us on Steam Green Light@@]", true); + } if (version > CHECK_VERSION) { #if defined(ANDROID) @@ -1064,7 +1072,7 @@ void UpdaterWindow::loadDirMods(const std::string &dir) const ModInfo *const mod = (*modIt).second; if (mod) { - const std::string localDir = mod->getLocalDir(); + const std::string &localDir = mod->getLocalDir(); if (!localDir.empty()) resman->addToSearchPath(dir + "/" + localDir, false); } @@ -1087,7 +1095,7 @@ void UpdaterWindow::unloadMods(const std::string &dir) const ModInfo *const mod = (*modIt).second; if (mod) { - const std::string localDir = mod->getLocalDir(); + const std::string &localDir = mod->getLocalDir(); if (!localDir.empty()) resman->removeFromSearchPath(dir + "/" + localDir); } diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index a1683ffc8..b7616eb72 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -519,6 +519,7 @@ int WhoIsOnline::downloadThread(void *ptr) curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 7); curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30); + Net::Download::addHeaders(curl); Net::Download::addProxy(curl); Net::Download::secureCurl(curl); diff --git a/src/localconsts.h b/src/localconsts.h index d71126c11..298877b6b 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -112,6 +112,9 @@ // use file access fuzzer // #define USE_FUZZER 1 +// use OpenGL debug features +// #define DEBUG_OPENGL 1 + #ifdef DYECMD #undef USE_FUZZER #endif diff --git a/src/main.h b/src/main.h index 60ecfb981..5c47e72ac 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.3.29" -#define CHECK_VERSION "01.04.03.29" +#define SMALL_VERSION "1.4.4.12" +#define CHECK_VERSION "01.04.04.12" #ifdef HAVE_CONFIG_H #include "../config.h" diff --git a/src/net/download.cpp b/src/net/download.cpp index 6d127d0a4..cf5a1d0b3 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -326,6 +326,7 @@ int Download::downloadThread(void *ptr) curl_easy_setopt(d->mCurl, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(d->mCurl, CURLOPT_CONNECTTIMEOUT, 30); curl_easy_setopt(d->mCurl, CURLOPT_TIMEOUT, 1800); + addHeaders(d->mCurl); addProxy(d->mCurl); secureCurl(d->mCurl); } @@ -536,6 +537,13 @@ void Download::secureCurl(CURL *const curl) #endif } +void Download::addHeaders(CURL *const curl) +{ +#if CURLVERSION_ATLEAST(7, 21, 7) + curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, ""); +#endif +} + void Download::prepareForm(curl_httppost **form, const std::string &fileName) { curl_httppost *lastPtr = nullptr; diff --git a/src/net/download.h b/src/net/download.h index 7dae8913f..3628a8f3a 100644 --- a/src/net/download.h +++ b/src/net/download.h @@ -104,6 +104,8 @@ class Download final static void secureCurl(CURL *const curl); + static void addHeaders(CURL *const curl); + static unsigned long adlerBuffer(char *const buffer, int size); static std::string getUploadResponse() diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp index 27f01d4e1..54c3623c4 100644 --- a/src/particle/particleemitter.cpp +++ b/src/particle/particleemitter.cpp @@ -574,7 +574,7 @@ std::list<Particle *> ParticleEmitter::createParticles(const int tick) Particle *newParticle = nullptr; if (mParticleImage) { - const std::string name = mParticleImage->getIdPath(); + const std::string &name = mParticleImage->getIdPath(); if (ImageParticle::imageParticleCountByName.find(name) == ImageParticle::imageParticleCountByName.end()) { diff --git a/src/render/mgl.cpp b/src/render/mgl.cpp index 54845b944..bf8483a67 100644 --- a/src/render/mgl.cpp +++ b/src/render/mgl.cpp @@ -42,6 +42,12 @@ defName(glBindSampler); defName(glSamplerParameteri); defName(glDebugMessageControl); defName(glDebugMessageCallback); +defName(glFrameTerminator); +defName(glLabelObject); +defName(glGetObjectLabel); +defName(glInsertEventMarker); +defName(glPushGroupMarker); +defName(glPopGroupMarker); #ifdef WIN32 defName(wglGetExtensionsString); diff --git a/src/render/mgl.h b/src/render/mgl.h index a47a70218..b612c5e03 100644 --- a/src/render/mgl.h +++ b/src/render/mgl.h @@ -74,6 +74,15 @@ #define GL_DEBUG_SEVERITY_LOW 0x9148 #endif +#ifndef GL_EXT_debug_label +#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F +#define GL_PROGRAM_OBJECT_EXT 0x8B40 +#define GL_SHADER_OBJECT_EXT 0x8B48 +#define GL_BUFFER_OBJECT_EXT 0x9151 +#define GL_QUERY_OBJECT_EXT 0x9153 +#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154 +#endif + #define defNameE(name) extern name##_t m##name typedef void (APIENTRY *glGenRenderbuffers_t)(GLsizei, GLuint *); @@ -99,6 +108,16 @@ typedef void (APIENTRY *glSamplerParameteri_t) (GLuint sampler, GLenum pname, GLint param); typedef void (APIENTRY *glDebugMessageControl_t) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled); +typedef void (APIENTRY *glFrameTerminator_t) (void); +typedef void (APIENTRY *glLabelObject_t) (GLenum type, GLuint object, + GLsizei length, const GLchar *label); +typedef void (APIENTRY *glGetObjectLabel_t) (GLenum type, GLuint object, + GLsizei bufSize, GLsizei *length, GLchar *label); +typedef void (APIENTRY *glInsertEventMarker_t) + (GLsizei length, const char *marker); +typedef void (APIENTRY *glPushGroupMarker_t) + (GLsizei length, const char *marker); +typedef void (APIENTRY *glPopGroupMarker_t) (void); // callback typedef void (APIENTRY *GLDEBUGPROC_t) (GLenum source, GLenum type, GLuint id, @@ -123,6 +142,12 @@ defNameE(glBindSampler); defNameE(glSamplerParameteri); defNameE(glDebugMessageControl); defNameE(glDebugMessageCallback); +defNameE(glFrameTerminator); +defNameE(glLabelObject); +defNameE(glGetObjectLabel); +defNameE(glInsertEventMarker); +defNameE(glPushGroupMarker); +defNameE(glPopGroupMarker); #ifdef WIN32 typedef const char* (APIENTRY * wglGetExtensionsString_t) (HDC hdc); diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp index 0ad5bfeb7..ede89f115 100644 --- a/src/render/mobileopenglgraphics.cpp +++ b/src/render/mobileopenglgraphics.cpp @@ -31,6 +31,8 @@ #include "graphicsvertexes.h" #include "logger.h" +#include "render/mgl.h" + #include "resources/image.h" #include "resources/openglimagehelper.h" @@ -834,6 +836,10 @@ void MobileOpenGLGraphics::updateScreen() #else SDL_GL_SwapBuffers(); #endif +#ifdef DEBUG_OPENGL + if (mglFrameTerminator) + mglFrameTerminator(); +#endif // may be need clear? // glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); BLOCK_END("Graphics::updateScreen") diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp index 72fbd8a99..8f3659936 100644 --- a/src/render/normalopenglgraphics.cpp +++ b/src/render/normalopenglgraphics.cpp @@ -30,6 +30,8 @@ #include "graphicsvertexes.h" #include "logger.h" +#include "render/mgl.h" + #include "resources/image.h" #include "resources/openglimagehelper.h" @@ -1095,6 +1097,10 @@ void NormalOpenGLGraphics::updateScreen() #else SDL_GL_SwapBuffers(); #endif +#ifdef DEBUG_OPENGL + if (mglFrameTerminator) + mglFrameTerminator(); +#endif // may be need clear? // glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); BLOCK_END("Graphics::updateScreen") diff --git a/src/render/opengldebug.h b/src/render/opengldebug.h new file mode 100644 index 000000000..82b151cc8 --- /dev/null +++ b/src/render/opengldebug.h @@ -0,0 +1,36 @@ +/* + * The ManaPlus Client + * Copyright (C) 2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef RENDER_OPENGLDEBUG_H +#define RENDER_OPENGLDEBUG_H + +#include "render/mgl.h" + +#if defined(DEBUG_OPENGL) && defined(USE_OPENGL) +#define GLDEBUG_START(text) if (mglPushGroupMarker) \ + mglPushGroupMarker(sizeof(text), text); +#define GLDEBUG_END() if (mglPopGroupMarker) \ + mglPopGroupMarker(); +#else +#define GLDEBUG_START(text) +#define GLDEBUG_END() +#endif + +#endif // RENDER_OPENGLDEBUG_H diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp index a191142b5..177cfecb5 100644 --- a/src/render/safeopenglgraphics.cpp +++ b/src/render/safeopenglgraphics.cpp @@ -28,6 +28,8 @@ #include "configuration.h" #include "graphicsmanager.h" +#include "render/mgl.h" + #include "resources/image.h" #include "resources/openglimagehelper.h" @@ -421,6 +423,10 @@ void SafeOpenGLGraphics::updateScreen() #else SDL_GL_SwapBuffers(); #endif +#ifdef DEBUG_OPENGL + if (mglFrameTerminator) + mglFrameTerminator(); +#endif BLOCK_END("Graphics::updateScreen") } diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp index 262d839f7..dc0218d65 100644 --- a/src/resources/openglimagehelper.cpp +++ b/src/resources/openglimagehelper.cpp @@ -244,6 +244,15 @@ Image *OpenGLImageHelper::glLoad(SDL_Surface *tmpImage, tmpImage->w, tmpImage->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, tmpImage->pixels); +#ifdef DEBUG_OPENGL +// disabled for now, because debugger cant show it +// if (mglLabelObject) +// { +// const char *const text = "image text"; +// mglLabelObject(GL_TEXTURE, texture, strlen(text), text); +// } +#endif + /* GLint compressed; glGetTexLevelParameteriv(mTextureType, 0, diff --git a/src/spellshortcut.cpp b/src/spellshortcut.cpp index ecdf3a8ae..4e0e5a180 100644 --- a/src/spellshortcut.cpp +++ b/src/spellshortcut.cpp @@ -44,7 +44,7 @@ void SpellShortcut::load() if (!spellManager) return; - const std::vector<TextCommand*> spells = spellManager->getAll(); + const std::vector<TextCommand*> &spells = spellManager->getAll(); unsigned k = 0; for (std::vector<TextCommand*>::const_iterator i = spells.begin(), |