From 7236581748d15f6189f5d44dda6eadd4f12f5124 Mon Sep 17 00:00:00 2001
From: Kai Takac <kai.takac@gmail.com>
Date: Wed, 13 Nov 2019 19:43:07 +0100
Subject: [PATCH 01/13] =?UTF-8?q?Add=20switch=20to=20change=20from=20bibla?=
 =?UTF-8?q?tex=20to=20bibtex=20and=20vice=20versa=20(fi=E2=80=A6=20(#5565)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  2 +
 .../gui/cleanup/CleanupPresetPanel.java       |  3 +-
 .../cleanup/FieldFormatterCleanupsPanel.java  | 28 ++++++-------
 .../LibraryPropertiesDialog.fxml              | 40 ++++++++++++-------
 .../LibraryPropertiesDialogView.java          | 12 ++++--
 .../LibraryPropertiesDialogViewModel.java     | 17 ++++++++
 .../org/jabref/model/metadata/MetaData.java   |  4 ++
 src/main/resources/l10n/JabRef_en.properties  |  8 ++--
 8 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17873d43bf5c..9ba3e1109e71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - The entry editor is now open by default when JabRef starts up. [#5460](https://github.com/JabRef/jabref/issues/5460)
 - We added a new ADS fetcher to use the new ADS API [#4949](https://github.com/JabRef/jabref/issues/4949)
 - We added support of the [X11 primary selection](https://unix.stackexchange.com/a/139193/18033) [#2389](https://github.com/JabRef/jabref/issues/2389)
+- We added support to switch between biblatex and bibtex library types. [#5550](https://github.com/JabRef/jabref/issues/5550)
+- We changed the save action buttons to be easier to understand. [#5565](https://github.com/JabRef/jabref/issues/5565)
 - We made the columns for groups, files and uri in the main table reorderable and merged the clickable icon columns for uri, url, doi and eprint. [#5544](https://github.com/JabRef/jabref/pull/5544)
 
 ### Fixed
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
index 719c11bc2672..563fb7ac9e40 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -12,7 +12,6 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.logic.cleanup.CleanupPreset;
-import org.jabref.logic.cleanup.Cleanups;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.StandardField;
@@ -64,7 +63,7 @@ private void init(CleanupPreset cleanupPreset, FilePreferences filePreferences)
 
         cleanUpUpgradeExternalLinks.setText(Localization.lang("Upgrade external PDF/PS links to use the '%0' field.", StandardField.FILE.getDisplayName()));
 
-        cleanUpFormatters = new FieldFormatterCleanupsPanel(Localization.lang("Run field formatter:"), Cleanups.DEFAULT_SAVE_ACTIONS);
+        cleanUpFormatters = new FieldFormatterCleanupsPanel(Localization.lang("Run field formatter:"));
         formatterContainer.getChildren().setAll(cleanUpFormatters);
 
         String currentPattern = Localization.lang("Filename format pattern")
diff --git a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
index 23917990ebec..7ef6dfc4d566 100644
--- a/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/FieldFormatterCleanupsPanel.java
@@ -42,7 +42,6 @@ public class FieldFormatterCleanupsPanel extends GridPane {
 
     private static final String DESCRIPTION = Localization.lang("Description") + ": ";
     private final CheckBox cleanupEnabled;
-    private final FieldFormatterCleanups defaultFormatters;
     private final List<Formatter> availableFormatters;
     private FieldFormatterCleanups fieldFormatterCleanups;
     private ListView<FieldFormatterCleanup> actionsList;
@@ -50,13 +49,12 @@ public class FieldFormatterCleanupsPanel extends GridPane {
     private ComboBox<String> selectFieldCombobox;
     private Button addButton;
     private Label descriptionAreaText;
-    private Button removeButton;
-    private Button resetButton;
+    private Button removeSelectedButton;
+    private Button removeAllButton;
     private Button recommendButton;
     private ObservableList<FieldFormatterCleanup> actions;
 
-    public FieldFormatterCleanupsPanel(String description, FieldFormatterCleanups defaultFormatters) {
-        this.defaultFormatters = Objects.requireNonNull(defaultFormatters);
+    public FieldFormatterCleanupsPanel(String description) {
         cleanupEnabled = new CheckBox(description);
         availableFormatters = Cleanups.getBuiltInFormatters();
         availableFormatters.add(new ProtectTermsFormatter(Globals.protectedTermsLoader));
@@ -110,12 +108,12 @@ private void buildLayout() {
                 .install(actionsList);
         add(actionsList, 1, 1, 3, 1);
 
-        resetButton = new Button(Localization.lang("Reset"));
-        resetButton.setOnAction(e -> actions.setAll(defaultFormatters.getConfiguredActions()));
+        removeAllButton = new Button(Localization.lang("Remove all"));
+        removeAllButton.setOnAction(e -> actions.clear());
 
         BibDatabaseContext databaseContext = JabRefGUI.getMainFrame().getCurrentBasePanel().getBibDatabaseContext();
 
-        recommendButton = new Button(Localization.lang("Recommended for %0", databaseContext.getMode().getFormattedName()));
+        recommendButton = new Button(Localization.lang("Reset to recommended"));
         boolean isBiblatex = databaseContext.isBiblatexMode();
 
         recommendButton.setOnAction(e -> {
@@ -126,14 +124,14 @@ private void buildLayout() {
             }
         });
 
-        removeButton = new Button(Localization.lang("Remove selected"));
-        removeButton.setOnAction(e -> actions.remove(actionsList.getSelectionModel().getSelectedItem()));
+        removeSelectedButton = new Button(Localization.lang("Remove selected"));
+        removeSelectedButton.setOnAction(e -> actions.remove(actionsList.getSelectionModel().getSelectedItem()));
         descriptionAreaText = new Label(DESCRIPTION);
         descriptionAreaText.setWrapText(true);
 
-        add(removeButton, 3, 2, 1, 1);
-        add(resetButton, 1, 2, 1, 1);
-        add(recommendButton, 2, 2, 1, 1);
+        add(recommendButton, 1, 2, 1, 1);
+        add(removeSelectedButton, 2, 2, 1, 1);
+        add(removeAllButton, 3, 2, 1, 1);
         add(getSelectorPanel(), 1, 3, 3, 1);
         add(descriptionAreaText, 1, 4, 3, 1);
 
@@ -234,8 +232,8 @@ private void setStatus(boolean status) {
             selectFieldCombobox.setDisable(!status);
             formattersCombobox.setDisable(!status);
             addButton.setDisable(!status);
-            removeButton.setDisable(!status);
-            resetButton.setDisable(!status);
+            removeSelectedButton.setDisable(!status);
+            removeAllButton.setDisable(!status);
             recommendButton.setDisable(!status);
         }
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index 76aa87d595cd..12f7febeb966 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -1,17 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<DialogPane minHeight="-Infinity" prefHeight="784.0" prefWidth="921.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.libraryproperties.LibraryPropertiesDialogView">
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<DialogPane minHeight="-Infinity" prefHeight="784.0" prefWidth="921.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.libraryproperties.LibraryPropertiesDialogView">
     <content>
         <VBox fx:id="contentVbox" minHeight="-Infinity" prefHeight="200.0" prefWidth="100.0">
             <children>
@@ -22,7 +14,7 @@
                         <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="100.0" />
                     </columnConstraints>
                     <rowConstraints>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                        <RowConstraints minHeight="25.0" prefHeight="65.0" vgrow="SOMETIMES" />
                         <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" />
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
                         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="ALWAYS" />
@@ -32,8 +24,26 @@
                         <RowConstraints minHeight="-Infinity" prefHeight="50.0" vgrow="SOMETIMES" />
                     </rowConstraints>
                     <children>
-                        <Label text="%Library encoding" />
-                        <ComboBox fx:id="encoding" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
+                        <GridPane vgap="5.0" GridPane.columnSpan="3" GridPane.hgrow="ALWAYS">
+                            <columnConstraints>
+                                <ColumnConstraints hgrow="SOMETIMES" maxWidth="218.0" minWidth="10.0" prefWidth="200.0" />
+                                <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="529.0" />
+                                <ColumnConstraints hgrow="SOMETIMES" maxWidth="797.0" minWidth="10.0" prefWidth="100.0" />
+                            </columnConstraints>
+                            <Label text="%Library encoding" />
+                            <ComboBox fx:id="encoding" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" />
+                            <Label text="%Library mode" GridPane.rowIndex="2" />
+                            <ComboBox fx:id="databaseMode" prefWidth="250.0" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2" />
+                     <columnConstraints>
+                        <ColumnConstraints />
+                        <ColumnConstraints />
+                     </columnConstraints>
+                     <rowConstraints>
+                        <RowConstraints />
+                        <RowConstraints />
+                        <RowConstraints />
+                     </rowConstraints>
+                        </GridPane>
                         <Label text="%General file directory" GridPane.rowIndex="2" />
                         <TextField fx:id="generalFileDirectory" GridPane.columnIndex="1" GridPane.rowIndex="2" />
                         <Button fx:id="browseGeneralFileDir" mnemonicParsing="false" onAction="#browseGeneralFileDirectory" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="2" />
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index 42197cbc5a05..36966cad156e 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -21,8 +21,8 @@
 import org.jabref.gui.SaveOrderConfigDisplayView;
 import org.jabref.gui.cleanup.FieldFormatterCleanupsPanel;
 import org.jabref.gui.util.BaseDialog;
-import org.jabref.logic.cleanup.Cleanups;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.metadata.SaveOrderConfig;
 import org.jabref.preferences.PreferencesService;
@@ -33,6 +33,7 @@ public class LibraryPropertiesDialogView extends BaseDialog<Void> {
 
     @FXML private VBox contentVbox;
     @FXML private ComboBox<Charset> encoding;
+    @FXML private ComboBox<String> databaseMode;
     @FXML private TextField generalFileDirectory;
     @FXML private Button browseGeneralFileDir;
     @FXML private TextField userSpecificFileDirectory;
@@ -79,13 +80,15 @@ private void initialize() {
         encoding.disableProperty().bind(viewModel.encodingDisableProperty());
         protect.disableProperty().bind(viewModel.protectDisableProperty());
 
+        databaseMode.itemsProperty().bind(viewModel.databaseModesProperty());
+        databaseMode.valueProperty().bindBidirectional(viewModel.selectedDatabaseModeProperty());
+
         saveOrderConfigDisplayView = new SaveOrderConfigDisplayView();
         Optional<SaveOrderConfig> storedSaveOrderConfig = panel.getBibDatabaseContext().getMetaData().getSaveOrderConfig();
         oldSaveOrderConfig = storedSaveOrderConfig.orElseGet(preferencesService::loadExportSaveOrder);
 
         saveOrderConfigDisplayView.changeExportDescriptionToSave();
-        fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"),
-                                                                      Cleanups.DEFAULT_SAVE_ACTIONS);
+        fieldFormatterCleanupsPanel = new FieldFormatterCleanupsPanel(Localization.lang("Enable save actions"));
         Label saveActions = new Label(Localization.lang("Save actions"));
         saveActions.getStyleClass().add("sectionHeader");
 
@@ -124,6 +127,9 @@ private void storeSettings() {
         Charset newEncoding = viewModel.selectedEncodingProperty().getValue();
         metaData.setEncoding(newEncoding);
 
+        BibDatabaseMode newMode = BibDatabaseMode.parse(viewModel.selectedDatabaseModeProperty().getValue());
+        metaData.setMode(newMode);
+
         String text = viewModel.generalFileDirectoryPropertyProperty().getValue().trim();
         if (text.isEmpty()) {
             metaData.clearDefaultFileDirectory();
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
index 3206b98be9c2..8d4dccd9c544 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java
@@ -2,7 +2,9 @@
 
 import java.nio.charset.Charset;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -18,6 +20,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.logic.l10n.Encodings;
+import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.database.shared.DatabaseLocation;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.PreferencesService;
@@ -29,6 +32,7 @@ public class LibraryPropertiesDialogViewModel {
     private final StringProperty laTexFileDirectoryProperty = new SimpleStringProperty("");
     private final ListProperty<Charset> encodingsProperty = new SimpleListProperty<>(FXCollections.observableArrayList(Encodings.getCharsets()));
     private final ObjectProperty<Charset> selectedEncodingPropety = new SimpleObjectProperty<>(Encodings.getCharsets().get(0));
+    private final SimpleStringProperty selectedDatabaseModeProperty = new SimpleStringProperty(BibDatabaseMode.BIBLATEX.getFormattedName());
     private final BooleanProperty libraryProtectedProperty = new SimpleBooleanProperty();
     private final BooleanProperty encodingDisableProperty = new SimpleBooleanProperty();
     private final BooleanProperty protectDisableProperty = new SimpleBooleanProperty();
@@ -55,6 +59,7 @@ public LibraryPropertiesDialogViewModel(BasePanel panel, DialogService dialogSer
 
         Optional<Charset> charset = metaData.getEncoding();
         selectedEncodingPropety.setValue(charset.orElse(preferencesService.getDefaultEncoding()));
+        selectedDatabaseModeProperty.setValue(metaData.getMode().orElse(BibDatabaseMode.BIBLATEX).getFormattedName());
 
         Optional<String> fileD = metaData.getDefaultFileDirectory();
         fileD.ifPresent(path -> generalFileDirectoryProperty.setValue(path.trim()));
@@ -88,6 +93,18 @@ public ListProperty<Charset> encodingsProperty() {
         return this.encodingsProperty;
     }
 
+    public ListProperty<String> databaseModesProperty() {
+        return new SimpleListProperty<>(FXCollections.observableArrayList(
+                Arrays.stream(BibDatabaseMode.values())
+                        .map(BibDatabaseMode::getFormattedName)
+                        .collect(Collectors.toList())
+        ));
+    }
+
+    public SimpleStringProperty selectedDatabaseModeProperty() {
+        return this.selectedDatabaseModeProperty;
+    }
+
     public ObjectProperty<Charset> selectedEncodingProperty() {
         return this.selectedEncodingPropety;
     }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index cc998f373d97..ef6d97671956 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -149,6 +149,10 @@ public Optional<BibDatabaseMode> getMode() {
     }
 
     public void setMode(BibDatabaseMode mode) {
+        if (mode == this.mode) {
+            return;
+        }
+
         this.mode = Objects.requireNonNull(mode);
         postChange();
     }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 0a656074d5c4..36a9c345cb40 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -997,8 +997,6 @@ MIME\ type=MIME type
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For instance, this is useful when you open a file in JabRef from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time.
 Run\ fetcher=Run fetcher
 
-Reset=Reset
-
 Use\ IEEE\ LaTeX\ abbreviations=Use IEEE LaTeX abbreviations
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=When opening file link, search for matching file if no link is defined
@@ -1770,7 +1768,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=A backup file for '%0' was found.
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=This could indicate that JabRef did not shut down cleanly last time the file was used.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Do you want to recover the library from the backup file?
 
-Recommended\ for\ %0=Recommended for %0
 Show\ 'Related\ Articles'\ tab=Show 'Related Articles' tab
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=This might be caused by reaching the traffic limitation of Google Scholar (see 'Help' for details).
 
@@ -2096,7 +2093,10 @@ Start\ on\ second\ duplicate\ key\ with\ letter\ B\ (b,\ c,\ ...)=Start on secon
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Always add letter (a, b, ...) to generated keys
 Default\ pattern=Default pattern
 Reset\ %s\ to\ default\ value=Reset %s to default value
-
+Library\ mode=Library mode
+Reset\ to\ recommended=Reset to recommended
+Remove\ all=Remove all
 Column\ type\ %0\ is\ unknown.=Column type %0 is unknown.
 Linked\ identifiers=Linked identifiers
 Special\ field\ type\ %0\ is\ unknown.\ Using\ normal\ column\ type.=Special field type %0 is unknown. Using normal column type.
+

From ad60111e2d8a52f136f05a4216d771a9df0d91cd Mon Sep 17 00:00:00 2001
From: Galileo Sartor <galileo.sartor@gmail.com>
Date: Thu, 14 Nov 2019 00:03:03 +0100
Subject: [PATCH 02/13] Add stable extension id to json (#5606)

* Add stable extension id to json

* Similar fix for Windows as well
---
 buildres/linux/org.jabref.jabref.json | 3 ++-
 buildres/windows/jabref.json          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/buildres/linux/org.jabref.jabref.json b/buildres/linux/org.jabref.jabref.json
index 8516f3882661..1edebc9c576f 100644
--- a/buildres/linux/org.jabref.jabref.json
+++ b/buildres/linux/org.jabref.jabref.json
@@ -4,6 +4,7 @@
   "path": "/opt/jabref/lib/jabrefHost.py",
   "type": "stdio",
   "allowed_extensions": [
-    "browserextension@jabref.org"
+    "browserextension@jabref.org",
+    "@jabfox"
   ]
 }
diff --git a/buildres/windows/jabref.json b/buildres/windows/jabref.json
index d636c8b71a08..30dfc79034a3 100644
--- a/buildres/windows/jabref.json
+++ b/buildres/windows/jabref.json
@@ -4,6 +4,7 @@
   "path": "JabRefHost.bat",
   "type": "stdio",
   "allowed_extensions": [
-    "browserextension@jabref.org"
+    "browserextension@jabref.org",
+    "@jabfox"
   ]
 }

From 31cabdb51792de970f6860ff3edf4b3af8543f74 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 14 Nov 2019 00:06:00 +0100
Subject: [PATCH 03/13] Upgrade jpackage

---
 .github/workflows/deployment.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 06ceda21c2cc..5e62339204c5 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -11,17 +11,17 @@ jobs:
         include:
          - os: ubuntu-latest
            displayName: linux
-           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-67_linux-x64_bin.tar.gz
+           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-70_linux-x64_bin.tar.gz
            jdk14Path: /jdk-14
            archivePortable: tar -czf build/distribution/JabRef-portable_linux.tar.gz -C build/distribution JabRef && rm -R build/distribution/JabRef
          - os: windows-latest
            displayName: windows
-           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-67_windows-x64_bin.zip
+           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-70_windows-x64_bin.zip
            jdk14Path: /jdk-14
            archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip ./build/distribution/JabRef && rm -R build/distribution/JabRef
          - os: macOS-latest
            displayName: macOS
-           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-67_osx-x64_bin.tar.gz
+           jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-70_osx-x64_bin.tar.gz
            jdk14Path: /jdk-14.jdk/Contents/Home
            archivePortable: tar -czf build/distribution/JabRef-portable_macos.tar.gz -C build/distribution JabRef.app && rm -R build/distribution/JabRef.app
 

From 19393bf1d00e4e0028436dc7b364fe3b7a7bfd81 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Thu, 14 Nov 2019 00:17:00 +0100
Subject: [PATCH 04/13] Unify month field formatting in test bib files (#5578)

* Unify month field formatting in test bib files (fixes JabRef/jabref#5116)

* Fix month creation. #name# is really used within JabRef to determine a BibTeX string content (and not plain text)

- Fix tests
- Sort BibEntryTests: default constructor, keywords, all others
- Fix name of "CanonicalBibEntry" (from CanonicalBibtexEntry)
- Revert "fix jabref format of month", this also reverts commit 77c25ca0f1702991493cf37278a4cedad0d984a4.
- Format some code
- Add comments

* Merge all BibEntry test classes into one
---
 .../logic/exporter/BibTeXMLExporter.java      |  15 +
 .../importer/fileformat/BibTeXMLImporter.java |  17 +-
 .../importer/fileformat/BibtexParser.java     |   3 -
 .../importer/fileformat/IsiImporter.java      |  16 +-
 .../importer/fileformat/MedlineImporter.java  |   7 +-
 .../importer/fileformat/RepecNepImporter.java |  10 +-
 .../jabref/logic/xmp/DublinCoreExtractor.java |  58 +-
 .../java/org/jabref/model/entry/BibEntry.java |   2 +-
 ...ibtexEntry.java => CanonicalBibEntry.java} |  16 +-
 .../java/org/jabref/model/entry/Month.java    |   5 +-
 .../importer/fileformat/BibtexParserTest.java |   7 +
 .../importer/fileformat/IsiImporterTest.java  |   8 +-
 .../model/entry/BibEntryEqualityTest.java     |  44 --
 .../org/jabref/model/entry/BibEntryTest.java  | 506 +++++++++++++++++-
 .../org/jabref/model/entry/BibEntryTests.java | 404 --------------
 .../model/entry/CanonicalBibEntryTest.java    |  15 +-
 .../exporter/BibTeXMLExporterTestArticle.bib  |   2 +-
 .../BibTeXMLExporterTestArticleWithoutID.bib  |   2 +-
 .../exporter/BibTeXMLExporterTestBook.bib     |   2 +-
 .../exporter/BibTeXMLExporterTestBooklet.bib  |   2 +-
 .../BibTeXMLExporterTestConference.bib        |   2 +-
 .../exporter/BibTeXMLExporterTestInBook.bib   |   2 +-
 .../BibTeXMLExporterTestInCollection.bib      |   2 +-
 .../BibTeXMLExporterTestInProceedings.bib     |   2 +-
 .../BibTeXMLExporterTestInbookLessFields.bib  |   2 +-
 .../exporter/BibTeXMLExporterTestManual.bib   |   2 +-
 .../BibTeXMLExporterTestMasterThesis.bib      |   2 +-
 .../exporter/BibTeXMLExporterTestMisc.bib     |   2 +-
 .../BibTeXMLExporterTestPhdThesis.bib         |   2 +-
 .../BibTeXMLExporterTestProceedings.bib       |   2 +-
 .../BibTeXMLExporterTestTechReport.bib        |   2 +-
 .../BibTeXMLExporterTestUnpublished.bib       |   2 +-
 .../BibTeXMLImporterTestArticle.bib           |   2 +-
 .../BibTeXMLImporterTestArticle2.bib          |   2 +-
 .../BibTeXMLImporterTestArticleWithoutID.bib  |   2 +-
 .../fileformat/BibTeXMLImporterTestBook.bib   |   2 +-
 .../BibTeXMLImporterTestBooklet.bib           |   2 +-
 .../BibTeXMLImporterTestConference.bib        |   2 +-
 .../fileformat/BibTeXMLImporterTestInBook.bib |   2 +-
 .../BibTeXMLImporterTestInCollection.bib      |   2 +-
 .../BibTeXMLImporterTestInProceedings.bib     |   2 +-
 .../BibTeXMLImporterTestInbookLessFields.bib  |   2 +-
 ...ImporterTestIncollectionWithoutChapter.bib |   2 +-
 .../fileformat/BibTeXMLImporterTestManual.bib |   2 +-
 .../BibTeXMLImporterTestMasterThesis.bib      |   2 +-
 .../fileformat/BibTeXMLImporterTestMisc.bib   |   2 +-
 .../BibTeXMLImporterTestPhdThesis.bib         |   2 +-
 .../BibTeXMLImporterTestProceedings.bib       |   2 +-
 .../BibTeXMLImporterTestTechReport.bib        |   2 +-
 .../BibTeXMLImporterTestUnpublished.bib       |   2 +-
 .../MedlineImporterTestArticleID.bib          |   2 +-
 .../MedlineImporterTestArticleNoISSN.bib      |   2 +-
 .../MedlineImporterTestBookArticleSet.bib     |   2 +-
 .../fileformat/MedlineImporterTestNbib.bib    |   2 +-
 .../MedlineImporterTestPubmedBook.bib         |   2 +-
 .../jabref/logic/xmp/article_dublinCore.bib   |   2 +-
 src/test/resources/org/jabref/util/twente.bib |   2 +-
 src/test/resources/testbib/jabref-authors.bib |  14 +-
 src/test/resources/testbib/saveactions2.bib   |   4 +-
 .../resources/testbib/testjabref_210as292.bib |  10 +-
 src/test/resources/testbib/testjabref_292.bib |  10 +-
 61 files changed, 662 insertions(+), 591 deletions(-)
 rename src/main/java/org/jabref/model/entry/{CanonicalBibtexEntry.java => CanonicalBibEntry.java} (78%)
 delete mode 100644 src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java
 delete mode 100644 src/test/java/org/jabref/model/entry/BibEntryTests.java

diff --git a/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java b/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java
index 2c0100b5f12e..1e5b6b310cab 100644
--- a/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibTeXMLExporter.java
@@ -10,6 +10,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javax.xml.bind.JAXBContext;
@@ -40,6 +41,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
@@ -153,6 +155,13 @@ private void parseInbook(Inbook inbook, BibEntry bibEntry, Entry entry) {
                 JAXBElement<BigInteger> number = new JAXBElement<>(new QName(BIBTEXML_NAMESPACE_URI, "number"),
                         BigInteger.class, new BigInteger(value));
                 inbook.getContent().add(number);
+            } else if (StandardField.MONTH.equals(key)) {
+                Optional<Month> month = bibEntry.getMonth();
+                if (month.isPresent()) {
+                    JAXBElement<String> element = new JAXBElement<>(new QName(BIBTEXML_NAMESPACE_URI, key.getName()),
+                            String.class, month.get().getFullName());
+                    inbook.getContent().add(element);
+                }
             } else {
                 JAXBElement<String> element = new JAXBElement<>(new QName(BIBTEXML_NAMESPACE_URI, key.getName()), String.class,
                         value);
@@ -205,6 +214,12 @@ private <T> void parse(T entryType, BibEntry bibEntry, Entry entry) {
                             LOGGER.warn("The value %s of the 'number' field is not an integer and thus is ignored for the export", value);
                         }
                         break;
+                    } else if (StandardField.MONTH.equals(key)) {
+                        Optional<Month> month = bibEntry.getMonth();
+                        if (month.isPresent()) {
+                            method.invoke(entryType, month.get().getFullName());
+                        }
+                        break;
                     } else {
                         method.invoke(entryType, value);
                         break;
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java
index 7465b5c3a8ce..ab69185bc43f 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibTeXMLImporter.java
@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.regex.Pattern;
 
 import javax.xml.bind.JAXBContext;
@@ -27,6 +28,7 @@
 import org.jabref.logic.importer.fileformat.bibtexml.Incollection;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
@@ -176,6 +178,9 @@ private <T> void parse(T entryType, Map<Field, String> fields) {
                 } else if (method.getName().equals("getNumber")) {
                     putNumber(fields, (BigInteger) method.invoke(entryType));
                     continue;
+                } else if (method.getName().equals("getMonth")) {
+                    putMonth(fields, Month.parse((String) method.invoke(entryType)));
+                    continue;
                 } else if (isMethodToIgnore(method.getName())) {
                     continue;
                 } else if (method.getName().startsWith("get")) {
@@ -208,7 +213,11 @@ private void parseInbook(Inbook inbook, Map<Field, String> fields) {
             Object elementValue = element.getValue();
             if (elementValue instanceof String) {
                 String value = (String) elementValue;
-                putIfValueNotNull(fields, field, value);
+                if (StandardField.MONTH.equals(field)) {
+                    putMonth(fields, Month.parse(value));
+                } else {
+                    putIfValueNotNull(fields, field, value);
+                }
             } else if (elementValue instanceof BigInteger) {
                 BigInteger value = (BigInteger) elementValue;
                 if (StandardField.NUMBER.equals(field)) {
@@ -241,6 +250,12 @@ private void putNumber(Map<Field, String> fields, BigInteger number) {
         }
     }
 
+    private void putMonth(Map<Field, String> fields, Optional<Month> month) {
+        if (month.isPresent()) {
+            fields.put(StandardField.MONTH, month.get().getJabRefFormat());
+        }
+    }
+
     private void putIfValueNotNull(Map<Field, String> fields, Field field, String value) {
         if (value != null) {
             fields.put(field, value);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
index 3cdfa7e10e10..0fb4526f7419 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -589,7 +589,6 @@ private String parseFieldContent(Field field) throws IOException {
         int character;
 
         while (((character = peek()) != ',') && (character != '}') && (character != ')')) {
-
             if (eof) {
                 throw new IOException("Error in line " + line + ": EOF in mid-string");
             }
@@ -602,7 +601,6 @@ private String parseFieldContent(Field field) throws IOException {
                 // brackets to know when the string is finished.
                 StringBuilder text = parseBracketedTextExactly();
                 value.append(fieldContentParser.format(text, field));
-
             } else if (Character.isDigit((char) character)) { // value is a number
                 String number = parseTextToken();
                 value.append(number);
@@ -619,7 +617,6 @@ private String parseFieldContent(Field field) throws IOException {
             skipWhitespace();
         }
         return value.toString();
-
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
index 8451e1914b0c..8e5b98730758 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
@@ -143,7 +143,7 @@ private static void processCapitalization(Map<Field, String> map) {
     public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
 
-        List<BibEntry> bibitems = new ArrayList<>();
+        List<BibEntry> bibEntries = new ArrayList<>();
         StringBuilder sb = new StringBuilder();
 
         // Pattern fieldPattern = Pattern.compile("^AU |^TI |^SO |^DT |^C1 |^AB
@@ -233,7 +233,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 } else if ("SO".equals(beg) || "JA".equals(beg)) {
                     hm.put(StandardField.JOURNAL, EOL_PATTERN.matcher(value).replaceAll(" "));
                 } else if ("ID".equals(beg) || "KW".equals(beg)) {
-
                     value = EOL_PATTERN.matcher(value).replaceAll(" ");
                     String existingKeywords = hm.get(StandardField.KEYWORDS);
                     if ((existingKeywords == null) || existingKeywords.contains(value)) {
@@ -242,7 +241,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         existingKeywords += ", " + value;
                     }
                     hm.put(StandardField.KEYWORDS, existingKeywords);
-
                 } else if ("AB".equals(beg)) {
                     hm.put(StandardField.ABSTRACT, EOL_PATTERN.matcher(value).replaceAll(" "));
                 } else if ("BP".equals(beg) || "BR".equals(beg) || "SP".equals(beg)) {
@@ -271,12 +269,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 } else if ("DI".equals(beg)) {
                     hm.put(StandardField.DOI, value);
                 } else if ("PD".equals(beg)) {
-
                     String month = IsiImporter.parseMonth(value);
                     if (month != null) {
                         hm.put(StandardField.MONTH, month);
                     }
-
                 } else if ("DT".equals(beg)) {
                     if ("Review".equals(value)) {
                         type = StandardEntryType.Article; // set "Review" in Note/Comment?
@@ -327,17 +323,19 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
 
             b.setField(hm);
 
-            bibitems.add(b);
+            bibEntries.add(b);
         }
-        return new ParserResult(bibitems);
+        return new ParserResult(bibEntries);
     }
 
     private static String parsePages(String value) {
         return value.replace("-", "--");
     }
 
-    public static String parseMonth(String value) {
-
+    /**
+     * Parses the month and returns it in the JabRef format
+     */
+    static String parseMonth(String value) {
         String[] parts = value.split("\\s|\\-");
         for (String part1 : parts) {
             Optional<Month> month = Month.getMonthByShortName(part1.toLowerCase(Locale.ROOT));
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
index bc8feb039f0f..c37038bbb818 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
@@ -13,6 +13,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBElement;
@@ -74,6 +75,7 @@
 import org.jabref.logic.importer.fileformat.medline.Text;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.InternalField;
@@ -603,7 +605,10 @@ private void addPubDate(Map<Field, String> fields, PubDate pubDate) {
         } else {
             fields.put(StandardField.YEAR, pubDate.getYear());
             if (pubDate.getMonth() != null) {
-                fields.put(StandardField.MONTH, pubDate.getMonth());
+                Optional<Month> month = Month.parse(pubDate.getMonth());
+                if (month.isPresent()) {
+                    fields.put(StandardField.MONTH, month.get().getJabRefFormat());
+                }
             } else if (pubDate.getSeason() != null) {
                 fields.put(new UnknownField("season"), pubDate.getSeason());
             }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
index c330a465c6bc..550972ea5916 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
@@ -330,22 +330,22 @@ private void parseAdditionalFields(BibEntry be, boolean multilineUrlFieldAllowed
             // skip keyword
             this.lastLine = "".equals(this.lastLine) ? "" : this.lastLine.substring(this.lastLine.indexOf(':') + 1).trim();
 
-            // parse keywords field
             if ("Keywords".equals(keyword)) {
+                // parse keywords field
                 String content = readMultipleLines(in);
                 String[] keywords = content.split("[,;]");
                 be.addKeywords(Arrays.asList(keywords),
                         importFormatPreferences.getKeywordSeparator());
-                // parse JEL field
             } else if ("JEL".equals(keyword)) {
+                // parse JEL field
                 be.setField(new UnknownField("jel"), readMultipleLines(in));
 
             } else if (keyword.startsWith("Date")) {
                 // parse date field
                 String content = readMultipleLines(in);
                 Date.parse(content).ifPresent(be::setDate);
-                // parse URL field
             } else if (keyword.startsWith("URL")) {
+                // parse URL field
                 String content;
                 if (multilineUrlFieldAllowed) {
                     content = readMultipleLines(in);
@@ -354,10 +354,8 @@ private void parseAdditionalFields(BibEntry be, boolean multilineUrlFieldAllowed
                     readLine(in);
                 }
                 be.setField(StandardField.URL, content);
-
-                // authors field
             } else if (keyword.startsWith("By")) {
-                // parse authors
+                // parse authors field
                 parseAuthors(be, in);
             } else {
                 readLine(in);
diff --git a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
index def4bb4c4ba3..9c54524bc0ac 100644
--- a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
@@ -67,13 +67,11 @@ private void extractAuthor() {
 
     /**
      * Year in BibTex - Date in DublinCore is only the year information, because dc interprets empty months as January.
-     * Tries to extract the month as well.
-     * In JabRef the bibtex/month/value is prioritized.
-     * <br/>
-     * The problem is the default value of the calendar, which is always January, also if there is no month information in
-     * the xmp metdata. The idea is, to reject all information with YYYY-01-01. In cases, where xmp is written with JabRef
-     * the month property filled with jan will override this behavior and no data is lost. In the cases, where xmp
-     * is written by another service, the assumption is, that the 1st January is not a publication date at all.
+     * Tries to extract the month as well. In JabRef the bibtex/month/value is prioritized. <br/> The problem is the
+     * default value of the calendar, which is always January, also if there is no month information in the xmp metdata.
+     * The idea is, to reject all information with YYYY-01-01. In cases, where xmp is written with JabRef the month
+     * property filled with jan will override this behavior and no data is lost. In the cases, where xmp is written by
+     * another service, the assumption is, that the 1st January is not a publication date at all.
      */
     private void extractYearAndMonth() {
         List<String> dates = dcSchema.getUnqualifiedSequenceValueList("date");
@@ -87,12 +85,11 @@ private void extractYearAndMonth() {
             }
             if (calender != null) {
                 bibEntry.setField(StandardField.YEAR, String.valueOf(calender.get(Calendar.YEAR)));
+                int monthNumber = calender.get(Calendar.MONTH) + 1;
                 // not the 1st of January
-                if (!((calender.get(Calendar.MONTH) == 0) && (calender.get(Calendar.DAY_OF_MONTH) == 1))) {
-                    Optional<Month> month = Month.getMonthByNumber(calender.get(Calendar.MONTH) + 1);
-                    if (month.isPresent()) {
-                        bibEntry.setField(StandardField.MONTH, month.get().getShortName());
-                    }
+                if (!((monthNumber == 1) && (calender.get(Calendar.DAY_OF_MONTH) == 1))) {
+                    Month.getMonthByNumber(monthNumber)
+                         .ifPresent(month -> bibEntry.setMonth(month));
                 }
             }
         }
@@ -129,15 +126,13 @@ private void extractPublisher() {
     }
 
     /**
-     * This method sets all fields, which are custom in bibtext and therefore supported by jabref, but which are not included in the DublinCore format.
-     * <p/>
+     * This method sets all fields, which are custom in BibTeX and therefore supported by JabRef, but which are not
+     * included in the DublinCore format.
+     * <p>
      * The relation attribute of DublinCore is abused to insert these custom fields.
      */
     private void extractBibTexFields() {
-        List<String> relationships = dcSchema.getRelations();
-
         Predicate<String> isBibTeXElement = s -> s.startsWith("bibtex/");
-
         Consumer<String> splitBibTeXElement = s -> {
             // the default pattern is bibtex/key/value, but some fields contains url etc.
             // so the value property contains additional slashes, which makes the usage of
@@ -154,15 +149,15 @@ private void extractBibTexFields() {
                 // see also DublinCoreExtractor#extractYearAndMonth
                 if (StandardField.MONTH.equals(key)) {
                     Optional<Month> parsedMonth = Month.parse(value);
-                    parsedMonth.ifPresent(month -> bibEntry.setField(key, month.getShortName()));
+                    parsedMonth.ifPresent(bibEntry::setMonth);
                 }
             }
-
         };
+        List<String> relationships = dcSchema.getRelations();
         if (relationships != null) {
             relationships.stream()
-                    .filter(isBibTeXElement)
-                    .forEach(splitBibTeXElement);
+                         .filter(isBibTeXElement)
+                         .forEach(splitBibTeXElement);
         }
     }
 
@@ -220,26 +215,27 @@ private void extractType() {
     }
 
     /**
-     * Helper function for retrieving a BibEntry from the DublinCore metadata
-     * in a PDF file.
+     * Helper function for retrieving a BibEntry from the DublinCore metadata in a PDF file.
+     * <p>
+     * To understand how to get hold of a DublinCore have a look in the test cases for XMPUtil.
+     * <p>
+     * The BibEntry is build by mapping individual fields in the dublin core (like creator, title, subject) to fields in
+     * a bibtex bibEntry. In case special "bibtex/" entries are contained, the normal dublin core fields take
+     * precedence. For instance, the dublin core date takes precedence over bibtex/month.
      *
-     * To understand how to get hold of a DublinCore have a look in the
-     * test cases for XMPUtil.
-     *
-     * The BibEntry is build by mapping individual fields in the dublin core
-     * (like creator, title, subject) to fields in a bibtex bibEntry.
-     *
-     * @return The bibtex bibEntry found in the document information.
+     * @return The bibEntry extracted from the document information.
      */
     public Optional<BibEntry> extractBibtexEntry() {
+        // first extract "bibtex/" entries
+        this.extractBibTexFields();
 
+        // then extract all "standard" dublin core entries
         this.extractEditor();
         this.extractAuthor();
         this.extractYearAndMonth();
         this.extractAbstract();
         this.extractDOI();
         this.extractPublisher();
-        this.extractBibTexFields();
         this.extractRights();
         this.extractSource();
         this.extractSubject();
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index a9afe9ba0e8b..2d1b29a02c1c 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -614,7 +614,7 @@ public Object clone() {
      */
     @Override
     public String toString() {
-        return CanonicalBibtexEntry.getCanonicalRepresentation(this);
+        return CanonicalBibEntry.getCanonicalRepresentation(this);
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/entry/CanonicalBibtexEntry.java b/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
similarity index 78%
rename from src/main/java/org/jabref/model/entry/CanonicalBibtexEntry.java
rename to src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
index 0f9ba8e30223..a854db41907f 100644
--- a/src/main/java/org/jabref/model/entry/CanonicalBibtexEntry.java
+++ b/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
@@ -11,16 +11,19 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
 
-public class CanonicalBibtexEntry {
+public class CanonicalBibEntry {
 
-    private CanonicalBibtexEntry() {
+    private CanonicalBibEntry() {
     }
 
     /**
-     * This returns a canonical BibTeX serialization. Special characters such as "{" or "&" are NOT escaped, but written
-     * as is
+     * This returns a canonical BibTeX serialization. Serializes all fields, even the JabRef internal ones. Does NOT
+     * serialize "KEY_FIELD" as field, but as key
      *
-     * Serializes all fields, even the JabRef internal ones. Does NOT serialize "KEY_FIELD" as field, but as key
+     * <ul>
+     *     <li>Special characters such as "{" or "&" are NOT escaped, but written as</li>
+     *     <li>String constants are not handled. That means, <code>month = apr</code> in a bib file gets <code>month = {#apr#}</code>. This indicates that the month field is correctly stored</li>
+     * </ul>
      */
     public static String getCanonicalRepresentation(BibEntry entry) {
         StringBuilder sb = new StringBuilder();
@@ -50,7 +53,7 @@ public static String getCanonicalRepresentation(BibEntry entry) {
         // generate field entries
         StringJoiner sj = new StringJoiner(",\n", "", "\n");
         for (String fieldName : sortedFields) {
-            String line = String.format("  %s = {%s}", fieldName, String.valueOf(mapFieldToValue.get(fieldName)).replaceAll("\\r\\n","\n"));
+            String line = String.format("  %s = {%s}", fieldName, String.valueOf(mapFieldToValue.get(fieldName)).replaceAll("\\r\\n", "\n"));
             sj.add(line);
         }
         sb.append(sj);
@@ -59,5 +62,4 @@ public static String getCanonicalRepresentation(BibEntry entry) {
         sb.append('}');
         return sb.toString();
     }
-
 }
diff --git a/src/main/java/org/jabref/model/entry/Month.java b/src/main/java/org/jabref/model/entry/Month.java
index 6d6f6fbfe157..bb9d3b441478 100644
--- a/src/main/java/org/jabref/model/entry/Month.java
+++ b/src/main/java/org/jabref/model/entry/Month.java
@@ -168,8 +168,9 @@ public String getShortName() {
      * Returns the month in JabRef format. The format is the short 3-digit name surrounded by a '#'.
      * Example: #jan#, #feb#, etc.
      *
-     * See https://github.com/JabRef/jabref/issues/263#issuecomment-151246595 for a discussion on that thing.
-     * This seems to be an <em>invalid</em> format in terms of plain BiBTeX, but a <em>valid</em> format in the case of JabRef
+     * See <a href="https://github.com/JabRef/jabref/issues/263#issuecomment-151246595">Issue 263</a> for a discussion on that thing.
+     * This seems to be an <em>invalid</em> format in terms of plain BiBTeX, but a <em>valid</em> format in the case of JabRef.
+     * The documentation is available at the <a href="http://help.jabref.org/en/Strings">Strings help</a> of JabRef.
      *
      * @return Month in JabRef format
      */
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index 1dcd5ba75c85..b4ac66f03d45 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -1784,4 +1784,11 @@ void bibTeXConstantAprilIsDisplayedAsConstant() throws ParseException {
 
         assertEquals("#apr#", result.get().getField(StandardField.MONTH).get());
     }
+
+    @Test
+    void bibTeXConstantAprilIsParsedAsStringMonthAprilWhenReadingTheField() throws ParseException {
+        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = apr }" );
+
+        assertEquals(Optional.of("#apr#"), result.get().getField(StandardField.MONTH));
+    }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
index daa7834214bf..e470436f40de 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
@@ -13,6 +13,7 @@
 
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Month;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
@@ -24,9 +25,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-/**
- * Test cases for the IsiImporter
- */
 public class IsiImporterTest {
 
     private static final String FILE_ENDING = ".isi";
@@ -191,7 +189,7 @@ public void testImportEntriesINSPEC() throws IOException, URISyntaxException {
                 first.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("Applied Physics Letters"), first.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("2006"), first.getField(StandardField.YEAR));
-        assertEquals(Optional.of("#jul#"), first.getField(StandardField.MONTH));
+        assertEquals(Optional.of(Month.JULY), first.getMonth());
         assertEquals(Optional.of("89"), first.getField(StandardField.VOLUME));
         assertEquals(Optional.of("4"), first.getField(StandardField.NUMBER));
         assertEquals(Optional.of("Lorem ipsum abstract"), first.getField(StandardField.ABSTRACT));
@@ -334,7 +332,7 @@ public void testImportEntriesMedline() throws IOException, URISyntaxException {
                         "Joffe, Hadine and Hall, Janet E. and Gruber, Staci and Sarmiento, Ingrid A. and Cohen, Lee S. and Yurgelun-Todd, Deborah and Martin, Kathryn A."),
                 second.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("2006"), second.getField(StandardField.YEAR));
-        assertEquals(Optional.of("#may#"), second.getField(StandardField.MONTH));
+        assertEquals(Optional.of(Month.MAY), second.getMonth());
         assertEquals(Optional.of("13"), second.getField(StandardField.VOLUME));
         assertEquals(Optional.of("3"), second.getField(StandardField.NUMBER));
         assertEquals(Optional.of("411--22"), second.getField(StandardField.PAGES));
diff --git a/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java b/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java
deleted file mode 100644
index d438d3412bb5..000000000000
--- a/src/test/java/org/jabref/model/entry/BibEntryEqualityTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.jabref.model.entry;
-
-import org.jabref.model.entry.field.UnknownField;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class BibEntryEqualityTest {
-    @Test
-    public void identicObjectsareEqual() throws Exception {
-        BibEntry e1 = new BibEntry();
-        BibEntry e2 = e1;
-        assertTrue(e1.equals(e2));
-    }
-
-    @Test
-    public void compareToNullObjectIsFalse() throws Exception {
-        BibEntry e1 = new BibEntry();
-        assertFalse(e1.equals(null));
-    }
-
-    @Test
-    public void compareToDifferentClassIsFalse() throws Exception {
-        BibEntry e1 = new BibEntry();
-        Object e2 = new Object();
-        assertFalse(e1.equals(e2));
-    }
-
-    @Test
-    public void compareIsTrueWhenIdAndFieldsAreEqual() throws Exception {
-        BibEntry e1 = new BibEntry();
-        e1.setId("1");
-        e1.setField(new UnknownField("key"), "value");
-        BibEntry e2 = new BibEntry();
-        e2.setId("1");
-        assertNotEquals(e1, e2);
-        e2.setField(new UnknownField("key"), "value");
-        assertEquals(e1, e2);
-    }
-}
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTest.java b/src/test/java/org/jabref/model/entry/BibEntryTest.java
index 2c16dbe91d42..ddfe5dab35c0 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTest.java
@@ -1,24 +1,35 @@
 package org.jabref.model.entry;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.FieldPriority;
+import org.jabref.model.entry.field.InternalField;
+import org.jabref.model.entry.field.OrFields;
+import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
+import org.jabref.model.entry.types.StandardEntryType;
 
+import com.google.common.collect.Sets;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class BibEntryTest {
-
+class BibEntryTest {
     private BibEntry entry;
 
     @BeforeEach
@@ -31,35 +42,188 @@ public void tearDown() {
         entry = null;
     }
 
+    @Test
+    public void testDefaultConstructor() {
+        assertEquals(StandardEntryType.Misc, entry.getType());
+        assertNotNull(entry.getId());
+        assertFalse(entry.getField(StandardField.AUTHOR).isPresent());
+    }
+
+    @Test
+    public void settingTypeToNullThrowsException() {
+        assertThrows(NullPointerException.class, () -> entry.setType(null));
+    }
+
+    @Test
+    public void setNullFieldThrowsNPE() {
+        assertThrows(NullPointerException.class, () -> entry.setField(null));
+    }
+
     @Test
     public void getFieldIsCaseInsensitive() throws Exception {
         entry.setField(new UnknownField("TeSt"), "value");
-
         assertEquals(Optional.of("value"), entry.getField(new UnknownField("tEsT")));
     }
 
     @Test
     public void getFieldWorksWithBibFieldAsWell() throws Exception {
         entry.setField(StandardField.AUTHOR, "value");
-
         assertEquals(Optional.of("value"), entry.getField(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).getField()));
     }
 
     @Test
     public void setFieldWorksWithBibFieldAsWell() throws Exception {
         entry.setField(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).getField(), "value");
-
         assertEquals(Optional.of("value"), entry.getField(StandardField.AUTHOR));
     }
 
     @Test
-    public void clonedBibentryHasUniqueID() throws Exception {
-        BibEntry entry = new BibEntry();
+    public void clonedBibEntryHasUniqueID() throws Exception {
         BibEntry entryClone = (BibEntry) entry.clone();
-
         assertNotEquals(entry.getId(), entryClone.getId());
     }
 
+    @Test
+    public void setAndGetAreConsistentForMonth() throws Exception {
+        entry.setField(StandardField.MONTH, "may");
+        assertEquals(Optional.of("may"), entry.getField(StandardField.MONTH));
+    }
+
+    @Test
+    public void setAndGetAreConsistentForCapitalizedMonth() throws Exception {
+        entry.setField(StandardField.MONTH, "May");
+        assertEquals(Optional.of("May"), entry.getField(StandardField.MONTH));
+    }
+
+    @Test
+    public void setAndGetAreConsistentForMonthString() throws Exception {
+        entry.setField(StandardField.MONTH, "#may#");
+        assertEquals(Optional.of("#may#"), entry.getField(StandardField.MONTH));
+    }
+
+    @Test
+    public void monthCorrectlyReturnedForMonth() throws Exception {
+        entry.setField(StandardField.MONTH, "may");
+        assertEquals(Optional.of(Month.MAY), entry.getMonth());
+    }
+
+    @Test
+    public void monthCorrectlyReturnedForCapitalizedMonth() throws Exception {
+        entry.setField(StandardField.MONTH, "May");
+        assertEquals(Optional.of(Month.MAY), entry.getMonth());
+    }
+
+    @Test
+    public void monthCorrectlyReturnedForMonthString() throws Exception {
+        entry.setField(StandardField.MONTH, "#may#");
+        assertEquals(Optional.of(Month.MAY), entry.getMonth());
+    }
+
+    @Test
+    public void monthCorrectlyReturnedForMonthMay() throws Exception {
+        entry.setMonth(Month.MAY);
+        assertEquals(Optional.of(Month.MAY), entry.getMonth());
+    }
+
+    @Test
+    public void monthFieldCorrectlyReturnedForMonthMay() throws Exception {
+        entry.setMonth(Month.MAY);
+        assertEquals(Optional.of("#may#"), entry.getField(StandardField.MONTH));
+    }
+
+    @Test
+    public void getFieldOrAliasDateWithYearNumericalMonthString() {
+        entry.setField(StandardField.YEAR, "2003");
+        entry.setField(StandardField.MONTH, "3");
+        assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
+    }
+
+    @Test
+    public void getFieldOrAliasDateWithYearAbbreviatedMonth() {
+        entry.setField(StandardField.YEAR, "2003");
+        entry.setField(StandardField.MONTH, "#mar#");
+        assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
+    }
+
+    @Test
+    public void getFieldOrAliasDateWithYearAbbreviatedMonthString() {
+        entry.setField(StandardField.YEAR, "2003");
+        entry.setField(StandardField.MONTH, "mar");
+        assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
+    }
+
+    @Test
+    public void getFieldOrAliasDateWithOnlyYear() {
+        entry.setField(StandardField.YEAR, "2003");
+        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.DATE));
+    }
+
+    @Test
+    public void getFieldOrAliasYearWithDateYYYY() {
+        entry.setField(StandardField.DATE, "2003");
+        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
+    }
+
+    @Test
+    public void getFieldOrAliasYearWithDateYYYYMM() {
+        entry.setField(StandardField.DATE, "2003-03");
+        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
+    }
+
+    @Test
+    public void getFieldOrAliasYearWithDateYYYYMMDD() {
+        entry.setField(StandardField.DATE, "2003-03-30");
+        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
+    }
+
+    @Test
+    public void getFieldOrAliasMonthWithDateYYYYReturnsNull() {
+        entry.setField(StandardField.DATE, "2003");
+        assertEquals(Optional.empty(), entry.getFieldOrAlias(StandardField.MONTH));
+    }
+
+    @Test
+    public void getFieldOrAliasMonthWithDateYYYYMM() {
+        entry.setField(StandardField.DATE, "2003-03");
+        assertEquals(Optional.of("#mar#"), entry.getFieldOrAlias(StandardField.MONTH));
+    }
+
+    @Test
+    public void getFieldOrAliasMonthWithDateYYYYMMDD() {
+        entry.setField(StandardField.DATE, "2003-03-30");
+        assertEquals(Optional.of("#mar#"), entry.getFieldOrAlias(StandardField.MONTH));
+    }
+
+    @Test
+    public void getFieldOrAliasLatexFreeAlreadyFreeValueIsUnchanged() {
+        entry.setField(StandardField.TITLE, "A Title Without any LaTeX commands");
+        assertEquals(Optional.of("A Title Without any LaTeX commands"), entry.getFieldOrAliasLatexFree(StandardField.TITLE));
+    }
+
+    @Test
+    public void getFieldOrAliasLatexFreeAlreadyFreeAliasValueIsUnchanged() {
+        entry.setField(StandardField.JOURNAL, "A Title Without any LaTeX commands");
+        assertEquals(Optional.of("A Title Without any LaTeX commands"), entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
+    }
+
+    @Test
+    public void getFieldOrAliasLatexFreeBracesAreRemoved() {
+        entry.setField(StandardField.TITLE, "{A Title with some {B}ra{C}es}");
+        assertEquals(Optional.of("A Title with some BraCes"), entry.getFieldOrAliasLatexFree(StandardField.TITLE));
+    }
+
+    @Test
+    public void getFieldOrAliasLatexFreeBracesAreRemovedFromAlias() {
+        entry.setField(StandardField.JOURNAL, "{A Title with some {B}ra{C}es}");
+        assertEquals(Optional.of("A Title with some BraCes"), entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
+    }
+
+    @Test
+    public void getFieldOrAliasLatexFreeComplexConversionInAlias() {
+        entry.setField(StandardField.JOURNAL, "A 32~{mA} {$\\Sigma\\Delta$}-modulator");
+        assertEquals(Optional.of("A 32 mA ΣΔ-modulator"), entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
+    }
+
     @Test
     public void testGetAndAddToLinkedFileList() {
         List<LinkedFile> files = entry.getFiles();
@@ -84,23 +248,333 @@ public void testGetSingleKeywords() {
     }
 
     @Test
-    public void testGetKeywords() {
+    public void settingCiteKeyLeadsToCorrectCiteKey() {
+        assertFalse(entry.hasCiteKey());
+        entry.setCiteKey("Einstein1931");
+        assertEquals(Optional.of("Einstein1931"), entry.getCiteKeyOptional());
+    }
+
+    @Test
+    public void settingCiteKeyLeadsToHasCiteKy() {
+        assertFalse(entry.hasCiteKey());
+        entry.setCiteKey("Einstein1931");
+        assertTrue(entry.hasCiteKey());
+    }
+
+    @Test
+    public void clearFieldWorksForAuthor() {
+        entry.setField(StandardField.AUTHOR, "Albert Einstein");
+        entry.clearField(StandardField.AUTHOR);
+        assertEquals(Optional.empty(), entry.getField(StandardField.AUTHOR));
+    }
+
+    @Test
+    public void setFieldWorksForAuthor() {
+        entry.setField(StandardField.AUTHOR, "Albert Einstein");
+        assertEquals(Optional.of("Albert Einstein"), entry.getField(StandardField.AUTHOR));
+    }
+
+    @Test
+    public void allFieldsPresentDefault() {
+        BibEntry e = new BibEntry(StandardEntryType.Article);
+        e.setField(StandardField.AUTHOR, "abc");
+        e.setField(StandardField.TITLE, "abc");
+        e.setField(StandardField.JOURNAL, "abc");
+
+        List<OrFields> requiredFields = new ArrayList<>();
+        requiredFields.add(new OrFields(StandardField.AUTHOR));
+        requiredFields.add(new OrFields(StandardField.TITLE));
+        assertTrue(e.allFieldsPresent(requiredFields, null));
+
+        requiredFields.add(new OrFields(StandardField.YEAR));
+        assertFalse(e.allFieldsPresent(requiredFields, null));
+    }
+
+    @Test
+    public void allFieldsPresentOr() {
+        BibEntry e = new BibEntry(StandardEntryType.Article);
+        e.setField(StandardField.AUTHOR, "abc");
+        e.setField(StandardField.TITLE, "abc");
+        e.setField(StandardField.JOURNAL, "abc");
+
+        List<OrFields> requiredFields = new ArrayList<>();
+        requiredFields.add(new OrFields(StandardField.JOURNAL, StandardField.YEAR));
+        assertTrue(e.allFieldsPresent(requiredFields, null));
+
+        requiredFields.add(new OrFields(StandardField.YEAR, StandardField.ADDRESS));
+        assertFalse(e.allFieldsPresent(requiredFields, null));
+    }
+
+    @Test
+    public void isNullCiteKeyThrowsNPE() {
+        BibEntry e = new BibEntry(StandardEntryType.Article);
+        assertThrows(NullPointerException.class, () -> e.setCiteKey(null));
+    }
+
+    @Test
+    public void isEmptyCiteKey() {
+        BibEntry e = new BibEntry(StandardEntryType.Article);
+        assertFalse(e.hasCiteKey());
+
+        e.setCiteKey("");
+        assertFalse(e.hasCiteKey());
+
+        e.setCiteKey("key");
+        assertTrue(e.hasCiteKey());
+
+        e.clearField(InternalField.KEY_FIELD);
+        assertFalse(e.hasCiteKey());
+    }
+
+    @Test
+    public void identicObjectsareEqual() throws Exception {
+        BibEntry otherEntry = entry;
+        assertTrue(entry.equals(otherEntry));
+    }
+
+    @Test
+    public void compareToNullObjectIsFalse() throws Exception {
+        assertFalse(entry.equals(null));
+    }
+
+    @Test
+    public void compareToDifferentClassIsFalse() throws Exception {
+        assertFalse(entry.equals(new Object()));
+    }
+
+    @Test
+    public void compareIsTrueWhenIdAndFieldsAreEqual() throws Exception {
+        entry.setId("1");
+        entry.setField(new UnknownField("key"), "value");
+        BibEntry otherEntry = new BibEntry();
+        otherEntry.setId("1");
+        assertNotEquals(entry, otherEntry);
+        otherEntry.setField(new UnknownField("key"), "value");
+        assertEquals(entry, otherEntry);
+    }
+
+    @Test
+    public void addNullKeywordThrowsNPE() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        assertThrows(NullPointerException.class, () -> entry.addKeyword((Keyword) null, ','));
+    }
+
+    @Test
+    public void putNullKeywordListThrowsNPE() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        assertThrows(NullPointerException.class, () -> entry.putKeywords((KeywordList) null, ','));
+    }
+
+    @Test
+    public void putNullKeywordSeparatorThrowsNPE() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        assertThrows(NullPointerException.class, () -> entry.putKeywords(Arrays.asList("A", "B"), null));
+    }
+
+    @Test
+    public void testGetSeparatedKeywordsAreCorrect() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        assertEquals(new KeywordList("Foo", "Bar"), entry.getKeywords(','));
+    }
+
+    @Test
+    public void testAddKeywordIsCorrect() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.addKeyword("FooBar", ',');
+        assertEquals(new KeywordList("Foo", "Bar", "FooBar"), entry.getKeywords(','));
+    }
+
+    @Test
+    public void testAddKeywordHasChanged() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.addKeyword("FooBar", ',');
+        assertTrue(entry.hasChanged());
+    }
+
+    @Test
+    public void testAddKeywordTwiceYiedsOnlyOne() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.addKeyword("FooBar", ',');
+        entry.addKeyword("FooBar", ',');
+        assertEquals(new KeywordList("Foo", "Bar", "FooBar"), entry.getKeywords(','));
+    }
+
+    @Test
+    public void addKeywordIsCaseSensitive() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.addKeyword("FOO", ',');
+        assertEquals(new KeywordList("Foo", "Bar", "FOO"), entry.getKeywords(','));
+    }
+
+    @Test
+    public void testAddKeywordWithDifferentCapitalizationChanges() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.addKeyword("FOO", ',');
+        assertTrue(entry.hasChanged());
+    }
+
+    @Test
+    public void testAddKeywordEmptyKeywordIsNotAdded() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.addKeyword("", ',');
+        assertEquals(new KeywordList("Foo", "Bar"), entry.getKeywords(','));
+    }
+
+    @Test
+    public void testAddKeywordEmptyKeywordNotChanged() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.setChanged(false);
+        entry.addKeyword("", ',');
+        assertFalse(entry.hasChanged());
+    }
+
+    @Test
+    public void texNewBibEntryHasNoKeywords() {
+        assertTrue(entry.getKeywords(',').isEmpty());
+    }
+
+    @Test
+    public void texNewBibEntryHasNoKeywordsEvenAfterAddingEmptyKeyword() {
+        entry.addKeyword("", ',');
+        assertTrue(entry.getKeywords(',').isEmpty());
+    }
+
+    @Test
+    public void texNewBibEntryAfterAddingEmptyKeywordNotChanged() {
+        entry.addKeyword("", ',');
+        assertFalse(entry.hasChanged());
+    }
+
+    @Test
+    public void testAddKeywordsWorksAsExpected() {
+        entry.addKeywords(Arrays.asList("Foo", "Bar"), ',');
+        assertEquals(new KeywordList("Foo", "Bar"), entry.getKeywords(','));
+    }
+
+    @Test
+    public void testPutKeywordsOverwritesOldKeywords() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.putKeywords(Arrays.asList("Yin", "Yang"), ',');
+        assertEquals(new KeywordList("Yin", "Yang"), entry.getKeywords(','));
+    }
+
+    @Test
+    public void testPutKeywordsHasChanged() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.putKeywords(Arrays.asList("Yin", "Yang"), ',');
+        assertTrue(entry.hasChanged());
+    }
+
+    @Test
+    public void testPutKeywordsPutEmpyListErasesPreviousKeywords() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.putKeywords(Collections.emptyList(), ',');
+        assertTrue(entry.getKeywords(',').isEmpty());
+    }
+
+    @Test
+    public void testPutKeywordsPutEmpyListHasChanged() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.putKeywords(Collections.emptyList(), ',');
+        assertTrue(entry.hasChanged());
+    }
+
+    @Test
+    public void testPutKeywordsPutEmpyListToEmptyBibentry() {
+        entry.putKeywords(Collections.emptyList(), ',');
+        assertTrue(entry.getKeywords(',').isEmpty());
+    }
+
+    @Test
+    public void testPutKeywordsPutEmpyListToEmptyBibentryNotChanged() {
+        entry.putKeywords(Collections.emptyList(), ',');
+        assertFalse(entry.hasChanged());
+    }
+
+    @Test
+    public void putKeywordsToEmptyReturnsNoChange() {
+        Optional<FieldChange> change = entry.putKeywords(Collections.emptyList(), ',');
+        assertEquals(Optional.empty(), change);
+    }
+
+    @Test
+    public void clearKeywordsReturnsChange() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        Optional<FieldChange> change = entry.putKeywords(Collections.emptyList(), ',');
+        assertEquals(Optional.of(new FieldChange(entry, StandardField.KEYWORDS, "Foo, Bar", null)), change);
+    }
+
+    @Test
+    public void changeKeywordsReturnsChange() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        Optional<FieldChange> change = entry.putKeywords(Arrays.asList("Test", "FooTest"), ',');
+        assertEquals(Optional.of(new FieldChange(entry, StandardField.KEYWORDS, "Foo, Bar", "Test, FooTest")),
+                change);
+    }
+
+    @Test
+    public void putKeywordsToSameReturnsNoChange() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        Optional<FieldChange> change = entry.putKeywords(Arrays.asList("Foo", "Bar"), ',');
+        assertEquals(Optional.empty(), change);
+    }
+
+    @Test
+    public void getKeywordsReturnsParsedKeywordListFromKeywordsField() {
+        entry.setField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
+        assertEquals(new KeywordList("w1", "w2a w2b", "w3"), entry.getKeywords(','));
+    }
+
+    @Test
+    public void removeKeywordsOnEntryWithoutKeywordsDoesNothing() {
+        Optional<FieldChange> change = entry.removeKeywords(SpecialField.RANKING.getKeyWords(), ',');
+        assertEquals(Optional.empty(), change);
+    }
+
+    @Test
+    public void removeKeywordsWithEmptyListDoesNothing() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.putKeywords(Arrays.asList("kw1", "kw2"), ',');
+        Optional<FieldChange> change = entry.removeKeywords(new KeywordList(), ',');
+        assertEquals(Optional.empty(), change);
+    }
+
+    @Test
+    public void removeKeywordsWithNonExistingKeywordsDoesNothing() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.putKeywords(Arrays.asList("kw1", "kw2"), ',');
+        Optional<FieldChange> change = entry.removeKeywords(KeywordList.parse("kw3, kw4", ','), ',');
+        assertEquals(Optional.empty(), change);
+        assertEquals(Sets.newHashSet("kw1", "kw2"), entry.getKeywords(',').toStringList());
+    }
+
+    @Test
+    public void removeKeywordsWithExistingKeywordsRemovesThem() {
+        entry.setField(StandardField.KEYWORDS, "Foo, Bar");
+        entry.putKeywords(Arrays.asList("kw1", "kw2", "kw3"), ',');
+        Optional<FieldChange> change = entry.removeKeywords(KeywordList.parse("kw1, kw2", ','), ',');
+        assertTrue(change.isPresent());
+        assertEquals(KeywordList.parse("kw3", ','), entry.getKeywords(','));
+    }
+
+    @Test
+    public void keywordListCorrectlyConstructedForThreeKeywords() {
         entry.addKeyword("kw", ',');
         entry.addKeyword("kw2", ',');
         entry.addKeyword("kw3", ',');
         KeywordList actual = entry.getKeywords(',');
-
         assertEquals(new KeywordList(new Keyword("kw"), new Keyword("kw2"), new Keyword("kw3")), actual);
     }
 
     @Test
     public void testGetEmptyResolvedKeywords() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry2 = new BibEntry();
         entry.setField(StandardField.CROSSREF, "entry2");
+        database.insertEntry(entry);
+
+        BibEntry entry2 = new BibEntry();
         entry2.setCiteKey("entry2");
         database.insertEntry(entry2);
-        database.insertEntry(entry);
 
         KeywordList actual = entry.getResolvedKeywords(',', database);
 
@@ -110,10 +584,12 @@ public void testGetEmptyResolvedKeywords() {
     @Test
     public void testGetSingleResolvedKeywords() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry2 = new BibEntry();
         entry.setField(StandardField.CROSSREF, "entry2");
+
+        BibEntry entry2 = new BibEntry();
         entry2.setCiteKey("entry2");
         entry2.addKeyword("kw", ',');
+
         database.insertEntry(entry2);
         database.insertEntry(entry);
 
@@ -125,12 +601,14 @@ public void testGetSingleResolvedKeywords() {
     @Test
     public void testGetResolvedKeywords() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry2 = new BibEntry();
         entry.setField(StandardField.CROSSREF, "entry2");
+
+        BibEntry entry2 = new BibEntry();
         entry2.setCiteKey("entry2");
         entry2.addKeyword("kw", ',');
         entry2.addKeyword("kw2", ',');
         entry2.addKeyword("kw3", ',');
+
         database.insertEntry(entry2);
         database.insertEntry(entry);
 
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTests.java b/src/test/java/org/jabref/model/entry/BibEntryTests.java
deleted file mode 100644
index a0e2ee64ad02..000000000000
--- a/src/test/java/org/jabref/model/entry/BibEntryTests.java
+++ /dev/null
@@ -1,404 +0,0 @@
-package org.jabref.model.entry;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
-import org.jabref.model.FieldChange;
-import org.jabref.model.entry.field.InternalField;
-import org.jabref.model.entry.field.OrFields;
-import org.jabref.model.entry.field.SpecialField;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.types.StandardEntryType;
-
-import com.google.common.collect.Sets;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class BibEntryTests {
-
-    private BibEntry keywordEntry;
-    private BibEntry emptyEntry;
-
-    @BeforeEach
-    public void setUp() {
-        // Default entry for most keyword and some type tests
-        keywordEntry = new BibEntry();
-        keywordEntry.setType(StandardEntryType.Article);
-        keywordEntry.setField(StandardField.KEYWORDS, "Foo, Bar");
-        keywordEntry.setChanged(false);
-
-        // Empty entry for some tests
-        emptyEntry = new BibEntry();
-        emptyEntry.setType(StandardEntryType.Article);
-        emptyEntry.setChanged(false);
-    }
-
-    @Test
-    public void testDefaultConstructor() {
-        BibEntry entry = new BibEntry();
-        assertEquals(StandardEntryType.Misc, entry.getType());
-        assertNotNull(entry.getId());
-        assertFalse(entry.getField(StandardField.AUTHOR).isPresent());
-    }
-
-    @Test
-    public void allFieldsPresentDefault() {
-        BibEntry e = new BibEntry(StandardEntryType.Article);
-        e.setField(StandardField.AUTHOR, "abc");
-        e.setField(StandardField.TITLE, "abc");
-        e.setField(StandardField.JOURNAL, "abc");
-
-        List<OrFields> requiredFields = new ArrayList<>();
-        requiredFields.add(new OrFields(StandardField.AUTHOR));
-        requiredFields.add(new OrFields(StandardField.TITLE));
-        assertTrue(e.allFieldsPresent(requiredFields, null));
-
-        requiredFields.add(new OrFields(StandardField.YEAR));
-        assertFalse(e.allFieldsPresent(requiredFields, null));
-    }
-
-    @Test
-    public void allFieldsPresentOr() {
-        BibEntry e = new BibEntry(StandardEntryType.Article);
-        e.setField(StandardField.AUTHOR, "abc");
-        e.setField(StandardField.TITLE, "abc");
-        e.setField(StandardField.JOURNAL, "abc");
-
-        List<OrFields> requiredFields = new ArrayList<>();
-        requiredFields.add(new OrFields(StandardField.JOURNAL, StandardField.YEAR));
-        assertTrue(e.allFieldsPresent(requiredFields, null));
-
-        requiredFields.add(new OrFields(StandardField.YEAR, StandardField.ADDRESS));
-        assertFalse(e.allFieldsPresent(requiredFields, null));
-    }
-
-    @Test
-    public void isNullCiteKeyThrowsNPE() {
-        BibEntry e = new BibEntry(StandardEntryType.Article);
-        assertThrows(NullPointerException.class, () -> e.setCiteKey(null));
-    }
-
-    @Test
-    public void isEmptyCiteKey() {
-        BibEntry e = new BibEntry(StandardEntryType.Article);
-        assertFalse(e.hasCiteKey());
-
-        e.setCiteKey("");
-        assertFalse(e.hasCiteKey());
-
-        e.setCiteKey("key");
-        assertTrue(e.hasCiteKey());
-
-        e.clearField(InternalField.KEY_FIELD);
-        assertFalse(e.hasCiteKey());
-    }
-
-    @Test
-    public void settingTypeToNullThrowsException() {
-        assertThrows(NullPointerException.class, () -> keywordEntry.setType(null));
-    }
-
-    @Test
-    public void getFieldOrAliasDateWithYearNumericalMonthString() {
-        emptyEntry.setField(StandardField.YEAR, "2003");
-        emptyEntry.setField(StandardField.MONTH, "3");
-        assertEquals(Optional.of("2003-03"), emptyEntry.getFieldOrAlias(StandardField.DATE));
-    }
-
-    @Test
-    public void getFieldOrAliasDateWithYearAbbreviatedMonth() {
-        emptyEntry.setField(StandardField.YEAR, "2003");
-        emptyEntry.setField(StandardField.MONTH, "#mar#");
-        assertEquals(Optional.of("2003-03"), emptyEntry.getFieldOrAlias(StandardField.DATE));
-    }
-
-    @Test
-    public void getFieldOrAliasDateWithYearAbbreviatedMonthString() {
-        emptyEntry.setField(StandardField.YEAR, "2003");
-        emptyEntry.setField(StandardField.MONTH, "mar");
-        assertEquals(Optional.of("2003-03"), emptyEntry.getFieldOrAlias(StandardField.DATE));
-    }
-
-    @Test
-    public void getFieldOrAliasDateWithOnlyYear() {
-        emptyEntry.setField(StandardField.YEAR, "2003");
-        assertEquals(Optional.of("2003"), emptyEntry.getFieldOrAlias(StandardField.DATE));
-    }
-
-    @Test
-    public void getFieldOrAliasYearWithDateYYYY() {
-        emptyEntry.setField(StandardField.DATE, "2003");
-        assertEquals(Optional.of("2003"), emptyEntry.getFieldOrAlias(StandardField.YEAR));
-    }
-
-    @Test
-    public void getFieldOrAliasYearWithDateYYYYMM() {
-        emptyEntry.setField(StandardField.DATE, "2003-03");
-        assertEquals(Optional.of("2003"), emptyEntry.getFieldOrAlias(StandardField.YEAR));
-    }
-
-    @Test
-    public void getFieldOrAliasYearWithDateYYYYMMDD() {
-        emptyEntry.setField(StandardField.DATE, "2003-03-30");
-        assertEquals(Optional.of("2003"), emptyEntry.getFieldOrAlias(StandardField.YEAR));
-    }
-
-    @Test
-    public void getFieldOrAliasMonthWithDateYYYYReturnsNull() {
-        emptyEntry.setField(StandardField.DATE, "2003");
-        assertEquals(Optional.empty(), emptyEntry.getFieldOrAlias(StandardField.MONTH));
-    }
-
-    @Test
-    public void getFieldOrAliasMonthWithDateYYYYMM() {
-        emptyEntry.setField(StandardField.DATE, "2003-03");
-        assertEquals(Optional.of("#mar#"), emptyEntry.getFieldOrAlias(StandardField.MONTH));
-    }
-
-    @Test
-    public void getFieldOrAliasMonthWithDateYYYYMMDD() {
-        emptyEntry.setField(StandardField.DATE, "2003-03-30");
-        assertEquals(Optional.of("#mar#"), emptyEntry.getFieldOrAlias(StandardField.MONTH));
-    }
-
-    @Test
-    public void getFieldOrAliasLatexFreeAlreadyFreeValueIsUnchanged() {
-        emptyEntry.setField(StandardField.TITLE, "A Title Without any LaTeX commands");
-        assertEquals(Optional.of("A Title Without any LaTeX commands"), emptyEntry.getFieldOrAliasLatexFree(StandardField.TITLE));
-    }
-
-    @Test
-    public void getFieldOrAliasLatexFreeAlreadyFreeAliasValueIsUnchanged() {
-        emptyEntry.setField(StandardField.JOURNAL, "A Title Without any LaTeX commands");
-        assertEquals(Optional.of("A Title Without any LaTeX commands"), emptyEntry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
-    }
-
-    @Test
-    public void getFieldOrAliasLatexFreeBracesAreRemoved() {
-        emptyEntry.setField(StandardField.TITLE, "{A Title with some {B}ra{C}es}");
-        assertEquals(Optional.of("A Title with some BraCes"), emptyEntry.getFieldOrAliasLatexFree(StandardField.TITLE));
-    }
-
-    @Test
-    public void getFieldOrAliasLatexFreeBracesAreRemovedFromAlias() {
-        emptyEntry.setField(StandardField.JOURNAL, "{A Title with some {B}ra{C}es}");
-        assertEquals(Optional.of("A Title with some BraCes"), emptyEntry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
-    }
-
-    @Test
-    public void getFieldOrAliasLatexFreeComplexConversionInAlias() {
-        emptyEntry.setField(StandardField.JOURNAL, "A 32~{mA} {$\\Sigma\\Delta$}-modulator");
-        assertEquals(Optional.of("A 32 mA ΣΔ-modulator"), emptyEntry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
-    }
-
-    @Test
-    public void setNullField() {
-        assertThrows(NullPointerException.class, () -> emptyEntry.setField(null));
-    }
-
-    @Test
-    public void addNullKeywordThrowsNPE() {
-        assertThrows(NullPointerException.class, () -> keywordEntry.addKeyword((Keyword) null, ','));
-    }
-
-    @Test
-    public void putNullKeywordListThrowsNPE() {
-        assertThrows(NullPointerException.class, () -> keywordEntry.putKeywords((KeywordList) null, ','));
-    }
-
-    @Test
-    public void putNullKeywordSeparatorThrowsNPE() {
-        assertThrows(NullPointerException.class, () -> keywordEntry.putKeywords(Arrays.asList("A", "B"), null));
-    }
-
-    @Test
-    public void testGetSeparatedKeywordsAreCorrect() {
-        assertEquals(new KeywordList("Foo", "Bar"), keywordEntry.getKeywords(','));
-    }
-
-    @Test
-    public void testAddKeywordIsCorrect() {
-        keywordEntry.addKeyword("FooBar", ',');
-        assertEquals(new KeywordList("Foo", "Bar", "FooBar"), keywordEntry.getKeywords(','));
-    }
-
-    @Test
-    public void testAddKeywordHasChanged() {
-        keywordEntry.addKeyword("FooBar", ',');
-        assertTrue(keywordEntry.hasChanged());
-    }
-
-    @Test
-    public void testAddKeywordTwiceYiedsOnlyOne() {
-        keywordEntry.addKeyword("FooBar", ',');
-        keywordEntry.addKeyword("FooBar", ',');
-        assertEquals(new KeywordList("Foo", "Bar", "FooBar"), keywordEntry.getKeywords(','));
-    }
-
-    @Test
-    public void addKeywordIsCaseSensitive() {
-        keywordEntry.addKeyword("FOO", ',');
-        assertEquals(new KeywordList("Foo", "Bar", "FOO"), keywordEntry.getKeywords(','));
-    }
-
-    @Test
-    public void testAddKeywordWithDifferentCapitalizationChanges() {
-        keywordEntry.addKeyword("FOO", ',');
-        assertTrue(keywordEntry.hasChanged());
-    }
-
-    @Test
-    public void testAddKeywordEmptyKeywordIsNotAdded() {
-        keywordEntry.addKeyword("", ',');
-        assertEquals(new KeywordList("Foo", "Bar"), keywordEntry.getKeywords(','));
-    }
-
-    @Test
-    public void testAddKeywordEmptyKeywordNotChanged() {
-        keywordEntry.addKeyword("", ',');
-        assertFalse(keywordEntry.hasChanged());
-    }
-
-    @Test
-    public void texNewBibEntryHasNoKeywords() {
-        assertTrue(emptyEntry.getKeywords(',').isEmpty());
-    }
-
-    @Test
-    public void texNewBibEntryHasNoKeywordsEvenAfterAddingEmptyKeyword() {
-        emptyEntry.addKeyword("", ',');
-        assertTrue(emptyEntry.getKeywords(',').isEmpty());
-    }
-
-    @Test
-    public void texNewBibEntryAfterAddingEmptyKeywordNotChanged() {
-        emptyEntry.addKeyword("", ',');
-        assertFalse(emptyEntry.hasChanged());
-    }
-
-    @Test
-    public void testAddKeywordsWorksAsExpected() {
-        emptyEntry.addKeywords(Arrays.asList("Foo", "Bar"), ',');
-        assertEquals(new KeywordList("Foo", "Bar"), emptyEntry.getKeywords(','));
-    }
-
-    @Test
-    public void testPutKeywordsOverwritesOldKeywords() {
-        keywordEntry.putKeywords(Arrays.asList("Yin", "Yang"), ',');
-        assertEquals(new KeywordList("Yin", "Yang"), keywordEntry.getKeywords(','));
-    }
-
-    @Test
-    public void testPutKeywordsHasChanged() {
-        keywordEntry.putKeywords(Arrays.asList("Yin", "Yang"), ',');
-        assertTrue(keywordEntry.hasChanged());
-    }
-
-    @Test
-    public void testPutKeywordsPutEmpyListErasesPreviousKeywords() {
-        keywordEntry.putKeywords(Collections.emptyList(), ',');
-        assertTrue(keywordEntry.getKeywords(',').isEmpty());
-    }
-
-    @Test
-    public void testPutKeywordsPutEmpyListHasChanged() {
-        keywordEntry.putKeywords(Collections.emptyList(), ',');
-        assertTrue(keywordEntry.hasChanged());
-    }
-
-    @Test
-    public void testPutKeywordsPutEmpyListToEmptyBibentry() {
-        emptyEntry.putKeywords(Collections.emptyList(), ',');
-        assertTrue(emptyEntry.getKeywords(',').isEmpty());
-    }
-
-    @Test
-    public void testPutKeywordsPutEmpyListToEmptyBibentryNotChanged() {
-        emptyEntry.putKeywords(Collections.emptyList(), ',');
-        assertFalse(emptyEntry.hasChanged());
-    }
-
-    @Test
-    public void putKeywordsToEmptyReturnsNoChange() {
-        Optional<FieldChange> change = emptyEntry.putKeywords(Collections.emptyList(), ',');
-        assertEquals(Optional.empty(), change);
-    }
-
-    @Test
-    public void clearKeywordsReturnsChange() {
-        Optional<FieldChange> change = keywordEntry.putKeywords(Collections.emptyList(), ',');
-        assertEquals(Optional.of(new FieldChange(keywordEntry, StandardField.KEYWORDS, "Foo, Bar", null)), change);
-    }
-
-    @Test
-    public void changeKeywordsReturnsChange() {
-        Optional<FieldChange> change = keywordEntry.putKeywords(Arrays.asList("Test", "FooTest"), ',');
-        assertEquals(Optional.of(new FieldChange(keywordEntry, StandardField.KEYWORDS, "Foo, Bar", "Test, FooTest")),
-                change);
-    }
-
-    @Test
-    public void putKeywordsToSameReturnsNoChange() {
-        Optional<FieldChange> change = keywordEntry.putKeywords(Arrays.asList("Foo", "Bar"), ',');
-        assertEquals(Optional.empty(), change);
-    }
-
-    @Test
-    public void getKeywordsReturnsParsedKeywordListFromKeywordsField() {
-        BibEntry entry = new BibEntry();
-        entry.setField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
-        assertEquals(new KeywordList("w1", "w2a w2b", "w3"), entry.getKeywords(','));
-    }
-
-    @Test
-    public void removeKeywordsOnEntryWithoutKeywordsDoesNothing() {
-        BibEntry entry = new BibEntry();
-        Optional<FieldChange> change = entry.removeKeywords(SpecialField.RANKING.getKeyWords(), ',');
-        assertEquals(Optional.empty(), change);
-    }
-
-    @Test
-    public void removeKeywordsWithEmptyListDoesNothing() {
-        keywordEntry.putKeywords(Arrays.asList("kw1", "kw2"), ',');
-        Optional<FieldChange> change = keywordEntry.removeKeywords(new KeywordList(), ',');
-        assertEquals(Optional.empty(), change);
-    }
-
-    @Test
-    public void removeKeywordsWithNonExistingKeywordsDoesNothing() {
-        keywordEntry.putKeywords(Arrays.asList("kw1", "kw2"), ',');
-        Optional<FieldChange> change = keywordEntry.removeKeywords(KeywordList.parse("kw3, kw4", ','), ',');
-        assertEquals(Optional.empty(), change);
-        assertEquals(Sets.newHashSet("kw1", "kw2"), keywordEntry.getKeywords(',').toStringList());
-    }
-
-    @Test
-    public void removeKeywordsWithExistingKeywordsRemovesThem() {
-        keywordEntry.putKeywords(Arrays.asList("kw1", "kw2", "kw3"), ',');
-        Optional<FieldChange> change = keywordEntry.removeKeywords(KeywordList.parse("kw1, kw2", ','), ',');
-        assertTrue(change.isPresent());
-        assertEquals(KeywordList.parse("kw3", ','), keywordEntry.getKeywords(','));
-    }
-
-    @Test
-    public void setCiteKey() {
-        BibEntry be = new BibEntry();
-        assertFalse(be.hasCiteKey());
-        be.setField(StandardField.AUTHOR, "Albert Einstein");
-        be.setCiteKey("Einstein1931");
-        assertTrue(be.hasCiteKey());
-        assertEquals(Optional.of("Einstein1931"), be.getCiteKeyOptional());
-        assertEquals(Optional.of("Albert Einstein"), be.getField(StandardField.AUTHOR));
-        be.clearField(StandardField.AUTHOR);
-        assertEquals(Optional.empty(), be.getField(StandardField.AUTHOR));
-    }
-}
diff --git a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
index f4ce6967dfae..6d6921128717 100644
--- a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
@@ -7,7 +7,16 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class CanonicalBibEntryTest {
+class CanonicalBibEntryTest {
+
+    @Test
+    void canonicalRepresentationIsCorrectForStringMonth() {
+        BibEntry entry = new BibEntry();
+        entry.setMonth(Month.MAY);
+        assertEquals("@misc{,\n" +
+                "  month = {#may#}\n" +
+                "}", CanonicalBibEntry.getCanonicalRepresentation(entry));
+    }
 
     @Test
     public void simpleCanonicalRepresentation() {
@@ -16,7 +25,7 @@ public void simpleCanonicalRepresentation() {
         e.setField(StandardField.AUTHOR, "abc");
         e.setField(StandardField.TITLE, "def");
         e.setField(StandardField.JOURNAL, "hij");
-        String canonicalRepresentation = CanonicalBibtexEntry.getCanonicalRepresentation(e);
+        String canonicalRepresentation = CanonicalBibEntry.getCanonicalRepresentation(e);
         assertEquals("@article{key,\n  author = {abc},\n  journal = {hij},\n  title = {def}\n}",
                 canonicalRepresentation);
     }
@@ -26,7 +35,7 @@ public void canonicalRepresentationWithNewlines() {
         BibEntry e = new BibEntry(StandardEntryType.Article);
         e.setCiteKey("key");
         e.setField(StandardField.ABSTRACT, "line 1\nline 2");
-        String canonicalRepresentation = CanonicalBibtexEntry.getCanonicalRepresentation(e);
+        String canonicalRepresentation = CanonicalBibEntry.getCanonicalRepresentation(e);
         assertEquals("@article{key,\n  abstract = {line 1\nline 2}\n}", canonicalRepresentation);
     }
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib
index f170c7f5e105..8bae7ec117ac 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticle.bib
@@ -6,6 +6,6 @@ @Article{Mustermann2016
   journal =  {Java Journal},
   year =     {2016},
   pages =    {2},
-  month =    {February},
+  month =    feb,
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib
index b759fbeebf08..8e05175af26b 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestArticleWithoutID.bib
@@ -6,6 +6,6 @@ @Article{
   journal =  {Java Journal},
   year =     {2016},
   pages =    {2},
-  month =    {February},
+  month =    feb,
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib
index d4b21de4684b..fa5079267a59 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBook.bib
@@ -6,6 +6,6 @@ @Book{Mustermann2016
   year =      {2016},
   author =    {Max Mustermann},
   volume =    {1},
-  month =     {February},
+  month =     feb,
   keywords =  {java}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib
index 3dad334bf5fc..ae3762ef13b4 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestBooklet.bib
@@ -4,7 +4,7 @@ @Booklet{Mustermann2016
   title =    {Java Booklet},
   author =   {Max Mustermann},
   address =  {Stuttgart},
-  month =    {February},
+  month =    feb,
   year =     {2016},
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib
index e7709cedf11e..55e24a662f79 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestConference.bib
@@ -11,7 +11,7 @@ @Conference{Mustermann2016
   series =       {1},
   pages =        {3-9},
   address =      {Stuttgart},
-  month =        {February},
+  month =        feb,
   organization = {Java Org},
   publisher =    {Java Publisher},
   keywords =     {java}
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib
index d0e1c4d66865..a3d080037ca2 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInBook.bib
@@ -8,6 +8,6 @@ @InBook{Mustermann2016
   year =      {2016},
   author =    {Max Mustermann},
   volume =    {1},
-  month =     {February},
+  month =     feb,
   keywords =  {java}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib
index 9fa735acd678..f9e6451fd564 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInCollection.bib
@@ -11,6 +11,6 @@ @InCollection{Mustermann2016
   number =    {1},
   chapter =   {3},
   pages =     {18-26},
-  month =     {February},
+  month =     feb,
   keywords =  {java}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib
index 0a9546563d9b..a2f650259c1d 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInProceedings.bib
@@ -5,7 +5,7 @@ @InProceedings{Mustermann2016
   title =        {Java InProceedings},
   booktitle =    {Java Book},
   year =         {2016},
-  month =        {February},
+  month =        feb,
   organization = {Java Org},
   publisher =    {Java Publisher},
   keywords =     {java}
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib
index 4014194c1b07..1c7c0aa3c7b7 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestInbookLessFields.bib
@@ -9,7 +9,7 @@ @InBook{Mustermann2016
   series    = {1},
   address   = {Stuttgart},
   edition   = {10},
-  month     = {February},
+  month     = feb,
   note      = {some note},
   keywords  = {java},
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib
index 21a7961789e2..8a4f5228bc87 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestManual.bib
@@ -5,7 +5,7 @@ @Manual{Mustermann2016
   author =        {Max Mustermann},
   organization =  {Java Users},
   address =       {Stuttgart},
-  month =         {February},
+  month =         feb,
   year =          {2016},
   keywords =      {java}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib
index 003c2879c6c4..54d02f07c169 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMasterThesis.bib
@@ -7,6 +7,6 @@ @MastersThesis{Mustermann2016
   year =     {2016},
   type =     {Thesis},
   address =  {Stuttgart},
-  month =    {February},
+  month =    feb,
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib
index 9101bba68e27..1d67e1933413 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestMisc.bib
@@ -4,7 +4,7 @@ @Misc{Mustermann2016
   author =       {Max Mustermann},
   title =        {Java Misc},
   howpublished = {Internet},
-  month =        {February},
+  month =        feb,
   year =         {2016},
   keywords =     {java}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib
index 6121bc38d242..66707a4015e6 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestPhdThesis.bib
@@ -7,6 +7,6 @@ @PhdThesis{Mustermann2016
   year =     {2016},
   type =     {Thesis},
   address =  {Stuttgart},
-  month =    {February},
+  month =    feb,
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib
index 8d6cbe4c6615..c20654b07b92 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestProceedings.bib
@@ -6,6 +6,6 @@ @Proceedings{Musterfrau2016
   editor =       {Maxima Musterfrau},
   address =      {Stuttgart},
   publisher =    {Java Pub},
-  month =        {February},
+  month =        feb,
   organization = {Java Org}
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib
index 1ab28ba275c1..d88e3c1335a3 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestTechReport.bib
@@ -6,6 +6,6 @@ @TechReport{Mustermann2016
   type =          {Report},
   number =        {1},
   address =       {Stuttgart},
-  month =         {February},
+  month =         feb,
   keywords =      {java},
 }
diff --git a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib
index f1720ddef2bd..a3dceb11d4bc 100644
--- a/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib
+++ b/src/test/resources/org/jabref/logic/exporter/BibTeXMLExporterTestUnpublished.bib
@@ -3,7 +3,7 @@
 @Unpublished{Mustermann2016,
   author =   {Max Mustermann},
   title =    {Java Unpublished},
-  month =    {February},
+  month =    feb,
   year =     {2016},
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib
index f170c7f5e105..8bae7ec117ac 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle.bib
@@ -6,6 +6,6 @@ @Article{Mustermann2016
   journal =  {Java Journal},
   year =     {2016},
   pages =    {2},
-  month =    {February},
+  month =    feb,
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib
index 515e1a1367bf..580a364c6a3e 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticle2.bib
@@ -2,7 +2,7 @@ @article{Mustermann2016
   author = {Max Mustermann},
   journal = {Java Journal},
   keywords = {java},
-  month = {February},
+  month = feb,
   pages = {2},
   title = {Java tricks},
   year = {2016}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib
index b759fbeebf08..8e05175af26b 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestArticleWithoutID.bib
@@ -6,6 +6,6 @@ @Article{
   journal =  {Java Journal},
   year =     {2016},
   pages =    {2},
-  month =    {February},
+  month =    feb,
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib
index d4b21de4684b..fa5079267a59 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBook.bib
@@ -6,6 +6,6 @@ @Book{Mustermann2016
   year =      {2016},
   author =    {Max Mustermann},
   volume =    {1},
-  month =     {February},
+  month =     feb,
   keywords =  {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib
index 3dad334bf5fc..ae3762ef13b4 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestBooklet.bib
@@ -4,7 +4,7 @@ @Booklet{Mustermann2016
   title =    {Java Booklet},
   author =   {Max Mustermann},
   address =  {Stuttgart},
-  month =    {February},
+  month =    feb,
   year =     {2016},
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib
index e7709cedf11e..55e24a662f79 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestConference.bib
@@ -11,7 +11,7 @@ @Conference{Mustermann2016
   series =       {1},
   pages =        {3-9},
   address =      {Stuttgart},
-  month =        {February},
+  month =        feb,
   organization = {Java Org},
   publisher =    {Java Publisher},
   keywords =     {java}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib
index d0e1c4d66865..a3d080037ca2 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInBook.bib
@@ -8,6 +8,6 @@ @InBook{Mustermann2016
   year =      {2016},
   author =    {Max Mustermann},
   volume =    {1},
-  month =     {February},
+  month =     feb,
   keywords =  {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib
index 9fa735acd678..f9e6451fd564 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInCollection.bib
@@ -11,6 +11,6 @@ @InCollection{Mustermann2016
   number =    {1},
   chapter =   {3},
   pages =     {18-26},
-  month =     {February},
+  month =     feb,
   keywords =  {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib
index 0a9546563d9b..a2f650259c1d 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInProceedings.bib
@@ -5,7 +5,7 @@ @InProceedings{Mustermann2016
   title =        {Java InProceedings},
   booktitle =    {Java Book},
   year =         {2016},
-  month =        {February},
+  month =        feb,
   organization = {Java Org},
   publisher =    {Java Publisher},
   keywords =     {java}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib
index 4014194c1b07..1c7c0aa3c7b7 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestInbookLessFields.bib
@@ -9,7 +9,7 @@ @InBook{Mustermann2016
   series    = {1},
   address   = {Stuttgart},
   edition   = {10},
-  month     = {February},
+  month     = feb,
   note      = {some note},
   keywords  = {java},
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib
index b716c95368d5..9b8b16265638 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestIncollectionWithoutChapter.bib
@@ -9,6 +9,6 @@ @InCollection{Mustermann2016
   volume =    {1},
   number =    {1},
   pages =     {18-26},
-  month =     {February},
+  month =     feb,
   keywords =  {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib
index 21a7961789e2..8a4f5228bc87 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestManual.bib
@@ -5,7 +5,7 @@ @Manual{Mustermann2016
   author =        {Max Mustermann},
   organization =  {Java Users},
   address =       {Stuttgart},
-  month =         {February},
+  month =         feb,
   year =          {2016},
   keywords =      {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib
index 003c2879c6c4..54d02f07c169 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMasterThesis.bib
@@ -7,6 +7,6 @@ @MastersThesis{Mustermann2016
   year =     {2016},
   type =     {Thesis},
   address =  {Stuttgart},
-  month =    {February},
+  month =    feb,
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib
index 9101bba68e27..1d67e1933413 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestMisc.bib
@@ -4,7 +4,7 @@ @Misc{Mustermann2016
   author =       {Max Mustermann},
   title =        {Java Misc},
   howpublished = {Internet},
-  month =        {February},
+  month =        feb,
   year =         {2016},
   keywords =     {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib
index 6121bc38d242..66707a4015e6 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestPhdThesis.bib
@@ -7,6 +7,6 @@ @PhdThesis{Mustermann2016
   year =     {2016},
   type =     {Thesis},
   address =  {Stuttgart},
-  month =    {February},
+  month =    feb,
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib
index 8d6cbe4c6615..c20654b07b92 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestProceedings.bib
@@ -6,6 +6,6 @@ @Proceedings{Musterfrau2016
   editor =       {Maxima Musterfrau},
   address =      {Stuttgart},
   publisher =    {Java Pub},
-  month =        {February},
+  month =        feb,
   organization = {Java Org}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib
index 1ab28ba275c1..d88e3c1335a3 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestTechReport.bib
@@ -6,6 +6,6 @@ @TechReport{Mustermann2016
   type =          {Report},
   number =        {1},
   address =       {Stuttgart},
-  month =         {February},
+  month =         feb,
   keywords =      {java},
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib
index f1720ddef2bd..a3dceb11d4bc 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/BibTeXMLImporterTestUnpublished.bib
@@ -3,7 +3,7 @@
 @Unpublished{Mustermann2016,
   author =   {Max Mustermann},
   title =    {Java Unpublished},
-  month =    {February},
+  month =    feb,
   year =     {2016},
   keywords = {java}
 }
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib
index 720a0cdd4641..e0ab059dc0e5 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleID.bib
@@ -8,7 +8,7 @@ @article{
   journal = {Diagnostic microbiology and infectious disease},
   journal-abbreviation = {Diagn Microbiol Infect Dis},
   keywords = {Cryptococcal meningitis; Diagnostics; HIV; Immunocompromised; Meningitis; PCR},
-  month = {Dec},
+  month = dec,
   nlm-id = {8305899},
   owner = {NLM},
   pages = {1234},
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib
index f7b2362fbcce..b381cdc64863 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestArticleNoISSN.bib
@@ -8,7 +8,7 @@ @Article{
   issue                = {3},
   pages                = {228--242},
   doi                  = {10.1080/1357650X.2015.1125914},
-  month                = {May},
+  month                = may,
   citation-subset      = {IM},
   country              = {England},
   created              = {2016-03-10},
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib
index 4befa1c87046..cf6ed424c9b3 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestBookArticleSet.bib
@@ -4,7 +4,7 @@ @article{
   contribution = {2012-03-27},
   doi = {10.3275/8949},
   isbn = {9781860163593},
-  month = {02},
+  month = feb,
   pii = {1223321},
   pmid = {21413195},
   publisher = {Royal College of Physicians (UK)},
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib
index 45a1448438a7..6d897517d74f 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestNbib.bib
@@ -41,7 +41,7 @@ @article{
   author = {National Collaborating Centre for Chronic Conditions (UK)},
   copyright = {Copyright from somwhere},
   isbn = {9781860163593},
-  month = {02},
+  month = feb,
   pmid = {21413195},
   publisher = {Royal College of Physicians (UK)},
   publocation = {London},
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib
index ea185bb57175..6b838e30345f 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MedlineImporterTestPubmedBook.bib
@@ -1,7 +1,7 @@
 @Article{,
   title       = {Rheumatoid Arthritis: National Clinical Guideline for Management and Treatment in Adults},
   year        = {2009},
-  month       = {02},
+  month       = feb,
   abstract    = {just a dummy.},
   author = {National Collaborating Centre for Chronic Conditions (UK) and Williams, Darlisha A},
   copyright   = {Copyright from somwhere},
diff --git a/src/test/resources/org/jabref/logic/xmp/article_dublinCore.bib b/src/test/resources/org/jabref/logic/xmp/article_dublinCore.bib
index 42645b694f6b..7a0af0f2d012 100644
--- a/src/test/resources/org/jabref/logic/xmp/article_dublinCore.bib
+++ b/src/test/resources/org/jabref/logic/xmp/article_dublinCore.bib
@@ -6,7 +6,7 @@ @Article{Olly2018
   volume       = {1},
   number       = {1},
   pages        = {1-2},
-  month        = {mar},
+  month        = mar,
   issn         = {978-123-123},
   note         = {That's a note},
   abstract     = {That's an abstract},
diff --git a/src/test/resources/org/jabref/util/twente.bib b/src/test/resources/org/jabref/util/twente.bib
index f8d4d51f0da4..a02f1c174993 100644
--- a/src/test/resources/org/jabref/util/twente.bib
+++ b/src/test/resources/org/jabref/util/twente.bib
@@ -144,7 +144,7 @@ @TECHREPORT{Patterson06
   year = {2006},
   type = {Presentation},
   address = {Palo Alto, CA},
-  month = {August},
+  month = aug,
   pdf = {Patterson06.pdf},
   url = {http://www.hotchips.org/hc18/program/conference_day_one.htm}
 }
diff --git a/src/test/resources/testbib/jabref-authors.bib b/src/test/resources/testbib/jabref-authors.bib
index 3ff9ce751e5a..d79207bb5fd2 100644
--- a/src/test/resources/testbib/jabref-authors.bib
+++ b/src/test/resources/testbib/jabref-authors.bib
@@ -1136,7 +1136,7 @@ @InProceedings{GeigerHarrerLenhardEtAl2016
   year      = {2016},
   pages     = {120--128},
   address   = {Oxford, UK},
-  month     = {March/April},
+  month     = mar,
   doi       = {10.1109/sose.2016.39},
   file      = {:geiger2016evolution.pdf:PDF},
   keywords  = {rank4},
@@ -1148,7 +1148,7 @@ @InProceedings{GeigerHarrerLenhard2016
   booktitle = {Proceedings of the 8th Central-European Workshop on Services and their Composition (ZEUS), January 27-28, Vienna, Austria},
   year      = {2016},
   pages     = {37--44},
-  month     = {jan},
+  month     = jan,
   file      = {:Geiger2016ProcessEngineBenchmarking.pdf:PDF},
 }
 
@@ -1315,7 +1315,7 @@ @TechReport{Geiger2013
   year        = {2013},
   type        = {Bamberger Beitr\"age zur Wirtschaftsinformatik und Angewandten Informatik,},
   number      = {no. 92},
-  month       = {May},
+  month       = may,
   file        = {:Geiger2013BPMN20Process.pdf:PDF},
 }
 
@@ -1451,7 +1451,7 @@ @InProceedings{GeigerSchoenbergerWirtz2011
   year      = {2011},
   series    = {CEUR Workshop Proceedings},
   pages     = {24--25},
-  month     = {Feb},
+  month     = feb,
   publisher = {CEUR-WS.org},
   file      = {:Geiger2011ProposalCheckingConformance.pdf:PDF},
 }
@@ -1480,9 +1480,9 @@ @InProceedings{SchoenbergerSchwalbWirtz2011
 @InProceedings{GeigerSchoenbergerWirtz2011a,
   author    = {Matthias Geiger and Andreas Sch\"onberger and Guido Wirtz},
   title     = {{Towards Automated Conformance Checking of {ebBP-ST} Choreographies and Corresponding {WS-BPEL} Based Orchestrations}},
-  booktitle = {Conference on Software Engineering and Knowledge Engineering (SEKE), Miami, Florida, USA},
+  booktitle = {Conference on Software Engineering and Knowledge Engineering (SEKE), Miami, Florida, USA, July 7-9, 2011},
   year      = {2011},
-  month     = {7.-9. July},
+  month     = jul,
   publisher = {Knowledge Systems Institute},
   file      = {:Geiger2011TowardsAutomatedConformance.pdf:PDF},
 }
@@ -1501,7 +1501,7 @@ @InProceedings{SchoenbergerBenkerFritzemeierEtAl2009
   title        = {{QoS}-{E}nabled {B}usiness-to-{B}usiness {I}ntegration {U}sing {ebBP} to {WS-BPEL} {T}ranslations},
   booktitle    = {Proceedings of the IEEE SCC 2009 International Conference on Services Computing, Bangalore, India},
   year         = {2009},
-  month        = {September},
+  month        = sep,
   organization = {IEEE},
   doi          = {10.1109/scc.2009.56},
   keywords     = {B2Bi, ebXML BPSS, WS-BPEL, Quality of Service, NES, conformance},
diff --git a/src/test/resources/testbib/saveactions2.bib b/src/test/resources/testbib/saveactions2.bib
index fe5a09212760..613eda350fe1 100644
--- a/src/test/resources/testbib/saveactions2.bib
+++ b/src/test/resources/testbib/saveactions2.bib
@@ -3,11 +3,11 @@
 @InProceedings{Pautasso2015TowardsWorkflowBenchmarking,
   author =    {Pautasso, Cesare and Ferme, Vincenzo and Roller, Dieter and Leymann, Frank and Skouradaki, Marigianna},
   title =     {{Towards Workflow Benchmarking: Open Research Challenges}},
-  booktitle = {Proceedings of the 16\textsuperscript{th} Conference on Database Systems for Business, Technology, and Web},
+  booktitle = {Proceedings of the 16\textsuperscript{th} Conference on Database Systems for Business, Technology, and Web, March 2-6, 2015},
   year =      {2015},
   pages =     {1--20},
   address =   {Hamburg, Germany},
-  month =     {March 2-6},
+  month =     mar,
   file =      {:Pautasso2015TowardsWorkflowBenchmarking.pdf:PDF},
   keywords =  {benchflow}
 }
diff --git a/src/test/resources/testbib/testjabref_210as292.bib b/src/test/resources/testbib/testjabref_210as292.bib
index eaf4c6f35164..9885433cb843 100644
--- a/src/test/resources/testbib/testjabref_210as292.bib
+++ b/src/test/resources/testbib/testjabref_210as292.bib
@@ -16,7 +16,7 @@ @ARTICLE{Aziz2009256-ChannelNeuralRecordingandDeltaCompressionMicrosystemWith3DE
   volume = {44},
   pages = {995-1005},
   number = {3},
-  month = {MAR},
+  month = mar,
   abstract = {A 3D microsystem for multi-site penetrating extracellular neural recording
 	
 	 from the brain is presented. A 16 x 16-channel neural recording interface
@@ -161,7 +161,7 @@ @ARTICLE{Baccus1998Synapticfacilitationbyreflectedactionpotentials--enhancemento
   volume = {95},
   pages = {8345--8350},
   number = {14},
-  month = {Jul},
+  month = jul,
   abstract = {A rapid, reversible enhancement of synaptic transmission from a sensory
 	
 	 neuron is reported and explained by impulses that reverse direction,
@@ -240,7 +240,7 @@ @ARTICLE{Brewer1995Serum-freeB27/neurobasalmediumsupportsdifferentiatedgrowthofn
   volume = {42},
   pages = {674--683},
   number = {5},
-  month = {Dec},
+  month = dec,
   abstract = {Two fundamental questions about neuron cell culture were addressed.
 	
 	 Can one serum-free medium that was developed for optimum growth of
@@ -342,7 +342,7 @@ @ARTICLE{Brewer1997Isolationandcultureofadultrathippocampalneurons.JNeurosciMeth
   volume = {71},
   pages = {143--155},
   number = {2},
-  month = {Feb},
+  month = feb,
   abstract = {Inability to culture adult central neurons and the failure of injured
 	
 	 neurons to regenerate in the brain could be due to genetic controls
@@ -417,7 +417,7 @@ @ARTICLE{Brewer2008NbActiv4mediumimprovementtoNeurobasal/B27increasesneuronsynap
   volume = {170},
   pages = {181--187},
   number = {2},
-  month = {May},
+  month = may,
   abstract = {The most interesting property of neurons is their long-distance propagation
 	
 	 of signals as spiking action potentials. Since 1993, Neurobasal/B27
diff --git a/src/test/resources/testbib/testjabref_292.bib b/src/test/resources/testbib/testjabref_292.bib
index d267b33c4e7e..939e1b14fd36 100644
--- a/src/test/resources/testbib/testjabref_292.bib
+++ b/src/test/resources/testbib/testjabref_292.bib
@@ -12,7 +12,7 @@ @ARTICLE{Aziz2009256-ChannelNeuralRecordingandDeltaCompressionMicrosystemWith3DE
   volume = {44},
   pages = {995-1005},
   number = {3},
-  month = {MAR},
+  month = mar,
   abstract = {A 3D microsystem for multi-site penetrating extracellular neural recording
 	from the brain is presented. A 16 x 16-channel neural recording interface
 	integrated prototype fabricated in 0.35 mu m CMOS occupies 3.5 mm
@@ -83,7 +83,7 @@ @ARTICLE{Baccus1998Synapticfacilitationbyreflectedactionpotentials--enhancemento
   volume = {95},
   pages = {8345--8350},
   number = {14},
-  month = {Jul},
+  month = jul,
   abstract = {A rapid, reversible enhancement of synaptic transmission from a sensory
 	neuron is reported and explained by impulses that reverse direction,
 	or reflect, at axon branch points. In leech mechanosensory neurons,
@@ -154,7 +154,7 @@ @ARTICLE{Brewer1997Isolationandcultureofadultrathippocampalneurons.JNeurosciMeth
   volume = {71},
   pages = {143--155},
   number = {2},
-  month = {Feb},
+  month = feb,
   abstract = {Inability to culture adult central neurons and the failure of injured
 	neurons to regenerate in the brain could be due to genetic controls
 	or environmental inhibitors. We tested the environmental inhibitor
@@ -200,7 +200,7 @@ @ARTICLE{Brewer1995Serum-freeB27/neurobasalmediumsupportsdifferentiatedgrowthofn
   volume = {42},
   pages = {674--683},
   number = {5},
-  month = {Dec},
+  month = dec,
   abstract = {Two fundamental questions about neuron cell culture were addressed.
 	Can one serum-free medium that was developed for optimum growth of
 	hippocampal neurons support the growth of neurons from other regions
@@ -262,7 +262,7 @@ @ARTICLE{Brewer2008NbActiv4mediumimprovementtoNeurobasal/B27increasesneuronsynap
   volume = {170},
   pages = {181--187},
   number = {2},
-  month = {May},
+  month = may,
   abstract = {The most interesting property of neurons is their long-distance propagation
 	of signals as spiking action potentials. Since 1993, Neurobasal/B27
 	has been used as a serum-free medium optimized for hippocampal neuron

From 8f7188d2d27503b0fa36a505b5650b7ef8caf632 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Thu, 14 Nov 2019 08:44:44 +0100
Subject: [PATCH 05/13] Fix jpackage build (#5608)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 69e80a080275..e9be0242041a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.27.0'
     id 'org.javamodularity.moduleplugin' version '1.5.0'
     id 'org.openjfx.javafxplugin' version '0.0.8'
-    id 'org.beryx.jlink' version '2.16.3'
+    id 'org.beryx.jlink' version '2.16.4'
 }
 
 gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.ShowStacktrace.ALWAYS

From b823943e2fed56e9e9708d63ea619a3a0ba5f582 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Thu, 14 Nov 2019 21:49:58 +0100
Subject: [PATCH 06/13] Remove obsolete spaces

---
 CHANGELOG.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ba3e1109e71..30e23a84926e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,12 +30,12 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where it was no longer possible to connect to LibreOffice. [#5261](https://github.com/JabRef/jabref/issues/5261)
 - The "All entries group" is no longer shown when no library is open.
 - We fixed an exception which occurred when closing JabRef. [#5348](https://github.com/JabRef/jabref/issues/5348)
-- We fixed an issue where JabRef reports incorrectly about customized entry types. [#5332](https://github.com/JabRef/jabref/issues/5332) 
+- We fixed an issue where JabRef reports incorrectly about customized entry types. [#5332](https://github.com/JabRef/jabref/issues/5332)
 - We fixed a few problems that prevented JabFox to communicate with JabRef. [#4737](https://github.com/JabRef/jabref/issues/4737) [#4303](https://github.com/JabRef/jabref/issues/4303)
-- We fixed an error where the groups containing an entry loose their highlight color when scrolling. [#5022](https://github.com/JabRef/jabref/issues/5022) 
+- We fixed an error where the groups containing an entry loose their highlight color when scrolling. [#5022](https://github.com/JabRef/jabref/issues/5022)
 - We fixed an error where scrollbars were not shown. [#5374](https://github.com/JabRef/jabref/issues/5374)
 - We fixed an error where an exception was thrown when merging entries. [#5169](https://github.com/JabRef/jabref/issues/5169)
-- We fixed an error where certain metadata items were not serialized alphabetically. 
+- We fixed an error where certain metadata items were not serialized alphabetically.
 - After assigning an entry to a group, the item count is now properly colored to reflect the new membership of the entry. [#3112](https://github.com/JabRef/jabref/issues/3112)
 - The group panel is now properly updated when switching between libraries (or when closing/opening one). [#3142](https://github.com/JabRef/jabref/issues/3142)
 - We fixed an error where the number of matched entries shown in the group pane was not updated correctly. [#4441](https://github.com/JabRef/jabref/issues/4441)
@@ -46,7 +46,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We fixed an issue where multiple entries were highlighted in the web search result after scrolling. [#5035](https://github.com/JabRef/jabref/issues/5035)
 - We fixed an issue where the hover indication in the web search pane was not working. [#5277](https://github.com/JabRef/jabref/issues/5277)
 - We fixed an error mentioning "javafx.controls/com.sun.javafx.scene.control" that was thrown when interacting with the toolbar.
-- We fixed an error where a cleared search was restored after switching libraries. [#4846](https://github.com/JabRef/jabref/issues/4846) 
+- We fixed an error where a cleared search was restored after switching libraries. [#4846](https://github.com/JabRef/jabref/issues/4846)
 - We fixed an exception which occurred when trying to open a non-existing file from the "Recent files"-menu [#5334](https://github.com/JabRef/jabref/issues/5334)
 - We fixed an issues where the search highlight in the entry preview did not worked. [#5069](https://github.com/JabRef/jabref/issues/5069)
 - The context menu for fields in the entry editor is back. [#5254](https://github.com/JabRef/jabref/issues/5254)
@@ -55,7 +55,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We re-introduced the feature to switch between different preview styles. [#5221](https://github.com/JabRef/jabref/issues/5221)
 - We fixed various issues (including [#5263](https://github.com/JabRef/jabref/issues/5263)) related to copying entries to the clipboard
 - We fixed some display errors in the preferences dialog and replaced some of the controls [#5033](https://github.com/JabRef/jabref/pull/5033) [#5047](https://github.com/JabRef/jabref/pull/5047) [#5062](https://github.com/JabRef/jabref/pull/5062) [#5141](https://github.com/JabRef/jabref/pull/5141) [#5185](https://github.com/JabRef/jabref/pull/5185) [#5265](https://github.com/JabRef/jabref/pull/5265) [#5315](https://github.com/JabRef/jabref/pull/5315) [#5360](https://github.com/JabRef/jabref/pull/5360)
-- We fixed an exception which occurred when trying to import entries without an open library. [#5447](https://github.com/JabRef/jabref/issues/5447) 
+- We fixed an exception which occurred when trying to import entries without an open library. [#5447](https://github.com/JabRef/jabref/issues/5447)
 - After successful import of one or multiple bib entries the main table scrolls to the first imported entry [#5383](https://github.com/JabRef/jabref/issues/5383)
 - We fixed an exception which occurred when an invalid jstyle was loaded. [#5452](https://github.com/JabRef/jabref/issues/5452)
 - We fixed an error where the preview theme did not adapt to the "Dark" mode [#5463](https://github.com/JabRef/jabref/issues/5463)
@@ -164,7 +164,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We optimized the code responsible for connecting to an external database, which should lead to huge improvements in performance.
 - For automatically created groups, added ability to filter groups by entry type. [#4539](https://github.com/JabRef/jabref/issues/4539)
 - We added the ability to add field names from the Preferences Dialog [#4546](https://github.com/JabRef/jabref/issues/4546)
-- We added the ability to change the column widths directly in the main 
+- We added the ability to change the column widths directly in the main
 . [#4546](https://github.com/JabRef/jabref/issues/4546)
 - We added a description of how recommendations were chosen and better error handling to Related Articles tab
 - We added the ability to execute default action in dialog by using with <kbd>Ctrl</kbd> + <kbd>Enter</kbd> combination [#4496](https://github.com/JabRef/jabref/issues/4496)

From 17b10b8995dc0ce01c35fedb58b487558b2817fe Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 15 Nov 2019 20:31:59 +0100
Subject: [PATCH 07/13] Fix test logging. Refs
 https://github.com/JabRef/jabref/issues/3510

---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e9be0242041a..495ef0ca2fb6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -445,7 +445,8 @@ test {
 
     testLogging {
         // set options for log level LIFECYCLE
-        events = ["FAILED", "STANDARD_OUT", "STANDARD_ERROR"]
+        // for debugging tests: add "STANDARD_OUT", "STANDARD_ERROR"
+        events = ["FAILED"]
         exceptionFormat "full"
     }
 }

From 337716f6c37acd59763b77bdb3e5e772ec34a99e Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 15 Nov 2019 22:13:24 +0100
Subject: [PATCH 08/13] Update help URLs (#5609)

* Update help URLs (and fix some fetcher tests)
* Allow codecov to fail (hotfix)
---
 .github/PULL_REQUEST_TEMPLATE.md              |  3 +-
 .travis.yml                                   |  1 +
 CHANGELOG.md                                  |  2 +-
 README.md                                     |  8 +-
 docs/adr/0001-use-crowdin-for-translations.md |  2 +-
 docs/adr/0004-use-mariadb-connector.md        |  2 +-
 ...fully-support-utf8-only-for-latex-files.md |  2 +-
 .../java/org/jabref/gui/help/HelpAction.java  | 23 +-----
 .../java/org/jabref/logic/help/HelpFile.java  | 81 +++++++++----------
 .../importer/fetcher/MedlineFetcher.java      |  2 +-
 .../java/org/jabref/model/entry/Month.java    |  2 +-
 .../org/jabref/logic/help/HelpFileTest.java   | 27 ++++---
 .../fetcher/AstrophysicsDataSystemTest.java   |  5 +-
 .../logic/importer/fetcher/IEEETest.java      |  5 +-
 .../importer/fetcher/IsbnFetcherTest.java     |  2 +-
 .../fetcher/IsbnViaEbookDeFetcherTest.java    |  2 +-
 .../fetcher/IsbnViaOttoBibFetcherTest.java    |  2 +-
 .../importer/fetcher/OpenAccessDoiTest.java   |  2 +-
 .../importer/fileformat/BibtexParserTest.java |  6 +-
 .../jabref/model/entry/BibtexStringTest.java  |  8 +-
 20 files changed, 83 insertions(+), 104 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 9964ff946dfe..2a1a625d7bc6 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,5 +9,4 @@
 - [ ] Tests created for changes
 - [ ] Manually tested changed features in running JabRef
 - [ ] Screenshots added in PR description (for bigger UI changes)
-- [ ] Ensured that [the git commit message is a good one](https://github.com/joelparkerhenderson/git_commit_message)
-- [ ] Check documentation status (Issue created for outdated help page at [help.jabref.org](https://github.com/JabRef/help.jabref.org/issues)?)
+- [ ] [Checked documentation](https://docs.jabref.org/): Is the information available and up to date? If not: Issue created at <https://github.com/JabRef/user-documentation/issues>.
diff --git a/.travis.yml b/.travis.yml
index 22c531f9877d..b9d4177fe1e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ env:
 matrix:
     fast_finish: true
     allow_failures:
+      - env: TEST_SUITE=codecov
       - env: TEST_SUITE=fetcherTest
       - env: TEST_SUITE=databaseTest
       - env: TEST_SUITE=guiTest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30e23a84926e..5246bd3355fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -145,7 +145,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - Change default icon for groups to a circle because a colored version of the old icon was hard to distinguish from its black counterpart.
 - In the main table, the context menu appears now when you press the "context menu" button on the keyboard. [feature request in the forum](http://discourse.jabref.org/t/how-to-enable-keyboard-context-key-windows)
 - We added icons to the group side panel to quickly switch between `union` and `intersection` group view mode https://github.com/JabRef/jabref/issues/3269.
-- We use `https` for [fetching from most online bibliographic database](https://help.jabref.org/en/#-using-online-bibliographic-database).
+- We use `https` for [fetching from most online bibliographic database](https://docs.jabref.org/import-using-online-bibliographic-database).
 - We changed the default keyboard shortcuts for moving between entries when the entry editor is active to ̀<kbd>alt</kbd> + <kbd>up/down</kbd>.
 - Opening a new file now prompts the directory of the currently selected file, instead of the directory of the last opened file.
 - Window state is saved on close and restored on start.
diff --git a/README.md b/README.md
index 599de1952761..fb15af17b061 100644
--- a/README.md
+++ b/README.md
@@ -64,9 +64,9 @@ The [latest stable release is available at FossHub](https://www.fosshub.com/JabR
 
 JabRef runs on any system equipped with the Java Virtual Machine (Java 11 or higher), which can be downloaded at no cost from [AdoptOpenDJK](https://adoptopenjdk.net/).
 From JabRef 4.0 onwards, [JavaFX] support has to be installed.
- - Windows: JabRef offers an installer, which also adds a shortcut to JabRef to your start menu. Please also see our [Windows FAQ](https://help.jabref.org/en/FAQwindows)
- - Linux: Please see our [Installation Guide](http://help.jabref.org/en/Installation).
- - Mac OS X: Please see our [Mac OS X FAQ](https://help.jabref.org/en/FAQosx).
+ - Windows: JabRef offers an installer, which also adds a shortcut to JabRef to your start menu. Please also see our [Windows FAQ](https://docs.jabref.org/faq/faqwindows)
+ - Linux: Please see our [Installation Guide](https://docs.jabref.org/general/installation).
+ - Mac OS X: Please see our [Mac OS X FAQ](https://docs.jabref.org/faq/faqosx).
 
 In addition, JabRef can be downloaded as an executable `.jar` file. 
 Try to double click the `jar` file or execute the following command:
@@ -78,7 +78,7 @@ Try to double click the `jar` file or execute the following command:
 
 We are thankful for any bug reports or other feedback.
 If you have ideas for new features you want to be included in JabRef, [tell us in our forum](http://discourse.jabref.org/c/features)!
-If you need support in using JabRef, please read [the documentation](https://help.jabref.org/) first and have a look at our [community forum](http://discourse.jabref.org/c/help).
+If you need support in using JabRef, please read [the documentation](https://docs.jabref.org/) first and have a look at our [community forum](https://discourse.jabref.org/c/help).
 You can use our [GitHub issue tracker](https://github.com/JabRef/jabref/issues) to file bug reports.
 
 An explanation of donation possibilities and usage of donations is available at our [donations page](https://donations.jabref.org).
diff --git a/docs/adr/0001-use-crowdin-for-translations.md b/docs/adr/0001-use-crowdin-for-translations.md
index 0d8955782abb..5b53d44fad65 100644
--- a/docs/adr/0001-use-crowdin-for-translations.md
+++ b/docs/adr/0001-use-crowdin-for-translations.md
@@ -9,7 +9,7 @@ The JabRef UI is offered in multiple languages. It should be easy for translator
 * Use [Crowdin](http://crowdin.com/)
 * Use [popeye](https://github.com/JabRef/popeye)
 * Use [Lingohub](https://lingohub.com/)
-* Keep current GitHub flow. See the [Step-by-step guide](https://github.com/JabRef/help.jabref.org/blob/d5569bebdb0e1de5c71401bbfba45311c19c80a8/en/TranslatingGUI.md#step-by-step-guide).
+* Keep current GitHub flow. See the [Step-by-step guide](https://docs.jabref.org/faq/how-to-translate-the-ui).
 
 ## Decision Outcome
 
diff --git a/docs/adr/0004-use-mariadb-connector.md b/docs/adr/0004-use-mariadb-connector.md
index 413364bfe356..b7d361f7e6cb 100644
--- a/docs/adr/0004-use-mariadb-connector.md
+++ b/docs/adr/0004-use-mariadb-connector.md
@@ -3,7 +3,7 @@
 ## Context and Problem Statement
 
 JabRef needs to connect to a MySQL database.
-See [Shared SQL Database](https://help.jabref.org/en/SQLDatabase) for more information.
+See [Shared SQL Database](https://docs.jabref.org/collaborative-work/sqldatabase) for more information.
 
 ## Considered Options
 
diff --git a/docs/adr/0005-fully-support-utf8-only-for-latex-files.md b/docs/adr/0005-fully-support-utf8-only-for-latex-files.md
index 6e066e8b7d89..337511fe0c49 100644
--- a/docs/adr/0005-fully-support-utf8-only-for-latex-files.md
+++ b/docs/adr/0005-fully-support-utf8-only-for-latex-files.md
@@ -2,7 +2,7 @@
 
 ## Context and Problem Statement
 
-The feature [search for citations](https://github.com/JabRef/help.jabref.org/issues/210) displays the content of LaTeX files.
+The feature [search for citations](https://github.com/JabRef/user-documentation/issues/210) displays the content of LaTeX files.
 The LaTeX files are text files and might be encoded arbitrarily.
 
 ## Considered Options
diff --git a/src/main/java/org/jabref/gui/help/HelpAction.java b/src/main/java/org/jabref/gui/help/HelpAction.java
index 603e055abaf0..1cfe14937ffa 100644
--- a/src/main/java/org/jabref/gui/help/HelpAction.java
+++ b/src/main/java/org/jabref/gui/help/HelpAction.java
@@ -1,15 +1,8 @@
 package org.jabref.gui.help;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import org.jabref.Globals;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.logic.help.HelpFile;
-import org.jabref.preferences.JabRefPreferences;
 
 /**
  * This Action keeps a reference to a URL. When activated, it shows the help
@@ -17,12 +10,6 @@
  */
 public class HelpAction extends SimpleCommand {
 
-    /**
-     * New languages of the help have to be added here
-     */
-    private static final Set<String> AVAILABLE_LANG_FILES = Stream.of("en", "de", "fr", "in", "ja")
-                                                                  .collect(Collectors.toCollection(HashSet::new));
-
     private HelpFile helpPage;
 
     public HelpAction(HelpFile helpPage) {
@@ -30,15 +17,7 @@ public HelpAction(HelpFile helpPage) {
     }
 
     public static void openHelpPage(HelpFile helpPage) {
-        String lang = Globals.prefs.get(JabRefPreferences.LANGUAGE);
-        StringBuilder sb = new StringBuilder("https://help.jabref.org/");
-
-        if (AVAILABLE_LANG_FILES.contains(lang)) {
-            sb.append(lang);
-            sb.append("/");
-        } else {
-            sb.append("en/");
-        }
+        StringBuilder sb = new StringBuilder("https://docs.jabref.org/");
         sb.append(helpPage.getPageName());
         JabRefDesktop.openBrowserShowPopup(sb.toString());
     }
diff --git a/src/main/java/org/jabref/logic/help/HelpFile.java b/src/main/java/org/jabref/logic/help/HelpFile.java
index c679bd58f17c..6e5ce34fc126 100644
--- a/src/main/java/org/jabref/logic/help/HelpFile.java
+++ b/src/main/java/org/jabref/logic/help/HelpFile.java
@@ -3,56 +3,47 @@
 /**
  * This enum globally defines all help pages with the name of the markdown file in the help repository at Github.
  *
- * @see <a href=https://github.com/JabRef/help.jabref.org>help.jabref.org@github</a>
+ * @see <a href="https://github.com/JabRef/user-documentation">user-documentation@github</a>
  */
 public enum HelpFile {
-    COMMAND_LINE(""),
-    //Empty because it refers to the TOC/index
-    CONTENTS(""),
-    ENTRY_EDITOR("EntryEditor"),
-    STRING_EDITOR("StringEditor"),
-    SEARCH("Search"),
-    GROUP("Groups"),
-    CONTENT_SELECTOR("ContentSelector"),
-    SPECIAL_FIELDS("SpecialFields"),
-    BIBTEX_KEY_PATTERN("BibtexKeyPatterns"),
-    OWNER("Owner"),
-    TIMESTAMP("TimeStamp"),
-    CUSTOM_EXPORTS("CustomExports"),
-    CUSTOM_EXPORTS_NAME_FORMATTER("CustomExports#NameFormatter"),
-    CUSTOM_IMPORTS("CustomImports"),
-    GENERAL_FIELDS("GeneralFields"),
-    IMPORT_INSPECTION("ImportInspectionDialog"),
-    REMOTE("Remote"),
-    JOURNAL_ABBREV("JournalAbbreviations"),
-    REGEX_SEARCH("ExternalFiles#RegularExpressionSearch"),
-    PREVIEW("Preview"),
-    AUTOSAVE("Autosave"),
+    // empty string denotes that it refers to the TOC/index
+    CONTENTS(""), // this is always the index
+    ENTRY_EDITOR("general/entryeditor"),
+    STRING_EDITOR("setup/stringeditor"),
+    SPECIAL_FIELDS("fields/specialfields"),
+    BIBTEX_KEY_PATTERN("setup/bibtexkeypatterns"),
+    OWNER("fields/owner"),
+    TIMESTAMP("fields/timestamp"),
+    CUSTOM_EXPORTS_NAME_FORMATTER("import-export/customexports#using-custom-name-formatters"),
+    GENERAL_FIELDS("setup/generalfields"),
+    REMOTE("general/remote"),
+    REGEX_SEARCH("fields/filelinks#RegularExpressionSearch"),
+    PREVIEW("setup/preview"),
+    AUTOSAVE("general/autosave"),
     //The help page covers both OO and LO.
-    OPENOFFICE_LIBREOFFICE("OpenOfficeIntegration"),
-    FETCHER_ACM("ACMPortal"),
-    FETCHER_ADS("ADS"),
+    OPENOFFICE_LIBREOFFICE("import-export/openofficeintegration"),
+    FETCHER_ACM("import-using-online-bibliographic-database/acmportal"),
+    FETCHER_ADS("import-using-online-bibliographic-database/ads"),
     FETCHER_BIBSONOMY_SCRAPER(""),
-    FETCHER_CITESEERX("CiteSeer"),
-    FETCHER_DBLP("DBLP"),
-    FETCHER_DIVA("DiVAtoBibTeX"),
-    FETCHER_DOAJ("DOAJ"),
-    FETCHER_DOI("DOItoBibTeX"),
-    FETCHER_GOOGLE_SCHOLAR("GoogleScholar"),
-    FETCHER_GVK("GVK"),
-    FETCHER_IEEEXPLORE("IEEEXplore"),
-    FETCHER_INSPIRE("INSPIRE"),
-    FETCHER_ISBN("ISBNtoBibTeX"),
-    FETCHER_MEDLINE("Medline"),
-    FETCHER_OAI2_ARXIV("arXiv"),
-    FETCHER_RFC("RFCtoBibTeX"),
-    FETCHER_SPRINGER("Springer"),
-    FETCHER_TITLE("TitleToBibTeX"),
+    FETCHER_CITESEERX("import-using-online-bibliographic-database/citeseer"),
+    FETCHER_DBLP("import-using-online-bibliographic-database/dblp"),
+    FETCHER_DIVA("import-using-publication-identifiers/divatobibtex"),
+    FETCHER_DOAJ("import-using-online-bibliographic-database/doaj"),
+    FETCHER_DOI("import-using-publication-identifiers/doitobibtex"),
+    FETCHER_GOOGLE_SCHOLAR("import-using-online-bibliographic-database/googlescholar"),
+    FETCHER_GVK("import-using-online-bibliographic-database/gvk"),
+    FETCHER_IEEEXPLORE("import-using-online-bibliographic-database/ieeexplore"),
+    FETCHER_INSPIRE("import-using-online-bibliographic-database/inspire"),
+    FETCHER_ISBN("import-using-publication-identifiers/isbntobibtex"),
+    FETCHER_MEDLINE("import-using-online-bibliographic-database/medline"),
+    FETCHER_OAI2_ARXIV("import-using-online-bibliographic-database/arxiv"),
+    FETCHER_RFC("import-using-publication-identifiers/rfctobibtex"),
+    FETCHER_SPRINGER("import-using-online-bibliographic-database/springer"),
+    FETCHER_TITLE("import-using-publication-identifiers/titletobibtex"),
     FETCHER_SCIENCEDIRECT(""),
-    DATABASE_PROPERTIES("DatabaseProperties"),
-    FIND_DUPLICATES("FindDuplicates"),
-    SQL_DATABASE_MIGRATION("SQLDatabaseMigration"),
-    SQL_DATABASE("SQLDatabase");
+    DATABASE_PROPERTIES("setup/databaseproperties"),
+    FIND_DUPLICATES("finding-sorting-and-cleaning-entries/findduplicates"),
+    SQL_DATABASE_MIGRATION("collaborative-work/sqldatabasemigration");
 
     private final String pageName;
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
index 8577bbf6b823..9168c7f7282e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
@@ -42,7 +42,7 @@
 /**
  * Fetch or search from PubMed <a href="http://www.ncbi.nlm.nih.gov/sites/entrez/">www.ncbi.nlm.nih.gov</a>
  * The MedlineFetcher fetches the entries from the PubMed database.
- * See <a href="http://help.jabref.org/en/MedlineRIS">help.jabref.org</a> for a detailed documentation of the available fields.
+ * See <a href="https://docs.jabref.org/import-export/medlineris">docs.jabref.org</a> for a detailed documentation of the available fields.
  */
 public class MedlineFetcher implements IdBasedParserFetcher, SearchBasedFetcher {
     private static final Logger LOGGER = LoggerFactory.getLogger(MedlineFetcher.class);
diff --git a/src/main/java/org/jabref/model/entry/Month.java b/src/main/java/org/jabref/model/entry/Month.java
index bb9d3b441478..b962a0540e6d 100644
--- a/src/main/java/org/jabref/model/entry/Month.java
+++ b/src/main/java/org/jabref/model/entry/Month.java
@@ -170,7 +170,7 @@ public String getShortName() {
      *
      * See <a href="https://github.com/JabRef/jabref/issues/263#issuecomment-151246595">Issue 263</a> for a discussion on that thing.
      * This seems to be an <em>invalid</em> format in terms of plain BiBTeX, but a <em>valid</em> format in the case of JabRef.
-     * The documentation is available at the <a href="http://help.jabref.org/en/Strings">Strings help</a> of JabRef.
+     * The documentation is available at the <a href="https://docs.jabref.org/fields/strings">Strings help</a> of JabRef.
      *
      * @return Month in JabRef format
      */
diff --git a/src/test/java/org/jabref/logic/help/HelpFileTest.java b/src/test/java/org/jabref/logic/help/HelpFileTest.java
index 0b97be002e12..8395039b7ef4 100644
--- a/src/test/java/org/jabref/logic/help/HelpFileTest.java
+++ b/src/test/java/org/jabref/logic/help/HelpFileTest.java
@@ -3,24 +3,31 @@
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.util.Arrays;
+import java.util.stream.Stream;
 
 import org.jabref.logic.net.URLDownload;
 
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
+import static org.jabref.logic.help.HelpFile.values;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class HelpFileTest {
 
-    private final String jabrefHelp = "https://help.jabref.org/en/";
+    private final String jabrefHelp = "https://docs.jabref.org/";
 
-    @Test
-    public void referToValidPage() throws IOException {
-        for (HelpFile help : HelpFile.values()) {
-            URL url = new URL(jabrefHelp + help.getPageName());
-            HttpURLConnection http = (HttpURLConnection) url.openConnection();
-            http.setRequestProperty("User-Agent", URLDownload.USER_AGENT);
-            assertEquals(200, http.getResponseCode());
-        }
+    static Stream<HelpFile> getAllHelpFiles() {
+        return Arrays.stream(values());
+    }
+
+    @ParameterizedTest
+    @MethodSource("getAllHelpFiles")
+    public void referToValidPage(HelpFile help) throws IOException {
+        URL url = new URL(jabrefHelp + help.getPageName());
+        HttpURLConnection http = (HttpURLConnection) url.openConnection();
+        http.setRequestProperty("User-Agent", URLDownload.USER_AGENT);
+        assertEquals(200, http.getResponseCode(), "Wrong URL: " + url.toString());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
index f31410195241..55038ea1033b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
@@ -49,6 +49,7 @@ public void setUp() throws Exception {
         diezSliceTheoremEntry.setField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2018arXiv181204698D");
         diezSliceTheoremEntry.setField(StandardField.ABSTRACT,
                 "We establish a general slice theorem for the action of a locally convex         Lie group on a locally convex manifold, which generalizes the         classical slice theorem of Palais to infinite dimensions. We         discuss two important settings under which the assumptions of         this theorem are fulfilled. First, using Gl{\\\"o}ckner's inverse         function theorem, we show that the linear action of a compact         Lie group on a Fr{\\'e}chet space admits a slice. Second, using         the Nash--Moser theorem, we establish a slice theorem for the         tame action of a tame Fr{\\'e}chet Lie group on a tame         Fr{\\'e}chet manifold. For this purpose, we develop the concept         of a graded Riemannian metric, which allows the construction of         a path-length metric compatible with the manifold topology and         of a local addition. Finally, generalizing a classical result in         finite dimensions, we prove that the existence of a slice         implies that the decomposition of the manifold into orbit types         of the group action is a stratification.");
+        diezSliceTheoremEntry.setField(StandardField.ABSTRACT, "Not Available <P />");
 
         famaeyMcGaughEntry = new BibEntry();
         famaeyMcGaughEntry.setType(StandardEntryType.Article);
@@ -96,6 +97,7 @@ public void setUp() throws Exception {
         xiongSunEntry.setField(StandardField.VOLUME, "45");
         xiongSunEntry.setField(StandardField.YEAR, "2007");
         xiongSunEntry.setField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2007ITGRS..45..879X");
+        xiongSunEntry.setField(StandardField.ABSTRACT, "Not Available <P />");
 
         ingersollPollardEntry = new BibEntry();
         ingersollPollardEntry.setType(StandardEntryType.Article);
@@ -127,11 +129,12 @@ public void setUp() throws Exception {
         luceyPaulEntry.setField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2000JGR...10520297L");
         luceyPaulEntry.setField(StandardField.MONTH, "Jan");
         luceyPaulEntry.setField(StandardField.NUMBER, "E8");
+        luceyPaulEntry.setField(StandardField.ABSTRACT, "Not Available <P />");
     }
 
     @Test
     public void testHelpPage() {
-        assertEquals("ADS", fetcher.getHelpPage().get().getPageName());
+        assertEquals("import-using-online-bibliographic-database/ads", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java b/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
index 112fc0f0efb5..3303aab46699 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
@@ -97,9 +97,9 @@ void searchResultHasNoKeywordTerms() throws FetcherException {
 
         expected.setField(StandardField.AUTHOR, "Shatakshi Jha and Ikhlaq Hussain and Bhim Singh and Sukumar Mishra");
         expected.setField(StandardField.DATE, "25 2 2019");
+        expected.setField(StandardField.YEAR, "2019");
         expected.setField(StandardField.DOI, "10.1049/iet-rpg.2018.5648");
         expected.setField(StandardField.FILE, ":https\\://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=8636659:PDF");
-        expected.setField(StandardField.ISSN, "1752-1416");
         expected.setField(StandardField.ISSUE, "3");
         expected.setField(StandardField.JOURNALTITLE, "IET Renewable Power Generation");
         expected.setField(StandardField.PAGES, "418--426");
@@ -118,12 +118,11 @@ void searchByQueryFindsEntry() throws Exception {
         BibEntry expected = new BibEntry(StandardEntryType.InProceedings);
         expected.setField(StandardField.AUTHOR, "Igor Steinmacher and Tayana Uchoa Conte and Christoph Treude and Marco Aurélio Gerosa");
         expected.setField(StandardField.DATE, "14-22 May 2016");
+        expected.setField(StandardField.YEAR, "2016");
         expected.setField(StandardField.EVENTDATE, "14-22 May 2016");
         expected.setField(StandardField.EVENTTITLEADDON, "Austin, TX");
         expected.setField(StandardField.LOCATION, "Austin, TX");
         expected.setField(StandardField.DOI, "10.1145/2884781.2884806");
-        expected.setField(StandardField.ISBN, "978-1-4503-3900-1");
-        expected.setField(StandardField.ISSN, "1558-1225");
         expected.setField(StandardField.JOURNALTITLE, "2016 IEEE/ACM 38th International Conference on Software Engineering (ICSE)");
         expected.setField(StandardField.PAGES, "273--284");
         expected.setField(StandardField.PUBLISHER, "IEEE");
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
index 4c1fe285d31a..b699c6290e78 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
@@ -51,7 +51,7 @@ void testName() {
 
     @Test
     void testHelpPage() {
-        assertEquals("ISBNtoBibTeX", fetcher.getHelpPage().get().getPageName());
+        assertEquals("import-using-publication-identifiers/isbntobibtex", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
index 90d8b99902fc..9f9977021a42 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaEbookDeFetcherTest.java
@@ -46,7 +46,7 @@ public void testName() {
     @Test
     @Override
     public void testHelpPage() {
-        assertEquals("ISBNtoBibTeX", fetcher.getHelpPage().get().getPageName());
+        assertEquals("import-using-publication-identifiers/isbntobibtex", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java
index c6f6a05fc77f..526e5c57539c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnViaOttoBibFetcherTest.java
@@ -43,7 +43,7 @@ public void testName() {
     @Test
     @Override
     public void testHelpPage() {
-        assertEquals("ISBNtoBibTeX", fetcher.getHelpPage().get().getPageName());
+        assertEquals("import-using-publication-identifiers/isbntobibtex", fetcher.getHelpPage().get().getPageName());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java b/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
index d4335eb187b2..db4c1271a5f5 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
@@ -29,7 +29,7 @@ void setUp() {
     void findByDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1038/nature12373");
 
-        assertEquals(Optional.of(new URL("https://dash.harvard.edu/bitstream/handle/1/12285462/Nanometer-Scale%20Thermometry.pdf?sequence=1")), finder.findFullText(entry));
+        assertEquals(Optional.of(new URL("https://dash.harvard.edu/bitstream/1/12285462/Nanometer-Scale%20Thermometry.pdf?sequence=1")), finder.findFullText(entry));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
index b4ac66f03d45..b5780306e55f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -1715,7 +1715,7 @@ void parseYear() throws Exception {
 
     @Test
     void parseEntryUsingStringConstantsForTwoAuthorsWithEtAsStringConstant() throws ParseException {
-        // source of the example: https://github.com/JabRef/help.jabref.org/blob/gh-pages/en/Strings.md
+        // source of the example: https://docs.jabref.org/fields/strings
         Collection<BibEntry> parsed = parser
                 .parseEntries("@String { kopp = \"Kopp, Oliver\" }" +
                         "@String { kubovy = \"Kubovy, Jan\" }" +
@@ -1731,7 +1731,7 @@ void parseEntryUsingStringConstantsForTwoAuthorsWithEtAsStringConstant() throws
 
     @Test
     void parseStringConstantsForTwoAuthorsHasCorrectBibTeXEntry() throws ParseException {
-        // source of the example: https://github.com/JabRef/help.jabref.org/blob/gh-pages/en/Strings.md
+        // source of the example: https://docs.jabref.org/fields/strings
         Collection<BibEntry> parsed = parser
                 .parseEntries("@String { kopp = \"Kopp, Oliver\" }" +
                         "@String { kubovy = \"Kubovy, Jan\" }" +
@@ -1747,7 +1747,7 @@ void parseStringConstantsForTwoAuthorsHasCorrectBibTeXEntry() throws ParseExcept
 
     @Test
     void parseStringConstantsForTwoAuthors() throws ParseException {
-        // source of the example: https://github.com/JabRef/help.jabref.org/blob/gh-pages/en/Strings.md
+        // source of the example: https://docs.jabref.org/fields/strings
         Collection<BibEntry> parsed = parser
                 .parseEntries("@String { kopp = \"Kopp, Oliver\" }" +
                         "@String { kubovy = \"Kubovy, Jan\" }" +
diff --git a/src/test/java/org/jabref/model/entry/BibtexStringTest.java b/src/test/java/org/jabref/model/entry/BibtexStringTest.java
index c6b251410f49..1d418a13f7b1 100644
--- a/src/test/java/org/jabref/model/entry/BibtexStringTest.java
+++ b/src/test/java/org/jabref/model/entry/BibtexStringTest.java
@@ -97,28 +97,28 @@ public void getContentNeverReturnsNull() {
 
     @Test
     public void authorTypeCorrectlyDetermined() {
-        // Source of the example: https://help.jabref.org/en/Strings
+        // Source of the example: https://docs.jabref.org/fields/strings
         BibtexString bibtexString = new BibtexString("aKopp", "KoppOliver");
         assertEquals(BibtexString.Type.AUTHOR, bibtexString.getType());
     }
 
     @Test
     public void institutionTypeCorrectlyDetermined() {
-        // Source of the example: https://help.jabref.org/en/Strings
+        // Source of the example: https://docs.jabref.org/fields/strings
         BibtexString bibtexString = new BibtexString("iMIT", "{Massachusetts Institute of Technology ({MIT})}");
         assertEquals(BibtexString.Type.INSTITUTION, bibtexString.getType());
     }
 
     @Test
     public void otherTypeCorrectlyDeterminedForLowerCase() {
-        // Source of the example: https://help.jabref.org/en/Strings
+        // Source of the example: https://docs.jabref.org/fields/strings
         BibtexString bibtexString = new BibtexString("anct", "Anecdote");
         assertEquals(BibtexString.Type.OTHER, bibtexString.getType());
     }
 
     @Test
     public void otherTypeCorrectlyDeterminedForUpperCase() {
-        // Source of the example: https://help.jabref.org/en/Strings
+        // Source of the example: https://docs.jabref.org/fields/strings
         BibtexString bibtexString = new BibtexString("lTOSCA", "Topology and Orchestration Specification for Cloud Applications");
         assertEquals(BibtexString.Type.OTHER, bibtexString.getType());
     }

From e47ab7aa3b001dad06e56f9ac27b0be28d8b152c Mon Sep 17 00:00:00 2001
From: Christoph <siedlerkiller@gmail.com>
Date: Fri, 15 Nov 2019 22:48:39 +0100
Subject: [PATCH 09/13] New Crowdin translations (#5601)

---
 src/main/resources/l10n/JabRef_da.properties  |  2 -
 src/main/resources/l10n/JabRef_de.properties  | 21 +++++++--
 src/main/resources/l10n/JabRef_el.properties  |  3 --
 src/main/resources/l10n/JabRef_es.properties  |  3 --
 src/main/resources/l10n/JabRef_fa.properties  |  1 -
 src/main/resources/l10n/JabRef_fr.properties  | 13 ++++--
 src/main/resources/l10n/JabRef_in.properties  |  3 --
 src/main/resources/l10n/JabRef_it.properties  |  3 --
 src/main/resources/l10n/JabRef_ja.properties  | 43 +++++++++++++++----
 src/main/resources/l10n/JabRef_nl.properties  |  3 --
 src/main/resources/l10n/JabRef_no.properties  |  2 -
 src/main/resources/l10n/JabRef_pl.properties  |  1 -
 .../resources/l10n/JabRef_pt_BR.properties    |  2 -
 src/main/resources/l10n/JabRef_ru.properties  |  2 -
 src/main/resources/l10n/JabRef_sv.properties  |  2 -
 src/main/resources/l10n/JabRef_tl.properties  |  2 -
 src/main/resources/l10n/JabRef_tr.properties  |  5 +--
 src/main/resources/l10n/JabRef_vi.properties  |  2 -
 src/main/resources/l10n/JabRef_zh.properties  |  3 --
 19 files changed, 64 insertions(+), 52 deletions(-)

diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index 42dbaaf9943d..3d218994083a 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -894,8 +894,6 @@ MIME\ type=MIME-type
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Denne funktion tillader, at flere filer kan åbnes eller importeres i en allerede kørende JabRef i stedet for at åbne programmet påny. For eksempel er dette praktisk, når du åbner filer i JabRef fra din web browser. Bemærk at dette vil forhindre dig i at køre mere end en instans af JabRef ad gangen.
 
-Reset=Nulstil
-
 Use\ IEEE\ LaTeX\ abbreviations=Brug IEEE-LaTeX-forkortelser
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Søg efter en matchende fil, når der åbnes et fil-link, der ikke er defineret
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index d4f2bdf0a93f..970cebeb1717 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -12,7 +12,9 @@
 
 %0\ matches\ the\ term\ <b>%1</b>=%0 exakt dem Ausdruck <b>%1</b> entspricht
 
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (DEFAULT\ abbreviation)=Zeitschriftennamen der ausgewählten Einträge abkürzen (Standard-Abkürzung)
 Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (MEDLINE\ abbreviation)=Zeitschriftentitel der ausgewählten Einträge abkürzen (MEDLINE-Abkürzung)
+Abbreviate\ journal\ names\ of\ the\ selected\ entries\ (SHORTEST\ UNIQUE\ abbreviation)=Zeitschriftennamen der ausgewählten Einträge abkürzen (Kürzestmögliche eindeutige Abkürzung)
 
 Abbreviate\ names=Namen abkürzen
 Abbreviated\ %0\ journal\ names.=%0 Zeitschriftentitel abgekürzt.
@@ -202,6 +204,7 @@ Cut=Ausschneiden
 
 cut\ entries=Einträge ausschneiden
 
+cut\ entry\ %0=Eintrag %0 ausschneiden
 
 
 Library\ encoding=Zeichenkodierung der Bibliothek
@@ -994,8 +997,6 @@ MIME\ type=MIME-Typ
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Diese Funktion öffnet neue oder importierte Dateien in einer bereits laufenden Instanz von JabRef und nicht in einem neuen Fenster. Das ist beispielsweise nützlich, wenn Sie JabRef von einem Webbrowser aus starten. Beachten Sie, dass damit nicht mehr als eine Instanz von JabRef gestartet werden kann.
 Run\ fetcher=Fetcher ausführen
 
-Reset=Zurücksetzen
-
 Use\ IEEE\ LaTeX\ abbreviations=Benutze IEEE-LaTeX-Abkürzungen
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Beim Öffnen des Dateilinks die passende Datei suchen, falls keine verlinkt ist
@@ -1423,6 +1424,7 @@ abbreviation\ detected=Abkürzung erkannt
 wrong\ entry\ type\ as\ proceedings\ has\ page\ numbers=falscher Eintragstyp, weil 'Konferenzbericht' Feld mit Seitenzahlen hat
 Abbreviate\ journal\ names=Kürze Zeitschriftentitel ab
 Abbreviating...=Kürze ab...
+Abbreviation\ '%0'\ for\ journal\ '%1'\ already\ defined.=Abkürzung %0 für das Journal %1 ist bereits definiert.
 Abbreviation\ cannot\ be\ empty=Abkürzung darf nicht leer sein
 Duplicated\ Journal\ Abbreviation=Doppelte Abkürzung für Zeitschriftentitel
 Duplicated\ Journal\ File=Doppelte Datei mit Zeitschriftentiteln
@@ -1632,6 +1634,7 @@ change\ string\ name\ %0\ to\ %1=Ändere Stringnamen von %0 auf %1
 change\ type\ of\ entry\ %0\ from\ %1\ to\ %2=Ändere Typ des Eintrags %0 auf %1
 insert\ entry\ %0=Füge Eintrag %0 hinzu
 insert\ string\ %0=Füge String %0 hinzu
+remove\ entries=Einträge löschen
 remove\ entry\ %0=Entferne Eintrag %0
 remove\ string\ %0=Entferne String %0
 undefined=unbekannt
@@ -1642,9 +1645,14 @@ Entry\ from\ %0=Eintrag basierend auf %0
 Merge\ entry\ with\ %0\ information=Eintrag mit %0-Informationen zusammenführen
 Updated\ entry\ with\ info\ from\ %0=Eintrag wurde mit %0-Information aktualisiert.
 
+Add\ new\ list=Neue Liste hinzufügen
+Open\ existing\ list=Vorhandene Liste öffnen
 Remove\ list=Liste entfernen
+Add\ abbreviation=Abkürzung hinzufügen
+Remove\ abbreviation=Abkürzung entfernen
 Full\ journal\ name=Voller Zeitschriftentitel
 Abbreviation\ name=Name der Abkürzung
+Shortest\ unique\ abbreviation=Kürzestmögliche eindeutige Abkürzung
 
 No\ abbreviation\ files\ loaded=Keine Datei mit Abkürzungen geladen
 
@@ -1760,7 +1768,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=Es wurde eine Backup-Datei für '%0' gef
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Dies kann bedeuten, dass JabRef bei der letzten Benutzung nicht korrekt beendet wurde.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Möchten Sie die Bibliothek mit Hilfe der Backup-Datei wiederherstellen?
 
-Recommended\ for\ %0=Empfohlen für %0
 Show\ 'Related\ Articles'\ tab=Reiter für Empfehlungen anzeigen
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=Dies kann durch eine Downloadbeschränkung von Google Scholar ausgelöst werden (mehr Details in der 'Hilfe').
 
@@ -2077,6 +2084,8 @@ Size\:=Größe\:
 Font\ settings=Schrifteinstellungen
 Override\ font\ settings=Schrifteinstellungen überschreiben
 Override\ font\ size=Schriftgröße überschreiben
+Theme\ changed\ to\ dark\ theme.=Theme wurde zum dunklen Theme geändert.
+Theme\ changed\ to\ light\ theme.=Theme wurde zu hellem Theme geändert.
 You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=Sie müssen einen Ganzzahlwert größer als 8 eingeben.
 Letters\ after\ duplicate\ generated\ keys=Buchstaben nach doppelten generierten Schlüsseln
 Start\ on\ second\ duplicate\ key\ with\ letter\ A\ (a,\ b,\ ...)=Beim zweiten doppelten Schlüssel mit Buchstaben A (a, b, ...) starten
@@ -2084,4 +2093,10 @@ Start\ on\ second\ duplicate\ key\ with\ letter\ B\ (b,\ c,\ ...)=Beim zweiten d
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Immer einen Buchstaben (a, b, ...) zum BibTeX-Key hinzufügen
 Default\ pattern=Standardmuster
 Reset\ %s\ to\ default\ value=%s auf den Standardwert zurücksetzen
+Library\ mode=Bibliotheksmodus
+Reset\ to\ recommended=Auf Empfehlung zurücksetzen
+Remove\ all=Alle entfernen
+Column\ type\ %0\ is\ unknown.=Spaltentyp %0 ist unbekannt.
+Linked\ identifiers=Verknüpfte Bezeichner
+Special\ field\ type\ %0\ is\ unknown.\ Using\ normal\ column\ type.=Spezialfeld-typ %0 ist unbekannt. Verwende normalen Spaltentyp.
 
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index d18a73d99899..36af92fed410 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -936,8 +936,6 @@ MIME\ type=Τύπος MIME
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Το χαρακτηριστικό αυτό επιτρέπει το άνοιγμα ή την εισαγωγή νέων αρχείων σε ένα ήδη τρέχον παράθυρο JabRef αντί να ανοίγει νέο παράθυρο. Για παράδειγμα, αυτό είναι χρήσιμο όταν ανοίγετε ένα αρχείο JabRef από τον περιηγητή ιστού. Σημειώστε πως αυτό θα σας εμποδίσει από το να τρέξετε περισσότερα από ένα παράθυρα JabRef ταυτόχρονα.
 
-Reset=Επαναφορά
-
 Use\ IEEE\ LaTeX\ abbreviations=Χρήση των συντομογραφιών IEEE LaTeX
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Κατά το άνοιγμα συνδέσμου αρχείου, να πραγματοποιείται αναζήτηση για αντίστοιχο αρχείο, όταν δεν καθορίζεται σύνδεσμος
@@ -1677,7 +1675,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=Βρέθηκε ένα αντίγραφο
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Αυτό ίσως υποδεικνύει πως το JabRef δεν τερματίστηκε σωστά την τελευταία φορά που χρησιμοποιήθηκε το αρχείο.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Θέλετε να επαναφέρετε τη βιβλιοθήκη από το αντίγραφο ασφαλείας;
 
-Recommended\ for\ %0=Προτείνεται για %0
 Show\ 'Related\ Articles'\ tab=Εμφάνιση καρτέλας 'Σχετικά Άρθρα'
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=Αυτό ίσως προκαλείται επειδή φτάνετε στο όριο κίνησης του Google Scholar (δείτε στη 'Βοήθεια' για λεπτομέρειες).
 
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index ad769ce8d491..9368469dc4f5 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -971,8 +971,6 @@ MIME\ type=Tipo MIME
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Esta función permite que los nuevos archivos sean abiertos o importados en una instancia de JabRef que ya se esté ejecutando, en lugar de abrir una nueva instancia. Esto es útil, por ejemplo, cuando se abre un archivo en JabRef desde el navegador de internet. Tenga en cuenta que esto le impedirá ejecutar más de una instancia de JabRef a la vez.
 
-Reset=Restablecer
-
 Use\ IEEE\ LaTeX\ abbreviations=Usar abreviaturas LaTeX IEEE
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Al abrir el enlace al archivo, buscar por archivo coincidente si no hay enlace definido
@@ -1725,7 +1723,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=Una copia de seguridad para '%0' ha sido
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Esto puede indicar que JabRef no se cerró correctamente la última vez que se usó ese archivo.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=¿Quiere recuperar la biblioteca desde la copia de seguridad?
 
-Recommended\ for\ %0=Recomendado para %0
 Show\ 'Related\ Articles'\ tab=Ver pestaña de 'Artículos relacionados'
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=Esto puede ser debido a alcanzar el límite de tráfico de GoogleScholar (vea la 'Ayuda' para más detalles)
 
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index 803b5568b08e..bf2f14d3d5ee 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -469,7 +469,6 @@ Open\ terminal\ here=در اینجا پایانه را باز کن
 
 
 
-
 
 
 Cleanup\ entries=تمیز کردن ورودی‌ها
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index 7bd7b7cb342f..afb0a6834bc5 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -204,6 +204,7 @@ Cut=Couper
 
 cut\ entries=Couper les entrées
 
+cut\ entry\ %0=couper l'entrée %0
 
 
 Library\ encoding=Encodage du fichier
@@ -996,8 +997,6 @@ MIME\ type=Type MIME
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Cette fonction permet aux nouveaux fichiers d'être ouverts ou importés dans une fenêtre JabRef déjà active<BR>au lieu d'ouvrir une nouvelle fenêtre. Par exemple, c'est utile quand vous ouvrez un fichier dans JabRef<BR>à partir de notre navigateur internet. <BR>Notez que cela vous empêchera de lancer plus d'une fenêtre JabRef à la fois.
 Run\ fetcher=Lancer l'outil de recherche
 
-Reset=Réinitialiser
-
 Use\ IEEE\ LaTeX\ abbreviations=Utiliser les abréviations LaTeX IEEE
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=A l'ouverture d'un lien de fichier, rechercher un fichier correspondant si aucun lien n'est défini
@@ -1635,6 +1634,7 @@ change\ string\ name\ %0\ to\ %1=modifier le nom de la chaîne de %0 en %1
 change\ type\ of\ entry\ %0\ from\ %1\ to\ %2=modifier le type d'entrée 0% de %1 en %2
 insert\ entry\ %0=insèrer l'entrée %0
 insert\ string\ %0=insérer la chaîne %0
+remove\ entries=supprimer les entrées
 remove\ entry\ %0=supprimer l'entrée %0
 remove\ string\ %0=supprimer la chaîne %0
 undefined=indéfini
@@ -1768,7 +1768,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=Un fichier de sauvegarde a été trouvé
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Cela pourrait indiquer que JabRef ne s'est pas fermé proprement lors de la dernière utilisation du fichier.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Voulez-vous récupérer le fichier à partir du fichier de sauvegarde ?
 
-Recommended\ for\ %0=Recommandé pour %0
 Show\ 'Related\ Articles'\ tab=Afficher l'onglet 'Articles liés'
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=La limitation de trafic de Google Scholar pourrait avoir été atteinte (voir l'aide pour plus de détails).
 
@@ -2085,6 +2084,8 @@ Size\:=Taille \:
 Font\ settings=Paramètres de police
 Override\ font\ settings=Remplacer les paramètres de la police
 Override\ font\ size=Remplacer la taille de la police
+Theme\ changed\ to\ dark\ theme.=Thème changé en thème sombre.
+Theme\ changed\ to\ light\ theme.=Thème changé en thème clair.
 You\ must\ enter\ an\ integer\ value\ higher\ than\ 8.=Vous devez entrer un entier supérieur à 8.
 Letters\ after\ duplicate\ generated\ keys=Lettres après les clefs générées en double
 Start\ on\ second\ duplicate\ key\ with\ letter\ A\ (a,\ b,\ ...)=Commencer avec la deuxième clef en double ayant la lettre A (a, b, ...)
@@ -2092,4 +2093,10 @@ Start\ on\ second\ duplicate\ key\ with\ letter\ B\ (b,\ c,\ ...)=Commencer avec
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Toujours ajouter une lettre (a, b, ...) aux clefs générées
 Default\ pattern=Modèle par défaut
 Reset\ %s\ to\ default\ value=Réinitialiser %s à la valeur par défaut
+Library\ mode=Mode de fichier
+Reset\ to\ recommended=Rétablir les options recommandées
+Remove\ all=Tout supprimer
+Column\ type\ %0\ is\ unknown.=Le type de colonne %0 est inconnu.
+Linked\ identifiers=Identifiants liés
+Special\ field\ type\ %0\ is\ unknown.\ Using\ normal\ column\ type.=Le type de champ spécial %0 est inconnu. Utilisation du type de colonne normal.
 
diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
index 389b196593c7..1d37ddf211ab 100644
--- a/src/main/resources/l10n/JabRef_in.properties
+++ b/src/main/resources/l10n/JabRef_in.properties
@@ -926,8 +926,6 @@ MIME\ type=Tipe MIME
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Fitur ini memungkinkan berkas baru atau impor ke jendela JabRef yang aktifbukan membuat baru. Hal ini berguna ketika anda membuka berkas di JabRef dari halaman web. Hal ini akan menghindari anda membuka beberapa JabRef pada saat yang sama.
 
-Reset=Atur ulang
-
 Use\ IEEE\ LaTeX\ abbreviations=Gunakan singkatan IEEE LaTeX
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Ketika membuka tautan berkas, cari berkas yang sesuai
@@ -1658,7 +1656,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=File cadangan untuk ' % 0 ' ditemukan.
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Ini bisa menunjukkan bahwa JabRef tidak dimatikan secara bersih terakhir kali file tersebut digunakan.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Apakah Anda ingin memulihkan perpustakaan dari file cadangan?
 
-Recommended\ for\ %0=Disarankan untuk % 0
 Show\ 'Related\ Articles'\ tab=Tampilkan tab 'Artikel Terkait'
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=Ini mungkin disebabkan oleh keterbatasan lalu lintas Google Scholar (lihat 'Bantuan' untuk detailnya).
 
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index 0ddecdea6382..6670290014fb 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -936,8 +936,6 @@ MIME\ type=Tipo MIME
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Questa funzione permette l'apertura o l'importazione di nuovi file in una istanza di JabRef già aperta invece di aprirne una nuova. Per esempio, ciò è utile quando un file viene aperto in JabRef da un browser web. Questo tuttavia impedisce di aprire più sessioni di JabRef contemporaneamente.
 
-Reset=Reinizializza
-
 Use\ IEEE\ LaTeX\ abbreviations=Usa le abbreviazioni LaTeX IEEE
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=All'apertura di un collegamento ad un file, ricercare un file corrispondente se non ne è definito uno.
@@ -1677,7 +1675,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=Non ho trovato un file di backup per '%0
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Questo può significare che HabRef non si è chiuso correttamente l'ultima volta che il file è stato usato.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Vuoi recuperare l'archivio dal file di backup?
 
-Recommended\ for\ %0=Raccomandato per %0
 Show\ 'Related\ Articles'\ tab=Mostra il tab 'Articoli Correlati'
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=Questo può essere dovuto al raggiungimento del limite di traffico di Google Scholar (vedi 'Aiuto' per i dettagli).
 
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index c59af3c9abd3..6f8405976182 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -184,6 +184,7 @@ Could\ not\ run\ the\ 'vim'\ program.=「vim」プログラムを実行できま
 Could\ not\ save\ file.=ファイルを保存できませんでした
 Character\ encoding\ '%0'\ is\ not\ supported.=．文字エンコーディング「%0」はサポートされていません．
 
+Create\ custom\ fields\ for\ each\ BibTeX\ entry=各BibTeX項目用のカスタムフィールドを作成
 
 crossreferenced\ entries\ included=相互参照している項目を取り込みました
 
@@ -203,6 +204,7 @@ Cut=切り取り
 
 cut\ entries=項目を切り取り
 
+cut\ entry\ %0=項目%0を切り取り
 
 
 Library\ encoding=ライブラリのエンコーディング
@@ -217,6 +219,7 @@ Default\ encoding=既定エンコーディング
 
 Default\ grouping\ field=既定のグループ化フィールド
 
+Execute\ default\ action\ in\ dialog=ダイアログの既定アクションを実行
 
 Delete=削除
 
@@ -236,11 +239,13 @@ Description=説明
 
 Disable\ this\ confirmation\ dialog=この確認ダイアログをもう表示しない
 
+Display\ all\ entries\ belonging\ to\ one\ or\ more\ of\ the\ selected\ groups=選択したグループの一つ以上に属する項目をすべて表示する
 
 Display\ all\ error\ messages=全エラーメッセージを表示
 
 Display\ help\ on\ command\ line\ options=コマンドラインオプションに関するヘルプを表示
 
+Display\ only\ entries\ belonging\ to\ all\ selected\ groups=選択したグループ全てに属する項目のみ表示する
 Display\ version=バージョンを表示
 
 Do\ not\ abbreviate\ names=名前を略さない
@@ -250,6 +255,7 @@ Do\ not\ import\ entry=項目を読み込まない
 Do\ not\ open\ any\ files\ at\ startup=起動時にファイルを開かない
 
 Do\ not\ wrap\ the\ following\ fields\ when\ saving=以下のフィールドは保存時に改行しない
+Do\ not\ write\ the\ following\ fields\ to\ XMP\ Metadata=以下のフィールドはXMPメタデータに書き込まない
 
 Donate\ to\ JabRef=JabRefに寄付
 
@@ -266,6 +272,7 @@ Dynamically\ group\ entries\ by\ a\ free-form\ search\ expression=自由型検
 
 Dynamically\ group\ entries\ by\ searching\ a\ field\ for\ a\ keyword=フィールド中のキーワードを検索して動的にグループ化
 
+Each\ line\ must\ be\ of\ the\ following\ form=各行は以下の形でなくてはなりません
 
 Edit=編集
 
@@ -301,6 +308,7 @@ Entry\ preview=項目プレビュー
 Entry\ table=項目表
 
 Entry\ table\ columns=項目表の列
+Entry\ Title\ (Required\ to\ deliver\ recommendations.)=項目タイトル (おすすめの提示に必要)
 
 Entry\ type=項目型
 
@@ -364,6 +372,7 @@ First\ select\ the\ entries\ you\ want\ keys\ to\ be\ generated\ for.=鍵を生
 Fit\ table\ horizontally\ on\ screen=表を画面上の水平方向に合わせて表示
 
 Float=上部に表示
+Format\:\ Tab\:field;field;...\ (e.g.\ General\:url;pdf;note...)=書式\: タブ\:フィールド;フィールド;... (例\: General\:url;pdf;note...)
 
 Format\ of\ author\ and\ editor\ names=著者名と編集者名の書式
 Format\ string=整形文字列
@@ -373,6 +382,7 @@ Formatter\ name=整形定義の名称
 
 found\ in\ AUX\ file=AUXファイルを検出
 
+Further\ information\ about\ Mr\ DLib.\ for\ JabRef\ users.=Mr DLib.に関するJabRefユーザー向けの詳しい情報．
 
 General=一般
 
@@ -466,6 +476,7 @@ Invalid\ date\ format=無効な日付書式です
 Invalid\ URL=無効なURLです
 
 Online\ help=オンラインヘルプ
+JabRef\ Language\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ preferred\ language.)=JabRefの言語 (ユーザーの好みの言語を指定することでより良い予測ができます)
 
 JabRef\ preferences=JabRefの設定
 
@@ -495,6 +506,7 @@ Link=リンク
 Listen\ for\ remote\ operation\ on\ port=以下のポートでリモート操作を待ち受ける
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=起動時にjabref.xmlの読み込みと保存を行う（メモリースティックモード）
 
+Show\ advanced\ hints\ (i.e.\ helpful\ tooltips,\ suggestions\ and\ explanation)=詳細なヒントを表示する (詳しいツールチップやおすすめ，説明など)
 
 Main\ file\ directory=基本ファイルディレクトリ
 
@@ -550,6 +562,7 @@ no\ library\ generated=ライブラリは生成されませんでした
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=項目が見つかりませんでした．正しい読み込みフィルタを使用していることを確認してください．
 No\ files\ found.=ファイルがみつかりません．
 
+No\ GUI.\ Only\ process\ command\ line\ options=GUIなし。コマンドラインオプションのみ処理します
 
 No\ journal\ names\ could\ be\ abbreviated.=学術誌名を短縮形にすることができませんでした．
 
@@ -590,6 +603,7 @@ Open\ URL\ or\ DOI=URLまたはDOIを開く
 Opening=開いています
 
 Operation\ canceled.=操作は取り消されました．
+Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ system\ set-up.)=基本ソフト (ユーザーのシステムを指定することでより良い予測ができます)
 
 Optional\ fields=非必須フィールド
 
@@ -627,6 +641,7 @@ Please\ enter\ the\ field\ to\ search\ (e.g.\ <b>keywords</b>)\ and\ the\ keywor
 
 Please\ enter\ the\ string's\ label=文字列のラベルを入力してください．
 
+Please\ restart\ JabRef\ for\ preferences\ to\ take\ effect.=設定を有効にするには、JabRefを再起動してください。
 
 Possible\ duplicate\ entries=重複の可能性のある項目
 
@@ -646,6 +661,7 @@ Preview\ style\ changed\ to\:\ %0=プレビュー様式が %0 に変更されま
 Next\ preview\ layout=次のプレビュー様式
 Previous\ preview\ layout=前のプレビュー様式
 Available=利用可能
+Selected=選択済み
 
 
 Previous\ entry=前の項目
@@ -657,6 +673,7 @@ Pull\ changes\ from\ shared\ database=共有データベースから変更点を
 
 Pushed\ citations\ to\ %0=引用を%0に送り込みました
 
+Push\ applications=プッシュ先アプリケーション
 
 Quit\ JabRef=JabRefを終了
 
@@ -800,7 +817,7 @@ Show\ 'Lastname,\ Firstname'=「姓, 名」と表示
 
 Show\ BibTeX\ source\ by\ default=既定でBibTeXソースを表示
 
-Show\ confirmation\ dialog\ when\ deleting\ entries=項目を削除する際に確認ダイアログを表示
+Show\ confirmation\ dialog\ when\ deleting\ entries=項目を削除する際に確認ダイアログを表示する
 
 Show\ last\ names\ only=姓のみを表示する
 
@@ -871,6 +888,7 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=この操作を行うには，1つ以上の項目が選択されている必要があります．
 
+Time\ stamp=タイムスタンプ
 Toggle\ groups\ interface=グループ操作面を入切
 
 
@@ -963,8 +981,6 @@ MIME\ type=MIME型
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=この機能は，新規ファイルを，新しいJabRefインスタンスを開かないで，すでに実行されているインスタンスに開いたり 読み込んだりするものです．たとえば，これは，ウェブブラウザからJabRefにファイルを開かせたい時に便利です．これによって，一度にJabRefのインスタンスを一つしか開けなくなることに注意してください
 
-Reset=リセット
-
 Use\ IEEE\ LaTeX\ abbreviations=IEEEのLaTeX略語を使用
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=ファイルリンクを開く際，リンクが定義されていなければ，一致するファイルを検索する
@@ -1024,6 +1040,7 @@ User-specific\ file\ directory=ユーザーファイルディレクトリ
 LaTex\ file\ directory=LaTeXファイルディレクトリ
 Search\ failed\:\ illegal\ search\ expression=検索に失敗：誤った検索表現です
 
+You\ must\ enter\ an\ integer\ value\ in\ the\ interval\ 1025-65535=1025〜65535の間の整数値を入力しなくてはなりません
 Automatically\ open\ browse\ dialog\ when\ creating\ new\ file\ link=新しくファイルリンクを作成する際，自動的にブラウズダイアログを開く
 Autocomplete\ names\ in\ 'Firstname\ Lastname'\ format\ only=「名 姓」形式の名前のみ自動補完
 Autocomplete\ names\ in\ 'Lastname,\ Firstname'\ format\ only=「姓, 名」形式の名前のみ自動補完
@@ -1317,6 +1334,7 @@ should\ contain\ a\ four\ digit\ number=4桁の数字でなくてはなりませ
 should\ contain\ a\ valid\ page\ number\ range=有効なページ数範囲でなくてはなりません
 No\ results\ found.=検出されませんでした．
 Found\ %0\ results.=%0件検出しました．
+Invalid\ regular\ expression=正規表現が不正
 plain\ text=平文
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ regular\ expression\ <b>%0</b>=この検索結果は，フィールドのうちどれかに正規表現<b>%0</b>が含まれている項目を表示します．
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ term\ <b>%0</b>=この検索結果は，フィールドのうちどれかに用語<b>%0</b>が含まれている項目を表示します．
@@ -1355,7 +1373,7 @@ Save\ all=すべて保存
 String\ dialog,\ add\ string=文字列ダイアログ・文字列を追加
 String\ dialog,\ remove\ string=文字列ダイアログ・文字列を削除
 Synchronize\ files=ファイルを同期
-Unabbreviate=非短縮形化
+Unabbreviate=短縮解除
 should\ contain\ a\ protocol=プロトコルを含む必要あり
 Copy\ preview=プレビューをコピー
 Automatically\ setting\ file\ links=ファイルリンクを自動的に設定
@@ -1379,8 +1397,9 @@ Show\ remaining\ fields=その他のフィールドを表示
 link\ should\ refer\ to\ a\ correct\ file\ path=リンクは正しいファイルパスを参照しなくてはなりません
 abbreviation\ detected=短縮形を検出しました
 wrong\ entry\ type\ as\ proceedings\ has\ page\ numbers=項目型の誤り：proceedingsにページ番号があります
-Abbreviate\ journal\ names=学術誌名を短縮形化
+Abbreviate\ journal\ names=学術誌名を短縮形に
 Abbreviating...=短縮形化中
+Abbreviation\ '%0'\ for\ journal\ '%1'\ already\ defined.=短縮形「%0」は，学術誌「%1」用にすでに定義されています．
 Abbreviation\ cannot\ be\ empty=短縮形は空にはできません
 Duplicated\ Journal\ Abbreviation=学術誌名短縮形が重複しています
 Duplicated\ Journal\ File=学術誌ファイルが重複しています
@@ -1393,7 +1412,7 @@ Display\ keywords\ appearing\ in\ ANY\ entry=いずれかの項目に現れる
 None\ of\ the\ selected\ entries\ have\ titles.=選択した項目のいずれにもタイトルがありません．
 None\ of\ the\ selected\ entries\ have\ BibTeX\ keys.=選択した項目のいずれにもBibTeX鍵がありません．
 Unabbreviate\ journal\ names=学術誌名を非短縮形に
-Unabbreviating...=非短縮形化中...
+Unabbreviating...=短縮解除中...
 Usage=使用法
 
 
@@ -1711,7 +1730,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=「%0」のバックアップファイ
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=これは，このファイルが最後に使用された際にJabRefが正常に終了しなかったことを意味している可能性があります．
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=ライブラリをバックアップファイルから復活させますか？
 
-Recommended\ for\ %0=%0に対する推奨
 Show\ 'Related\ Articles'\ tab=「関連文献」タブを表示
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=これはGoogle Scholarのトラフィック上限に達したせいかもしれません（詳細は「ヘルプ」を参照）．
 
@@ -1850,6 +1868,8 @@ Password\:=パスワード\:
 Export\ name=書出名
 Main\ layout\ file=基本レイアウトファイル
 File\ extension\:=ファイル拡張子
+Keyword\ seperator=キーワード区切り
+Reset\ to\ default=既定値に戻す
 Edit\ string\ constants=文字列定数の編集
 Export\ all\ entries=全項目を書き出す
 Generate\ BibTeX\ keys=BibTeX鍵を生成
@@ -1873,9 +1893,10 @@ Starts\ the\ extraction\ of\ the\ BibTeX\ entry=BibTeX項目の抽出を開始
 
 Execute\ command=コマンドを実行
 Open\ File\ Browser=ファイルブラウザで開く
+Use\ default\ file\ browser=既定のファイルブラウザを使用
 
 Set\ rank\ to\ one=ランク1に設定
-Set\ rank\ to\ two=ランクに2設定
+Set\ rank\ to\ two=ランク2に設定
 Set\ rank\ to\ three=ランク3に設定
 Set\ rank\ to\ four=ランク4に設定
 Set\ rank\ to\ five=ランク5に設定
@@ -1885,7 +1906,9 @@ Executing\ command\ "%0"...=コマンド「%0」を実行…
 
 New\ Filename=新しいファイル名
 
+Application\ settings=アプリケーションの設定
 
+Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=BibTeXモードの「edition」フィールドを整数にすることを許可する
 
 Search\ for\ Citations\ in\ LaTeX\ Files=LaTeXファイルから引用を検索
 LaTeX\ Citations\ Search\ Results=「LaTeXでの引用」の検索結果
@@ -1897,9 +1920,13 @@ No\ LaTeX\ files\ containing\ this\ entry\ were\ found.=この項目を含むLaT
 Current\ search\ directory\:=現在の検索ディレクトリ：
 Set\ LaTeX\ file\ directory=LaTeXファイルディレクトリを指定する
 
+Columns=列
 
 
+Show\ preview\ as\ a\ tab\ in\ entry\ editor=プレビューを項目エディタのタブとして表示する
 Letters\ after\ duplicate\ generated\ keys=生成鍵が重複している時に後置する文字
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=鍵生成時に常に(a, ,b, …)などの文字を付加
 Default\ pattern=既定パターン
+Reset\ %s\ to\ default\ value=%sを既定値に戻す
+Reset\ to\ recommended=おすすめに戻す
 
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index 0a3d9e30a945..342abdcabacc 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -958,8 +958,6 @@ Unable\ to\ open\ link.=Link openen niet mogelijk.
 MIME\ type=MIME type
 
 
-Reset=Herstellen
-
 Use\ IEEE\ LaTeX\ abbreviations=IEEE LaTeX afkortingen gebruiken
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Als er geen link is bepaald, zoek dan naar overeenkomend bestand als de bestandslink wordt geopend
@@ -1700,7 +1698,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=Een back-up bestand voor '%0' was gevond
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Dit kan erop duiden dat JabRef niet netjes werd afgesloten toen het bestand voor het laatst werd gebruikt.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Wilt u de bibliotheek herstellen van het backup bestand?
 
-Recommended\ for\ %0=Aanbevolen voor %0
 Show\ 'Related\ Articles'\ tab=Toon 'Gerelateerde Artikelen' tab
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=Dit kan worden veroorzaakt door de verkeersbeperking van Google Scholar (zie 'Help' voor meer informatie).
 
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index 312985f6a653..318cd1453351 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -939,8 +939,6 @@ MIME\ type=MIME-type
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Denne funksjonen lar deg åpne eller importere nye filer til en allerede kjørende instans av JabRef fra nettleseren din. Merk at dette vil hindre deg i å kjøre mer enn en instans av JabRef av gangen.
 
-Reset=Resett
-
 Use\ IEEE\ LaTeX\ abbreviations=Bruk IEEE-LaTeX-forkortelser
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Ved åpning av linke, s¸k etter matchende fil hvis ingen er definert
diff --git a/src/main/resources/l10n/JabRef_pl.properties b/src/main/resources/l10n/JabRef_pl.properties
index d28d1289ec81..093f3e9247ce 100644
--- a/src/main/resources/l10n/JabRef_pl.properties
+++ b/src/main/resources/l10n/JabRef_pl.properties
@@ -562,6 +562,5 @@ Application=Aplikacja
 
 
 
-
 
 
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index 15f04824f03c..828231296bd8 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -953,8 +953,6 @@ Unable\ to\ open\ link.=Não foi possível abrir link.
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Esta funcionalidade permite que novos arquivos sejam abertos ou importados para uma instância do JabRef já aberta ao invés de abrir uma nova instância. Por exemplo, isto é útil quando você abre um arquivo no JabRef a partir de ser navegador web. Note que isto irá previnir que você execute uma ou mais instâncias do JabRef ao mesmo tempo.
 
-Reset=Redefinir
-
 Use\ IEEE\ LaTeX\ abbreviations=Utilizar abreviações LaTeX IEEE
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Ao abrir o link do arquivo, procurar por arquivo correspondente se nenhum link está definido
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index 37b84d4403ab..04f9a853f6de 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -950,8 +950,6 @@ MIME\ type=MIME-тип
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Эта функция позволяет открывать или импортировать файлы в работающий экземпляр JabRef без запуска нового экземпляра приложения. Например, при передаче файла в JabRef из веб-браузера. Обратите внимание, что эта функция не даст запустить несколько экземпляров JabRef одновременно.
 
-Reset=Инициализировать
-
 Use\ IEEE\ LaTeX\ abbreviations=Использовать сокращения LaTeX для IEEE
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=При переходе по ссылке выполнять поиск соответствующего файла, если ссылка не определена
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index f4fc9229e6fc..be42f104b59c 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -868,8 +868,6 @@ Unable\ to\ open\ link.=Kan inte öppna länk.
 MIME\ type=MIME-typ
 
 
-Reset=Återställ
-
 Use\ IEEE\ LaTeX\ abbreviations=Använd IEEE LaTeX-förkortningar
 
 Download\ from\ URL=Ladda ned från URL
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index 4d3453a4d350..f91d31e87ac6 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -927,8 +927,6 @@ MIME\ type=Uri ng MIME
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Ang tampok na ito ay nagbibigay-daan sa mga bagong file na mabuksan o ma-import sa isang tumatakbo na halimbawa ng JabRef sa halip ng pagbubukas ng isang bagong pagkakataon. Halimbawa, ito ay kapaki-pakinabang kapag binuksan mo ang isang file sa JabRef mula sa iyong web browser. Tandaan na ito ay pipigil sa iyo mula sa pagpapatakbo ng higit sa isang halimbawa ng JabRef sa isang pagkakataon.
 
-Reset=I-reset
-
 Use\ IEEE\ LaTeX\ abbreviations=Gumamit ng mga abbreviation ng IEEE LaTeX
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Kapag binubuksan ang link ng file, maghanap ng pagtutugma ng file kung walang tinukoy na link
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 68aa341cfb1b..dce8d5ca2a18 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -996,8 +996,6 @@ MIME\ type=MIME türü
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Bu özellik yeni dosyaların yeni bir oturum açmaktansa halen çalışmakta olan bir<BR>JabRef oturumu içine açılması ya da aktarılmasını sağlar. Örneğin bu, tarayıcınızdan bir dosyayı<BR>JabRef içine açtığnızda kullanışlıdır.<BR>Bunun, birden fazla JabRef oturumunu aynı anda çalıştırmanızı önleyeceğini not ediniz.
 Run\ fetcher=Getiriciyi çalıştır
 
-Reset=Sıfırla
-
 Use\ IEEE\ LaTeX\ abbreviations=IEEE LaTeX kısaltmaları kullanınız
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Dosya bağlantısını açarken, eğer link tanımlanmamışsa eşleşen dosyayı ara
@@ -1768,7 +1766,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.='%0' için bir yedek dosyası bulundu.
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Bu, dosya son kullanıldığında JabRef'in temiz kapatılmadığını belirtiyor olabilir.
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Veritabanınızı yedek dosyadan kurtarmak ister misiniz?
 
-Recommended\ for\ %0=%0 için önerilir
 Show\ 'Related\ Articles'\ tab='İlişkili Makaleler' sekmesini göster
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=Bu, Google Scholar'ın trafik limitine erişmekten dolayı olabilir (ayrıntılar için 'Yardım'a bakınız).
 
@@ -2094,7 +2091,7 @@ Start\ on\ second\ duplicate\ key\ with\ letter\ B\ (b,\ c,\ ...)=İkinci müker
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Oluşturulmuş anahtarlara her zaman harf ekle (a, b ...)
 Default\ pattern=Öntanımlı desen
 Reset\ %s\ to\ default\ value=%s'i ön tanımlı değere sıfırla
-
 Column\ type\ %0\ is\ unknown.=%0 sütun türü bilinmiyor.
 Linked\ identifiers=Bağlantılı tanımlayıcılar
 Special\ field\ type\ %0\ is\ unknown.\ Using\ normal\ column\ type.=%0 özel alan türü bilinmiyor. Normal sütun türü kullanılacak.
+
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index aea1fef3939d..f213fe3959b9 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -916,8 +916,6 @@ MIME\ type=Kiểu MIME
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=Tính chất này cho phép các tập tin mới có thể được mở hoặc nhập vào một phiên JabRef đang chạy thay vì phải mở một phiên làm việc mới. Điều này có ích, ví dụ như khi bạn mở một tập tin trong JabRef từ trình duyệt web của mình. Lưu ý rằng điều này sẽ không cho phép bạn chạy nhiều hơn một phiên làm việc của JabRef cùng lúc.
 
-Reset=Thiết lập lại
-
 Use\ IEEE\ LaTeX\ abbreviations=Dùng các chữ viết tắt kiểu IEEE LaTeX
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Khi mở liên kết tập tin, tìm tập tin khớp nếu liên kết không được định nghĩa
diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
index ba64d4e0d41f..f0a1950c865f 100644
--- a/src/main/resources/l10n/JabRef_zh.properties
+++ b/src/main/resources/l10n/JabRef_zh.properties
@@ -959,8 +959,6 @@ MIME\ type=MIME 类型
 
 This\ feature\ lets\ new\ files\ be\ opened\ or\ imported\ into\ an\ already\ running\ instance\ of\ JabRef\ instead\ of\ opening\ a\ new\ instance.\ For\ instance,\ this\ is\ useful\ when\ you\ open\ a\ file\ in\ JabRef\ from\ your\ web\ browser.\ Note\ that\ this\ will\ prevent\ you\ from\ running\ more\ than\ one\ instance\ of\ JabRef\ at\ a\ time.=该选项使得打开或者导入新文件的操作在已经运行的 JabRef 中进行，而不是新建另一个 JabRef 窗口 来进行这些操作。例如，当您从浏览器中调用 JabRef 打开一个文件时，这个选项将比较有用。注意：它将阻止您同时运行多个 JabRef 实例。
 
-Reset=重置
-
 Use\ IEEE\ LaTeX\ abbreviations=使用 IEEE LaTeX 缩写
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=打开文件时，如果文件链接未定义，则自动寻找匹配的文件。
@@ -1701,7 +1699,6 @@ A\ backup\ file\ for\ '%0'\ was\ found.=找到了 "%0" 的备份文件。
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=这可能表明, 上次使用该文件时, JabRef 没有完全关闭。
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=是否要从备份文件中恢复库？
 
-Recommended\ for\ %0=为 %0 推荐
 Show\ 'Related\ Articles'\ tab=显示 "相关文章" 选项卡
 This\ might\ be\ caused\ by\ reaching\ the\ traffic\ limitation\ of\ Google\ Scholar\ (see\ 'Help'\ for\ details).=这可能是由于达到了谷歌学术搜索的流量限制（更多详细信息，请参阅“帮助”）。
 

From c8af1c16b8250fdbeb705f21fc6476d59b86d2cf Mon Sep 17 00:00:00 2001
From: Galileo Sartor <galileo.sartor@gmail.com>
Date: Sat, 16 Nov 2019 08:37:00 +0100
Subject: [PATCH 10/13] Add chromium json for browser integration (#5571)

* Add chromium json for jabfox integration

* Add chrome install on windows

* Update Chrome ID
---
 .../chromium/org.jabref.jabref.json                |  9 +++++++++
 .../firefox}/org.jabref.jabref.json                |  0
 buildres/linux/postinst                            |  5 +++--
 buildres/linux/postrm                              | 14 +++++++++-----
 buildres/windows/JabRef-post-image.wsf             |  4 ++--
 5 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 buildres/linux/native-messaging-host/chromium/org.jabref.jabref.json
 rename buildres/linux/{ => native-messaging-host/firefox}/org.jabref.jabref.json (100%)

diff --git a/buildres/linux/native-messaging-host/chromium/org.jabref.jabref.json b/buildres/linux/native-messaging-host/chromium/org.jabref.jabref.json
new file mode 100644
index 000000000000..6283016eafef
--- /dev/null
+++ b/buildres/linux/native-messaging-host/chromium/org.jabref.jabref.json
@@ -0,0 +1,9 @@
+{
+  "name": "org.jabref.jabref",
+  "description": "JabRef",
+  "path": "/opt/jabref/lib/jabrefHost.py",
+  "type": "stdio",
+  "allowed_origins": [
+    "chrome-extension://bifehkofibaamoeaopjglfkddgkijdlh/"
+  ]
+}
diff --git a/buildres/linux/org.jabref.jabref.json b/buildres/linux/native-messaging-host/firefox/org.jabref.jabref.json
similarity index 100%
rename from buildres/linux/org.jabref.jabref.json
rename to buildres/linux/native-messaging-host/firefox/org.jabref.jabref.json
diff --git a/buildres/linux/postinst b/buildres/linux/postinst
index ea5525ebd03e..1c3af73aa249 100644
--- a/buildres/linux/postinst
+++ b/buildres/linux/postinst
@@ -19,8 +19,9 @@ set -e
 
 case "$1" in
     configure)
-        INSTALL_PATH="/usr/lib/mozilla/native-messaging-hosts"
-        install -D -m0755 /opt/jabref/lib/org.jabref.jabref.json $INSTALL_PATH/org.jabref.jabref.json
+        install -D -m0755 /opt/jabref/lib/native-messaging-host/firefox/org.jabref.jabref.json /usr/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json
+        install -D -m0755 /opt/jabref/lib/native-messaging-host/chromium/org.jabref.jabref.json /etc/chromium/native-messaging-hosts/org.jabref.jabref.json
+        install -D -m0755 /opt/jabref/lib/native-messaging-host/chromium/org.jabref.jabref.json /etc/opt/chrome/native-messaging-hosts/org.jabref.jabref.json
         DESKTOP_COMMANDS_INSTALL
     ;;
 
diff --git a/buildres/linux/postrm b/buildres/linux/postrm
index 2cd3bfb9079c..5d9530a3bbd9 100644
--- a/buildres/linux/postrm
+++ b/buildres/linux/postrm
@@ -16,12 +16,16 @@ set -e
 #          <overwriter-version>
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
+
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    NATIVE_MESSAGING_JSON="/usr/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json"
-    if [ -e $NATIVE_MESSAGING_JSON ] && grep --quiet '"path": "/opt' $NATIVE_MESSAGING_JSON; then
-        rm $NATIVE_MESSAGING_JSON
-    fi
+		for NATIVE_MESSAGING_JSON in "/usr/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json"\
+                                     "/etc/chromium/native-messaging-hosts/org.jabref.jabref.json"\
+                                     "/etc/opt/chrome/native-messaging-hosts/org.jabref.jabref.json"; do
+		    if [ -e $NATIVE_MESSAGING_JSON ] && grep --quiet '"path": "/opt' $NATIVE_MESSAGING_JSON; then
+		        echo $NATIVE_MESSAGING_JSON
+		    fi
+		done
     ;;
 
     *)
@@ -30,4 +34,4 @@ case "$1" in
     ;;
 esac
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/buildres/windows/JabRef-post-image.wsf b/buildres/windows/JabRef-post-image.wsf
index b7feaf3c66d2..285fd471972b 100644
--- a/buildres/windows/JabRef-post-image.wsf
+++ b/buildres/windows/JabRef-post-image.wsf
@@ -16,8 +16,8 @@
         var contents = wxsFile.ReadAll();
         wxsFile.Close();
 
-        // Add registry values for JabFox
-        contents = contents.replace("</Product>", "<DirectoryRef Id=\"TARGETDIR\"><Component Id=\"RegistryJabFoxEntries\" Guid=\"b6bc55ad-905c-4258-89b1-8b37abbe559c\" Win64=\"yes\"><RegistryKey Root=\"HKMU\" Key=\"SOFTWARE\\Mozilla\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[APPLICATIONFOLDER]jabref.json\"/></RegistryKey></Component></DirectoryRef><Feature Id=\"JabFox\" Level=\"1\"><ComponentRef Id=\"RegistryJabFoxEntries\" /></Feature></Product>");
+        // Add registry values for JabRef Browser Extension
+        contents = contents.replace("</Product>", "<DirectoryRef Id=\"TARGETDIR\"><Component Id=\"RegistryJabRefBrowserEntries\" Guid=\"b6bc55ad-905c-4258-89b1-8b37abbe559c\" Win64=\"yes\"><RegistryKey Root=\"HKMU\" Key=\"SOFTWARE\\Mozilla\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[APPLICATIONFOLDER]jabref.json\"/></RegistryKey><RegistryKey Root=\"HKMU\" Key=\"Software\\Google\\Chrome\\NativeMessagingHosts\\org.jabref.jabref\" Action=\"createAndRemoveOnUninstall\" ForceCreateOnInstall=\"yes\"><RegistryValue Type=\"string\" Value=\"[APPLICATIONFOLDER]jabref-chrome.json\"/></RegistryKey></Component></DirectoryRef><Feature Id=\"JabFox\" Level=\"1\"><ComponentRef Id=\"RegistryJabFoxEntries\" /></Feature></Product>");
 
         // Specify correct icon in Add/Remove Programs
         contents = contents.replace("</Product>", "<Property Id=\"ARPPRODUCTICON\" Value=\"DesktopIcon.exe\" /></Product>");

From bf58c52378ca070dedfafece84a9401f5f17b3de Mon Sep 17 00:00:00 2001
From: Galileo Sartor <galileo.sartor@gmail.com>
Date: Sat, 16 Nov 2019 08:38:25 +0100
Subject: [PATCH 11/13] [blocked by #5571 - can be merged afterwards] Add rpm
 spec file to add/remove json extension files (#5574)

* Add rpm spec file

* Set preuninstall to remove json files
---
 buildres/linux/jabref.spec | 71 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 buildres/linux/jabref.spec

diff --git a/buildres/linux/jabref.spec b/buildres/linux/jabref.spec
new file mode 100644
index 000000000000..71c9574c4499
--- /dev/null
+++ b/buildres/linux/jabref.spec
@@ -0,0 +1,71 @@
+Summary: APPLICATION_SUMMARY
+Name: APPLICATION_PACKAGE
+Version: APPLICATION_VERSION
+Release: APPLICATION_RELEASE
+License: APPLICATION_LICENSE_TYPE
+Vendor: APPLICATION_VENDOR
+Prefix: %{dirname:APPLICATION_DIRECTORY}
+Provides: APPLICATION_PACKAGE
+%if "xAPPLICATION_GROUP" != x
+Group: APPLICATION_GROUP
+%endif
+
+Autoprov: 0
+Autoreq: 0
+%if "xPACKAGE_DEFAULT_DEPENDENCIES" != x || "xPACKAGE_CUSTOM_DEPENDENCIES" != x
+Requires: PACKAGE_DEFAULT_DEPENDENCIES PACKAGE_CUSTOM_DEPENDENCIES
+%endif
+
+#avoid ARCH subfolder
+%define _rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
+
+#comment line below to enable effective jar compression
+#it could easily get your package size from 40 to 15Mb but
+#build time will substantially increase and it may require unpack200/system java to install
+%define __jar_repack %{nil}
+
+%description
+APPLICATION_DESCRIPTION
+
+%prep
+
+%build
+
+%install
+rm -rf %{buildroot}
+install -d -m 755 %{buildroot}APPLICATION_DIRECTORY
+cp -r %{_sourcedir}APPLICATION_DIRECTORY/* %{buildroot}APPLICATION_DIRECTORY
+%if "xAPPLICATION_LICENSE_FILE" != x
+  %define license_install_file %{_defaultlicensedir}/%{name}-%{version}/%{basename:APPLICATION_LICENSE_FILE}
+  install -d -m 755 %{buildroot}%{dirname:%{license_install_file}}
+  install -m 644 APPLICATION_LICENSE_FILE %{buildroot}%{license_install_file}
+%endif
+
+%files
+%if "xAPPLICATION_LICENSE_FILE" != x
+  %license %{license_install_file}
+  %{dirname:%{license_install_file}}
+%endif
+# If installation directory for the application is /a/b/c, we want only root
+# component of the path (/a) in the spec file to make sure all subdirectories
+# are owned by the package.
+%(echo APPLICATION_DIRECTORY | sed -e "s|\(^/[^/]\{1,\}\).*$|\1|")
+
+%post
+install -D -m0755 /opt/jabref/lib/native-messaging-host/firefox/org.jabref.jabref.json /usr/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json
+install -D -m0755 /opt/jabref/lib/native-messaging-host/chromium/org.jabref.jabref.json /etc/chromium/native-messaging-hosts/org.jabref.jabref.json
+install -D -m0755 /opt/jabref/lib/native-messaging-host/chromium/org.jabref.jabref.json /etc/opt/chrome/native-messaging-hosts/org.jabref.jabref.json
+DESKTOP_COMMANDS_INSTALL
+
+%preun
+for NATIVE_MESSAGING_JSON in "/usr/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json"\
+                             "/etc/chromium/native-messaging-hosts/org.jabref.jabref.json"\
+                             "/etc/opt/chrome/native-messaging-hosts/org.jabref.jabref.json"; do
+    if [ -e $NATIVE_MESSAGING_JSON ] && grep --quiet '"path": "/opt' $NATIVE_MESSAGING_JSON; then
+        rm $NATIVE_MESSAGING_JSON
+    fi
+done
+UTILITY_SCRIPTS
+DESKTOP_COMMANDS_UNINSTALL
+
+%clean
\ No newline at end of file

From e5e96b2c23bcd561f5b6afb6c3678c4fcdaca722 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sat, 16 Nov 2019 08:42:27 +0100
Subject: [PATCH 12/13] Fix expected result (#5612)

---
 .../java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
index b699c6290e78..16e72ea7f21a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IsbnFetcherTest.java
@@ -38,7 +38,7 @@ void setUp() {
         bibEntry.setField(StandardField.PUBLISHER, "Addison Wesley");
         bibEntry.setField(StandardField.YEAR, "2018");
         bibEntry.setField(StandardField.AUTHOR, "Bloch, Joshua");
-        bibEntry.setField(StandardField.DATE, "2018-01-11");
+        bibEntry.setField(StandardField.DATE, "2018-01-01");
         bibEntry.setField(new UnknownField("ean"), "9780134685991");
         bibEntry.setField(StandardField.ISBN, "0134685997");
         bibEntry.setField(StandardField.URL, "https://www.ebook.de/de/product/28983211/joshua_bloch_effective_java.html");

From b8cd609d0bb46103f01cd2ecaced5b46532e50f1 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 17 Nov 2019 21:58:59 +0100
Subject: [PATCH 13/13] Rename "Extract BibTeX from plain text" to
 (pre-existing) "New entry from plain text"

---
 src/main/java/org/jabref/gui/JabRefFrame.java             | 2 +-
 src/main/java/org/jabref/gui/actions/StandardActions.java | 1 -
 src/main/resources/l10n/JabRef_en.properties              | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 97165cfa8e6b..9e405a767a7b 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -729,6 +729,7 @@ private MenuBar createMenu() {
         //@formatter:off
         library.getItems().addAll(
                 factory.createMenuItem(StandardActions.NEW_ENTRY, new NewEntryAction(this, dialogService, Globals.prefs, stateManager)),
+                factory.createMenuItem(StandardActions.NEW_ENTRY_FROM_PLAINTEX, new ExtractBibtexAction(stateManager)),
                 factory.createMenuItem(StandardActions.DELETE_ENTRY, new OldDatabaseCommandWrapper(Actions.DELETE, this, stateManager)),
 
                 new SeparatorMenuItem(),
@@ -768,7 +769,6 @@ private MenuBar createMenu() {
                 factory.createMenuItem(StandardActions.FIND_UNLINKED_FILES, new FindUnlinkedFilesAction(this, stateManager)),
                 factory.createMenuItem(StandardActions.WRITE_XMP, new OldDatabaseCommandWrapper(Actions.WRITE_XMP, this, stateManager)),
                 factory.createMenuItem(StandardActions.COPY_LINKED_FILES, new CopyFilesAction(stateManager, this.getDialogService())),
-                factory.createMenuItem(StandardActions.EXTRACT_BIBTEX, new ExtractBibtexAction(stateManager)),
 
                 new SeparatorMenuItem(),
 
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 87f48f1b4a53..9e6e2cef4bc1 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -138,7 +138,6 @@ public enum StandardActions implements Action {
     DOWNLOAD_FULL_TEXT(Localization.lang("Search full text documents online"), IconTheme.JabRefIcons.FILE_SEARCH, KeyBinding.DOWNLOAD_FULL_TEXT),
     CLEANUP_ENTRIES(Localization.lang("Cleanup entries"), IconTheme.JabRefIcons.CLEANUP_ENTRIES, KeyBinding.CLEANUP),
     SET_FILE_LINKS(Localization.lang("Automatically set file links"), KeyBinding.AUTOMATICALLY_LINK_FILES),
-    EXTRACT_BIBTEX(Localization.lang("Extract BibTeX from plain text")),
 
     HELP(Localization.lang("Online help"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
     HELP_KEY_PATTERNS(Localization.lang("Help on key patterns"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 36a9c345cb40..be20c79fce15 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2004,7 +2004,6 @@ Dismiss\ changes=Dismiss changes
 The\ library\ has\ been\ modified\ by\ another\ program.=The library has been modified by another program.
 
 Extract=Extract
-Extract\ BibTeX\ from\ plain\ text= Extract BibTeX from plain text
 Input\ text\ to\ parse=Input text to parse
 Starts\ the\ extraction\ of\ the\ BibTeX\ entry=Starts the extraction of the BibTeX entry