:-( Sorry GunChleoc. I'm going to relink them later.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: ht
The bugs are related to the branch because this is a permanent branch that I
keep recycling. Just like the bugs that are linked to trunk, they should have
remained linked.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944
Your team Widelands Devel
Review: Approve
Fix is okay, but as Klaus said. The related bugs don't fit. :-)
I'm going to remove them from the merge request.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/
Uhm, I dont find any changes for #1421942, #1487887, #1530240, #1547909 ,
#1530398
Bu only soem pluar in the wincondition.
Can we get the relations correct?
The actual fix is ok :-)
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/362944
Your team Widelands Developers
Thanks!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelan
Review: Approve diff, testing
Changes sound good to me and output looks as expected.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
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.
___
@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
Po
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://la
Thanks!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelan
Review: Approve
Approved, changes sound good to me.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: ht
Review: Resubmit
Fixed accidental changes
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://laun
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
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
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
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
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
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
Thanks a lot for the review :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/342037
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https:/
Review: Approve
Proofread the changes, everything looks good to me.
Tested the in-game help and played a quick artifacts game; it all works as it
should.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/342037
Your team Widelands Developers is subscribed to branch
lp:~
Thanks for the review :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launc
Review: Approve
LGTM
Thanks for doing the empire 4 string.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/337849
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing
Review: Approve
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/326266
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-dev
Po
Since we don't have a consensus, I reverted it to the way it was. I don't have
strong feelings about this string.
Ans even as master of strings I appreciate any feedback and improvement from
others ;)
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/318985
Your team Wi
For me "Jundlina Writes a Letter" is the heading of this chapter. The header
gives a hint on whats going on in the following text, but isn't a concrete part
of the text.
Since i am not registered on transifex and you are the master of translation,
feel free to change it as you like.
I am not
Regarding your comment, I changed it due to the following feedback on Transifex:
Wait, so Jundlina writes a letter in which she writes that she will write a
letter to Sidolus?
Perhaps we should just go with one of the older titles? It would fit perfectly
well if she received a letter instead of
Review: Approve
One nit, otherwise looks good to me.
Diff comments:
> === modified file 'data/campaigns/atl01.wmf/scripting/texts.lua'
> --- data/campaigns/atl01.wmf/scripting/texts.lua 2017-02-15 19:32:31
> +
> +++ data/campaigns/atl01.wmf/scripting/texts.lua 2017-03-04 13:46:04
Thanks for reviewing again :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://
Review: Approve
Thanks for the campaign fixes, the diff looks good to me now.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/316931
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
__
1. I don't have a better idea either. In Firefox, it's "Ctrl++" and "Ctrl+-",
so it's the same solution without the blank spaces.
2. Good idea, I have split this. I don't think that we need to mention the zoom
though, the user will notice that anyway. The important information here is
which hot
Most of the diff looks good to me.
Two nits:
- "Ctrl + +" and "Ctrl + -" just look strange. But I haven't any better idea.
- I would split up the "Ctrl + 1-9" help text into a "Ctrl + 1-9"-line for
storing and a "1-9"-line for restoring the positions. Maybe also add a comment
that the zoom level
Thanks!
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelan
Review: Approve
lgtm.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-dev
Po
Review: Approve
LGTM.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/294939
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291335
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-dev
Po
Review: Approve
LGTM.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291335
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291154
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-dev
Po
Review: Approve
LGTM.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/291154
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands
T have retested this myself now, and since I don't expect any new bugs (famous
last words...), I'm gonna merge.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/st
Review: Approve
Code looks good to me, not tested
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/290399
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: http
Travis passed
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/288491
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~w
Review: Approve
LGTM, I have not tested it but if travis says it is OK, you can merge this I
think
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/288491
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-dev
Po
Review: Approve
lgtm.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/286547
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~wideland
Review: Approve
no, not that I know. I am just bugged by seeing fixed bugs attached to a
branch. I'll get over it I guess :)
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/285088
Your team Widelands Developers is subscribed to branch
lp:~widelands-de
This is sort of my catch-all branch for string issues - I just fix whatever
gets reported on Transifex here. It would be hard to come up with a good branch
name each time. Is reusing the branch a problem for the commit history?
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/
Review: Approve
You should probably use another branch name in the future. This one has all
those fixed bugs attached.
One tiny nit, otherwise lgtm.
Diff comments:
>
> === modified file 'src/ui_basic/progresswindow.cc'
> --- src/ui_basic/progresswindow.cc2016-01-31 21:03:15 +
> +++ sr
Review: Approve
lgtm.
@bunnybot merge
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/283712
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchp
Only SirVer and I have the necessary privileges on Transifex to push
translations. So, the new translation templates will have to wait until I get
back home.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646
Your team Widelands Developers is subscribed to branch
Merged and pushed. :)
(Haven't generated new translation templates though)
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
_
Thanks. Could someone please merge my approved branches, unless they contain
difficult merge conflicts? It will take some time until I can do this myself
again.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646
Your team Widelands Developers is subscribed to branc
Review: Approve
OK, I tested it
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/
Code looks good, please test
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
___
M
Thanks :)
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-dev
Post to
Review: Approve
lgtm. gonna merge.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.n
Yes, that fixed it :)
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-
see inline comments
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/278857
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-de
Review: Needs Fixing
Diff comments:
>
> === modified file 'utils/buildcat.py'
> --- utils/buildcat.py 2015-11-06 18:57:00 +
> +++ utils/buildcat.py 2015-11-27 17:43:13 +
> @@ -58,8 +58,9 @@
> "../../world/*/*/*/*/*/*.lua",
> ]),
> ("tribes/tribes", [
> -"../.
Review: Approve
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/277693
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-dev
Review: Approve
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/271730
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-dev
The change you commented is straight quote -> curly quote. So, no addicental
whitespace added - may editor will strip any trailing whitespaces anyway.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/270856
Your team Widelands Developers is subscribed to branch
lp:~wide
Review: Approve
one thing to look into, otherwise lgtm.
Diff comments:
>
> === modified file 'tribes/atlanteans/woodcutters_house/help.lua'
> --- tribes/atlanteans/woodcutters_house/help.lua 2015-07-26 10:59:28
> +
> +++ tribes/atlanteans/woodcutters_house/help.lua 2015-09-13 06:
Review: Approve
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/270159
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~widelands-dev
Review: Approve
I reviewed offline and merged right after.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/266520
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing l
In revision 7492,the change "Working radius" -> "Work area" in the file
tribes/scripting/format_help.lua should be revised. The string prints the
work area radius, so the original text "Working radius" seems more
appropriate.
On 27 July 2015 at 11:10, wrote:
> The proposal to merge lp:~widelands
Review: Approve
Gonna merge.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/265906
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~wi
Review: Approve
Lgtm.
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/253922
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/string-fixes.
___
Mailing list: https://launchpad.net/~wideland
Review: Approve
couple of nits to consider.
Diff comments:
> === modified file 'src/ui_fsmenu/campaign_select.cc'
> --- src/ui_fsmenu/campaign_select.cc 2014-10-31 07:40:54 +
> +++ src/ui_fsmenu/campaign_select.cc 2014-12-07 10:33:42 +
> @@ -233,11 +233,14 @@
> Ca
+1
--
https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/216424
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/string-fixes into lp:widelands.
___
Mailing list: https://launc
71 matches
Mail list logo
