Hi,
drebs wrote (08 Oct 2012 18:52:28 GMT) :
> Hello, pull request!
Thank you. This branch introduces unresolved conflict markers in at
least these two files:
* wiki/src/doc/anonymous_internet.index.fr.po
* wiki/src/doc/encryption_and_privacy/openpgp_passphrase_encryption.fr.po
When merging in stuff that you are not supposed to change on your
side, and a conflict arises, I suggest to checkout the known-good
(that is, upstream) version of the file while resolving the merge:
$ git checkout upstream/master -- $FILE
$ git add $FILE
Apparently, you did the latter, without doing the former or actually
resolving the conflict.
I've fixed that, and merged your (much welcome) work :)
Thanks a lot!
> Question: is there someone else here focusing on
> portuguese translation?
I don't think so.
