-
Notifications
You must be signed in to change notification settings - Fork 84
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
Translations update from Hosted Weblate #1034
Translations update from Hosted Weblate #1034
Conversation
Checking this one, too, as it's definitely a different file:
Swedish
|
In an earlier commit in my PR, I originally had:
But we changed it here. Is that perhaps implicated in what's going on? |
I guess it's related somehow... |
What if I do a PR to test what happens if I put it back to |
13df6b2
to
8a22b9c
Compare
May need a rebase... |
503bdc9
to
9a045b3
Compare
Hit with a hammer. Now fixed. |
Are the translations gone? |
There were no new translations - they'd been merged successfully. This was a fix to the build system: |
Are you sure? I thought there were translations |
When do you think the translations happened, relative to the commits?
|
https://github.com/jamulussoftware/jamuluswebsite/compare/503bdc9218632ac10c5b53f6637c5def74f30a8e..9a045b384b890be57f2b212670d413def7402943#diff-6bfc7b6a323989b18ef5ccb35a90eb634b54cb760b54feb08c258288ab14dd19L89 |
So 9a045b3 is ahead of HEAD on next-release? That I have the ref locally means I guess I dropped it at some point.
However, |
First, check locally to see if I have them...
Nope.
Yep. Now see if
Hm. So I can And if I create a branch at 9a045b3 and rebase to next-release, I get (as expected, given the diff) a no-op and the branch resets to next-release, losing the ref. |
Is 9a045b3 just trying to repeat commit 07585e3 (which was a squash)? |
From what I can see from 503bdc9...release it looks like 503bdc9 is old - possibly around 3.10.0 time. What I don't understand is why 503bdc9 thinks it's parent is 257dbc8:
|
9a045b3
to
ae2f1de
Compare
I just forced an update on weblate and a new translation showed up. |
ae2f1de
to
86d52cd
Compare
Currently translated at 100.0% (137 of 137 strings) Translation: Jamulus/Software-Manual Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/fr/
Currently translated at 89.4% (34 of 38 strings) Translation: Jamulus/Getting-Started Translate-URL: https://hosted.weblate.org/projects/jamulus/getting-started/pt_BR/
Currently translated at 100.0% (56 of 56 strings) Translation: Jamulus/Client-Troubleshooting Translate-URL: https://hosted.weblate.org/projects/jamulus/client-troubleshooting/es/
Currently translated at 100.0% (38 of 38 strings) Translation: Jamulus/Getting-Started Translate-URL: https://hosted.weblate.org/projects/jamulus/getting-started/es/
Currently translated at 100.0% (42 of 42 strings) Translation: Jamulus/Installation-for-Windows Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-windows/es/
Currently translated at 100.0% (159 of 159 strings) Translation: Jamulus/Running-a-Server Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/es/
Currently translated at 100.0% (136 of 136 strings) Translation: Jamulus/Software-Manual Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/es/
Currently translated at 100.0% (25 of 25 strings) Translation: Jamulus/Navigation Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/es/
Currently translated at 89.4% (34 of 38 strings) Translation: Jamulus/Getting-Started Translate-URL: https://hosted.weblate.org/projects/jamulus/getting-started/pt_BR/
Currently translated at 100.0% (56 of 56 strings) Translation: Jamulus/Client-Troubleshooting Translate-URL: https://hosted.weblate.org/projects/jamulus/client-troubleshooting/es/
Currently translated at 100.0% (38 of 38 strings) Translation: Jamulus/Getting-Started Translate-URL: https://hosted.weblate.org/projects/jamulus/getting-started/es/
Currently translated at 100.0% (42 of 42 strings) Translation: Jamulus/Installation-for-Windows Translate-URL: https://hosted.weblate.org/projects/jamulus/installation-for-windows/es/
Currently translated at 100.0% (159 of 159 strings) Translation: Jamulus/Running-a-Server Translate-URL: https://hosted.weblate.org/projects/jamulus/running-a-server/es/
Currently translated at 100.0% (136 of 136 strings) Translation: Jamulus/Software-Manual Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/es/
Currently translated at 100.0% (25 of 25 strings) Translation: Jamulus/Navigation Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/es/
Currently translated at 100.0% (136 of 136 strings) Translation: Jamulus/Software-Manual Translate-URL: https://hosted.weblate.org/projects/jamulus/software-manual/es/
Currently translated at 100.0% (25 of 25 strings) Translation: Jamulus/Navigation Translate-URL: https://hosted.weblate.org/projects/jamulus/navigation/es/
73867ee
to
95330d9
Compare
OK, as per #1051 I'll merge this as it stands and let Weblate raise a new PR. |
Well, it didn't blow up because of Gemfile.lock, at least.
|
I've tried deleting the cache and rerunning... ... which appears to have fixed it. |
Translations update from Hosted Weblate for Jamulus/Startpage.
It also includes the following components:
Jamulus/Running-a-Server
Jamulus/Command-Line-Options
Jamulus/Unregistered-Servers
Jamulus/Installation-for-Android
Jamulus/Navigation
Jamulus/Installation-for-iOS
Jamulus/Copyright notices
Jamulus/Include-Backing-Up
Jamulus/Tips-Tricks-More
Jamulus/Server-Troubleshooting
Jamulus/Client-Troubleshooting
Jamulus/Installation-for-Macintosh
Jamulus/Include-Shared-Commands
Jamulus/Software-Manual
Jamulus/QOS-Windows
Jamulus/Include-Client-Commands
Jamulus/General strings
Jamulus/Contribution
Jamulus/Server-Bandwidth
Jamulus/Getting-Started
Jamulus/FAQ
Jamulus/Installation-for-Linux
Jamulus/Installation-for-Windows
Jamulus/Directories
Jamulus/Privacy-Statement
Current translation status: