iobrokertranslator/doc

Documentation of the translation process for ioBroker

doc's Issues

Weblate small error / enhancement in correction guide

For a merge conflict the following guide is displayed by weblate (here for repo admin)

Typical workflow for fixing merge conflicts

Commit all pending changes in Weblate and lock the translation component.
wlc commit; wlc lock
Add Weblate exported repository as a remote.
git remote add weblate https://weblate.iobroker.net/git/adapters/admin/ ; git remote update weblate
Merge Weblate changes and resolve any conflicts.
git merge weblate/main
Push changes into upstream repository.
git push origin main
Weblate should now be able to see updated repository and you can unlock it.
wlc pull ; wlc unlock
[Check the FAQ for info on how to resolve this.](https://docs.weblate.org/en/weblate-4.12.2/faq.html#merge)

a) instead of or additional to wlc commands hints to the corresponding area at weltae webpage should be given (Users normally do not have access to commandline at weblate system)

b) git merge weblate/main and git push origin main should either use the correct head name (main OR master) or use soe syntax like main/master to guide inexperianced users.

c) In addition please add the following info : (c) UncleSamSwiss Um von Weblate Git pullen zu können, musst du deinen API Key und den Benutzer von Weblate benutzen.

Configure Watchtower to respect dependencies on updates

We should shutdown weblate before updating db or cache containers ... so respect the "depends_on" from docker_compose also in watchtower

Weblate PRs with huge number of changes due to whitespace changes

Example:

ioBroker/ioBroker.admin@780d45d

Weblate seems to issue PRs which contain only changes of (leading) whitespaces. I'm quite sure that I did not change anything within admin. I might have browsed admin but not sure either.

Anyway please check whether it would be possible to configure weblate in a way to ignore such whitespace changes.

If the problem ich caused by different settings of nom run translate and weblate formatting, check whether this can be made consistent.

Ignore package-lock.json on PRs

Else npm version on weblate and package-lock version might interfere

Die Übersetzung wurde automatisch gesperrt, aufgrund folgender Hinweise: Das Repository konnte nicht zusammengeführt werden.

Hi,
iqontrol wurde in weblate gesperrt und ich bekomme es nicht wieder entsperrt. Kann mir jemand dabei helfen?

Fehlermeldung:

Das Repository konnte nicht zusammengeführt werden.
Weblate konnte Upstream-Änderungen während der Aktualisierung des Repositorys nicht zusammenführen.

First, rewinding head to replay your work on top of it...
Applying: Update index_m.js
Using index info to reconstruct a base tree...
M	admin/index_m.js
Falling back to patching base and 3-way merge...
Auto-merging admin/index_m.js
CONFLICT (content): Merge conflict in admin/index_m.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Update index_m.js

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".