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

Fix more Weblate merge conflicts #5306

Merged
merged 13 commits into from
Mar 25, 2024
Merged

Fix more Weblate merge conflicts #5306

merged 13 commits into from
Mar 25, 2024

Commits on Mar 24, 2024

  1. Added translation using Weblate (Slovenian) 

    Co-authored-by: Jernej Vidmar <[email protected]>
    @Nazz78 @weblate
    Nazz78 authored and weblate committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    cb7d80e View commit details
    Browse the repository at this point in the history

  2. Translated using Weblate (Slovenian) 

    Currently translated at 100.0% (0 of 0 strings)

Co-authored-by: Prefill add-on <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/keywords/sl/
Translation: Hedy/Keywords
    @weblate
    Prefill add-on authored and weblate committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    d074f5c View commit details
    Browse the repository at this point in the history

  3. Added translation using Weblate (Slovenian) 

    Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Added translation using Weblate (Slovenian)

Co-authored-by: Languages add-on <[email protected]>
    @weblate
    Languages add-on authored and weblate committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    e4a51f3 View commit details
    Browse the repository at this point in the history

  4. Translated using Weblate (Slovenian) 

    Currently translated at 0.0% (0 of 391 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 44 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 618 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 2185 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.7% (5 of 692 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 189 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 50 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 24 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.0% (0 of 92 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.2% (1 of 464 strings)

Co-authored-by: Prefill add-on <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/achievements/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/client-messages/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/commands/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/parsons/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/slides/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/tutorials/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/webpages/sl/
Translation: Hedy/Achievements
Translation: Hedy/Adventures
Translation: Hedy/Cheatsheets
Translation: Hedy/Parsons
Translation: Hedy/Quizzes
Translation: Hedy/Texts
Translation: Hedy/Tutorials
Translation: Hedy/Webpages
Translation: Hedy/client-messages
Translation: Hedy/slides
    @weblate
    Prefill add-on authored and weblate committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    8b01ea6 View commit details
    Browse the repository at this point in the history

  5. Translated using Weblate (Slovenian) 

    Currently translated at 10.8% (75 of 692 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (64 of 64 strings)

Translated using Weblate (Slovenian)

Currently translated at 24.0% (12 of 50 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (92 of 92 strings)

Translated using Weblate (Slovenian)

Currently translated at 2.3% (16 of 692 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (64 of 64 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (44 of 44 strings)

Translated using Weblate (Slovenian)

Currently translated at 0.1% (3 of 2185 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (24 of 24 strings)

Translated using Weblate (Slovenian)

Currently translated at 1.1% (8 of 692 strings)

Translated using Weblate (Slovenian)

Currently translated at 100.0% (64 of 64 strings)

Translated using Weblate (Slovenian)

Currently translated at 3.1% (2 of 64 strings)

Translated using Weblate (Slovenian)

Currently translated at 1.5% (1 of 64 strings)

Co-authored-by: Jernej Vidmar <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/achievements/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/client-messages/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/keywords/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/parsons/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/quizzes/sl/
Translate-URL: https://hosted.weblate.org/projects/hedy/tutorials/sl/
Translation: Hedy/Achievements
Translation: Hedy/Adventures
Translation: Hedy/Keywords
Translation: Hedy/Parsons
Translation: Hedy/Quizzes
Translation: Hedy/Tutorials
Translation: Hedy/client-messages
    @Nazz78 @weblate
    Nazz78 authored and weblate committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    aba215b View commit details
    Browse the repository at this point in the history

  6. Translated using Weblate (French) 

    Currently translated at 82.6% (572 of 692 strings)

Co-authored-by: Étienne Charignon <[email protected]>
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/fr/
Translation: Hedy/Adventures
    @etienneCharignon @weblate
    etienneCharignon authored and weblate committed Mar 24, 2024
    Configuration menu
    Copy the full SHA
    4f082da View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Translated using Weblate (Ukrainian) 

    Currently translated at 37.4% (259 of 692 strings)

Translation: Hedy/Adventures
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/uk/
    @emartynov @weblate
    emartynov authored and weblate committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    c264cc9 View commit details
    Browse the repository at this point in the history

  2. Translated using Weblate (Slovenian) 

    Currently translated at 10.8% (75 of 692 strings)

Translation: Hedy/Adventures
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/sl/
    @Nazz78 @weblate
    Nazz78 authored and weblate committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    a77dcc5 View commit details
    Browse the repository at this point in the history

  3. Translated using Weblate (Slovenian) 

    Currently translated at 24.0% (12 of 50 strings)

Translation: Hedy/Parsons
Translate-URL: https://hosted.weblate.org/projects/hedy/parsons/sl/
    @Nazz78 @weblate
    Nazz78 authored and weblate committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    e3393fe View commit details
    Browse the repository at this point in the history

  4. Translated using Weblate (Chinese (Simplified)) 

    Currently translated at 100.0% (692 of 692 strings)

Translation: Hedy/Adventures
Translate-URL: https://hosted.weblate.org/projects/hedy/adventures/zh_Hans/
    @ZoomQuiet @weblate
    ZoomQuiet authored and weblate committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    555521c View commit details
    Browse the repository at this point in the history

  5. Translated using Weblate (Chinese (Simplified)) 

    Currently translated at 100.0% (618 of 618 strings)

Translation: Hedy/Texts
Translate-URL: https://hosted.weblate.org/projects/hedy/web-texts/zh_Hans/
    @ZoomQuiet @weblate
    ZoomQuiet authored and weblate committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    f50fbf7 View commit details
    Browse the repository at this point in the history

  6. Rewrites

    @rix0rrr
    rix0rrr committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    6e39f75 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/main' into merge-conflicts-2

    @rix0rrr
    rix0rrr committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    5a66cab View commit details
    Browse the repository at this point in the history