StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

docs: Update instructions to pull translations

Browse Source
This commit is contained in:
sudden6 2018-07-01 21:14:18 +02:00
parent 2e211d4201
commit 8317f2473f
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
1 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
MAINTAINING.md
View File

@ -110,42 +110,16 @@ translations, on the other, it lessened problems that were happening with
To get translations into qTox: To get translations into qTox:
1. Add Weblate: `git remote add weblate 1. Go to `https://hosted.weblate.org/projects/tox/qtox/#repository` and lock
https://hosted.weblate.org/git/tox/qtox/` the repository for translations.
2. Fetch newest: `git fetch weblate` 2. Make sure you have git setup to automatically gpg sign commits
3. Check what has been changed compared to master: `git log --no-merges 3. In the root of the qTox repository execute the script
master..weblate/master` `tools/update-weblate.sh`
4. Cherry-pick from the oldest commit. 4. Check what has been changed compared to master: `git diff upstream/master`
- check if there are multiple commits from the same author for the same 5. Checkout a new branch with e.g. `git checkout -b update_weblate` and open
translation. If there are, cherry-pick them accordingly: a Pull Request for it on Github.
6. After the Pull Request has been merged, unlock Weblate and `reset` it to
``` master
git cherry-pick <commit1> <commit2>
```
5. If there were multiple commits, squash them into a single one, leaving only
a single `feat(l10n): …` line in the commit message.
6. Get rid of Weblate's formatting and amend the commit using
[`./tools/deweblate-translation-file.sh`], i.e.:
```
./tools/deweblate-translation-file.sh
```
7. For translations that haven't yet been cherry-picked repeat steps 4-6.
8. Once done with cherry-picking, update all translation files, so that Weblate
would get newest strings that changed in qTox:
```
./tools/update-translation-files.sh ALL
```
9. Once PR with translation gets merged, `Reset` Weblate to current `master`,
since without reset there would be a git conflict that would prevent Weblate
from getting new strings.
**It's a good idea to lock translations on Weblate while they're in merge
process, so that no translation effort would be lost when resetting Weblate.**
## Adding new translations ## Adding new translations