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

New Crowdin translations #3961

Merged
merged 2 commits into from
Apr 16, 2018
Merged

New Crowdin translations #3961

merged 2 commits into from
Apr 16, 2018

Conversation

Siedlerchr
Copy link
Member

Enjoy!

@stefan-kolb stefan-kolb merged commit 457c0a7 into master Apr 16, 2018
@stefan-kolb stefan-kolb deleted the l10n_master branch April 16, 2018 16:31
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants