Submit changes to the repository

I want to help with the translation from English to Spanish in the administration menu so I sent some changes yesterday of some words in the menu.

https://bitbucket.org/wackowik[...]owiki/pull-requests/

I sent it to the master branch, since I didn't find developer branch. I hope they approve it to continue with some things that are missing to translate.

Greetings

Comments

Re: Submit changes to the repository

Now I have to learn how to merge a pull request. I got till now only diffs or updated files via email.

-> implicit merge via rebase or fast-forward merge (failed)
-> Squash on merge, generally without explicit merge (worked)

https://bitbucket.org/wackowik[...]07cb884fae9c1930b618
https://bitbucket.org/wackowik[...]30e3cff0b1544421ac90
https://bitbucket.org/wackowik[...]4f470f08d8563f5fd64c
- WikiAdmin
- 12/12/2020 19:33
- 12/19/2020 22:26 edited
Re: Submit changes to the repository

don't worry, I understand.

now i sent you another pull request to complement what i was missing in the translation.

Greetings
- ascrsoft
- 12/13/2020 00:04
Re: Submit changes to the repository

now update the spanish translation of the wiki client layer, some translations were missing and others had some detail.

I also joined the new action to review everything.

Greetings
- ascrsoft
- 12/19/2020 18:31
Re: Submit changes to the repository

Can you create a separate PR for the language file, I can't split the commits in the pull request, or I haven't figured out how.

So I can pull only the language file and we can work on the other.
- WikiAdmin
- 12/19/2020 20:12
- 12/19/2020 20:38 edited
Re: Submit changes to the repository

I can merge the last commit it manually - should I?
https://bitbucket.org/ascrnet/[...]cf78b11d3041c3ca/raw
- WikiAdmin
- 12/19/2020 20:40
- 12/19/2020 20:41 edited
Re: Submit changes to the repository

so I see the PR is putting all the changes together. Now I only leave the change of the translation once you try it and accept it, I upload the others.
- ascrsoft
- 12/19/2020 21:04
Re: Submit changes to the repository

Thanks, I messed up, chose the wrong default merge, did a git push https://bitbucket.org/wackowiki/wackowiki --force, merged the exported patch locally and pushed it back, all true ;)
- WikiAdmin
- 12/19/2020 22:33
- 12/19/2020 22:33 edited
Re: Submit changes to the repository

no problem, the important thing is the change to the master ;p
- ascrsoft
- 12/20/2020 00:58
Re: Submit changes to the repository

correction of words with accents and translation of missing words into Spanish PR
- ascrsoft
- 12/31/2020 19:54