Spanish translation 100% (except debug strings) #126
Conversation
|
hm, apparently there's a conflict? |
Yes, but I don't understand what that means xD Obviously there are differences between master and my PR, that's what PR is all about! xD |
It's because this PR branched off at a different point; master has received new updates since you first created this branch which you need to merge back into this branch first. Specifically, 7c62567, 1a3798f, e33df5f, b449e9d, and 3961792 all also touched this file. |
|
Everything is already included, I guess it will be enough to force the PR by replacing the file. |
@nemaara do we have a policy on using force-pushes to merge? |
regenerate with wmlxgettext
…New_Order into translation-second-pr
|
looking at the translation file some more in Poedit, I'm noticing more source strings that I ought to touch up, but I don't want to create more work for you (at least not just yet), so I'll put that off until after our next release... copyediting is tracked in issue #5 anyways... |
|
At last! |
|
Hm, looks like GitHub doesn't present a "force-push" option for merging via the web UI; I'm going to figure out how to do this via the command line... |
|
I finally figured out how to fix conflicts. On Github Desktop: "Branch" > "Update from upstream/master" > Select on the files with conflict to use the current branch, not upstream/master branch. |
ok cool, I'll squash and merge now |
merge nemaara/A_New_Order#126 from @Toranks
I send it in draft until it is really 100% to keep track of progress
Resolves #111
Partially #10