Skip to content

Update translation for docs.gaphor.org #3621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Dec 1, 2024
Merged

Update translation for docs.gaphor.org #3621

merged 3 commits into from
Dec 1, 2024

Conversation

weblate
Copy link
Contributor

@weblate weblate commented Dec 1, 2024

Translations update from Hosted Weblate for Gaphor/docs.gaphor.org.

Current translation status:

Weblate translation status

@github-actions github-actions bot added the translation Everything regarding translation, localization, and internationalization label Dec 1, 2024
ovari and others added 3 commits December 1, 2024 17:05
@ovari @weblate
Update Hungarian translation for docs.gaphor.org
3406a4f 
Currently translated at 12.7% (169 of 1321 strings)

Translation: Gaphor/docs.gaphor.org
Translate-URL: https://hosted.weblate.org/projects/gaphor/docs-gaphor-org/hu/
@stansz84 @weblate
Update French translation for docs.gaphor.org
82f3f84 
Currently translated at 51.9% (1037 of 1996 strings)

Translation: Gaphor/docs.gaphor.org
Translate-URL: https://hosted.weblate.org/projects/gaphor/docs-gaphor-org/fr/
@danyeaw @weblate
Update French translation for docs.gaphor.org
e1a1a0c 
Currently translated at 51.9% (1037 of 1996 strings)

Translation: Gaphor/docs.gaphor.org
Translate-URL: https://hosted.weblate.org/projects/gaphor/docs-gaphor-org/fr/
@weblate weblate force-pushed the weblate-gaphor-docs-gaphor-org branch from ff1126a to e1a1a0c Compare December 1, 2024 17:05
@danyeaw
Copy link
Member

danyeaw commented Dec 1, 2024

Thanks @stansz84 and @ovari! You rock ❤️

@danyeaw danyeaw merged commit 6c6ae45 into gaphor:main Dec 1, 2024
12 of 15 checks passed
@stansz84
Copy link
Contributor

stansz84 commented Dec 3, 2024 •
edited
Loading

Unable to merge repository.

Rebasing (1/3)
dropping 3406a4f Update Hungarian translation for docs.gaphor.org -- patch contents already upstream
Rebasing (2/3)
Auto-merging docs/locale/fr/LC_MESSAGES/docs.po
CONFLICT (content): Merge conflict in docs/locale/fr/LC_MESSAGES/docs.po
error: could not apply 82f3f84... Update French translation for docs.gaphor.org
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".

Could not apply 82f3f84... Update French translation for docs.gaphor.org

@amolenaar
Copy link
Member

@stansz84 I'm not sure what you're trying to achieve. Are you on the main branch? Then you should just be able to do git pull --ff-only.

You can always get out if a stuck rebase by invoking git rebase --abort.

@stansz84
Copy link
Contributor

stansz84 commented Dec 5, 2024 •
edited
Loading

@danyeaw I'm not working directly in GIT, I'm using WEBLATE. The https://hosted.weblate.org/projects/gaphor/docs-gaphor-org/ page is locked with a warning that displays the previous message. It's impossible to continue translating.

@amolenaar
Copy link
Member

@danyeaw I fixed the merge conflict, but I cannot unlock the tranmslation repo. the wlc tool tells me I do not have permission to perform that action.

@amolenaar
Copy link
Member

Hi @stansz84, sorry it took so long. The merge conflict has been resolved and weblate allows for translating the docs again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danyeaw danyeaw danyeaw approved these changes

Assignees
No one assigned
Labels
translation Everything regarding translation, localization, and internationalization
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@weblate @danyeaw @stansz84 @amolenaar @ovari