New Crowdin translations#3960
Merged
Merged
Conversation
Siedlerchr
added a commit
that referenced
this pull request
Apr 25, 2018
* upstream/master: (47 commits) Fix xmp exporter (#3964) Update JUnit from 5.2.0-M1 -> 5.2.0-RC1 Update xmlunit from 2.5.1 -> 2.6.0 Update mockito-core from 2.18.0 -> 2.18.3 Fixieee (#3970) Fix IEEE Fetcher by enabling cookie support (#3968) Update flowless from 0.6 -> 0.6.1 Update wiremock from 2.16.0 -> 2.17.0 Fix ebook.de (#3967) LOC test #3854 Fix arxiv tests New translations JabRef_en.properties (French) (#3963) Upgrade modernizer plugin New Crowdin translations (#3962) Fix test Improve test New Crowdin translations (#3961) New translations JabRef_en.properties (French) (#3960) Remove brackets before checking equality Replace all IEEE URLs with https #3930 (#3944) ... # Conflicts: # build.gradle # src/main/java/org/jabref/gui/BasePanel.java # src/main/java/org/jabref/gui/actions/CleanupAction.java # src/main/java/org/jabref/gui/collab/ChangeScanner.java # src/main/java/org/jabref/gui/exporter/ExportAction.java # src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java # src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java # src/main/java/org/jabref/gui/openoffice/OpenOfficeSidePanel.java # src/main/java/org/jabref/gui/preftabs/PreferencesDialog.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.
Enjoy!