Skip to content
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

Translations update from OSGeo Weblate #3065

Merged
merged 11 commits into from
Sep 12, 2023
Merged

Translations update from OSGeo Weblate #3065

merged 11 commits into from
Sep 12, 2023

Conversation

osgeoweblate
Copy link
Contributor

Translations update from OSGeo Weblate for GRASS GIS/grasslibs.

It also includes following components:

Current translation status:

Weblate translation status

@osgeoweblate osgeoweblate force-pushed the weblate-grass-gis-grasslibs branch 2 times, most recently from 220c50c to 7cf7eda Compare June 28, 2023 19:08
@HuidaeCho HuidaeCho added the translation Message translation related label Jul 25, 2023
@neteler neteler added this to the 8.4.0 milestone Aug 16, 2023
slichtzzz and others added 11 commits September 10, 2023 21:46
@slichtzzz @weblate
Translated using Weblate (Russian)
96fa6b6 
Currently translated at 100.0% (2193 of 2193 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/ru/
@slichtzzz @weblate
Translated using Weblate (Russian)
21a578d 
Currently translated at 97.6% (4277 of 4380 strings)

Translation: GRASS GIS/grasswxpy
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasswxpy/ru/
@slichtzzz @weblate
Translated using Weblate (Russian)
11cab28 
Currently translated at 0.9% (121 of 12647 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/ru/
@neteler @weblate
Translated using Weblate (German)
eeff31d 
Currently translated at 40.0% (879 of 2197 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/de/
@slichtzzz @weblate
Translated using Weblate (Russian)
551eee7 
Currently translated at 100.0% (2193 of 2193 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/ru/
@neteler @weblate
Translated using Weblate (German)
08f6fa1 
Currently translated at 34.4% (4394 of 12767 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/de/
@slichtzzz @weblate
Translated using Weblate (Russian)
76fd56b 
Currently translated at 100.0% (4380 of 4380 strings)

Translation: GRASS GIS/grasswxpy
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasswxpy/ru/
@slichtzzz @weblate
Translated using Weblate (Russian)
988f595 
Currently translated at 1.4% (182 of 12647 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/ru/
@neteler @weblate
Translated using Weblate (German)
73a260d 
Currently translated at 34.4% (4403 of 12767 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/de/
@neteler @weblate
Translated using Weblate (German)
c679724 
Currently translated at 40.2% (885 of 2197 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/de/
@neteler @weblate
Translated using Weblate (German)
9c70f73 
Currently translated at 61.9% (2734 of 4415 strings)

Translation: GRASS GIS/grasswxpy
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasswxpy/de/
@neteler
Copy link
Member

neteler commented Sep 11, 2023

This PR needs to be timely merged, otherwise the Weblate update mechanism fails.
See
https://trac.osgeo.org/osgeo/ticket/2981

@neteler neteler merged commit 9cccc35 into OSGeo:main Sep 12, 2023
18 checks passed
@HuidaeCho
Copy link
Member

HuidaeCho commented Sep 12, 2023 •
edited
Loading

Good to know that. We shouldn't wait to collect more translations... Now, updating its repo fails with

Rebasing (1/11)
error: could not apply 96fa6b652... Translated using Weblate (Russian)
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".
Could not apply 96fa6b652... Translated using Weblate (Russian)
Auto-merging locale/po/grasslibs_ru.po
CONFLICT (content): Merge conflict in locale/po/grasslibs_ru.po
 (1)

I think it's because there are some conflicts in outgoing commits. Not sure how often the Weblate repo is automatically updated, if ever, and the above failure from an automatic update can lock the Weblate.

Even a manual push fails with the same error :-(.

@neteler
Copy link
Member

neteler commented Sep 12, 2023

Can @robe2 please support us here (see above)?

@robe2
Copy link

robe2 commented Sep 12, 2023

You should a weblate hook in place to push commits then pushes happen on every commit to your repo. On the postgis-workshop side we have a hook that looks like this:

image

should be accessible from https://github.com/OSGeo/grass/settings/hooks

add a hook

@neteler
Copy link
Member

neteler commented Sep 12, 2023

Thanks for the hint, I have added the Weblate webhook.

@robe2
Copy link

robe2 commented Sep 13, 2023

Hopefully I didn't screw up anything I have as discussed here what I did https://trac.osgeo.org/osgeo/ticket/2981#comment:8 which created new pull request - #3151

@HuidaeCho
Copy link
Member

Thanks for the hint, I have added the Weblate webhook.

Great! Thanks! I didn't have access to the settings.

@HuidaeCho
Copy link
Member

Thanks @robe2! No more conflicts in the future!

@neteler
Copy link
Member

neteler commented Sep 13, 2023

FWIW: I have added some (yet incomplete) notes on how the Weblate installation works with GitHub: https://grasswiki.osgeo.org/wiki/GRASS_messages_translation#Weblate:_technical_background_on_the_installation

landam pushed a commit to landam/grass that referenced this pull request Oct 25, 2023
@osgeoweblate @slichtzzz
@neteler @landam
Translations update from OSGeo Weblate (OSGeo#3065)
e0c4a8d 
* Translated using Weblate (Russian)

Currently translated at 100.0% (2193 of 2193 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/ru/

* Translated using Weblate (Russian)

Currently translated at 97.6% (4277 of 4380 strings)

Translation: GRASS GIS/grasswxpy
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasswxpy/ru/

* Translated using Weblate (Russian)

Currently translated at 0.9% (121 of 12647 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/ru/

* Translated using Weblate (German)

Currently translated at 40.0% (879 of 2197 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/de/

* Translated using Weblate (Russian)

Currently translated at 100.0% (2193 of 2193 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/ru/

* Translated using Weblate (German)

Currently translated at 34.4% (4394 of 12767 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/de/

* Translated using Weblate (Russian)

Currently translated at 100.0% (4380 of 4380 strings)

Translation: GRASS GIS/grasswxpy
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasswxpy/ru/

* Translated using Weblate (Russian)

Currently translated at 1.4% (182 of 12647 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/ru/

* Translated using Weblate (German)

Currently translated at 34.4% (4403 of 12767 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/de/

* Translated using Weblate (German)

Currently translated at 40.2% (885 of 2197 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/de/

* Translated using Weblate (German)

Currently translated at 61.9% (2734 of 4415 strings)

Translation: GRASS GIS/grasswxpy
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasswxpy/de/

---------

Co-authored-by: Sergey Kazorin <[email protected]>
Co-authored-by: Markus <[email protected]>
neteler added a commit to nilason/grass that referenced this pull request Nov 7, 2023
@osgeoweblate @slichtzzz @neteler
Translations update from OSGeo Weblate (OSGeo#3065)
e4f21b1 
* Translated using Weblate (Russian)

Currently translated at 100.0% (2193 of 2193 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/ru/

* Translated using Weblate (Russian)

Currently translated at 97.6% (4277 of 4380 strings)

Translation: GRASS GIS/grasswxpy
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasswxpy/ru/

* Translated using Weblate (Russian)

Currently translated at 0.9% (121 of 12647 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/ru/

* Translated using Weblate (German)

Currently translated at 40.0% (879 of 2197 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/de/

* Translated using Weblate (Russian)

Currently translated at 100.0% (2193 of 2193 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/ru/

* Translated using Weblate (German)

Currently translated at 34.4% (4394 of 12767 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/de/

* Translated using Weblate (Russian)

Currently translated at 100.0% (4380 of 4380 strings)

Translation: GRASS GIS/grasswxpy
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasswxpy/ru/

* Translated using Weblate (Russian)

Currently translated at 1.4% (182 of 12647 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/ru/

* Translated using Weblate (German)

Currently translated at 34.4% (4403 of 12767 strings)

Translation: GRASS GIS/grassmods
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grassmods/de/

* Translated using Weblate (German)

Currently translated at 40.2% (885 of 2197 strings)

Translation: GRASS GIS/grasslibs
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasslibs/de/

* Translated using Weblate (German)

Currently translated at 61.9% (2734 of 4415 strings)

Translation: GRASS GIS/grasswxpy
Translate-URL: https://weblate.osgeo.org/projects/grass-gis/grasswxpy/de/

---------

Co-authored-by: Sergey Kazorin <[email protected]>
Co-authored-by: Markus <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
translation Message translation related
Projects
None yet
Milestone
8.4.0
Development

Successfully merging this pull request may close these issues.
5 participants
@osgeoweblate @neteler @HuidaeCho @robe2 @slichtzzz