diff --git a/modules/client_locales/locales.lua b/modules/client_locales/locales.lua index ab531b44..bf6a12e5 100644 --- a/modules/client_locales/locales.lua +++ b/modules/client_locales/locales.lua @@ -1,5 +1,5 @@ -- TIP: to find all possible translations in the modules directory use the following command --- find \( -name "*.lua" -o -name "*.otui" \) -exec grep -oE "tr\\("(\\\\"|[^"])*"" {} \; -exec grep -oE "tr\\(\"(\\\\\"|[^\"])*\nil {} \; | sort | uniq | sed "s/^tr(.\(.*\).$/[\"\1\"] = nil,/" +-- find \( -name "*.lua" -o -name "*.otui" \) -exec grep -oE "tr\\('(\\\\'|[^'])*'" {} \; -exec grep -oE "tr\\(\"(\\\\\"|[^\"])*" {} \; | sort | uniq | sed "s/^tr(.\(.*\).$/[\"\1\"] = nil,/" Locales = { } diff --git a/modules/client_options/options.lua b/modules/client_options/options.lua index ca4a0796..77c95cf1 100644 --- a/modules/client_options/options.lua +++ b/modules/client_options/options.lua @@ -28,7 +28,7 @@ function Options.init() optionsWindow = displayUI('options.otui') optionsWindow:hide() - optionsButton = TopMenu.addLeftButton('optionsButton', tr('Options'), 'options.png', Options.toggle) + optionsButton = TopMenu.addLeftButton('optionsButton', tr('Options') .. ' (Ctrl+P)', 'options.png', Options.toggle) optionsTabBar = optionsWindow:getChildById('optionsTabBar') optionsTabBar:setContentWidget(optionsWindow:getChildById('optionsTabContent')) optionsTabBar:addTab(tr('General'), loadUI('general.otui')) diff --git a/modules/game_viplist/viplist.lua b/modules/game_viplist/viplist.lua index 6674f6f9..55714d86 100644 --- a/modules/game_viplist/viplist.lua +++ b/modules/game_viplist/viplist.lua @@ -115,7 +115,7 @@ function VipList.onVipStateChange(id, online) local vipList = vipWindow:getChildById('contentsPanel') local label = vipList:getChildById('vip' .. id) local text = label:getText() - vipList:removeChild(label) + label:destroy() VipList.onAddVip(id, text, online) end diff --git a/tools/pkgs/makeotc b/tools/pkgs/makeotc index 6c7bdc21..5c3c2e67 100755 --- a/tools/pkgs/makeotc +++ b/tools/pkgs/makeotc @@ -46,6 +46,7 @@ else cmake -DCMAKE_TOOLCHAIN_FILE=$gitdir/src/framework/cmake/${platform}_toolchain.cmake \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_REVISION=$revision \ + -DBOT_PROTECTION=OFF \ -DPROTOCOL=$protocol \ .. || exit fi