search

gsantner / dandelion

a unofficial diaspora* client for Android
https://github.com/gsantner/dandelion
Other
113 stars 32 forks source link

update galician #188

Closed xmgz closed 6 years ago

xmgz commented 6 years ago

some minor fixes on plurals and better understanding in some options on navigation drawer

gsantner commented 6 years ago

Am 21. Februar 2018 09:36:14 MEZ schrieb x m l p notifications@github.com:

xmgz commented on this pull request.

@@ -5,6 +5,10 @@ tmp/ .tmp .bak *.log +###### +## sobre cómo enviar as traducións #### +traducir.md

Thank you! I will try your suggestion.

but, just one more question...

"git reset --hard upstream/master" is executed when HEAD is on "ga-translation" branch? so this merges your latest code from upstream/master to this branch; then I translate; then add/commit and finally pushing directly from this branch will send you (to upstream/master) the new code to be reviewed and finally merged (if no errors)?

exactly. it not just merges in latest changes, but also makes sure you dont have work of other branches in this new branch

So what I'm doing following your suggestion is to push DIRECTLY to your "master" branch, not to my "master" on github AND THEN making a pull-request from GUI on github?

no, you push to your branch on your fork, but get changes from our repo

So no need to "fork" dandelion on github, just need to init a local repo with your master branch as remote; new local branch "ga-translation"; then make changes on this branch and push them directly to you to merge.

no, you have to work on your repo on your account, and send a PR (like this one). You cannot push to our because you dont have the push rights.

xmgz commented 6 years ago

got it!

very informative

gsantner commented 6 years ago

Note that pushes to existing branches will update the PR if there is one

xmgz commented 6 years ago

I'm in a different computer now trying to use your guide above and replicate the steps.

In a moment I'll make a new PR with updated translation. It'd be nice if this happens fine :D because next time we have new text-chains to translate I'd just need to "reset" my local branch remotely-linked to your master; translate; add&commit; merge to my master; push to my github and finally make a push request to your repository.

This git-thing is not that easy tho :P

gsantner commented 6 years ago

Sounds great! :D

This git-thing is not that easy tho :P

There is one very convenient way to translate dandelion, without git and directly on your phone. Using stringlate: Translate - with Stringlate