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 encounter
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:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_campaign_
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: https://launchpad.net/~widelands-dev
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: https://launchpad.net/~wid
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.
___
M
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 buil
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:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fix
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 16:51:3
1. as far as I read the function in the helptexts.lua of the shovel the text
will be either the default or the tribe Version not both.
2. Ok. Perhaps I'll take the bug this evening. Is there any rule of format
where the # needs to be in the TRANSLATORS line?
--
https://code.launchpad.net/~widela
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:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_176713
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.
--
https://code.launchpad.net/~widelands-dev/widelands/docu
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).
--
https://code.launchpad.net/~widelands-dev/widelands/st
Review: Approve
1. have checked that sorry for the trouble.
2. What I meant should it be #TRANSLATORS or is it TRANSLATORS#
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string
The proposal to merge
lp:~widelands-dev/widelands-website/fix_django1_11_warnings into
lp:widelands-website has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/fix_django1_11_warnings/+merge/344973
--
Your team
Thanks :-)
Merged and deployed.
--
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: https://launchpad.net/~w
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 su
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:
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_road_promo
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 Widel
@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: https://launchp
The proposal to merge lp:~widelands-dev/widelands/string-fixes into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345000
--
Your team Widelands Developers is subscribed to branch
The proposal to merge lp:~widelands-dev/widelands/compiler_warnings_201804 into
lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_201804/+merge/344800
--
Your team Widelands Developers i
21 matches
Mail list logo
