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 weblate merge conflict #64

Merged
merged 7 commits into from
Aug 16, 2024
Merged

Fix weblate merge conflict #64

merged 7 commits into from
Aug 16, 2024

Commits on Mar 13, 2024

  1. Translated using Weblate (Japanese) 

    Currently translated at 100.0% (150 of 150 strings)

Translation: Privacy Friendly Apps/Password Generator android app
Translate-URL: https://hosted.weblate.org/projects/pfa/password-generator/password-generator-android-app/ja/
    @weblate
    Kazushi Hayama authored and weblate committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    64c4cfd View commit details
    Browse the repository at this point in the history

  2. Translated using Weblate (German) 

    Currently translated at 100.0% (150 of 150 strings)

Translation: Privacy Friendly Apps/Password Generator android app
Translate-URL: https://hosted.weblate.org/projects/pfa/password-generator/password-generator-android-app/de/
    @weblate
    weblate committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    8ad812a View commit details
    Browse the repository at this point in the history

  3. Translated using Weblate (Japanese) 

    Currently translated at 100.0% (150 of 150 strings)

Translation: Privacy Friendly Apps/Password Generator android app
Translate-URL: https://hosted.weblate.org/projects/pfa/password-generator/password-generator-android-app/ja/
    @weblate
    weblate committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    4a37638 View commit details
    Browse the repository at this point in the history

  4. Translated using Weblate (Estonian) 

    Currently translated at 6.6% (10 of 150 strings)

Translation: Privacy Friendly Apps/Password Generator android app
Translate-URL: https://hosted.weblate.org/projects/pfa/password-generator/password-generator-android-app/et/
    @weblate
    weblate committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    f9b26d1 View commit details
    Browse the repository at this point in the history

  5. Translated using Weblate (Turkish) 

    Currently translated at 100.0% (150 of 150 strings)

Translation: Privacy Friendly Apps/Password Generator android app
Translate-URL: https://hosted.weblate.org/projects/pfa/password-generator/password-generator-android-app/tr/
    @weblate
    weblate committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    538e02f View commit details
    Browse the repository at this point in the history

  6. Update translation files 

    Updated by "Remove blank strings" hook in Weblate.

Translation: Privacy Friendly Apps/Password Generator android app
Translate-URL: https://hosted.weblate.org/projects/pfa/password-generator/password-generator-android-app/
    @weblate
    weblate committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    23de4a5 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Merge branch 'weblate/master' into 'fix-weblate-merge-conflict' 

    # Conflicts:
#	app/src/main/res/values-ja/strings.xml
    @udenr
    udenr committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    22dd3a8 View commit details
    Browse the repository at this point in the history