Merge split localization string#10712
Merged
Merged
Conversation
Siedlerchr
approved these changes
Dec 26, 2023
Siedlerchr
previously approved these changes
Dec 26, 2023
Contributor
|
The build for this PR is no longer available. Please visit https://builds.jabref.org/main/ for the latest build. |
Siedlerchr
approved these changes
Dec 26, 2023
Siedlerchr
added a commit
to jlauber18/jabref
that referenced
this pull request
Jan 1, 2024
* upstream/main: (334 commits) Update CSL styles (JabRef#10734) Fix the preview panel showing the wrong entry (an entry that is not selected in the entry table) (JabRef#10728) Fix cancelling ignored when generating an entry from id (JabRef#10727) Merge split localization string (JabRef#10712) Downgrade jfx 21.0.1 to jfx 21 Bump actions/upload-pages-artifact from 2 to 3 (JabRef#10723) Bump actions/deploy-pages from 3 to 4 (JabRef#10722) Bump org.glassfish.jersey.core:jersey-server from 3.1.4 to 3.1.5 (JabRef#10720) Bump com.fasterxml.jackson.dataformat:jackson-dataformat-yaml (JabRef#10717) Bump org.apache.pdfbox:pdfbox from 3.0.0 to 3.0.1 (JabRef#10721) Bump org.postgresql:postgresql from 42.6.0 to 42.7.1 (JabRef#10718) Bump org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2 (JabRef#10719) update snapcraft update bug report template Show development information Release v5.12 Release v5.12 add jspecify exclude junit jupiter Add external libraries Update CSL styles (JabRef#10714) ... # Conflicts: # src/main/java/org/jabref/gui/externalfiles/ImportHandler.java # src/main/java/org/jabref/preferences/GuiPreferences.java # src/main/java/org/jabref/preferences/JabRefPreferences.java
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Newlines have to be inside the localization strings, not outside.
Mandatory checks
CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)