Review: Needs Information
Update: Made the two changes that SirVer proposed. "Provisorily" was wrong, of
course. To make not any spelling mistakes, I sometimes copy words from a
dictionary - and it seems, I copied the wrong line... And I changed the axe /
felling axe ratio to 1 / 5.
About that
You have been requested to review the proposed merge of
lp:~angreeone/widelands/trunk into lp:widelands.
Corrected untranslated strings, adjusted barbarian tutorial 3 according to new
changes ("felling axes"), fixed typos, updated empire texts to match new build
help ("red spots"), unification
Review: Needs Fixing
the merge conflict: merge trunk into your branch:
% bzr merge lp:widelands;
fix the conflicts
% bzr commit -m "Merged with trunk"
About the quotation marks: we can simply let the translate one:
function direct_speech(text)
return rt( (_ '"%s"'):format(text)))
end
I th
Review: Needs Information
Ok, I did the
bzr merge lp:widelands;
part. BZR told me:
"Text conflict in campaigns/cconfig
1 conflicts encountered."
How can I find out what exactly the conflict is and how I can fix it?
--
https://code.launchpad.net/~angreeone/widelands/trunk/+merge/40936
Your team
have a look at at start of line
=
and >
and read
http://doc.bazaar.canonical.com/latest/en/user-reference/conflict-types-help.html
--
https://code.launchpad.net/~angreeone/widelands/trunk/+merge/40936
Your team Widelands Developers is requested to review the propose
Review: Resubmit
Alright, I guess, I figured it out. I have the following conflict:
<<< TREE
campname2=_"(Tutorial) Atlanteans - the new rise"
===
campname2=_"Atlanteans - The run for the fire"
>>> MERGE-SOURCE
So, the old string was "Atlanteans - the new rise" and I added "(Tutorial)
Review: Needs Fixing
The uestion is: is the atlantean campaign a real tutorial? Of course it holds
quite some elements explaining (indirectly) what each building does. However
the main quest is to expand fast and to save everything before the flood sucks
it in the ocean.
So for me it is a campa
> The uestion is: is the atlantean campaign a real tutorial? Of course it holds
> quite some elements explaining (indirectly) what each building does. However
> the main quest is to expand fast and to save everything before the flood sucks
> it in the ocean.
>
> So for me it is a campaign with exp
8 matches
Mail list logo
