The proposal to merge lp:~widelands-dev/widelands/Economy_tutorial_fix into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/Economy_tutorial_fix/+merge/343770
--
Your team Widelands Developers is
The proposal to merge lp:~widelands-dev/widelands/objective-string-rules into
lp:widelands has been updated.
Commit message changed to:
Changed an objective in empire02 to be consistent with the rest of the campaign
For more details, see:
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1767130-japanese
into lp:widelands.
Commit message:
Converted geologists' messages to new font renderer. Added fallback message to
game message menu when old font renderer is used, to make such bugs easier to
find in the future.
I have answered your question below your comment. Thanks for the review!
@bunnybot merge
Diff comments:
>
> === modified file 'src/wui/interactive_base.cc'
> --- src/wui/interactive_base.cc 2018-04-27 13:19:15 +
> +++ src/wui/interactive_base.cc 2018-04-28 14:48:46 +
> @@
I have added some more tweaks - please review my changes and trigger the merge
if they're OK.
--
https://code.launchpad.net/~widelands-dev/widelands/objective-string-rules/+merge/344918
Your team Widelands Developers is requested to review the proposed merge of
Error merging this proposal:
Output:
stdout:
stderr:
M src/ai/ai_help_structs.h
M src/logic/campaign_visibility.cc
M src/map_io/map_players_view_packet.cc
M src/network/internet_gaming.cc
M src/wui/interactive_base.cc
Text conflict in src/network/internet_gaming.cc
1 conflicts
Continuous integration builds have changed state:
Travis build 3439. State: errored. Details:
https://travis-ci.org/widelands/widelands/builds/373880326.
Appveyor build 3244. State: success. Details:
Will do. Thanks!
--
https://code.launchpad.net/~widelands-dev/widelands/net-user-type/+merge/343754
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/net-user-type.
___
Mailing list:
Review: Approve
Looks good :)
--
https://code.launchpad.net/~widelands-dev/widelands-website/fix_django1_11_warnings/+merge/344973
Your team Widelands Developers is subscribed to branch lp:widelands-website.
___
Mailing list:
1. I have answered inline
2. Agreed, but not in this merge request. I have created a new bug for it:
https://bugs.launchpad.net/widelands/+bug/1768859
Diff comments:
>
> === modified file 'data/tribes/wares/shovel/helptexts.lua'
> --- data/tribes/wares/shovel/helptexts.lua2017-07-07
Continuous integration builds have changed state:
Travis build 3446. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/374280669.
Appveyor build 3251. State: success. Details:
Review: Resubmit
All config file options are documented somewhere now, either on command line,
in the source file or in the game options.
I also removed the "emailadd" configuration file option which does not seem to
be used anywhere.
--
Continuous integration builds have changed state:
Travis build 3444. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/374263196.
Appveyor build 3249. State: success. Details:
1. You can't see it locally. They are concatenated later in
data/tribes/scripting/help. Just look at the shovel in-game, and you'll see it.
2. It needs to be there if there is no translatable string below it (no _,
ngettext or pgettext).
--
The proposal to merge lp:~widelands-dev/widelands/objective-string-rules into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/objective-string-rules/+merge/344918
--
Your team Widelands Developers is
Continuous integration builds have changed state:
Travis build 3450. State: passed. Details:
https://travis-ci.org/widelands/widelands/builds/374329080.
Appveyor build 3255. State: success. Details:
Review: Approve
Thanks a lot.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/objective-string-rules/+merge/344918
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/objective-string-rules.
___
Review: Needs Fixing
1. see inline comment
2. I did a spotcheck of the helptexts and found multiple issues with the # sign
in TRANSLATORS remarks not correctly implemented. Just checked a couple of
frisian buildings where the ' is used in defined performance helptexts and not
used in other
2. Doesn't matter - you'll only need to remove the extra # where they are not
wanted to activate the comments for translators. It should be
-- TRANSLATORS:
Thanks for the review!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000
Your team
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_201804/+merge/344800
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/compiler_warnings_201804.
___
Mailing list:
20 matches
Mail list logo
