Skip to content

Translations update from Weblate #3613

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.

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

Merged
merged 30 commits into from
Oct 29, 2020

Conversation

weblate
Copy link
Collaborator

@weblate weblate commented Oct 27, 2020

Translations update from Weblate for CircuitPython/main.

Current translation status:

Weblate translation status

microdev1 and others added 15 commits October 22, 2020 21:32
This works in loopback mode, though the hardware filtering only permits a
single address or mask filter.
 * explain the introduction of the temporary variable in get_t_config
 * get rid of unneeded __attribute__
 * get rid of unneeded members of canio_can_obj_t
 * get rid of unneeded header inclusion
Currently translated at 100.0% (836 of 836 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/nl/
Currently translated at 100.0% (836 of 836 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/nl/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
jepler
jepler previously approved these changes Oct 27, 2020
Copy link

@jepler jepler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can merge after CI finishes. Thanks!

tannewt and others added 6 commits October 27, 2020 13:58
Currently translated at 99.6% (836 of 839 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
Currently translated at 100.0% (839 of 839 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
Copy link
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This diff is weird. Are we sure it's right?

tannewt and others added 4 commits October 28, 2020 14:45
Add Adafruit ESP EInk Portal and grayscale EInk support
Currently translated at 100.0% (844 of 844 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
Currently translated at 100.0% (844 of 844 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/
Copy link

@jepler jepler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The true changes are only in locale/. Ever since we changed weblate to merge instead of rebase, the github UI has confusingly listed changes on the main branch subsequent to the initial creation of the PR as being a part of the PR. I verify locally that the changes are correct:

jepler@babs:~/src/circuitpython$ git fetch origin refs/pull/3613/head:pr3613 main:main
From https://github.com/adafruit/circuitpython
 * [new ref]             refs/pull/3613/head -> pr3613
   c5d8c12e3..937462df3  main                -> main

List all files actually modified:

jepler@babs:~/src/circuitpython$ git diff --stat main..pr3613
 locale/ID.po             |  44 ++++++++++++-
 locale/cs.po             |  44 ++++++++++++-
 locale/de_DE.po          |  44 ++++++++++++-
 locale/el.po             |  44 ++++++++++++-
 locale/es.po             |  60 ++++++++++++++---
 locale/fil.po            |  44 ++++++++++++-
 locale/fr.po             |  44 ++++++++++++-
 locale/hi.po             |  44 ++++++++++++-
 locale/it_IT.po          |  44 ++++++++++++-
 locale/ja.po             |  44 ++++++++++++-
 locale/ko.po             |  44 ++++++++++++-
 locale/nl.po             | 166 +++++++++++++++++++++++++++++------------------
 locale/pl.po             |  44 ++++++++++++-
 locale/pt_BR.po          |  48 ++++++++++++--
 locale/sv.po             |  44 ++++++++++++-
 locale/zh_Latn_pinyin.po |  48 ++++++++++++--
 16 files changed, 732 insertions(+), 118 deletions(-)

List all commits actually included:

jepler@babs:~/src/circuitpython$ git log --oneline  main..pr3613
c6e842cf9 (pr3613) Merge branch 'origin/main' into Weblate.
d6f3d5948 Merge branch 'origin/main' into Weblate.
a28755d53 Translated using Weblate (Chinese (Pinyin))
cbad75a7d Translated using Weblate (Portuguese (Brazil))
34a0fec18 Merge branch 'origin/main' into Weblate.
32f6f64a2 Update translation files
e1be1e4f8 Merge branch 'origin/main' into Weblate.
54c26a772 Translated using Weblate (Portuguese (Brazil))
91e85e803 Translated using Weblate (Spanish)
e00ae204d Update translation files
2cb9d2368 Merge branch 'origin/main' into Weblate.
f2e79ce89 Translated using Weblate (Dutch)
ba0a3769e Translated using Weblate (Dutch)

@jepler jepler dismissed tannewt’s stale review October 29, 2020 17:43

[See my approving review comment]

@jepler jepler merged commit 05d663b into adafruit:main Oct 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.