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.

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

fix translation after PR #1268 #1393

Merged
merged 3 commits into from
Apr 14, 2024

Conversation

Strubbl
Copy link
Contributor

@Strubbl Strubbl commented Apr 13, 2024

after this PR is merged, translation via weblate should be possible again

@tcitworld tcitworld merged commit 4b47071 into wallabag:master Apr 14, 2024
2 checks passed
@Strubbl
Copy link
Contributor Author

Strubbl commented Apr 14, 2024

Since weblate is not fixed yet, I am going to rebase the weblate/master branch onto the current master (as described here: https://hosted.weblate.org/projects/wallabag/android-app/#alerts) and then i am going to push to master. Is a push to master still allowed? I'll try it

@Strubbl Strubbl deleted the fix-translation-zh-rTW branch April 14, 2024 13:12
@Strubbl
Copy link
Contributor Author

Strubbl commented Apr 14, 2024

This does not help. After these strategy the master is the same as the current HEAD.

@Strubbl
Copy link
Contributor Author

Strubbl commented Apr 14, 2024

I checked the 2 outgoing commits from weblate. These were already part of the translation in app/src/main/res/values-zh-rTW/strings.xml. Thus, i "Reset all changes in the Weblate repository"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants