Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands
Empire is good now :) Atlantean "none" still signals to me that there is something important there - it's visually too busy. Try just 1 strip of cloth in the middle and remove the 3rd pole? -- https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rework-resource-indicators. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
Review: Approve code Code LGTM, not tested. Thanks! -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
Continuous integration builds have changed state: Travis build 3943. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/427411087. Appveyor build 3741. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1791891_key_modifier_inputqueue-3741. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1766957-sinking-ship-animation/+merge/353746 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands
I´ve lost count the how-many-th version this is ;) I find only one strip of cloth hard to see, unless it´s very broad. How about these new crossed silk strips? -- https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rework-resource-indicators. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ferry into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/ferry into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/ferry/+merge/351880 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ferry into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1766957-sinking-ship-animation/+merge/353746 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1766957-sinking-ship-animation. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands
Continuous integration builds have changed state: Travis build 3945. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/427533795. Appveyor build 3743. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1434875_net_client_disconnect-3743. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1434875-net-client-disconnect/+merge/354531 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into
lp:widelands.
Commit message:
2 string fixes
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1421942 in widelands: "Unified term for "Black" and "Wasteland""
https://bugs.launchpad.net/widelands/+bug/1421942
Bug #1487887 in widelands: "Translation missing in editor and in replay
tooltip"
https://bugs.launchpad.net/widelands/+bug/1487887
Bug #1530240 in widelands: "wrong text in the tribal encyclopedia for the
battle ax"
https://bugs.launchpad.net/widelands/+bug/1530240
Bug #1530398 in widelands: "Wrong text above marble mine"
https://bugs.launchpad.net/widelands/+bug/1530398
Bug #1547909 in widelands: "Some strings in the editor cannot be translated"
https://bugs.launchpad.net/widelands/+bug/1547909
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
=== modified file 'data/campaigns/tutorial04_economy.wmf/scripting/texts.lua'
--- data/campaigns/tutorial04_economy.wmf/scripting/texts.lua 2018-05-01 20:35:22 +
+++ data/campaigns/tutorial04_economy.wmf/scripting/texts.lua 2018-09-12 15:59:25 +
@@ -231,7 +231,7 @@
div("width=100%", div("float=left padding_r=14 padding_t=5",p(img("images/logos/wl-ico-32.png"))) .. p(_[[The ‘General’ tab contains information about all the basic interface controls for Widelands. Furthermore, you can find tips that are relevant for your tribe there.]])) ..
div("width=100%", div("float=left padding_r=18 padding_t=15 padding_b=15 padding_l=4",p(img("images/wui/buildings/menu_tab_wares.png"))) .. p(_[[The ‘Wares’ tab shows information about the wares that your tribe needs, including a short help text, a list of buildings that produce each ware, the needed wares to produce it and where the ware is consumed.]])) ..
div("width=100%", div("float=left padding_r=16",p(img("images/wui/buildings/menu_tab_workers.png"))) .. p(_[[The ‘Workers’ tab shows information about your tribe’s workers in a similar manner to the wares in the second tab.]])) ..
- div("width=100%", div("float=left padding_r=18 padding_t=5 padding_l=4",p(img("images/wui/stats/genstats_nrbuildings.png"))) .. p(_[[The ‘Buldings’ tab contains all the necessary information about the buildings of your tribe.]])) ..
+ div("width=100%", div("float=left padding_r=18 padding_t=5 padding_l=4",p(img("images/wui/stats/genstats_nrbuildings.png"))) .. p(_[[The ‘Buildings’ tab contains all the necessary information about the buildings of your tribe.]])) ..
li_image("tribes/immovables/field_harvested/idle_00.png", _[[Finally, the ‘Immovables’ tab shows information about the specific immovables that your tribe’s workers can place on the map.]]) ..
li(_[[Now use the encyclopedia to find out how to create new soldiers.]]) ..
li_arrow(_[[A soldier needs a wooden spear and a helmet – from there on out, you can search backwards to find the wares and the buildings you need to supply your barracks where the soldier is recruited. When you are finished, just close the encyclopedia window.]])
=== modified file 'data/tribes/wares/granite/helptexts.lua'
--- data/tribes/wares/granite/helptexts.lua 2018-05-02 10:12:31 +
+++ data/tribes/wares/granite/helptexts.lua 2018-09-12 15:59:25 +
@@ -7,7 +7,7 @@
-- TRANSLATORS: Helptext for a ware: Granite
barbarians = pgettext("barbarians_ware", "The Barbarians produce granite blocks in quarries and granite mines."),
-- TRANSLATORS: Helptext for a ware: Granite
- frisians = pgettext("frisians_ware", "The Frisians produce granite blocks in quarries and rock mines. They can be refined by a brick burner."),
+ frisians = pgettext("frisians_ware", "The Frisians produce granite blocks in quarries and rock mines. They can be refined in a brick kiln."),
-- TRANSLATORS: Helptext for a ware: Granite
empire = pgettext("empire_ware", "The Empire produces granite blocks in quarries and marble mines.")
}
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/rework-resource-indicators into lp:widelands
Review: Approve Yes, we have a winner :D @bunnybot merge > I´ve lost count the how-many-th version this is ;) Me too... I find code easier to review *lol* -- https://code.launchpad.net/~widelands-dev/widelands/rework-resource-indicators/+merge/353996 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/rework-resource-indicators. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow/+merge/354179 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1669103-no-automatic-dismantlesitewindow. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Review: Approve changes look good for me: -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands
Continuous integration builds have changed state: Travis build 3948. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/427560056. Appveyor build 3746. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1751440_smugglers_desync_single_coroutine-3746. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine/+merge/354747 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1751440-smugglers-desync-single-coroutine into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable into lp:widelands
Continuous integration builds have changed state: Travis build 3949. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/427562201. Appveyor build 3747. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1772168_unused_key_in_luatable-3747. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1772168-unused-key-in-luatable/+merge/354202 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1772168-unused-key-in-luatable. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect into lp:widelands
Thanks for the bug report, the local fix and the review. Your remarks are hopefully all fixed now. Do we need a translator comment for both occurrences of "Replace with %s" or is one comment enough when it is the same string? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1434875-net-client-disconnect/+merge/354531 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1434875-net-client-disconnect. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Continuous integration builds have changed state: Travis build 3955. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/427787004. Appveyor build 3753. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-3753. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 3955. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/427787004. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix-sphinx into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/fix-sphinx into lp:widelands. Commit message: Remove sphinx from debug builds on Travis. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1792291 in widelands: "Sphinx is broken on Travis" https://bugs.launchpad.net/widelands/+bug/1792291 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix-sphinx/+merge/354827 We need our Travis back ASAP, so I have uncommented the Sphinx build for now. I can't get my system to cooperate and use the current version of Sphinx, so I can't reproduce the error. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-sphinx into lp:widelands. === modified file '.travis.sh' --- .travis.sh 2017-11-27 20:16:11 + +++ .travis.sh 2018-09-13 05:06:42 + @@ -30,17 +30,18 @@ if [ "$BUILD_TYPE" == "Debug" ]; then # Build the documentation. Any warning is an error. - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - sudo pip install sphinx - fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - pip2 install sphinx - fi - pushd ../doc/sphinx - mkdir source/_static - ./extract_rst.py - sphinx-build -W -b json -d build/doctrees source build/json - popd + # TODO: GunChleoc: Currently broken + #if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + # sudo pip install sphinx + #fi + #if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + # pip2 install sphinx + #fi + #pushd ../doc/sphinx + #mkdir source/_static + #./extract_rst.py + #sphinx-build -W -b json -d build/doctrees source build/json + #popd # Run the codecheck test suite. pushd ../cmake/codecheck ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue into lp:widelands
Tested. Now, how will the user find out about this feature? There should be additional info in the tooltip and/or in the helptexts explaining the keyboard shortcuts. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue/+merge/354732 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1791891-key-modifier-inputqueue. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix-sphinx into lp:widelands
@bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/fix-sphinx/+merge/354827 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix-sphinx into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Problem with the new sphinx version, unrelated to this branch. @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/354792 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
