forked from bibletime/bibletime
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Update from original #1
Open
TimMagee
wants to merge
2,516
commits into
TimMagee:master
Choose a base branch
from
bibletime:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…splay BtQmlScrollView did not seem to make sense as a separate widget.
For the corner-case of `mktemp -d` returning a pathname containing quotes we need to escape it properly. We do so using the @k transformation in Bash 5.1 or later.
…emoval Trailing ampersand characters were not correctly removed. Also refactored the logic into a separate simple function, also getting rid of the regular expression overhead.
The CMake requirement was changed by 5d5b1cb, with did not update the README.md file.
… Transifex New UI translations: Japanese, Ukrainian New HowTo translations: Ukrainian New Handbook translations: Russian
Unfortunately, Turkish had less than 25% translated.
This appears to fix or at work around an issue which caused an incorrect "no grouping" setting being saved instead of the actual different value. The cause of this bug is unknown, but it might have been related to how the class was constructed.
… messages` This fixes the "tr() cannot be called without context" warnings when building the "messages" target with Qt6. This seems to be due to QTBUG-128904. Thanks to Michael Weghorn for the original research on this issue. [1] [1]: 7303a2d
…CT macro Since DebugWindow is now unconditionally built in, it makes sense to move it into a separate translation unit. Adding the Q_OBJECT macro also fixes a `lupdate` warning about the missing macro during building the `messages` target.
Building with Qt 6 using the `-DUSE_QT6=ON` CMake flag works fine by now, so drop the note saying it doesn't.
Except Estonian, because I translate that manually. And because I accidentaly forgot to upload it to Transifex it got overwritten by the Transifex pull I did in commit 7aa6d9b, so now I restored it.
…ty issue The QDataStream version was not fixed before serialization and deserialization of the first values on the stream, potentially resulting in errors during cache deserialization which were not immediately detected, leading to issues elsewhere. This commit also bumps the cache format, introduces updating the cache file whenever an older format is read, and improves debug output.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I am trying to update my fork of Bibletime to make it identical with the current Bibletime/Bibletime master. As I have basically never used github before, I really do not know what I am doing and may be causing others trouble. If I am, I apologize.