mirror of
https://salsa.debian.org/hertzog/debian-handbook.git
synced 2026-01-11 19:56:38 +00:00
64 lines
2.3 KiB
Text
64 lines
2.3 KiB
Text
Some notes for the the project maintainers
|
|
==========================================
|
|
|
|
The information here is only interesting for the project maintainers.
|
|
|
|
How to merge from weblate
|
|
-------------------------
|
|
|
|
1. Go to https://hosted.weblate.org/projects/debian-handbook/#repository
|
|
and "lock" the repository. This will ensure nobody can make further
|
|
changes and will commit uncommitted changes.
|
|
|
|
2. In your local checkout, fetch the weblate remote repository:
|
|
$ git fetch weblate
|
|
If you don't have it configured, do it:
|
|
$ git remote add weblate https://hosted.weblate.org/git/debian-handbook/12_advanced-administration
|
|
|
|
3. Checkout the bookworm/main branch from weblate in "weblate-merge":
|
|
$ git checkout -B weblate-merge weblate/bookworm/main
|
|
|
|
4. Rebase it on top on bookworm/main and squash as many commits as
|
|
possible. You can get a list of commands to feed by executing
|
|
bin/merge-weblate
|
|
$ bin/merge-weblate >/tmp/rebase-commands
|
|
$ git rebase -i bookworm/main # feed content of /tmp/rebase-commands
|
|
# instead of list provided by git
|
|
|
|
5. Switch back to bookworm/main and merge weblate-merge.
|
|
$ git checkout bookworm/main
|
|
$ git merge weblate-merge
|
|
|
|
6. Run "bin/build-all". If some languages fail to build, find out why
|
|
and fix it. Usually it's due to some XML markup mistakes. Commit
|
|
those fixes with "git commit -a -m '<language-code>: fix XML markup'"
|
|
or something along those lines.
|
|
|
|
7. Update the POT/PO files if some changes have been committed to the
|
|
English text.
|
|
$ bin/update-l10n
|
|
|
|
8. Push the changes to the git repository on salsa.debian.org:
|
|
$ git push
|
|
|
|
9. Force reset changes in the weblate git repository. You do this
|
|
from https://hosted.weblate.org/projects/debian-handbook/#repository
|
|
with the "Reset" button.
|
|
|
|
10. Unlock the changes in weblate. From the same page click the "Unlock"
|
|
button.
|
|
|
|
How to update branch tracked in weblate
|
|
---------------------------------------
|
|
|
|
It's over here:
|
|
https://hosted.weblate.org/settings/debian-handbook/12_advanced-administration/
|
|
|
|
It can only be done by administrators (Raphaël, Petter).
|
|
|
|
How to ask for help with Weblate
|
|
--------------------------------
|
|
|
|
Michal Čihař <nijel@debian.org> told us: « In case you need some
|
|
assistance with Weblate, please write to care@weblate.org, so that it ends
|
|
up in our customer care portal. »
|