diff --git a/build.gradle b/build.gradle
index 9b39cf11101..2db03f600f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -121,7 +121,7 @@ dependencies {
 
     compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
 
-    compile 'com.google.guava:guava:27.1-jre'
+    compile 'com.google.guava:guava:28.0-jre'
 
     // JavaFX stuff
     compile 'de.jensd:fontawesomefx-commons:8.15'
@@ -142,7 +142,7 @@ dependencies {
     compile 'com.mashape.unirest:unirest-java:1.4.9'
 
     // >1.8.0-beta is required for java 9 compatibility
-    compile 'org.slf4j:slf4j-api:1.8.0-beta4'
+    compile 'org.slf4j:slf4j-api:2.0.0-alpha0'
     compile 'org.apache.logging.log4j:log4j-slf4j18-impl:2.11.2'
     compile 'org.apache.logging.log4j:log4j-jcl:2.11.2'
     compile 'org.apache.logging.log4j:log4j-api:2.11.2'
diff --git a/src/main/java/org/jabref/Globals.java b/src/main/java/org/jabref/Globals.java
index 1a5cc0ee385..0c26f8f6d38 100644
--- a/src/main/java/org/jabref/Globals.java
+++ b/src/main/java/org/jabref/Globals.java
@@ -1,6 +1,7 @@
 package org.jabref;
 
 import java.awt.GraphicsEnvironment;
+import java.io.IOException;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -24,6 +25,7 @@
 import org.jabref.preferences.JabRefPreferences;
 
 import com.google.common.base.StandardSystemProperty;
+import com.mashape.unirest.http.Unirest;
 import com.microsoft.applicationinsights.TelemetryClient;
 import com.microsoft.applicationinsights.TelemetryConfiguration;
 import com.microsoft.applicationinsights.internal.shutdown.SDKShutdownActivity;
@@ -125,6 +127,9 @@ public static void shutdownThreadPools() {
 
     public static void stopBackgroundTasks() {
         stopTelemetryClient();
+        try {
+            Unirest.shutdown();
+        } catch (IOException ignore) { }
     }
 
     public static Optional<TelemetryClient> getTelemetryClient() {
diff --git a/src/main/java/org/jabref/gui/Base.css b/src/main/java/org/jabref/gui/Base.css
index 2db5a049c00..c913bb5ad9e 100644
--- a/src/main/java/org/jabref/gui/Base.css
+++ b/src/main/java/org/jabref/gui/Base.css
@@ -1028,11 +1028,20 @@ We want to have a look that matches our icons in the tool-bar */
     -fx-background-color: -jr-error;
 }
 
+.titleHeader {
+    -fx-font-size: 150%;
+    -fx-padding: 0em 0em 0.5em 0em;
+}
+
 .sectionHeader {
-    -fx-font-size: 1.5em;
-    -fx-padding: 1em 0em 1em 0em;
+    -fx-font-size: 130%;
+    -fx-padding: 1em 0em 0.2em 0em;
 }
 
 .dialog-pane {
     -fx-background-color: -fx-control-inner-background;
 }
+
+.preference-sidepane {
+    -fx-background-color: -jr-sidepane-background;
+}
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index ef9074973d9..73f838d6315 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -759,7 +759,7 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.SET_FILE_LINKS, new AutoLinkFilesAction(this, prefs, stateManager, undoManager))
+                factory.createMenuItem(StandardActions.SET_FILE_LINKS, new AutoLinkFilesAction(this, prefs, stateManager, undoManager, Globals.TASK_EXECUTOR))
         );
 
         // PushToApplication
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index 5f4ca318ec2..33b35573a18 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -37,6 +37,7 @@ protected Collection<String> determineFieldsToShow(BibEntry entry, EntryType ent
                 .filter(field -> !allKnownFields.contains(field)).collect(Collectors.toList());
 
         otherFields.removeAll(entryType.getDeprecatedFields());
+        otherFields.removeAll(entryType.getOptionalFields());
         otherFields.remove(BibEntry.KEY_FIELD);
         otherFields.removeAll(customTabFieldNames);
         return otherFields;
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
index 74a9d3aea77..a2c23ebf6a5 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
@@ -13,6 +13,7 @@
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.util.BindingsHelper;
+import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -31,12 +32,14 @@ public class AutoLinkFilesAction extends SimpleCommand {
     private final JabRefPreferences preferences;
     private final StateManager stateManager;
     private UndoManager undoManager;
+    private TaskExecutor taskExecutor;
 
-    public AutoLinkFilesAction(JabRefFrame frame, JabRefPreferences preferences, StateManager stateManager, UndoManager undoManager) {
+    public AutoLinkFilesAction(JabRefFrame frame, JabRefPreferences preferences, StateManager stateManager, UndoManager undoManager, TaskExecutor taskExecutor) {
         this.dialogService = frame.getDialogService();
         this.preferences = preferences;
         this.stateManager = stateManager;
         this.undoManager = undoManager;
+        this.taskExecutor = taskExecutor;
 
         this.executable.bind(needsDatabase(this.stateManager).and(needsEntriesSelected(stateManager)));
         this.statusMessage.bind(BindingsHelper.ifThenElse(executable, "", Localization.lang("This operation requires one or more entries to be selected.")));
@@ -51,6 +54,7 @@ public void execute() {
         final NamedCompound nc = new NamedCompound(Localization.lang("Automatically set file links"));
         AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(database, preferences.getFilePreferences(), preferences.getAutoLinkPreferences(), ExternalFileTypes.getInstance());
         Task<List<BibEntry>> linkFilesTask = new Task<List<BibEntry>>() {
+
             @Override
             protected List<BibEntry> call() {
                 return util.linkAssociatedFiles(entries, nc);
@@ -71,9 +75,9 @@ protected void succeeded() {
         };
 
         dialogService.showProgressDialogAndWait(
-                Localization.lang("Automatically setting file links"),
-                Localization.lang("Searching for files"),
-                linkFilesTask
-        );
+                                                Localization.lang("Automatically setting file links"),
+                                                Localization.lang("Searching for files"),
+                                                linkFilesTask);
+        taskExecutor.execute(linkFilesTask);
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml b/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
new file mode 100644
index 00000000000..3876eace1bd
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+<?import javafx.scene.control.Tooltip?>
+<fx:root prefWidth="650.0" spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
+         fx:controller="org.jabref.gui.preferences.ExternalTabView">
+    <fx:define>
+        <ToggleGroup fx:id="openConsole"/>
+        <ToggleGroup fx:id="openPDF"/>
+        <ToggleGroup fx:id="openFileBrowser"/>
+    </fx:define>
+    <children>
+        <Label styleClass="titleHeader" text="%External programs"/>
+        <Label styleClass="sectionHeader" text="%Sending of emails"/>
+        <HBox alignment="CENTER_LEFT" spacing="10.0">
+
+            <children>
+                <Label text="%Subject for sending an email with references"/>
+                <TextField fx:id="eMailReferenceSubject"/>
+            </children>
+        </HBox>
+        <CheckBox fx:id="autoOpenAttachedFolders"
+                  text="%Automatically open folders of attached files"/>
+        <Label styleClass="sectionHeader" text="%Push applications"/>
+        <HBox>
+            <GridPane alignment="CENTER_LEFT">
+                <columnConstraints>
+                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
+                    <ColumnConstraints hgrow="SOMETIMES" percentWidth="0.0" prefWidth="10.0"/>
+                    <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="200.0"/>
+                    <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="10.0"/>
+                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="140.0"/>
+                </columnConstraints>
+                <rowConstraints>
+                    <RowConstraints prefHeight="30.0" vgrow="SOMETIMES"/>
+                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                    <RowConstraints minHeight="-Infinity" prefHeight="10.0" vgrow="SOMETIMES"/>
+                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                </rowConstraints>
+                <children>
+                    <Label text="%Application to push entries to"/>
+                    <ComboBox fx:id="pushToApplicationCombo" minWidth="-Infinity" prefWidth="200.0"
+                              GridPane.columnIndex="2"/>
+                    <Button onAction="#pushToApplicationSettings" prefWidth="140.0"
+                            text="%Application settings" GridPane.columnIndex="4"/>
+                    <Label text="%Cite command" GridPane.rowIndex="1"/>
+                    <TextField fx:id="citeCommand" minWidth="-Infinity" prefWidth="200.0" GridPane.columnIndex="2"
+                               GridPane.rowIndex="1"/>
+                    <Button onAction="#manageExternalFileTypes" prefWidth="200.0"
+                            text="%Manage external file types" GridPane.columnIndex="2" GridPane.rowIndex="3"/>
+                </children>
+            </GridPane>
+        </HBox>
+        <Label styleClass="sectionHeader" text="%Open console"/>
+        <VBox spacing="8.0">
+            <children>
+                <RadioButton fx:id="useTerminalDefault" text="%Use default terminal emulator"
+                             toggleGroup="$openConsole"/>
+                <HBox alignment="CENTER_LEFT" spacing="10.0">
+                    <children>
+                        <RadioButton fx:id="useTerminalSpecial" lineSpacing="10.0"
+                                     prefWidth="200.0" text="%Execute command" toggleGroup="$openConsole"/>
+                        <TextField fx:id="useTerminalCommand" prefWidth="350.0" disable="${!useTerminalSpecial.selected}">
+                            <tooltip>
+                                <Tooltip
+                                        text="%Note: Use the placeholder %DIR% for the location of the opened library file."/>
+                            </tooltip>
+                        </TextField>
+                        <Button fx:id="" text="%Browse" onAction="#useTerminalCommandBrowse" disable="${!useTerminalSpecial.selected}"/>
+                    </children>
+                </HBox>
+            </children>
+        </VBox>
+        <Label styleClass="sectionHeader" text="%Open PDF"/>
+        <HBox>
+            <GridPane alignment="CENTER_LEFT">
+                <columnConstraints>
+                    <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
+                    <ColumnConstraints hgrow="SOMETIMES" percentWidth="0.0" prefWidth="10.0"/>
+                    <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="350.0"/>
+                    <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" percentWidth="0.0" prefWidth="10.0"/>
+                    <ColumnConstraints hgrow="SOMETIMES"/>
+                </columnConstraints>
+                <rowConstraints>
+                    <RowConstraints prefHeight="30.0" vgrow="SOMETIMES"/>
+                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                </rowConstraints>
+                <children>
+                    <RadioButton fx:id="usePDFAcrobat" text="%Adobe Acrobat Reader"
+                                 toggleGroup="$openPDF"/>
+                    <TextField fx:id="usePDFAcrobatCommand" prefWidth="350.0" GridPane.columnIndex="2" disable="${!usePDFAcrobat.selected}"/>
+                    <Button onAction="#usePDFAcrobatCommandBrowse" text="%Browse"
+                            GridPane.columnIndex="4" disable="${!usePDFAcrobat.selected}"/>
+                    <RadioButton fx:id="usePDFSumatra" text="%Sumatra Reader" toggleGroup="$openPDF"
+                                 GridPane.rowIndex="1"/>
+                    <TextField fx:id="usePDFSumatraCommand" prefWidth="350.0" GridPane.columnIndex="2"
+                               GridPane.rowIndex="1" disable="${!usePDFSumatra.selected}"/>
+                    <Button onAction="#usePDFSumatraCommandBrowse" text="%Browse"
+                            GridPane.columnIndex="4" GridPane.rowIndex="1" disable="${!usePDFSumatra.selected}"/>
+                </children>
+            </GridPane>
+        </HBox>
+        <Label styleClass="sectionHeader" text="%Open File Browser"/>
+        <HBox>
+            <children>
+                <GridPane alignment="CENTER_LEFT">
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" percentWidth="0.0" prefWidth="10.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" prefWidth="350.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="-Infinity" percentWidth="0.0" prefWidth="10.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints prefHeight="30.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
+                    <children>
+                        <RadioButton fx:id="useFileBrowserDefault" text="%Use default file browser"
+                                     toggleGroup="$openFileBrowser"/>
+                        <RadioButton fx:id="useFileBrowserSpecial" text="%Execute command"
+                                     toggleGroup="$openFileBrowser" GridPane.rowIndex="1"/>
+                        <TextField fx:id="useFileBrowserSpecialCommand" prefWidth="350.0"
+                                   GridPane.columnIndex="2" GridPane.rowIndex="1" disable="${!useFileBrowserSpecial.selected}">
+                            <tooltip>
+                                <Tooltip
+                                        text="%Note: Use the placeholder %DIR% for the location of the opened library file."/>
+                            </tooltip>
+                        </TextField>
+                        <Button onAction="#useFileBrowserSpecialCommandBrowse" text="%Browse"
+                                GridPane.columnIndex="4" GridPane.rowIndex="1" disable="${!useFileBrowserSpecial.selected}"/>
+                    </children>
+                </GridPane>
+            </children>
+        </HBox>
+    </children>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.java b/src/main/java/org/jabref/gui/preferences/ExternalTab.java
deleted file mode 100644
index a2bca6c0077..00000000000
--- a/src/main/java/org/jabref/gui/preferences/ExternalTab.java
+++ /dev/null
@@ -1,322 +0,0 @@
-package org.jabref.gui.preferences;
-
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-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.RadioButton;
-import javafx.scene.control.Separator;
-import javafx.scene.control.TextField;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.HBox;
-
-import org.jabref.Globals;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.externalfiletype.EditExternalFileTypesAction;
-import org.jabref.gui.push.PushToApplication;
-import org.jabref.gui.push.PushToApplicationSettings;
-import org.jabref.gui.push.PushToApplicationsManager;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.gui.util.ViewModelListCellFactory;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.OS;
-import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.JabRefPreferences;
-
-class ExternalTab implements PrefsTab {
-
-    private final JabRefFrame frame;
-    private final JabRefPreferences prefs;
-    private final TextField emailSubject;
-    private final ComboBox<PushToApplication> pushToApplicationComboBox;
-
-    private final TextField citeCommand;
-    private final CheckBox openFoldersOfAttachedFiles;
-
-    private final RadioButton defaultConsole;
-    private final RadioButton executeConsole;
-    private final TextField consoleCommand;
-    private final Button browseButton;
-
-    private final RadioButton adobeAcrobatReader;
-    private final RadioButton sumatraReader;
-    private final TextField adobeAcrobatReaderPath;
-    private final TextField sumatraReaderPath;
-
-    private final RadioButton defaultFileBrowser;
-    private final RadioButton executeFileBrowser;
-    private final TextField fileBrowserCommand;
-    private final Button fileBrowserButton;
-
-    private final GridPane builder = new GridPane();
-    private final DialogService dialogService;
-    private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().build();
-
-    public ExternalTab(JabRefFrame frame, PreferencesDialog prefsDiag, JabRefPreferences prefs) {
-        this.prefs = prefs;
-        this.frame = frame;
-        dialogService = frame.getDialogService();
-        builder.setVgap(7);
-
-        pushToApplicationComboBox = new ComboBox<>();
-        Button pushToApplicationSettingsButton = new Button(Localization.lang("Application settings"));
-        pushToApplicationSettingsButton.setOnAction(e -> showPushToApplicationSettings());
-
-        Button editFileTypes = new Button(Localization.lang("Manage external file types"));
-        citeCommand = new TextField();
-        editFileTypes.setOnAction(e -> new EditExternalFileTypesAction().execute());
-        defaultConsole = new RadioButton(Localization.lang("Use default terminal emulator"));
-        executeConsole = new RadioButton(Localization.lang("Execute command") + ":");
-        consoleCommand = new TextField();
-        browseButton = new Button(Localization.lang("Browse"));
-        adobeAcrobatReader = new RadioButton(Localization.lang("Adobe Acrobat Reader"));
-        adobeAcrobatReaderPath = new TextField();
-        Button browseAdobeAcrobatReader = new Button(Localization.lang("Browse"));
-        sumatraReader = new RadioButton(Localization.lang("Sumatra Reader"));
-        sumatraReaderPath = new TextField();
-        Button browseSumatraReader = new Button(Localization.lang("Browse"));
-
-        defaultFileBrowser = new RadioButton(Localization.lang("Use default file browser"));
-        executeFileBrowser = new RadioButton(Localization.lang("Execute Command"));
-        fileBrowserCommand = new TextField();
-        fileBrowserButton = new Button(Localization.lang("Browser"));
-
-        Label commandDescription = new Label(Localization.lang("Note: Use the placeholder %0 for the location of the opened library file.", "%DIR"));
-        defaultConsole.setOnAction(e -> updateExecuteConsoleButtonAndFieldEnabledState());
-        executeConsole.setOnAction(e -> updateExecuteConsoleButtonAndFieldEnabledState());
-        browseButton.setOnAction(e -> showConsoleChooser());
-
-        fileBrowserButton.disableProperty().bind(executeFileBrowser.selectedProperty().not());
-        fileBrowserCommand.disableProperty().bind(executeFileBrowser.selectedProperty().not());
-        fileBrowserButton.setOnAction(e -> showFileBrowserCommandChooser());
-
-        browseAdobeAcrobatReader.setOnAction(e -> showAdobeChooser());
-
-        GridPane consoleOptionPanel = new GridPane();
-        final ToggleGroup consoleGroup = new ToggleGroup();
-        defaultConsole.setToggleGroup(consoleGroup);
-        executeConsole.setToggleGroup(consoleGroup);
-        consoleOptionPanel.add(defaultConsole, 1, 1);
-        consoleOptionPanel.add(executeConsole, 1, 2);
-        consoleOptionPanel.add(consoleCommand, 2, 2);
-        consoleOptionPanel.add(browseButton, 3, 2);
-        consoleOptionPanel.add(commandDescription, 2, 3);
-
-        GridPane pdfOptionPanel = new GridPane();
-        final ToggleGroup pdfReaderGroup = new ToggleGroup();
-        pdfOptionPanel.add(adobeAcrobatReader, 1, 1);
-        pdfOptionPanel.add(adobeAcrobatReaderPath, 2, 1);
-        adobeAcrobatReader.setToggleGroup(pdfReaderGroup);
-        pdfOptionPanel.add(browseAdobeAcrobatReader, 3, 1);
-
-        Label fileBrowserCommandDescription = new Label(Localization.lang("Note: Use the placeholder %0 for the location of the opened library file.", "%DIR"));
-        GridPane fileBrowserOptionPanel = new GridPane();
-        final ToggleGroup fileBrowserGroup = new ToggleGroup();
-        defaultFileBrowser.setToggleGroup(fileBrowserGroup);
-        executeFileBrowser.setToggleGroup(fileBrowserGroup);
-        fileBrowserOptionPanel.add(defaultFileBrowser, 1, 1);
-        fileBrowserOptionPanel.add(executeFileBrowser, 1, 2);
-        fileBrowserOptionPanel.add(fileBrowserCommand, 2, 2);
-        fileBrowserOptionPanel.add(fileBrowserButton, 3, 2);
-        fileBrowserOptionPanel.add(fileBrowserCommandDescription, 2, 3);
-
-        if (OS.WINDOWS) {
-            browseSumatraReader.setOnAction(e -> showSumatraChooser());
-            pdfOptionPanel.add(sumatraReader, 1, 2);
-            sumatraReader.setToggleGroup(pdfReaderGroup);
-            pdfOptionPanel.add(sumatraReaderPath, 2, 2);
-            pdfOptionPanel.add(browseSumatraReader, 3, 2);
-        }
-
-        // Sending of emails title
-        Label sendingOfEmails = new Label(Localization.lang("Sending of emails"));
-        sendingOfEmails.getStyleClass().add("sectionHeader");
-        builder.add(sendingOfEmails, 1, 1);
-
-        // Sending of emails configuration
-        HBox sendRefMailBox = new HBox();
-        sendRefMailBox.setSpacing(8);
-        sendRefMailBox.setAlignment(Pos.CENTER_LEFT);
-        Label subject = new Label(Localization.lang("Subject for sending an email with references").concat(":"));
-        builder.add(subject, 1, 2);
-        openFoldersOfAttachedFiles = new CheckBox(Localization.lang("Automatically open folders of attached files"));
-        emailSubject = new TextField();
-        sendRefMailBox.getChildren().setAll(openFoldersOfAttachedFiles, emailSubject);
-        builder.add(sendRefMailBox, 1, 3);
-
-        builder.add(new Separator(), 1, 7);
-
-        // External programs title
-        Label externalPrograms = new Label(Localization.lang("External programs"));
-        externalPrograms.getStyleClass().add("sectionHeader");
-        builder.add(externalPrograms, 1, 9);
-
-        // PushToApplication configuration
-        HBox pushToApplicationHBox = new HBox();
-        pushToApplicationHBox.setAlignment(Pos.CENTER_LEFT);
-        pushToApplicationHBox.setSpacing(10);
-        pushToApplicationHBox.getChildren().add(new Label(Localization.lang("Application to push entries to:")));
-        new ViewModelListCellFactory<PushToApplication>()
-                .withText(application -> application.getApplicationName())
-                .withIcon(application -> application.getIcon())
-                .install(pushToApplicationComboBox);
-        pushToApplicationComboBox.getItems().addAll(frame.getPushToApplicationsManager().getApplications());
-        pushToApplicationHBox.getChildren().add(pushToApplicationComboBox);
-        pushToApplicationHBox.getChildren().add(pushToApplicationSettingsButton);
-        builder.add(pushToApplicationHBox, 1, 10);
-
-        // Cite command configuration
-        HBox citeCommandBox = new HBox();
-        citeCommandBox.setSpacing(10);
-        citeCommandBox.setAlignment(Pos.CENTER_LEFT);
-        Label citeCommandLabel = new Label(Localization.lang("Cite command") + ':');
-        citeCommandBox.getChildren().setAll(citeCommandLabel, citeCommand, editFileTypes);
-        builder.add(citeCommandBox, 1, 12);
-
-        builder.add(new Separator(), 1, 16);
-
-        // Open console title
-        Label openConsole = new Label(Localization.lang("Open console"));
-        openConsole.getStyleClass().add("sectionHeader");
-        builder.add(openConsole, 1, 18);
-
-        builder.add(consoleOptionPanel, 1, 21);
-
-        builder.add(new Separator(), 1, 25);
-
-        // Open PDF title
-        Label openPdf = new Label(Localization.lang("Open PDF"));
-        openPdf.getStyleClass().add("sectionHeader");
-        builder.add(openPdf, 1, 27);
-
-        builder.add(pdfOptionPanel, 1, 29);
-
-        builder.add(new Separator(), 1, 33);
-
-        // Open file browser title
-        Label openFileBrowser = new Label(Localization.lang("Open File Browser"));
-        openFileBrowser.getStyleClass().add("sectionHeader");
-        builder.add(openFileBrowser,  1, 35);
-
-        builder.add(fileBrowserOptionPanel, 1, 36);
-
-    }
-
-    @Override
-    public Node getBuilder() {
-        return builder;
-    }
-
-    @Override
-    public void setValues() {
-
-        emailSubject.setText(prefs.get(JabRefPreferences.EMAIL_SUBJECT));
-        openFoldersOfAttachedFiles.setSelected(prefs.getBoolean(JabRefPreferences.OPEN_FOLDERS_OF_ATTACHED_FILES));
-
-        pushToApplicationComboBox.setValue(prefs.getActivePushToApplication(frame.getPushToApplicationsManager()));
-        citeCommand.setText(prefs.get(JabRefPreferences.CITE_COMMAND));
-
-        defaultConsole.setSelected(Globals.prefs.getBoolean(JabRefPreferences.USE_DEFAULT_CONSOLE_APPLICATION));
-        executeConsole.setSelected(!Globals.prefs.getBoolean(JabRefPreferences.USE_DEFAULT_CONSOLE_APPLICATION));
-
-        consoleCommand.setText(Globals.prefs.get(JabRefPreferences.CONSOLE_COMMAND));
-
-        defaultFileBrowser.setSelected(Globals.prefs.getBoolean(JabRefPreferences.USE_DEFAULT_FILE_BROWSER_APPLICATION));
-        executeFileBrowser.setSelected(!Globals.prefs.getBoolean(JabRefPreferences.USE_DEFAULT_FILE_BROWSER_APPLICATION));
-        fileBrowserCommand.setText(Globals.prefs.get(JabRefPreferences.FILE_BROWSER_COMMAND));
-
-        adobeAcrobatReaderPath.setText(Globals.prefs.get(JabRefPreferences.ADOBE_ACROBAT_COMMAND));
-        if (OS.WINDOWS) {
-            sumatraReaderPath.setText(Globals.prefs.get(JabRefPreferences.SUMATRA_PDF_COMMAND));
-
-            if (Globals.prefs.get(JabRefPreferences.USE_PDF_READER).equals(adobeAcrobatReaderPath.getText())) {
-                adobeAcrobatReader.setSelected(true);
-            } else if (Globals.prefs.get(JabRefPreferences.USE_PDF_READER).equals(sumatraReaderPath.getText())) {
-                sumatraReader.setSelected(true);
-            }
-        }
-
-        updateExecuteConsoleButtonAndFieldEnabledState();
-    }
-
-    @Override
-    public void storeSettings() {
-        prefs.put(JabRefPreferences.EMAIL_SUBJECT, emailSubject.getText());
-        prefs.putBoolean(JabRefPreferences.OPEN_FOLDERS_OF_ATTACHED_FILES, openFoldersOfAttachedFiles.isSelected());
-        prefs.setActivePushToApplication(pushToApplicationComboBox.getValue(), frame.getPushToApplicationsManager());
-        prefs.put(JabRefPreferences.CITE_COMMAND, citeCommand.getText());
-        prefs.putBoolean(JabRefPreferences.USE_DEFAULT_CONSOLE_APPLICATION, defaultConsole.isSelected());
-        prefs.put(JabRefPreferences.CONSOLE_COMMAND, consoleCommand.getText());
-        prefs.put(JabRefPreferences.ADOBE_ACROBAT_COMMAND, adobeAcrobatReaderPath.getText());
-
-        prefs.putBoolean(JabRefPreferences.USE_DEFAULT_FILE_BROWSER_APPLICATION, defaultFileBrowser.isSelected());
-        if (StringUtil.isNotBlank(fileBrowserCommand.getText())) {
-            prefs.put(JabRefPreferences.FILE_BROWSER_COMMAND, fileBrowserCommand.getText());
-        } else {
-            prefs.putBoolean(JabRefPreferences.USE_DEFAULT_FILE_BROWSER_APPLICATION, true); //default if no command specified
-        }
-        if (OS.WINDOWS) {
-            prefs.put(JabRefPreferences.SUMATRA_PDF_COMMAND, sumatraReaderPath.getText());
-        }
-        readerSelected();
-    }
-
-    @Override
-    public boolean validateSettings() {
-        return true;
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("External programs");
-    }
-
-    private void updateExecuteConsoleButtonAndFieldEnabledState() {
-        browseButton.setDisable(!executeConsole.isSelected());
-        consoleCommand.setDisable(!executeConsole.isSelected());
-    }
-
-    private void showPushToApplicationSettings() {
-        PushToApplicationsManager manager = frame.getPushToApplicationsManager();
-        PushToApplication selectedApplication = pushToApplicationComboBox.getValue();
-        PushToApplicationSettings settings = manager.getSettings(selectedApplication);
-        DialogPane dialogPane = new DialogPane();
-        dialogPane.setContent(settings.getSettingsPane());
-
-        dialogService.showCustomDialogAndWait(Localization.lang("Application settings"), dialogPane, ButtonType.OK, ButtonType.CANCEL).ifPresent(btn -> {
-            if (btn == ButtonType.OK) {
-                settings.storeSettings();
-            }
-        });
-    }
-
-    private void showConsoleChooser() {
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> consoleCommand.setText(file.toAbsolutePath().toString()));
-    }
-
-    private void showAdobeChooser() {
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> adobeAcrobatReaderPath.setText(file.toAbsolutePath().toString()));
-    }
-
-    private void showSumatraChooser() {
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> sumatraReaderPath.setText(file.toAbsolutePath().toString()));
-    }
-
-    private void showFileBrowserCommandChooser() {
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> fileBrowserCommand.setText(file.toAbsolutePath().toString()));
-    }
-
-    private void readerSelected() {
-        if (adobeAcrobatReader.isSelected()) {
-            prefs.put(JabRefPreferences.USE_PDF_READER, adobeAcrobatReaderPath.getText());
-        } else if (sumatraReader.isSelected()) {
-            prefs.put(JabRefPreferences.USE_PDF_READER, sumatraReaderPath.getText());
-        }
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTabView.java b/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
new file mode 100644
index 00000000000..87415f8f9e7
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
@@ -0,0 +1,141 @@
+package org.jabref.gui.preferences;
+
+import javax.inject.Inject;
+
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.push.PushToApplication;
+import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.JabRefPreferences;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class ExternalTabView extends VBox implements PrefsTab {
+
+    @FXML private TextField eMailReferenceSubject;
+    @FXML private CheckBox autoOpenAttachedFolders;
+
+    @FXML private ComboBox<PushToApplication> pushToApplicationCombo;
+    @FXML private TextField citeCommand;
+
+    @FXML private RadioButton useTerminalDefault;
+    @FXML private RadioButton useTerminalSpecial;
+    @FXML private TextField useTerminalCommand;
+
+    @FXML private RadioButton usePDFAcrobat;
+    @FXML private TextField usePDFAcrobatCommand;
+    @FXML private RadioButton usePDFSumatra;
+    @FXML private TextField usePDFSumatraCommand;
+
+    @FXML private RadioButton useFileBrowserDefault;
+    @FXML private RadioButton useFileBrowserSpecial;
+    @FXML private TextField useFileBrowserSpecialCommand;
+
+    @Inject private DialogService dialogService;
+    private final JabRefPreferences preferences;
+    private final JabRefFrame frame;
+
+    private ExternalTabViewModel viewModel;
+
+    public ExternalTabView(JabRefPreferences preferences, JabRefFrame frame) {
+        this.preferences = preferences;
+        this.frame = frame;
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    public void initialize() {
+        viewModel = new ExternalTabViewModel(dialogService, preferences, frame);
+
+        new ViewModelListCellFactory<PushToApplication>()
+                .withText(application -> application.getApplicationName())
+                .withIcon(application -> application.getIcon())
+                .install(pushToApplicationCombo);
+
+        eMailReferenceSubject.textProperty().bindBidirectional(viewModel.eMailReferenceSubjectProperty());
+        autoOpenAttachedFolders.selectedProperty().bindBidirectional(viewModel.autoOpenAttachedFoldersProperty());
+
+        pushToApplicationCombo.itemsProperty().bind(viewModel.pushToApplicationsListProperty());
+        pushToApplicationCombo.valueProperty().bindBidirectional(viewModel.selectedPushToApplication());
+        citeCommand.textProperty().bindBidirectional(viewModel.citeCommandProperty());
+
+        useTerminalDefault.selectedProperty().bindBidirectional(viewModel.useTerminalDefaultProperty());
+        useTerminalSpecial.selectedProperty().bindBidirectional(viewModel.useTerminalSpecialProperty());
+        useTerminalCommand.textProperty().bindBidirectional(viewModel.useTerminalCommandProperty());
+
+        usePDFAcrobat.selectedProperty().bindBidirectional(viewModel.usePDFAcrobatProperty());
+        usePDFAcrobatCommand.textProperty().bindBidirectional(viewModel.usePDFAcrobatCommandProperty());
+        usePDFSumatra.selectedProperty().bindBidirectional(viewModel.usePDFSumatraProperty());
+        usePDFSumatraCommand.textProperty().bindBidirectional(viewModel.usePDFSumatraCommandProperty());
+
+        useFileBrowserDefault.selectedProperty().bindBidirectional(viewModel.useFileBrowserDefaultProperty());
+        useFileBrowserSpecial.selectedProperty().bindBidirectional(viewModel.useFileBrowserSpecialProperty());
+        useFileBrowserSpecialCommand.textProperty().bindBidirectional(viewModel.useFileBrowserSpecialCommandProperty());
+    }
+
+    @FXML
+    void pushToApplicationSettings() {
+        viewModel.pushToApplicationSettings();
+    }
+
+    @FXML
+    void manageExternalFileTypes() {
+        viewModel.manageExternalFileTypes();
+    }
+
+    @FXML
+    void useTerminalCommandBrowse() {
+        viewModel.useTerminalCommandBrowse();
+    }
+
+    @FXML
+    void usePDFAcrobatCommandBrowse() {
+        viewModel.usePDFAcrobatCommandBrowse();
+    }
+
+    @FXML
+    void usePDFSumatraCommandBrowse() {
+        viewModel.usePDFSumatraCommandBrowse();
+    }
+
+    @FXML
+    void useFileBrowserSpecialCommandBrowse() {
+        viewModel.useFileBrowserSpecialCommandBrowse();
+    }
+
+    @Override
+    public Node getBuilder() {
+        return this;
+    }
+
+    @Override
+    public void setValues() {
+
+    }
+
+    @Override
+    public void storeSettings() {
+        viewModel.storeSettings();
+    }
+
+    @Override
+    public boolean validateSettings() {
+        return viewModel.validateSettings();
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("External programs");
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
new file mode 100644
index 00000000000..9791c4f656e
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
@@ -0,0 +1,203 @@
+package org.jabref.gui.preferences;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.DialogPane;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.externalfiletype.EditExternalFileTypesAction;
+import org.jabref.gui.push.PushToApplication;
+import org.jabref.gui.push.PushToApplicationSettings;
+import org.jabref.gui.push.PushToApplicationsManager;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.OS;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.JabRefPreferences;
+
+public class ExternalTabViewModel implements PreferenceTabViewModel {
+
+    private final StringProperty eMailReferenceSubjectProperty = new SimpleStringProperty("");
+    private final BooleanProperty autoOpenAttachedFoldersProperty = new SimpleBooleanProperty();
+
+    private final ListProperty<PushToApplication> pushToApplicationsListProperty = new SimpleListProperty<>();
+    private final ObjectProperty<PushToApplication> selectedPushToApplicationProperty = new SimpleObjectProperty<>();
+    private final StringProperty citeCommandProperty = new SimpleStringProperty("");
+
+    private final BooleanProperty useTerminalDefaultProperty = new SimpleBooleanProperty();
+    private final BooleanProperty useTerminalSpecialProperty = new SimpleBooleanProperty();
+    private final StringProperty useTerminalCommandProperty = new SimpleStringProperty("");
+
+    private final BooleanProperty usePDFAcrobatProperty = new SimpleBooleanProperty();
+    private final StringProperty usePDFAcrobatCommandProperty = new SimpleStringProperty("");
+    private final BooleanProperty usePDFSumatraProperty = new SimpleBooleanProperty();
+    private final StringProperty usePDFSumatraCommandProperty = new SimpleStringProperty("");
+
+    private final BooleanProperty useFileBrowserDefaultProperty = new SimpleBooleanProperty();
+    private final BooleanProperty useFileBrowserSpecialProperty = new SimpleBooleanProperty();
+    private final StringProperty useFileBrowserSpecialCommandProperty = new SimpleStringProperty("");
+
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
+    private final JabRefFrame frame;
+
+    private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().build();
+
+    public ExternalTabViewModel(DialogService dialogService, JabRefPreferences preferences, JabRefFrame frame) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        this.frame = frame;
+
+        setValues();
+    }
+
+    public void setValues() {
+
+        eMailReferenceSubjectProperty.setValue(preferences.get(JabRefPreferences.EMAIL_SUBJECT));
+        autoOpenAttachedFoldersProperty.setValue(preferences.getBoolean(JabRefPreferences.OPEN_FOLDERS_OF_ATTACHED_FILES));
+
+        pushToApplicationsListProperty.setValue(FXCollections.observableArrayList(frame.getPushToApplicationsManager().getApplications()));
+        selectedPushToApplicationProperty.setValue(preferences.getActivePushToApplication(frame.getPushToApplicationsManager()));
+        citeCommandProperty.setValue(preferences.get(JabRefPreferences.CITE_COMMAND));
+
+        useTerminalDefaultProperty.setValue(preferences.getBoolean(JabRefPreferences.USE_DEFAULT_CONSOLE_APPLICATION));
+        useTerminalCommandProperty.setValue(preferences.get(JabRefPreferences.CONSOLE_COMMAND));
+        useTerminalSpecialProperty.setValue(!preferences.getBoolean(JabRefPreferences.USE_DEFAULT_CONSOLE_APPLICATION));
+
+        usePDFAcrobatCommandProperty.setValue(preferences.get(JabRefPreferences.ADOBE_ACROBAT_COMMAND));
+        if (OS.WINDOWS) {
+            usePDFSumatraCommandProperty.setValue(preferences.get(JabRefPreferences.SUMATRA_PDF_COMMAND));
+
+            if (preferences.get(JabRefPreferences.USE_PDF_READER).equals(usePDFAcrobatCommandProperty.getValue())) {
+                usePDFAcrobatProperty.setValue(true);
+            } else if (preferences.get(JabRefPreferences.USE_PDF_READER).equals(usePDFSumatraCommandProperty.getValue())) {
+                usePDFSumatraProperty.setValue(true);
+            }
+        }
+
+        useFileBrowserDefaultProperty.setValue(preferences.getBoolean(JabRefPreferences.USE_DEFAULT_FILE_BROWSER_APPLICATION));
+        useFileBrowserSpecialProperty.setValue(!preferences.getBoolean(JabRefPreferences.USE_DEFAULT_FILE_BROWSER_APPLICATION));
+        useFileBrowserSpecialCommandProperty.setValue(preferences.get(JabRefPreferences.FILE_BROWSER_COMMAND));
+    }
+
+    public void storeSettings() {
+        preferences.put(JabRefPreferences.EMAIL_SUBJECT, eMailReferenceSubjectProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.OPEN_FOLDERS_OF_ATTACHED_FILES, autoOpenAttachedFoldersProperty.getValue());
+
+        preferences.setActivePushToApplication(selectedPushToApplicationProperty.getValue(), frame.getPushToApplicationsManager());
+        preferences.put(JabRefPreferences.CITE_COMMAND, citeCommandProperty.getValue());
+
+        preferences.putBoolean(JabRefPreferences.USE_DEFAULT_CONSOLE_APPLICATION, useTerminalDefaultProperty.getValue());
+        preferences.put(JabRefPreferences.CONSOLE_COMMAND, useTerminalCommandProperty.getValue());
+
+        preferences.put(JabRefPreferences.ADOBE_ACROBAT_COMMAND, usePDFAcrobatCommandProperty.getValue());
+        if (OS.WINDOWS) {
+            preferences.put(JabRefPreferences.SUMATRA_PDF_COMMAND, usePDFSumatraCommandProperty.getValue());
+        }
+        if (usePDFAcrobatProperty.getValue()) {
+            preferences.put(JabRefPreferences.USE_PDF_READER, usePDFAcrobatCommandProperty.getValue());
+        } else if (usePDFSumatraProperty.getValue()) {
+            preferences.put(JabRefPreferences.USE_PDF_READER, usePDFSumatraCommandProperty.getValue());
+        }
+
+        preferences.putBoolean(JabRefPreferences.USE_DEFAULT_FILE_BROWSER_APPLICATION, useFileBrowserDefaultProperty.getValue());
+        if (StringUtil.isNotBlank(useFileBrowserSpecialCommandProperty.getValue())) {
+            preferences.put(JabRefPreferences.FILE_BROWSER_COMMAND, useFileBrowserSpecialCommandProperty.getValue());
+        } else {
+            preferences.putBoolean(JabRefPreferences.USE_DEFAULT_FILE_BROWSER_APPLICATION, true); //default if no command specified
+        }
+    }
+
+    public boolean validateSettings() {
+        return true;
+    }
+
+    public void pushToApplicationSettings() {
+        PushToApplicationsManager manager = frame.getPushToApplicationsManager();
+        PushToApplication selectedApplication = selectedPushToApplicationProperty.getValue();
+        PushToApplicationSettings settings = manager.getSettings(selectedApplication);
+
+        DialogPane dialogPane = new DialogPane();
+        dialogPane.setContent(settings.getSettingsPane());
+
+        dialogService.showCustomDialogAndWait(
+                Localization.lang("Application settings"),
+                dialogPane,
+                ButtonType.OK, ButtonType.CANCEL)
+                     .ifPresent(btn -> {
+                                 if (btn == ButtonType.OK) {
+                                     settings.storeSettings();
+                                 }
+                             }
+                     );
+    }
+
+    public void manageExternalFileTypes() {
+        new EditExternalFileTypesAction().execute();
+    }
+
+    public void useTerminalCommandBrowse() {
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> useTerminalCommandProperty.setValue(file.toAbsolutePath().toString()));
+    }
+
+    public void usePDFAcrobatCommandBrowse() {
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> usePDFAcrobatCommandProperty.setValue(file.toAbsolutePath().toString()));
+    }
+
+    public void usePDFSumatraCommandBrowse() {
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> usePDFSumatraCommandProperty.setValue(file.toAbsolutePath().toString()));
+    }
+
+    public void useFileBrowserSpecialCommandBrowse() {
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> useFileBrowserSpecialCommandProperty.setValue(file.toAbsolutePath().toString()));
+    }
+
+    // EMail
+
+    public StringProperty eMailReferenceSubjectProperty() { return this.eMailReferenceSubjectProperty; }
+
+    public BooleanProperty autoOpenAttachedFoldersProperty() { return this.autoOpenAttachedFoldersProperty; }
+
+    // Push-To-Application
+
+    public ListProperty<PushToApplication> pushToApplicationsListProperty() { return this.pushToApplicationsListProperty; }
+
+    public ObjectProperty<PushToApplication> selectedPushToApplication() { return this.selectedPushToApplicationProperty; }
+
+    public StringProperty citeCommandProperty() { return this.citeCommandProperty; }
+
+    // Open console
+
+    public BooleanProperty useTerminalDefaultProperty() { return this.useTerminalDefaultProperty; }
+
+    public BooleanProperty useTerminalSpecialProperty() { return this.useTerminalSpecialProperty; }
+
+    public StringProperty useTerminalCommandProperty() { return this.useTerminalCommandProperty; }
+
+    // Open PDF
+
+    public BooleanProperty usePDFAcrobatProperty() { return this.usePDFAcrobatProperty; }
+
+    public StringProperty usePDFAcrobatCommandProperty() { return this.usePDFAcrobatCommandProperty; }
+
+    public BooleanProperty usePDFSumatraProperty() { return this.usePDFSumatraProperty; }
+
+    public StringProperty usePDFSumatraCommandProperty() { return this.usePDFSumatraCommandProperty; }
+
+    // Open File Browser
+
+    public BooleanProperty useFileBrowserDefaultProperty() { return this.useFileBrowserDefaultProperty; }
+
+    public BooleanProperty useFileBrowserSpecialProperty() { return this.useFileBrowserSpecialProperty; }
+
+    public StringProperty useFileBrowserSpecialCommandProperty() { return this.useFileBrowserSpecialCommandProperty; }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.fxml b/src/main/java/org/jabref/gui/preferences/FileTab.fxml
new file mode 100644
index 00000000000..3eec679c4f4
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/FileTab.fxml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<fx:root prefWidth="650.0" spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
+         fx:controller="org.jabref.gui.preferences.FileTabView">
+    <fx:define>
+        <ToggleGroup fx:id="stringsResolveToggleGroup"/>
+        <ToggleGroup fx:id="autolinkToggleGroup"/>
+    </fx:define>
+    <children>
+        <Label styleClass="sectionHeader" text="%General"/>
+        <CheckBox fx:id="openLastStartup" text="%Open last edited libraries at startup"/>
+        <CheckBox fx:id="backupOldFile" text="%Backup old file when saving"/>
+        <HBox alignment="CENTER_LEFT" spacing="10.0">
+            <children>
+                <Label text="%Do not wrap the following fields when saving"/>
+                <TextField fx:id="noWrapFiles" HBox.hgrow="ALWAYS"/>
+            </children>
+        </HBox>
+        <RadioButton fx:id="resolveStringsBibTex" text="%Resolve strings for standard BibTeX fields only"
+                     toggleGroup="$stringsResolveToggleGroup"/>
+        <HBox alignment="CENTER_LEFT" spacing="10.0">
+            <children>
+                <RadioButton fx:id="resolveStringsAll" alignment="TOP_LEFT" maxWidth="Infinity"
+                             text="%Resolve strings for all fields except" toggleGroup="$stringsResolveToggleGroup"/>
+                <TextField fx:id="resolveStringsExcept" disable="${!resolveStringsAll.selected}" HBox.hgrow="ALWAYS"/>
+            </children>
+        </HBox>
+        <HBox alignment="CENTER_LEFT" spacing="10.0">
+            <children>
+                <Label alignment="TOP_LEFT" text="%Newline separator"/>
+                <ComboBox fx:id="newLineSeparator" prefWidth="120.0"/>
+            </children>
+        </HBox>
+        <CheckBox fx:id="alwaysReformatBib" text="%Always reformat BIB file on save and export"/>
+        <Label styleClass="sectionHeader" text="%External file links"/>
+        <HBox alignment="CENTER_LEFT" spacing="10.0">
+            <children>
+                <Label text="%Main file directory"/>
+                <TextField fx:id="mainFileDir" HBox.hgrow="ALWAYS"/>
+                <Button onAction="#mainFileDirBrowse" text="%Browse"/>
+            </children>
+        </HBox>
+        <CheckBox fx:id="useBibLocationAsPrimary" text="%Use the BIB file location as primary file directory">
+            <tooltip>
+                <Tooltip
+                        text="%When downloading files, or moving linked files to the file directory, prefer the BIB file location rather than the file directory set above"/>
+            </tooltip>
+        </CheckBox>
+        <RadioButton fx:id="autolinkFileStartsBibtex" text="%Autolink files with names starting with the BibTeX key"
+                     toggleGroup="$autolinkToggleGroup"/>
+        <RadioButton fx:id="autolinkFileExactBibtex" text="%Autolink only files that match the BibTeX key"
+                     toggleGroup="$autolinkToggleGroup"/>
+        <HBox alignment="CENTER_LEFT" spacing="10.0">
+            <children>
+                <RadioButton fx:id="autolinkUseRegex" text="%Use regular expression search"
+                             toggleGroup="$autolinkToggleGroup"/>
+                <TextField fx:id="autolinkRegexKey" disable="${!autolinkUseRegex.selected}" HBox.hgrow="ALWAYS"/>
+                <Button fx:id="autolinkRegexHelp"/>
+            </children>
+        </HBox>
+        <CheckBox fx:id="searchFilesOnOpen"
+                  text="%When opening file link, search for matching file if no link is defined"/>
+        <CheckBox fx:id="openBrowseOnCreate" text="%Automatically open browse dialog when creating new file link"/>
+        <Label styleClass="sectionHeader" text="%Autosave"/>
+        <HBox alignment="CENTER_LEFT" spacing="10.0">
+            <children>
+                <CheckBox fx:id="autosaveLocalLibraries" text="%Autosave local libraries"/>
+                <Button fx:id="autosaveLocalLibrariesHelp"/>
+            </children>
+        </HBox>
+    </children>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/FileTab.java b/src/main/java/org/jabref/gui/preferences/FileTab.java
deleted file mode 100644
index 6f005da305a..00000000000
--- a/src/main/java/org/jabref/gui/preferences/FileTab.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package org.jabref.gui.preferences;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import javafx.collections.FXCollections;
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.Separator;
-import javafx.scene.control.TextField;
-import javafx.scene.control.ToggleGroup;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.actions.ActionFactory;
-import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.util.DirectoryDialogConfiguration;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.OS;
-import org.jabref.model.entry.FieldName;
-import org.jabref.model.metadata.FilePreferences;
-import org.jabref.preferences.JabRefPreferences;
-
-/**
- * Preferences tab for file options. These options were moved out from GeneralTab to
- * resolve the space issue.
- */
-class FileTab extends Pane implements PrefsTab {
-
-    private final DialogService dialogService;
-    private final JabRefPreferences prefs;
-
-    private final CheckBox backup;
-    private final CheckBox localAutoSave;
-    private final CheckBox openLast;
-    private final ComboBox<String> newlineSeparator;
-    private final CheckBox reformatFileOnSaveAndExport;
-    private final RadioButton resolveStringsStandard;
-    private final RadioButton resolveStringsAll;
-    private final TextField nonWrappableFields;
-    private final TextField doNotResolveStringsFor;
-    private final GridPane builder = new GridPane();
-
-    private final TextField fileDir;
-    private final CheckBox bibLocAsPrimaryDir;
-    private final CheckBox runAutoFileSearch;
-    private final CheckBox allowFileAutoOpenBrowse;
-    private final RadioButton useRegExpComboBox;
-    private final RadioButton matchExactKeyOnly = new RadioButton(
-                                                                  Localization.lang("Autolink only files that match the BibTeX key"));
-    private final RadioButton matchStartsWithKey = new RadioButton(
-                                                                   Localization.lang("Autolink files with names starting with the BibTeX key"));
-    private final TextField regExpTextField;
-
-    public FileTab(DialogService dialogService, JabRefPreferences prefs) {
-        this.dialogService = dialogService;
-        this.prefs = prefs;
-        builder.setVgap(7);
-
-        ActionFactory factory = new ActionFactory(prefs.getKeyBindingRepository());
-        bibLocAsPrimaryDir = new CheckBox(Localization.lang("Use the BIB file location as primary file directory"));
-        bibLocAsPrimaryDir.setAccessibleText(Localization.lang("When downloading files, or moving linked files to the "
-                                                               + "file directory, prefer the BIB file location rather than the file directory set above"));
-
-        runAutoFileSearch = new CheckBox(Localization.lang("When opening file link, search for matching file if no link is defined"));
-        allowFileAutoOpenBrowse = new CheckBox(Localization.lang("Automatically open browse dialog when creating new file link"));
-        regExpTextField = new TextField();
-        useRegExpComboBox = new RadioButton(Localization.lang("Use regular expression search"));
-        useRegExpComboBox.setOnAction(e -> regExpTextField.setEditable(useRegExpComboBox.isSelected()));
-
-        openLast = new CheckBox(Localization.lang("Open last edited libraries at startup"));
-        backup = new CheckBox(Localization.lang("Backup old file when saving"));
-        localAutoSave = new CheckBox(Localization.lang("Autosave local libraries"));
-        resolveStringsAll = new RadioButton(Localization.lang("Resolve strings for all fields except") + ":");
-        resolveStringsStandard = new RadioButton(Localization.lang("Resolve strings for standard BibTeX fields only"));
-
-        // This is sort of a quick hack
-        newlineSeparator = new ComboBox<>(FXCollections.observableArrayList("CR", "CR/LF", "LF"));
-
-        reformatFileOnSaveAndExport = new CheckBox(Localization.lang("Always reformat BIB file on save and export"));
-
-        nonWrappableFields = new TextField();
-        doNotResolveStringsFor = new TextField();
-        nonWrappableFields.setPrefSize(80, 25);
-        doNotResolveStringsFor.setPrefSize(80, 25);
-        builder.setPrefSize(800, 600);
-
-        Label general = new Label(Localization.lang("General"));
-        general.getStyleClass().add("sectionHeader");
-        builder.add(general, 1, 1);
-        builder.add(openLast, 1, 2);
-        builder.add(backup, 1, 3);
-
-        HBox notWrapBox = new HBox();
-        notWrapBox.setSpacing(15);
-        notWrapBox.setAlignment(Pos.CENTER_LEFT);
-        Label label = new Label(Localization.lang("Do not wrap the following fields when saving") + ":");
-        notWrapBox.getChildren().setAll(label, nonWrappableFields);
-        builder.add(notWrapBox, 1, 4);
-
-        final ToggleGroup resolveGroup = new ToggleGroup();
-        builder.add(resolveStringsStandard, 1, 5);
-        builder.add(resolveStringsAll, 1, 6);
-        builder.add(doNotResolveStringsFor, 2, 6);
-        resolveStringsStandard.setToggleGroup(resolveGroup);
-        resolveStringsAll.setToggleGroup(resolveGroup);
-        Label newlineSeparatorLabel = new Label(Localization.lang("Newline separator") + ":");
-        builder.add(newlineSeparatorLabel, 1, 7);
-        builder.add(newlineSeparator, 2, 7);
-        builder.add(reformatFileOnSaveAndExport, 1, 8);
-
-        builder.add(new Separator(), 1, 13);
-        Label externalFileLinks = new Label(Localization.lang("External file links"));
-        externalFileLinks.getStyleClass().add("sectionHeader");
-        builder.add(externalFileLinks, 1, 14);
-
-        // Main File Directory choice
-        HBox mainFileDirectoryBox = new HBox();
-        mainFileDirectoryBox.setSpacing(10);
-        mainFileDirectoryBox.setAlignment(Pos.CENTER_LEFT);
-        fileDir = new TextField();
-        label = new Label(Localization.lang("Main file directory") + ':');
-        Button browse = new Button(Localization.lang("Browse"));
-        browse.setPrefSize(80, 20);
-        browse.setOnAction(e -> {
-            DirectoryDialogConfiguration dirDialogConfiguration =
-                    new DirectoryDialogConfiguration.Builder().withInitialDirectory(Paths.get(fileDir.getText())).build();
-            dialogService.showDirectorySelectionDialog(dirDialogConfiguration)
-                    .ifPresent(f -> fileDir.setText(f.toString()));
-        });
-        mainFileDirectoryBox.getChildren().setAll(label, fileDir, browse);
-        builder.add(mainFileDirectoryBox, 1, 15);
-
-        builder.add(bibLocAsPrimaryDir, 1, 16);
-        final ToggleGroup autolinkGroup = new ToggleGroup();
-        builder.add(matchStartsWithKey, 1, 17);
-        builder.add(matchExactKeyOnly, 1, 18);
-        builder.add(useRegExpComboBox, 1, 19);
-        builder.add(regExpTextField, 2, 19);
-        matchStartsWithKey.setToggleGroup(autolinkGroup);
-        matchExactKeyOnly.setToggleGroup(autolinkGroup);
-        useRegExpComboBox.setToggleGroup(autolinkGroup);
-
-        Button help = factory.createIconButton(StandardActions.HELP_REGEX_SEARCH, new HelpAction(HelpFile.REGEX_SEARCH));
-        builder.add(help, 3, 16);
-        builder.add(runAutoFileSearch, 1, 21);
-        builder.add(allowFileAutoOpenBrowse, 1, 22);
-
-        builder.add(new Separator(), 1, 25);
-        Label autosave = new Label(Localization.lang("Autosave"));
-        autosave.getStyleClass().add("sectionHeader");
-        builder.add(autosave, 1, 27);
-
-        HBox saveAutosaveBox = new HBox();
-        saveAutosaveBox.setSpacing(7);
-        saveAutosaveBox.setAlignment(Pos.CENTER_LEFT);
-        Button helpAutosave = factory.createIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE));
-        saveAutosaveBox.getChildren().setAll(localAutoSave, helpAutosave);
-        builder.add(saveAutosaveBox, 1, 28);
-    }
-
-    @Override
-    public void setValues() {
-        fileDir.setText(prefs.getAsOptional(FieldName.FILE + FilePreferences.DIR_SUFFIX).orElse(""));
-        bibLocAsPrimaryDir.setSelected(prefs.getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR));
-        runAutoFileSearch.setSelected(prefs.getBoolean(JabRefPreferences.RUN_AUTOMATIC_FILE_SEARCH));
-        allowFileAutoOpenBrowse.setSelected(prefs.getBoolean(JabRefPreferences.ALLOW_FILE_AUTO_OPEN_BROWSE));
-        regExpTextField.setText(prefs.get(JabRefPreferences.AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY));
-        if (prefs.getBoolean(JabRefPreferences.AUTOLINK_USE_REG_EXP_SEARCH_KEY)) {
-            useRegExpComboBox.setSelected(true);
-        } else if (prefs.getBoolean(JabRefPreferences.AUTOLINK_EXACT_KEY_ONLY)) {
-            matchExactKeyOnly.setSelected(true);
-        } else {
-            matchStartsWithKey.setSelected(true);
-        }
-
-        openLast.setSelected(prefs.getBoolean(JabRefPreferences.OPEN_LAST_EDITED));
-        backup.setSelected(prefs.getBoolean(JabRefPreferences.BACKUP));
-
-        String newline = prefs.get(JabRefPreferences.NEWLINE);
-        if ("\r".equals(newline)) {
-            newlineSeparator.setValue("CR");
-        } else if ("\n".equals(newline)) {
-            newlineSeparator.setValue("LF");
-        } else {
-            // fallback: windows standard
-            newlineSeparator.setValue("CR/LF");
-        }
-        reformatFileOnSaveAndExport.setSelected(prefs.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT));
-
-        resolveStringsAll.setSelected(prefs.getBoolean(JabRefPreferences.RESOLVE_STRINGS_ALL_FIELDS));
-        resolveStringsStandard.setSelected(!resolveStringsAll.isSelected());
-        doNotResolveStringsFor.setText(prefs.get(JabRefPreferences.DO_NOT_RESOLVE_STRINGS_FOR));
-        nonWrappableFields.setText(prefs.get(JabRefPreferences.NON_WRAPPABLE_FIELDS));
-
-        localAutoSave.setSelected(prefs.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE));
-    }
-
-    @Override
-    public Node getBuilder() {
-        return builder;
-    }
-
-    @Override
-    public void storeSettings() {
-        prefs.put(FieldName.FILE + FilePreferences.DIR_SUFFIX, fileDir.getText());
-        prefs.putBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR, bibLocAsPrimaryDir.isSelected());
-        prefs.putBoolean(JabRefPreferences.RUN_AUTOMATIC_FILE_SEARCH, runAutoFileSearch.isSelected());
-        prefs.putBoolean(JabRefPreferences.ALLOW_FILE_AUTO_OPEN_BROWSE, allowFileAutoOpenBrowse.isSelected());
-        prefs.putBoolean(JabRefPreferences.AUTOLINK_USE_REG_EXP_SEARCH_KEY, useRegExpComboBox.isSelected());
-        prefs.putBoolean(JabRefPreferences.AUTOLINK_EXACT_KEY_ONLY, matchExactKeyOnly.isSelected());
-        if (useRegExpComboBox.isSelected()) {
-            prefs.put(JabRefPreferences.AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY, regExpTextField.getText());
-        }
-
-        String newline;
-        switch (newlineSeparator.getValue()) {
-            case "CR":
-                newline = "\r";
-                break;
-            case "LF":
-                newline = "\n";
-                break;
-            default:
-                newline = "\r\n";
-                break;
-        }
-        prefs.put(JabRefPreferences.NEWLINE, newline);
-        // we also have to change Globals variable as globals is not a getter, but a constant
-        OS.NEWLINE = newline;
-
-        prefs.putBoolean(JabRefPreferences.BACKUP, backup.isSelected());
-
-        prefs.putBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT, reformatFileOnSaveAndExport.isSelected());
-        prefs.putBoolean(JabRefPreferences.OPEN_LAST_EDITED, openLast.isSelected());
-        prefs.putBoolean(JabRefPreferences.RESOLVE_STRINGS_ALL_FIELDS, resolveStringsAll.isSelected());
-        prefs.put(JabRefPreferences.DO_NOT_RESOLVE_STRINGS_FOR, doNotResolveStringsFor.getText().trim());
-        doNotResolveStringsFor.setText(prefs.get(JabRefPreferences.DO_NOT_RESOLVE_STRINGS_FOR));
-
-        if (!nonWrappableFields.getText().trim().equals(prefs.get(JabRefPreferences.NON_WRAPPABLE_FIELDS))) {
-            prefs.put(JabRefPreferences.NON_WRAPPABLE_FIELDS, nonWrappableFields.getText());
-        }
-
-        prefs.putBoolean(JabRefPreferences.LOCAL_AUTO_SAVE, localAutoSave.isSelected());
-    }
-
-    @Override
-    public boolean validateSettings() {
-        Path path = Paths.get(fileDir.getText());
-        boolean valid = Files.exists(path) && Files.isDirectory(path);
-        if (!valid) {
-            dialogService.showErrorDialogAndWait(
-                                                 String.format("%s -> %s %n %n %s: %n %s", Localization.lang("File"),
-                                                               Localization.lang("Main file directory"), Localization.lang("Directory not found"), path));
-        }
-        return valid;
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("File");
-    }
-
-}
diff --git a/src/main/java/org/jabref/gui/preferences/FileTabView.java b/src/main/java/org/jabref/gui/preferences/FileTabView.java
new file mode 100644
index 00000000000..c980e561518
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/FileTabView.java
@@ -0,0 +1,127 @@
+package org.jabref.gui.preferences;
+
+import javax.inject.Inject;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
+
+import org.jabref.Globals;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.NewLineSeparator;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+public class FileTabView extends VBox implements PrefsTab {
+
+    @FXML private CheckBox openLastStartup;
+    @FXML private CheckBox backupOldFile;
+    @FXML private TextField noWrapFiles;
+    @FXML private RadioButton resolveStringsBibTex;
+    @FXML private RadioButton resolveStringsAll;
+    @FXML private TextField resolveStringsExcept;
+    @FXML private ComboBox<NewLineSeparator> newLineSeparator;
+    @FXML private CheckBox alwaysReformatBib;
+
+    @FXML private TextField mainFileDir;
+    @FXML private CheckBox useBibLocationAsPrimary;
+    @FXML private Button autolinkRegexHelp;
+    @FXML private RadioButton autolinkFileStartsBibtex;
+    @FXML private RadioButton autolinkFileExactBibtex;
+    @FXML private RadioButton autolinkUseRegex;
+    @FXML private TextField autolinkRegexKey;
+    @FXML private CheckBox searchFilesOnOpen;
+    @FXML private CheckBox openBrowseOnCreate;
+
+    @FXML private CheckBox autosaveLocalLibraries;
+    @FXML private Button autosaveLocalLibrariesHelp;
+
+    @Inject private DialogService dialogService;
+    private final JabRefPreferences preferences;
+
+    private FileTabViewModel viewModel;
+
+    private ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+
+    public FileTabView(JabRefPreferences preferences) {
+        this.preferences = preferences;
+        ViewLoader.view(this)
+                .root(this)
+                .load();
+    }
+
+    public void initialize() {
+        viewModel = new FileTabViewModel(dialogService, preferences);
+
+        openLastStartup.selectedProperty().bindBidirectional(viewModel.openLastStartupProperty());
+        backupOldFile.selectedProperty().bindBidirectional(viewModel.backupOldFileProperty());
+        noWrapFiles.textProperty().bindBidirectional(viewModel.noWrapFilesProperty());
+        resolveStringsBibTex.selectedProperty().bindBidirectional(viewModel.resolveStringsBibTexProperty());
+        resolveStringsAll.selectedProperty().bindBidirectional(viewModel.resolveStringsAllProperty());
+        resolveStringsExcept.textProperty().bindBidirectional(viewModel.resolvStringsExceptProperty());
+        newLineSeparator.itemsProperty().bind(viewModel.newLineSeparatorListProperty());
+        newLineSeparator.valueProperty().bindBidirectional(viewModel.selectedNewLineSeparatorProperty());
+        alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
+
+        mainFileDir.textProperty().bindBidirectional(viewModel.mainFileDirProperty());
+        useBibLocationAsPrimary.selectedProperty().bindBidirectional(viewModel.useBibLocationAsPrimaryProperty());
+        autolinkFileStartsBibtex.selectedProperty().bindBidirectional(viewModel.autolinkFileStartsBibtexProperty());
+        autolinkFileExactBibtex.selectedProperty().bindBidirectional(viewModel.autolinkFileExactBibtexProperty());
+        autolinkUseRegex.selectedProperty().bindBidirectional(viewModel.autolinkUseRegexProperty());
+        autolinkRegexKey.textProperty().bindBidirectional(viewModel.autolinkRegexKeyProperty());
+        searchFilesOnOpen.selectedProperty().bindBidirectional(viewModel.searchFilesOnOpenProperty());
+        openBrowseOnCreate.selectedProperty().bindBidirectional(viewModel.openBrowseOnCreateProperty());
+
+        autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
+
+        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+        actionFactory.configureIconButton(StandardActions.HELP_REGEX_SEARCH, new HelpAction(HelpFile.REGEX_SEARCH), autolinkRegexHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE), autosaveLocalLibrariesHelp);
+
+        validationVisualizer.setDecoration(new IconValidationDecorator());
+        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.mainFileDirValidationStatus(), mainFileDir));
+    }
+
+    @Override
+    public Node getBuilder() {
+        return this;
+    }
+
+    @Override
+    public void setValues() {
+        // Done by bindings
+    }
+
+    @Override
+    public void storeSettings() {
+        viewModel.storeSettings();
+    }
+
+    @Override
+    public boolean validateSettings() {
+        return viewModel.validateSettings();
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("File");
+    }
+
+    public void mainFileDirBrowse() {
+        viewModel.mainFileDirBrowse();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java b/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java
new file mode 100644
index 00000000000..56266c8fb20
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/FileTabViewModel.java
@@ -0,0 +1,192 @@
+package org.jabref.gui.preferences;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.util.DirectoryDialogConfiguration;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.entry.FieldName;
+import org.jabref.model.metadata.FilePreferences;
+import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.NewLineSeparator;
+
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+
+public class FileTabViewModel implements PreferenceTabViewModel {
+
+    private final BooleanProperty openLastStartupProperty = new SimpleBooleanProperty();
+    private final BooleanProperty backupOldFileProperty = new SimpleBooleanProperty();
+    private final StringProperty noWrapFilesProperty = new SimpleStringProperty("");
+    private final BooleanProperty resolveStringsBibTexProperty = new SimpleBooleanProperty();
+    private final BooleanProperty resolveStringsAllProperty = new SimpleBooleanProperty();
+    private final StringProperty resolveStringsExceptProperty = new SimpleStringProperty("");
+    private final ListProperty<NewLineSeparator> newLineSeparatorListProperty = new SimpleListProperty<>();
+    private final ObjectProperty<NewLineSeparator> selectedNewLineSeparatorProperty = new SimpleObjectProperty<>();
+    private final BooleanProperty alwaysReformatBibProperty = new SimpleBooleanProperty();
+
+    private final StringProperty mainFileDirProperty = new SimpleStringProperty("");
+    private final BooleanProperty useBibLocationAsPrimaryProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autolinkFileStartsBibtexProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autolinkFileExactBibtexProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autolinkUseRegexProperty = new SimpleBooleanProperty();
+    private final StringProperty autolinkRegexKeyProperty = new SimpleStringProperty("");
+    private final BooleanProperty searchFilesOnOpenProperty = new SimpleBooleanProperty();
+    private final BooleanProperty openBrowseOnCreateProperty = new SimpleBooleanProperty();
+
+    private final BooleanProperty autosaveLocalLibraries = new SimpleBooleanProperty();
+
+    private final FunctionBasedValidator mainFileDirValidator;
+
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
+
+    public FileTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        setValues();
+
+        mainFileDirValidator = new FunctionBasedValidator(
+                mainFileDirProperty,
+                input -> {
+                    Path path = Paths.get(mainFileDirProperty.getValue());
+                    return (Files.exists(path) && Files.isDirectory(path));
+                },
+                ValidationMessage.error(String.format("%s > %s > %s %n %n %s",
+                        Localization.lang("File"),
+                        Localization.lang("External file links"),
+                        Localization.lang("Main file directory"),
+                        Localization.lang("Directory not found")
+                        )
+                )
+        );
+    }
+
+    public void setValues() {
+        openLastStartupProperty.setValue(preferences.getBoolean(JabRefPreferences.OPEN_LAST_EDITED));
+        backupOldFileProperty.setValue(preferences.getBoolean(JabRefPreferences.BACKUP));
+        noWrapFilesProperty.setValue(preferences.get(JabRefPreferences.NON_WRAPPABLE_FIELDS));
+        resolveStringsAllProperty.setValue(preferences.getBoolean(JabRefPreferences.RESOLVE_STRINGS_ALL_FIELDS)); // Flipped around
+        resolveStringsBibTexProperty.setValue(!resolveStringsAllProperty.getValue());
+        resolveStringsExceptProperty.setValue(preferences.get(JabRefPreferences.DO_NOT_RESOLVE_STRINGS_FOR));
+        newLineSeparatorListProperty.setValue(FXCollections.observableArrayList(NewLineSeparator.values()));
+        selectedNewLineSeparatorProperty.setValue(preferences.getNewLineSeparator());
+        alwaysReformatBibProperty.setValue(preferences.getBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT));
+
+        mainFileDirProperty.setValue(preferences.getAsOptional(FieldName.FILE + FilePreferences.DIR_SUFFIX).orElse(""));
+        useBibLocationAsPrimaryProperty.setValue(preferences.getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR));
+        if (preferences.getBoolean(JabRefPreferences.AUTOLINK_USE_REG_EXP_SEARCH_KEY)) { // Flipped around
+            autolinkUseRegexProperty.setValue(true);
+        } else if (preferences.getBoolean(JabRefPreferences.AUTOLINK_EXACT_KEY_ONLY)) {
+            autolinkFileExactBibtexProperty.setValue(true);
+        } else {
+            autolinkFileStartsBibtexProperty.setValue(true);
+        }
+        autolinkRegexKeyProperty.setValue(preferences.get(JabRefPreferences.AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY));
+        searchFilesOnOpenProperty.setValue(preferences.getBoolean(JabRefPreferences.RUN_AUTOMATIC_FILE_SEARCH));
+        openBrowseOnCreateProperty.setValue(preferences.getBoolean(JabRefPreferences.ALLOW_FILE_AUTO_OPEN_BROWSE));
+
+        autosaveLocalLibraries.setValue(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE));
+    }
+
+    public void storeSettings() {
+        preferences.putBoolean(JabRefPreferences.OPEN_LAST_EDITED, openLastStartupProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.BACKUP, backupOldFileProperty.getValue());
+        if (!noWrapFilesProperty.getValue().trim().equals(preferences.get(JabRefPreferences.NON_WRAPPABLE_FIELDS))) {
+            preferences.put(JabRefPreferences.NON_WRAPPABLE_FIELDS, noWrapFilesProperty.getValue());
+        }
+        preferences.putBoolean(JabRefPreferences.RESOLVE_STRINGS_ALL_FIELDS, resolveStringsAllProperty.getValue());
+        preferences.put(JabRefPreferences.DO_NOT_RESOLVE_STRINGS_FOR, resolveStringsExceptProperty.getValue().trim());
+        resolveStringsExceptProperty.setValue(preferences.get(JabRefPreferences.DO_NOT_RESOLVE_STRINGS_FOR));
+        if (autolinkUseRegexProperty.getValue()) {
+            preferences.put(JabRefPreferences.AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY, autolinkRegexKeyProperty.getValue());
+        }
+        preferences.setNewLineSeparator(selectedNewLineSeparatorProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.REFORMAT_FILE_ON_SAVE_AND_EXPORT, alwaysReformatBibProperty.getValue());
+
+        preferences.put(FieldName.FILE + FilePreferences.DIR_SUFFIX, mainFileDirProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR, useBibLocationAsPrimaryProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.AUTOLINK_USE_REG_EXP_SEARCH_KEY, autolinkUseRegexProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.AUTOLINK_EXACT_KEY_ONLY, autolinkFileExactBibtexProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.RUN_AUTOMATIC_FILE_SEARCH, searchFilesOnOpenProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.ALLOW_FILE_AUTO_OPEN_BROWSE, openBrowseOnCreateProperty.getValue());
+
+        preferences.putBoolean(JabRefPreferences.LOCAL_AUTO_SAVE, autosaveLocalLibraries.getValue());
+    }
+
+    ValidationStatus mainFileDirValidationStatus() {
+        return mainFileDirValidator.getValidationStatus();
+    }
+
+    public boolean validateSettings() {
+        ValidationStatus status = mainFileDirValidationStatus();
+        if (!status.isValid()) {
+            dialogService.showErrorDialogAndWait(status.getHighestMessage().get().getMessage());
+            return false;
+        }
+        return true;
+    }
+
+    public void mainFileDirBrowse() {
+        DirectoryDialogConfiguration dirDialogConfiguration =
+                new DirectoryDialogConfiguration.Builder().withInitialDirectory(Paths.get(mainFileDirProperty.getValue())).build();
+        dialogService.showDirectorySelectionDialog(dirDialogConfiguration)
+                .ifPresent(f -> mainFileDirProperty.setValue(f.toString()));
+    }
+
+    // General
+
+    public BooleanProperty openLastStartupProperty() { return openLastStartupProperty; }
+
+    public BooleanProperty backupOldFileProperty() { return backupOldFileProperty; }
+
+    public StringProperty noWrapFilesProperty() { return noWrapFilesProperty; }
+
+    public BooleanProperty resolveStringsBibTexProperty() { return resolveStringsBibTexProperty; }
+
+    public BooleanProperty resolveStringsAllProperty() { return resolveStringsAllProperty; }
+
+    public StringProperty resolvStringsExceptProperty() { return resolveStringsExceptProperty; }
+
+    public ListProperty<NewLineSeparator> newLineSeparatorListProperty() { return newLineSeparatorListProperty; }
+
+    public ObjectProperty<NewLineSeparator> selectedNewLineSeparatorProperty() { return selectedNewLineSeparatorProperty; }
+
+    public BooleanProperty alwaysReformatBibProperty() { return alwaysReformatBibProperty; }
+
+    // External file links
+
+    public StringProperty mainFileDirProperty() { return mainFileDirProperty; }
+
+    public BooleanProperty useBibLocationAsPrimaryProperty() { return useBibLocationAsPrimaryProperty; }
+
+    public BooleanProperty autolinkFileStartsBibtexProperty() { return autolinkFileStartsBibtexProperty; }
+
+    public BooleanProperty autolinkFileExactBibtexProperty() { return autolinkFileExactBibtexProperty; }
+
+    public BooleanProperty autolinkUseRegexProperty() { return autolinkUseRegexProperty; }
+
+    public StringProperty autolinkRegexKeyProperty() { return autolinkRegexKeyProperty; }
+
+    public BooleanProperty searchFilesOnOpenProperty() { return searchFilesOnOpenProperty; }
+
+    public BooleanProperty openBrowseOnCreateProperty() { return openBrowseOnCreateProperty; }
+
+    // Autosave
+
+    public BooleanProperty autosaveLocalLibrariesProperty() { return autosaveLocalLibraries; }
+}
+
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
new file mode 100644
index 00000000000..63eb4929140
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+
+<fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/8.0.212"
+         xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.GeneralTabView">
+    <children>
+        <Label styleClass="sectionHeader" text="%General"/>
+        <GridPane>
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/>
+                <ColumnConstraints hgrow="SOMETIMES"/>
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="10.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="10.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+            </rowConstraints>
+            <children>
+                <Label text="%Language"/>
+                <ComboBox fx:id="language" prefWidth="200.0" GridPane.columnIndex="1"/>
+                <Label text="%Default encoding" GridPane.rowIndex="2"/>
+                <ComboBox fx:id="defaultEncoding" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+                <Label text="%Default bibliography mode" GridPane.rowIndex="4"/>
+                <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="4"/>
+            </children>
+        </GridPane>
+        <CheckBox fx:id="inspectionWarningDuplicate"
+                  text="%Warn about unresolved duplicates when closing inspection window"/>
+        <CheckBox fx:id="confirmDelete" text="%Show confirmation dialog when deleting entries"/>
+        <CheckBox fx:id="enforceLegalKeys" text="%Enforce legal characters in BibTeX keys"/>
+        <CheckBox fx:id="memoryStickMode"
+                  text="%Load and Save preferences from/to jabref.xml on start-up (memory stick mode)"/>
+        <CheckBox fx:id="collectTelemetry" text="%Collect and share telemetry data to help improve JabRef."/>
+        <CheckBox fx:id="showAdvancedHints"
+                  text="%Show advanced hints (i.e. helpful tooltips, suggestions and explanation)"/>
+
+        <Label styleClass="sectionHeader" text="%Entry owner"/>
+        <HBox alignment="CENTER_LEFT" spacing="10.0">
+            <children>
+                <CheckBox fx:id="markOwner" text="%Mark new entries with owner name"/>
+                <TextField fx:id="markOwnerName" disable="${!markOwner.selected}" HBox.hgrow="ALWAYS"/>
+                <CheckBox fx:id="markOwnerOverwrite" disable="${!markOwner.selected}" text="%Overwrite">
+                    <tooltip>
+                        <Tooltip text="%If a pasted or imported entry already has the field set, overwrite."/>
+                    </tooltip>
+                </CheckBox>
+                <Button fx:id="markOwnerHelp" prefWidth="20.0"/>
+            </children>
+        </HBox>
+
+        <Label styleClass="sectionHeader" text="%Time stamp"/>
+        <CheckBox fx:id="markTimestamp" text="%Mark new entries with addition date"/>
+        <HBox spacing="10.0">
+            <children>
+                <GridPane>
+                    <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES"/>
+                        <ColumnConstraints hgrow="SOMETIMES" prefWidth="10.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES"/>
+                        <ColumnConstraints hgrow="SOMETIMES" prefWidth="10.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES"/>
+                        <ColumnConstraints hgrow="SOMETIMES" prefWidth="10.0"/>
+                        <ColumnConstraints hgrow="SOMETIMES"/>
+                    </columnConstraints>
+                    <rowConstraints>
+                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                        <RowConstraints prefHeight="10.0" vgrow="SOMETIMES"/>
+                        <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                    </rowConstraints>
+                    <children>
+                        <Label disable="${!markTimestamp.selected}" text="%Date format"/>
+                        <TextField fx:id="markTimeStampFormat" disable="${!markTimestamp.selected}" prefWidth="200.0"
+                                   GridPane.columnIndex="2"/>
+                        <CheckBox fx:id="markTimeStampOverwrite" disable="${!markTimestamp.selected}" text="%Overwrite"
+                                  GridPane.columnIndex="4">
+                            <tooltip>
+                                <Tooltip text="%If a pasted or imported entry already has the field set, overwrite."/>
+                            </tooltip>
+                        </CheckBox>
+                        <Button fx:id="markTimeStampHelp" prefWidth="20.0" GridPane.columnIndex="6"/>
+                        <Label disable="${!markTimestamp.selected}" text="%Field name" GridPane.rowIndex="2"/>
+                        <TextField fx:id="markTimeStampFieldName" disable="${!markTimestamp.selected}" prefWidth="200.0"
+                                   GridPane.columnIndex="2" GridPane.rowIndex="2"/>
+                    </children>
+                </GridPane>
+            </children>
+        </HBox>
+        <CheckBox fx:id="updateTimeStamp" text="%Update timestamp on modification"/>
+    </children>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.java b/src/main/java/org/jabref/gui/preferences/GeneralTab.java
deleted file mode 100644
index 4c76449acdb..00000000000
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package org.jabref.gui.preferences;
-
-import java.nio.charset.Charset;
-import java.time.format.DateTimeFormatter;
-
-import javafx.collections.FXCollections;
-import javafx.geometry.Pos;
-import javafx.scene.Node;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.Pane;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.actions.ActionFactory;
-import org.jabref.gui.actions.StandardActions;
-import org.jabref.gui.help.HelpAction;
-import org.jabref.gui.util.DefaultTaskExecutor;
-import org.jabref.gui.util.ViewModelListCellFactory;
-import org.jabref.logic.help.HelpFile;
-import org.jabref.logic.l10n.Encodings;
-import org.jabref.logic.l10n.Language;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseMode;
-import org.jabref.model.entry.InternalBibtexFields;
-import org.jabref.preferences.JabRefPreferences;
-
-import static javafx.beans.binding.Bindings.not;
-
-class GeneralTab extends Pane implements PrefsTab {
-
-    private final CheckBox useOwner;
-    private final CheckBox overwriteOwner;
-    private final CheckBox enforceLegalKeys;
-    private final CheckBox shouldCollectTelemetry;
-    private final CheckBox confirmDelete;
-    private final CheckBox memoryStick;
-    private final CheckBox inspectionWarnDupli;
-    private final CheckBox showAdvancedHints;
-    private final CheckBox useTimeStamp;
-    private final CheckBox updateTimeStamp;
-    private final CheckBox overwriteTimeStamp;
-    private final TextField defOwnerField;
-    private final GridPane builder = new GridPane();
-
-    private final TextField timeStampFormat;
-    private final TextField timeStampField;
-    private final JabRefPreferences prefs;
-
-    private final ComboBox<Language> languageSelection = new ComboBox<>();
-    private final ComboBox<Charset> encodings;
-    private final ComboBox<BibDatabaseMode> biblatexMode;
-    private final DialogService dialogService;
-
-    public GeneralTab(DialogService dialogService, JabRefPreferences prefs) {
-        this.prefs = prefs;
-        this.dialogService = dialogService;
-        builder.setVgap(7);
-
-        ActionFactory factory = new ActionFactory(prefs.getKeyBindingRepository());
-
-        biblatexMode = new ComboBox<>(FXCollections.observableArrayList(BibDatabaseMode.values()));
-        memoryStick = new CheckBox(Localization.lang("Load and Save preferences from/to jabref.xml on start-up (memory stick mode)"));
-        useOwner = new CheckBox(Localization.lang("Mark new entries with owner name") + ':');
-        updateTimeStamp = new CheckBox(Localization.lang("Update timestamp on modification"));
-        useTimeStamp = new CheckBox(Localization.lang("Mark new entries with addition date") + ". "
-                + Localization.lang("Date format") + ':');
-        updateTimeStamp.disableProperty().bind(not(useTimeStamp.selectedProperty()));
-        overwriteOwner = new CheckBox(Localization.lang("Overwrite"));
-        overwriteTimeStamp = new CheckBox(Localization.lang("If a pasted or imported entry already has the field set, overwrite."));
-        enforceLegalKeys = new CheckBox(Localization.lang("Enforce legal characters in BibTeX keys"));
-        confirmDelete = new CheckBox(Localization.lang("Show confirmation dialog when deleting entries"));
-        defOwnerField = new TextField();
-        timeStampFormat = new TextField();
-        timeStampField = new TextField();
-        inspectionWarnDupli = new CheckBox(Localization.lang("Warn about unresolved duplicates when closing inspection window"));
-        showAdvancedHints = new CheckBox(Localization.lang("Show advanced hints (i.e. helpful tooltips, suggestions and explanation)"));
-        shouldCollectTelemetry = new CheckBox(Localization.lang("Collect and share telemetry data to help improve JabRef."));
-        encodings = new ComboBox<>(FXCollections.observableArrayList(Encodings.ENCODINGS));
-
-        Label general = new Label(Localization.lang("General"));
-        general.getStyleClass().add("sectionHeader");
-        builder.add(general, 1, 1);
-        builder.add(inspectionWarnDupli, 1, 3);
-        builder.add(confirmDelete, 1, 5);
-        builder.add(enforceLegalKeys, 1, 7);
-        builder.add(memoryStick, 1, 9);
-
-        // Owner name
-        HBox ownerBox = new HBox();
-        ownerBox.setAlignment(Pos.CENTER_LEFT);
-        ownerBox.setSpacing(7);
-        Button helpOwner = factory.createIconButton(StandardActions.HELP, new HelpAction(HelpFile.OWNER));
-        ownerBox.getChildren().addAll(useOwner, defOwnerField, overwriteOwner, helpOwner);
-        builder.add(ownerBox, 1, 10);
-
-        builder.add(useTimeStamp, 1, 14);
-        builder.add(timeStampFormat, 1, 16);
-        builder.add(overwriteTimeStamp, 1, 17);
-        Label fieldName = new Label(Localization.lang("Field name") + ':');
-        builder.add(fieldName, 1, 19);
-        builder.add(timeStampField, 1, 21);
-
-        Button helpTimestamp = factory.createIconButton(StandardActions.HELP, new HelpAction(HelpFile.TIMESTAMP));
-        builder.add(helpTimestamp, 1, 22);
-        builder.add(updateTimeStamp, 1, 23);
-        builder.add(shouldCollectTelemetry, 1, 25);
-
-        // Language configuration
-        HBox languageBox = new HBox();
-        languageBox.setSpacing(115);
-        languageBox.setAlignment(Pos.CENTER_LEFT);
-        Label languageLabel = new Label(Localization.lang("Language") + ':');
-        languageSelection.setItems(FXCollections.observableArrayList(Language.values()));
-        new ViewModelListCellFactory<Language>()
-                .withText(Language::getDisplayName)
-                .install(languageSelection);
-        languageBox.getChildren().addAll(languageLabel, languageSelection);
-        builder.add(languageBox, 1, 27);
-
-        // Encoding configuration
-        HBox encodingBox = new HBox();
-        encodingBox.setSpacing(68);
-        encodingBox.setAlignment(Pos.CENTER_LEFT);
-        Label defaultEncoding = new Label(Localization.lang("Default encoding") + ':');
-        encodingBox.getChildren().addAll(defaultEncoding, encodings);
-        builder.add(encodingBox, 1, 28);
-
-        // Bibliography mode configuration
-        HBox biblioBox = new HBox();
-        biblioBox.setSpacing(10);
-        biblioBox.setAlignment(Pos.CENTER_LEFT);
-        Label defaultBibliographyMode = new Label(Localization.lang("Default bibliography mode"));
-        biblioBox.getChildren().addAll(defaultBibliographyMode, biblatexMode);
-        builder.add(biblioBox, 1, 29);
-
-        builder.add(showAdvancedHints,1,30);
-    }
-
-    @Override
-    public Node getBuilder() {
-        return builder;
-    }
-
-    @Override
-    public void setValues() {
-        useOwner.setSelected(prefs.getBoolean(JabRefPreferences.USE_OWNER));
-        overwriteOwner.setSelected(prefs.getBoolean(JabRefPreferences.OVERWRITE_OWNER));
-        useTimeStamp.setSelected(prefs.getBoolean(JabRefPreferences.USE_TIME_STAMP));
-        overwriteTimeStamp.setSelected(prefs.getBoolean(JabRefPreferences.OVERWRITE_TIME_STAMP));
-        updateTimeStamp.setSelected(prefs.getBoolean(JabRefPreferences.UPDATE_TIMESTAMP));
-        enforceLegalKeys.setSelected(prefs.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
-        shouldCollectTelemetry.setSelected(prefs.shouldCollectTelemetry());
-        memoryStick.setSelected(prefs.getBoolean(JabRefPreferences.MEMORY_STICK_MODE));
-        confirmDelete.setSelected(prefs.getBoolean(JabRefPreferences.CONFIRM_DELETE));
-        defOwnerField.setText(prefs.get(JabRefPreferences.DEFAULT_OWNER));
-        timeStampFormat.setText(prefs.get(JabRefPreferences.TIME_STAMP_FORMAT));
-        timeStampField.setText(prefs.get(JabRefPreferences.TIME_STAMP_FIELD));
-        inspectionWarnDupli.setSelected(prefs.getBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION));
-        if (prefs.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE)) {
-            biblatexMode.setValue(BibDatabaseMode.BIBLATEX);
-        } else {
-            biblatexMode.setValue(BibDatabaseMode.BIBTEX);
-        }
-        encodings.setValue(prefs.getDefaultEncoding());
-        languageSelection.setValue(prefs.getLanguage());
-        showAdvancedHints.setSelected(prefs.getBoolean(JabRefPreferences.SHOW_ADVANCED_HINTS));
-    }
-
-    @Override
-    public void storeSettings() {
-        prefs.putBoolean(JabRefPreferences.USE_OWNER, useOwner.isSelected());
-        prefs.putBoolean(JabRefPreferences.OVERWRITE_OWNER, overwriteOwner.isSelected());
-        prefs.putBoolean(JabRefPreferences.USE_TIME_STAMP, useTimeStamp.isSelected());
-        prefs.putBoolean(JabRefPreferences.OVERWRITE_TIME_STAMP, overwriteTimeStamp.isSelected());
-        prefs.putBoolean(JabRefPreferences.UPDATE_TIMESTAMP, updateTimeStamp.isSelected());
-        prefs.putBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY, enforceLegalKeys.isSelected());
-        prefs.setShouldCollectTelemetry(shouldCollectTelemetry.isSelected());
-        if (prefs.getBoolean(JabRefPreferences.MEMORY_STICK_MODE) && !memoryStick.isSelected()) {
-            dialogService.showInformationDialogAndWait(Localization.lang("Memory stick mode"),
-                    Localization.lang("To disable the memory stick mode"
-                            + " rename or remove the jabref.xml file in the same folder as JabRef."));
-        }
-        prefs.putBoolean(JabRefPreferences.MEMORY_STICK_MODE, memoryStick.isSelected());
-        prefs.putBoolean(JabRefPreferences.SHOW_ADVANCED_HINTS, showAdvancedHints.isSelected());
-        prefs.putBoolean(JabRefPreferences.CONFIRM_DELETE, confirmDelete.isSelected());
-        prefs.putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, inspectionWarnDupli.isSelected());
-        String owner = defOwnerField.getText().trim();
-        prefs.put(JabRefPreferences.DEFAULT_OWNER, owner);
-        prefs.put(JabRefPreferences.TIME_STAMP_FORMAT, timeStampFormat.getText().trim());
-        prefs.put(JabRefPreferences.TIME_STAMP_FIELD, timeStampField.getText().trim());
-        // Update name of the time stamp field based on preferences
-        InternalBibtexFields.updateTimeStampField(prefs.get(JabRefPreferences.TIME_STAMP_FIELD));
-        prefs.setDefaultEncoding(encodings.getValue());
-        prefs.putBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE, biblatexMode.getValue() == BibDatabaseMode.BIBLATEX);
-
-        if (languageSelection.getValue() != prefs.getLanguage()) {
-            prefs.setLanguage(languageSelection.getValue());
-            Localization.setLanguage(languageSelection.getValue());
-
-            // Warn about restart needed:
-            dialogService.showWarningDialogAndWait(Localization.lang("Changed language settings"),
-                    Localization.lang("You have changed the language setting.")
-                                .concat(" ")
-                                .concat(Localization.lang("You must restart JabRef for this to come into effect.")));
-        }
-    }
-
-    @Override
-    public boolean validateSettings() {
-        try {
-            // Test if date format is legal:
-            DateTimeFormatter.ofPattern(timeStampFormat.getText());
-
-        } catch (IllegalArgumentException ex2) {
-            DefaultTaskExecutor.runInJavaFXThread(() -> dialogService.showErrorDialogAndWait(Localization.lang("Invalid date format"),
-                    Localization.lang("The chosen date format for new entries is not valid")));
-
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String getTabName() {
-        return Localization.lang("General");
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
new file mode 100644
index 00000000000..3138230d7cd
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
@@ -0,0 +1,128 @@
+package org.jabref.gui.preferences;
+
+import java.nio.charset.Charset;
+
+import javax.inject.Inject;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
+
+import org.jabref.Globals;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.actions.ActionFactory;
+import org.jabref.gui.actions.StandardActions;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.l10n.Language;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.preferences.JabRefPreferences;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+
+public class GeneralTabView extends VBox implements PrefsTab {
+
+    @FXML private ComboBox<Language> language;
+    @FXML private ComboBox<Charset> defaultEncoding;
+    @FXML private ComboBox<BibDatabaseMode> biblatexMode;
+    @FXML private CheckBox inspectionWarningDuplicate;
+    @FXML private CheckBox confirmDelete;
+    @FXML private CheckBox enforceLegalKeys;
+    @FXML private CheckBox memoryStickMode;
+    @FXML private CheckBox collectTelemetry;
+    @FXML private CheckBox showAdvancedHints;
+    @FXML private CheckBox markOwner;
+    @FXML private TextField markOwnerName;
+    @FXML private CheckBox markOwnerOverwrite;
+    @FXML private Button markOwnerHelp;
+    @FXML private CheckBox markTimestamp;
+    @FXML private TextField markTimeStampFormat;
+    @FXML private CheckBox markTimeStampOverwrite;
+    @FXML private TextField markTimeStampFieldName;
+    @FXML private Button markTimeStampHelp;
+    @FXML private CheckBox updateTimeStamp;
+
+    @Inject private DialogService dialogService;
+    private final JabRefPreferences preferences;
+
+    private GeneralTabViewModel viewModel;
+
+    private ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+
+    public GeneralTabView(JabRefPreferences preferences) {
+        this.preferences = preferences;
+        ViewLoader.view(this)
+                .root(this)
+                .load();
+    }
+
+    public void initialize() {
+        viewModel = new GeneralTabViewModel(dialogService, preferences);
+
+        language.itemsProperty().bind(viewModel.languagesListProperty());
+        language.valueProperty().bindBidirectional(viewModel.selectedLanguageProperty());
+
+        defaultEncoding.itemsProperty().bind(viewModel.encodingsListProperty());
+        defaultEncoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
+
+        biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
+        biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
+
+        inspectionWarningDuplicate.selectedProperty().bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
+        confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
+        enforceLegalKeys.selectedProperty().bindBidirectional(viewModel.enforceLegalKeysProperty());
+        memoryStickMode.selectedProperty().bindBidirectional(viewModel.memoryStickModeProperty());
+        collectTelemetry.selectedProperty().bindBidirectional(viewModel.collectTelemetryProperty());
+        showAdvancedHints.selectedProperty().bindBidirectional(viewModel.showAdvancedHintsProperty());
+
+        markOwner.selectedProperty().bindBidirectional(viewModel.markOwnerProperty());
+        markOwnerName.textProperty().bindBidirectional(viewModel.markOwnerNameProperty());
+        markOwnerOverwrite.selectedProperty().bindBidirectional(viewModel.markOwnerOverwriteProperty());
+
+        markTimestamp.selectedProperty().bindBidirectional(viewModel.markTimestampProperty());
+        markTimeStampFormat.textProperty().bindBidirectional(viewModel.markTimeStampFormatProperty());
+        markTimeStampOverwrite.selectedProperty().bindBidirectional(viewModel.markTimeStampOverwriteProperty());
+        markTimeStampFieldName.textProperty().bindBidirectional(viewModel.markTimeStampFieldNameProperty());
+        updateTimeStamp.selectedProperty().bindBidirectional(viewModel.updateTimeStampProperty());
+
+        ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.OWNER), markOwnerHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.TIMESTAMP), markTimeStampHelp);
+
+        validationVisualizer.setDecoration(new IconValidationDecorator());
+        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.markTimeStampFormatValidationStatus(), markTimeStampFormat));
+    }
+
+    @Override
+    public Node getBuilder() {
+        return this;
+    }
+
+    @Override
+    public void setValues() {
+        // ToDo: Remove this after conversion of all tabs
+    }
+
+    @Override
+    public void storeSettings() {
+        viewModel.storeSettings();
+    }
+
+    @Override
+    public boolean validateSettings() {
+        return viewModel.validateSettings();
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("General");
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
new file mode 100644
index 00000000000..4b801f54ee3
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
@@ -0,0 +1,210 @@
+package org.jabref.gui.preferences;
+
+import java.nio.charset.Charset;
+import java.time.format.DateTimeFormatter;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.DialogService;
+import org.jabref.logic.l10n.Encodings;
+import org.jabref.logic.l10n.Language;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.database.BibDatabaseMode;
+import org.jabref.model.entry.InternalBibtexFields;
+import org.jabref.preferences.JabRefPreferences;
+
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+
+public class GeneralTabViewModel implements PreferenceTabViewModel {
+    private final ListProperty<Language> languagesListProperty = new SimpleListProperty<>();
+    private final ObjectProperty<Language> selectedLanguageProperty = new SimpleObjectProperty<>();
+    private final ListProperty<Charset> encodingsListProperty = new SimpleListProperty<>();
+    private final ObjectProperty<Charset> selectedEncodingProperty = new SimpleObjectProperty<>();
+    private final ListProperty<BibDatabaseMode> bibliographyModeListProperty = new SimpleListProperty<>();
+    private final ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty = new SimpleObjectProperty<>();
+
+    private final BooleanProperty inspectionWarningDuplicateProperty = new SimpleBooleanProperty();
+    private final BooleanProperty confirmDeleteProperty = new SimpleBooleanProperty();
+    private final BooleanProperty memoryStickModeProperty = new SimpleBooleanProperty();
+    private final BooleanProperty collectTelemetryProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enforceLegalKeysProperty = new SimpleBooleanProperty();
+    private final BooleanProperty showAdvancedHintsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty markOwnerProperty = new SimpleBooleanProperty();
+    private final StringProperty markOwnerNameProperty = new SimpleStringProperty("");
+    private final BooleanProperty markOwnerOverwriteProperty = new SimpleBooleanProperty();
+    private final BooleanProperty markTimestampProperty = new SimpleBooleanProperty();
+    private final StringProperty markTimeStampFormatProperty = new SimpleStringProperty("");
+    private final BooleanProperty markTimeStampOverwriteProperty = new SimpleBooleanProperty();
+    private final StringProperty markTimeStampFieldNameProperty = new SimpleStringProperty("");
+    private final BooleanProperty updateTimeStampProperty = new SimpleBooleanProperty();
+
+    private FunctionBasedValidator markTimeStampFormatValidator;
+
+    private final DialogService dialogService;
+    private final JabRefPreferences preferences;
+
+    public GeneralTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
+        this.dialogService = dialogService;
+        this.preferences = preferences;
+        setValues();
+
+        markTimeStampFormatValidator = new FunctionBasedValidator(
+                markTimeStampFormatProperty,
+                input -> {
+                    try {
+                        DateTimeFormatter.ofPattern(markTimeStampFormatProperty.getValue());
+                    } catch (IllegalArgumentException exception) {
+                        return false;
+                    }
+                    return true;
+                },
+                ValidationMessage.error(String.format("%s > %s > %s %n %n %s",
+                        Localization.lang("General"),
+                        Localization.lang("Time stamp"),
+                        Localization.lang("Date format"),
+                        Localization.lang("Invalid date format")
+                        )
+                )
+        );
+    }
+
+    public void setValues() {
+        languagesListProperty.setValue(FXCollections.observableArrayList(Language.values()));
+        selectedLanguageProperty.setValue(preferences.getLanguage());
+
+        encodingsListProperty.setValue(FXCollections.observableArrayList(Encodings.getCharsets()));
+        selectedEncodingProperty.setValue(preferences.getDefaultEncoding());
+
+        bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
+        if (preferences.getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE)) {
+            selectedBiblatexModeProperty.setValue(BibDatabaseMode.BIBLATEX);
+        } else {
+            selectedBiblatexModeProperty.setValue(BibDatabaseMode.BIBLATEX);
+        }
+
+        inspectionWarningDuplicateProperty.setValue(preferences.getBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION));
+        confirmDeleteProperty.setValue(preferences.getBoolean(JabRefPreferences.CONFIRM_DELETE));
+        enforceLegalKeysProperty.setValue(preferences.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
+        memoryStickModeProperty.setValue(preferences.getBoolean(JabRefPreferences.MEMORY_STICK_MODE));
+        collectTelemetryProperty.setValue(preferences.shouldCollectTelemetry());
+        showAdvancedHintsProperty.setValue(preferences.getBoolean(JabRefPreferences.SHOW_ADVANCED_HINTS));
+
+        markOwnerProperty.setValue(preferences.getBoolean(JabRefPreferences.USE_OWNER));
+        markOwnerNameProperty.setValue(preferences.get(JabRefPreferences.DEFAULT_OWNER));
+        markOwnerOverwriteProperty.setValue(preferences.getBoolean(JabRefPreferences.OVERWRITE_OWNER));
+
+        markTimestampProperty.setValue(preferences.getBoolean(JabRefPreferences.USE_TIME_STAMP));
+        markTimeStampFormatProperty.setValue(preferences.get(JabRefPreferences.TIME_STAMP_FORMAT));
+        markTimeStampOverwriteProperty.setValue(preferences.getBoolean(JabRefPreferences.OVERWRITE_TIME_STAMP));
+        markTimeStampFieldNameProperty.setValue(preferences.get(JabRefPreferences.TIME_STAMP_FIELD));
+        updateTimeStampProperty.setValue(preferences.getBoolean(JabRefPreferences.UPDATE_TIMESTAMP));
+    }
+
+    public void storeSettings() {
+        if (selectedLanguageProperty.getValue() != preferences.getLanguage()) {
+            preferences.setLanguage(selectedLanguageProperty.getValue());
+            Localization.setLanguage(selectedLanguageProperty.getValue());
+
+            dialogService.showWarningDialogAndWait(Localization.lang("Changed language settings"),
+                    Localization.lang("You have changed the language setting.")
+                            .concat(" ")
+                            .concat(Localization.lang("You must restart JabRef for this to come into effect.")));
+        }
+        preferences.setDefaultEncoding(selectedEncodingProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE, selectedBiblatexModeProperty.getValue() == BibDatabaseMode.BIBLATEX);
+
+        preferences.putBoolean(JabRefPreferences.WARN_ABOUT_DUPLICATES_IN_INSPECTION, inspectionWarningDuplicateProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.CONFIRM_DELETE, confirmDeleteProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY, enforceLegalKeysProperty.getValue());
+        if (preferences.getBoolean(JabRefPreferences.MEMORY_STICK_MODE) && !memoryStickModeProperty.getValue()) {
+            dialogService.showInformationDialogAndWait(Localization.lang("Memory stick mode"),
+                    Localization.lang("To disable the memory stick mode"
+                            + " rename or remove the jabref.xml file in the same folder as JabRef."));
+        }
+        preferences.putBoolean(JabRefPreferences.MEMORY_STICK_MODE, memoryStickModeProperty.getValue());
+        preferences.setShouldCollectTelemetry(collectTelemetryProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.SHOW_ADVANCED_HINTS, showAdvancedHintsProperty.getValue());
+
+        preferences.putBoolean(JabRefPreferences.USE_OWNER, markOwnerProperty.getValue());
+        preferences.put(JabRefPreferences.DEFAULT_OWNER, markOwnerNameProperty.getValue().trim());
+        preferences.putBoolean(JabRefPreferences.OVERWRITE_OWNER, markOwnerOverwriteProperty.getValue());
+
+        preferences.putBoolean(JabRefPreferences.USE_TIME_STAMP, markTimestampProperty.getValue());
+        preferences.put(JabRefPreferences.TIME_STAMP_FORMAT, markTimeStampFormatProperty.getValue().trim());
+        preferences.put(JabRefPreferences.TIME_STAMP_FIELD, markTimeStampFieldNameProperty.getValue().trim());
+        preferences.putBoolean(JabRefPreferences.OVERWRITE_TIME_STAMP, markTimeStampOverwriteProperty.getValue());
+        preferences.putBoolean(JabRefPreferences.UPDATE_TIMESTAMP, updateTimeStampProperty.getValue());
+
+        // Update name of the time stamp field based on preferences
+        InternalBibtexFields.updateTimeStampField(preferences.get(JabRefPreferences.TIME_STAMP_FIELD));
+    }
+
+    public ValidationStatus markTimeStampFormatValidationStatus() {
+        return markTimeStampFormatValidator.getValidationStatus();
+    }
+
+    public boolean validateSettings() {
+        ValidationStatus status = markTimeStampFormatValidationStatus();
+        if (!status.isValid()) {
+            dialogService.showErrorDialogAndWait(status.getHighestMessage().get().getMessage());
+            return false;
+        }
+        return true;
+    }
+
+    // General
+
+    public ListProperty<Language> languagesListProperty() { return this.languagesListProperty; }
+
+    public ObjectProperty<Language> selectedLanguageProperty() { return this.selectedLanguageProperty; }
+
+    public ListProperty<Charset> encodingsListProperty() { return this.encodingsListProperty; }
+
+    public ObjectProperty<Charset> selectedEncodingProperty() { return this.selectedEncodingProperty; }
+
+    public ListProperty<BibDatabaseMode> biblatexModeListProperty() { return this.bibliographyModeListProperty; }
+
+    public ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty() { return this.selectedBiblatexModeProperty; }
+
+    public BooleanProperty inspectionWarningDuplicateProperty() { return this.inspectionWarningDuplicateProperty; }
+
+    public BooleanProperty confirmDeleteProperty() { return this.confirmDeleteProperty; }
+
+    public BooleanProperty memoryStickModeProperty() { return this.memoryStickModeProperty; }
+
+    public BooleanProperty collectTelemetryProperty() { return this.collectTelemetryProperty; }
+
+    public BooleanProperty enforceLegalKeysProperty() { return this.enforceLegalKeysProperty; }
+
+    public BooleanProperty showAdvancedHintsProperty() { return this.showAdvancedHintsProperty; }
+
+    // Entry owner
+
+    public BooleanProperty markOwnerProperty() { return this.markOwnerProperty; }
+
+    public StringProperty markOwnerNameProperty() { return this.markOwnerNameProperty; }
+
+    public BooleanProperty markOwnerOverwriteProperty() { return this.markOwnerOverwriteProperty; }
+
+    // Time stamp
+
+    public BooleanProperty markTimestampProperty() { return this.markTimestampProperty; }
+
+    public StringProperty markTimeStampFormatProperty() { return this.markTimeStampFormatProperty; }
+
+    public BooleanProperty markTimeStampOverwriteProperty() { return this.markTimeStampOverwriteProperty; }
+
+    public StringProperty markTimeStampFieldNameProperty() { return this.markTimeStampFieldNameProperty; }
+
+    public BooleanProperty updateTimeStampProperty() { return this.updateTimeStampProperty; }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
new file mode 100644
index 00000000000..b3396fe2eec
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
@@ -0,0 +1,10 @@
+package org.jabref.gui.preferences;
+
+public interface PreferenceTabViewModel {
+
+    void setValues();
+
+    void storeSettings();
+
+    boolean validateSettings();
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
index 8933d9096a3..f1b7bfdd5e1 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.css
@@ -1,14 +1,24 @@
-#sideMenu {
-    -fx-background-color: -fx-control-inner-background;
+#preferenceTabList {
+    -fx-background-color: transparent;
     -fx-border-color: -fx-outer-border;
     -fx-border-width: 1;
 }
 
-#sideMenu > .virtual-flow > .clipped-container > .sheet > .list-cell {
+#preferenceTabList > .virtual-flow > .clipped-container > .sheet > .list-cell {
     -fx-padding: 8 8 8 8;
+    -fx-background: transparent;
+    -fx-text-fill: -fx-text-base-color;
+}
+
+#preferenceTabList > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
     -fx-background: -fx-control-inner-background;
 }
 
+.split-pane-divider {
+    -fx-padding: 0 4 0 4;
+    -fx-background-color: transparent;
+}
+
 .preferencePaneContainer {
     -fx-padding: 1em 1em 1em 3em;
 }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index 367768f7cb9..7a90f13ef60 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -1,5 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonType?>
 <?import javafx.scene.control.DialogPane?>
-<DialogPane prefHeight="700.0" prefWidth="1100.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.PreferencesDialog" />
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.SplitPane?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.layout.VBox?>
+
+<?import org.controlsfx.control.textfield.CustomTextField?>
+
+<DialogPane prefHeight="700.0" prefWidth="1100.0" minHeight="400" minWidth="600"
+            xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="org.jabref.gui.preferences.PreferencesDialogView">
+    <content>
+        <SplitPane dividerPositions="0.2">
+            <items>
+                <VBox prefWidth="160.0" styleClass="preference-sidepane">
+                    <children>
+                        <CustomTextField fx:id="searchBox" promptText="%Search" VBox.vgrow="NEVER">
+                            <VBox.margin>
+                                <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
+                            </VBox.margin>
+                        </CustomTextField>
+                        <ListView fx:id="preferenceTabList" VBox.vgrow="ALWAYS"/>
+                        <VBox prefHeight="10.0" VBox.vgrow="SOMETIMES"/>
+                        <VBox alignment="BOTTOM_LEFT" spacing="3.0">
+                            <children>
+                                <Button maxWidth="Infinity" onAction="#importPreferences" text="%Import preferences">
+                                    <tooltip>
+                                        <Tooltip text="%Import preferences from file"/>
+                                    </tooltip>
+                                </Button>
+                                <Button maxWidth="Infinity" onAction="#exportPreferences" text="%Export preferences">
+                                    <tooltip>
+                                        <Tooltip text="%Export preferences to file"/>
+                                    </tooltip>
+                                </Button>
+                                <Button maxWidth="Infinity" onAction="#showAllPreferences" text="%Show preferences"/>
+                                <Button maxWidth="Infinity" onAction="#resetPreferences" text="%Reset preferences"/>
+                            </children>
+                            <padding>
+                                <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
+                            </padding>
+                        </VBox>
+                    </children>
+                </VBox>
+                <ScrollPane fx:id="preferencePaneContainer" styleClass="preferencePaneContainer" maxHeight="Infinity"
+                            maxWidth="Infinity"/>
+            </items>
+        </SplitPane>
+    </content>
+    <buttonTypes>
+        <ButtonType fx:id="saveButton" text="%Save" buttonData="OK_DONE"/>
+        <ButtonType fx:constant="CANCEL"/>
+    </buttonTypes>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
deleted file mode 100644
index 4814e1b4165..00000000000
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package org.jabref.gui.preferences;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.prefs.BackingStoreException;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.geometry.Pos;
-import javafx.scene.control.Button;
-import javafx.scene.control.ButtonBar.ButtonData;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.ListView;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.control.Tooltip;
-import javafx.scene.layout.BorderPane;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.VBox;
-
-import org.jabref.Globals;
-import org.jabref.JabRefException;
-import org.jabref.gui.DialogService;
-import org.jabref.gui.GUIGlobals;
-import org.jabref.gui.JabRefFrame;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.gui.util.ControlHelper;
-import org.jabref.gui.util.FileDialogConfiguration;
-import org.jabref.gui.util.TaskExecutor;
-import org.jabref.gui.util.ViewModelListCellFactory;
-import org.jabref.logic.exporter.ExporterFactory;
-import org.jabref.logic.exporter.SavePreferences;
-import org.jabref.logic.exporter.TemplateExporter;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.layout.LayoutFormatterPreferences;
-import org.jabref.logic.util.StandardFileType;
-import org.jabref.logic.xmp.XmpPreferences;
-import org.jabref.preferences.JabRefPreferences;
-import org.jabref.preferences.JabRefPreferencesFilter;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import org.fxmisc.easybind.EasyBind;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Preferences dialog. Contains a TabbedPane, and tabs will be defined in separate classes. Tabs MUST implement the
- * PrefsTab interface, since this dialog will call the storeSettings() method of all tabs when the user presses ok.
- *
- * With this design, it should be very easy to add new tabs later.
- */
-public class PreferencesDialog extends BaseDialog<Void> {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesDialog.class);
-
-    private final BorderPane container;
-
-    private final DialogService dialogService;
-    private final JabRefFrame frame;
-    private final JabRefPreferences prefs;
-    private final ObservableList<PrefsTab> preferenceTabs;
-
-    public PreferencesDialog(JabRefFrame parent, TaskExecutor taskExecutor) {
-        setTitle(Localization.lang("JabRef preferences"));
-        getDialogPane().getScene().getStylesheets().add(this.getClass().getResource("PreferencesDialog.css").toExternalForm());
-
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
-
-        ButtonType save = new ButtonType(Localization.lang("Save"), ButtonData.OK_DONE);
-        getDialogPane().getButtonTypes().addAll(save, ButtonType.CANCEL);
-        ControlHelper.setAction(save, getDialogPane(), event -> {
-            storeAllSettings();
-            close();
-        });
-
-        prefs = Globals.prefs;
-        frame = parent;
-        dialogService = frame.getDialogService();
-
-        preferenceTabs = FXCollections.observableArrayList();
-        preferenceTabs.add(new GeneralTab(dialogService, prefs));
-        preferenceTabs.add(new FileTab(dialogService, prefs));
-        preferenceTabs.add(new TablePrefsTab(prefs));
-        preferenceTabs.add(new TableColumnsTab(prefs, frame));
-        preferenceTabs.add(new PreviewPreferencesTab(dialogService, taskExecutor));
-        preferenceTabs.add(new ExternalTab(frame, this, prefs));
-        preferenceTabs.add(new GroupsPrefsTab(prefs));
-        preferenceTabs.add(new EntryEditorPrefsTab(prefs));
-        preferenceTabs.add(new BibtexKeyPatternPrefTab(prefs, frame.getCurrentBasePanel()));
-        preferenceTabs.add(new ImportSettingsTab(prefs));
-        preferenceTabs.add(new ExportSortingPrefsTab(prefs));
-        preferenceTabs.add(new NameFormatterTab(prefs));
-        preferenceTabs.add(new XmpPrefsTab(prefs));
-        preferenceTabs.add(new NetworkTab(dialogService, prefs));
-        preferenceTabs.add(new AdvancedTab(dialogService, prefs));
-        preferenceTabs.add(new AppearancePrefsTab(dialogService, prefs));
-
-        container = new BorderPane();
-        getDialogPane().setContent(container);
-
-        construct();
-    }
-
-    @FXML
-    private void initalize() {
-        //FIXME: Model whole dialog as fxml
-    }
-
-    private void construct() {
-        VBox vBox = new VBox();
-        vBox.setPrefWidth(160);
-
-        ListView<PrefsTab> tabsList = new ListView<>();
-        tabsList.setId("sideMenu");
-        tabsList.itemsProperty().setValue(preferenceTabs);
-        EasyBind.subscribe(tabsList.getSelectionModel().selectedItemProperty(), tab -> {
-            if (tab != null) {
-                ScrollPane preferencePaneContainer = new ScrollPane(tab.getBuilder());
-                preferencePaneContainer.getStyleClass().add("preferencePaneContainer");
-                container.setCenter(preferencePaneContainer);
-            } else {
-                container.setCenter(null);
-            }
-        });
-        tabsList.getSelectionModel().selectFirst();
-        new ViewModelListCellFactory<PrefsTab>()
-                                                .withText(PrefsTab::getTabName)
-                                                .install(tabsList);
-
-        TextField searchBox = new TextField();
-        searchBox.setPromptText(Localization.lang("Search"));
-
-        PreferencesSearchHandler searchHandler = new PreferencesSearchHandler(preferenceTabs);
-        tabsList.itemsProperty().bindBidirectional(searchHandler.filteredPreferenceTabsProperty());
-        searchBox.textProperty().addListener((observable, previousText, newText) -> {
-            searchHandler.filterTabs(newText.toLowerCase(Locale.ROOT));
-            tabsList.getSelectionModel().clearSelection();
-            tabsList.getSelectionModel().selectFirst();
-        });
-
-        VBox buttonContainer = new VBox();
-        buttonContainer.setAlignment(Pos.BOTTOM_LEFT);
-        buttonContainer.setSpacing(3.0);
-        Button importPreferences = new Button(Localization.lang("Import preferences"));
-        importPreferences.setTooltip(new Tooltip(Localization.lang("Import preferences from file")));
-        importPreferences.setOnAction(e -> importPreferences());
-        importPreferences.setMaxWidth(Double.MAX_VALUE);
-        Button exportPreferences = new Button(Localization.lang("Export preferences"));
-        exportPreferences.setTooltip(new Tooltip(Localization.lang("Export preferences to file")));
-        exportPreferences.setOnAction(e -> exportPreferences());
-        exportPreferences.setMaxWidth(Double.MAX_VALUE);
-        Button showPreferences = new Button(Localization.lang("Show preferences"));
-        showPreferences.setOnAction(e -> new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).showAndWait());
-        showPreferences.setMaxWidth(Double.MAX_VALUE);
-        Button resetPreferences = new Button(Localization.lang("Reset preferences"));
-        resetPreferences.setOnAction(e -> resetPreferences());
-        resetPreferences.setMaxWidth(Double.MAX_VALUE);
-        buttonContainer.getChildren().addAll(
-                                             importPreferences,
-                                             exportPreferences,
-                                             showPreferences,
-                                             resetPreferences);
-
-        VBox spacer = new VBox();
-        spacer.setPrefHeight(10.0);
-        VBox.setVgrow(tabsList, Priority.ALWAYS);
-        VBox.setVgrow(spacer, Priority.SOMETIMES);
-        vBox.getChildren().addAll(
-                searchBox,
-                tabsList,
-                spacer,
-                buttonContainer
-        );
-
-        container.setLeft(vBox);
-
-        setValues();
-
-    }
-
-    private void resetPreferences() {
-        boolean resetPreferencesConfirmed = dialogService.showConfirmationDialogAndWait(
-                                                                                        Localization.lang("Reset preferences"),
-                                                                                        Localization.lang("Are you sure you want to reset all settings to default values?"),
-                                                                                        Localization.lang("Reset preferences"),
-                                                                                        Localization.lang("Cancel"));
-        if (resetPreferencesConfirmed) {
-            try {
-                prefs.clear();
-
-                dialogService.showWarningDialogAndWait(Localization.lang("Reset preferences"),
-                                                       Localization.lang("You must restart JabRef for this to come into effect."));
-            } catch (BackingStoreException ex) {
-                LOGGER.error("Error while resetting preferences", ex);
-                dialogService.showErrorDialogAndWait(Localization.lang("Reset preferences"), ex);
-            }
-            updateAfterPreferenceChanges();
-        }
-    }
-
-    private void importPreferences() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                                                                                               .addExtensionFilter(StandardFileType.XML)
-                                                                                               .withDefaultExtension(StandardFileType.XML)
-                                                                                               .withInitialDirectory(prefs.setLastPreferencesExportPath()).build();
-
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
-            try {
-                prefs.importPreferences(file);
-                updateAfterPreferenceChanges();
-
-                dialogService.showWarningDialogAndWait(Localization.lang("Import preferences"),
-                                                       Localization.lang("You must restart JabRef for this to come into effect."));
-            } catch (JabRefException ex) {
-                LOGGER.error("Error while importing preferences", ex);
-                dialogService.showErrorDialogAndWait(Localization.lang("Import preferences"), ex);
-            }
-        });
-    }
-
-    private void updateAfterPreferenceChanges() {
-        setValues();
-        List<TemplateExporter> customExporters = prefs.getCustomExportFormats(Globals.journalAbbreviationLoader);
-        LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
-        SavePreferences savePreferences = prefs.loadForExportFromPreferences();
-        XmpPreferences xmpPreferences = prefs.getXMPPreferences();
-        Globals.exportFactory = ExporterFactory.create(customExporters, layoutPreferences, savePreferences, xmpPreferences);
-        prefs.updateEntryEditorTabList();
-    }
-
-    private void storeAllSettings() {
-        // First check that all tabs are ready to close:
-        for (PrefsTab tab : preferenceTabs) {
-            if (!tab.validateSettings()) {
-                return; // If not, break off.
-            }
-        }
-        // Then store settings and close:
-        for (PrefsTab tab : preferenceTabs) {
-            tab.storeSettings();
-        }
-        prefs.flush();
-
-        GUIGlobals.updateEntryEditorColors();
-        frame.setupAllTables();
-        frame.getGlobalSearchBar().updateHintVisibility();
-        dialogService.notify(Localization.lang("Preferences recorded."));
-    }
-
-    public void setValues() {
-        // Update all field values in the tabs:
-        for (PrefsTab prefsTab : preferenceTabs) {
-            prefsTab.setValues();
-        }
-    }
-
-    private void exportPreferences() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                                                                                               .addExtensionFilter(StandardFileType.XML)
-                                                                                               .withDefaultExtension(StandardFileType.XML)
-                                                                                               .withInitialDirectory(prefs.setLastPreferencesExportPath())
-                                                                                               .build();
-
-        dialogService.showFileSaveDialog(fileDialogConfiguration)
-                     .ifPresent(exportFile -> {
-                         try {
-                             storeAllSettings();
-                             prefs.exportPreferences(exportFile);
-                             prefs.setLastPreferencesExportPath(exportFile);
-                         } catch (JabRefException ex) {
-                             LOGGER.warn(ex.getMessage(), ex);
-                             dialogService.showErrorDialogAndWait(Localization.lang("Export preferences"), ex);
-                         }
-                     });
-    }
-}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
new file mode 100644
index 00000000000..7fb30a48067
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -0,0 +1,126 @@
+package org.jabref.gui.preferences;
+
+import java.util.Locale;
+
+import javax.inject.Inject;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.ListView;
+import javafx.scene.control.ScrollPane;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.gui.util.ControlHelper;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import org.controlsfx.control.textfield.CustomTextField;
+import org.fxmisc.easybind.EasyBind;
+
+/**
+ * Preferences dialog. Contains a TabbedPane, and tabs will be defined in separate classes. Tabs MUST implement the
+ * PrefsTab interface, since this dialog will call the storeSettings() method of all tabs when the user presses ok.
+ */
+public class PreferencesDialogView extends BaseDialog<PreferencesDialogViewModel> {
+
+    @FXML private CustomTextField searchBox;
+    @FXML private ListView<PrefsTab> preferenceTabList;
+    @FXML private ScrollPane preferencePaneContainer;
+    @FXML private ButtonType saveButton;
+
+    @Inject private DialogService dialogService;
+
+    private JabRefFrame frame;
+    private TaskExecutor taskExecutor;
+    private PreferencesDialogViewModel viewModel;
+
+    public PreferencesDialogView(JabRefFrame frame, TaskExecutor taskExecutor) {
+        this.frame = frame;
+        this.taskExecutor = taskExecutor;
+        this.setTitle(Localization.lang("JabRef preferences"));
+
+        ViewLoader.view(this)
+                .load()
+                .setAsDialogPane(this);
+
+        ControlHelper.setAction(saveButton, getDialogPane(), event -> savePreferencesAndCloseDialog());
+
+        // ToDo: After conversion of all tabs to mvvm, rework interface and make validSettings bindable
+        // Button btnSave = (Button) this.getDialogPane().lookupButton(saveButton);
+        // btnSave.disableProperty().bind(viewModel.validSettings().validProperty().not());
+    }
+
+    public PreferencesDialogViewModel getViewModel() {
+        return viewModel;
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new PreferencesDialogViewModel(dialogService, taskExecutor, frame);
+
+        preferenceTabList.itemsProperty().setValue(viewModel.getPreferenceTabs());
+
+        PreferencesSearchHandler searchHandler = new PreferencesSearchHandler(viewModel.getPreferenceTabs());
+        preferenceTabList.itemsProperty().bindBidirectional(searchHandler.filteredPreferenceTabsProperty());
+        searchBox.textProperty().addListener((observable, previousText, newText) -> {
+            searchHandler.filterTabs(newText.toLowerCase(Locale.ROOT));
+            preferenceTabList.getSelectionModel().clearSelection();
+            preferenceTabList.getSelectionModel().selectFirst();
+        });
+        searchBox.setPromptText(Localization.lang("Search") + "...");
+        searchBox.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
+
+        EasyBind.subscribe(preferenceTabList.getSelectionModel().selectedItemProperty(), tab -> {
+            if (tab != null) {
+                preferencePaneContainer.setContent(tab.getBuilder());
+            } else {
+                preferencePaneContainer.setContent(null);
+            }
+        });
+
+        preferenceTabList.getSelectionModel().selectFirst();
+        new ViewModelListCellFactory<PrefsTab>()
+                .withText(PrefsTab::getTabName)
+                .install(preferenceTabList);
+
+        viewModel.setValues(); // ToDo: Remove this after conversion of all tabs
+    }
+
+    @FXML
+    private void closeDialog() {
+        close();
+    }
+
+    @FXML
+    private void savePreferencesAndCloseDialog() {
+        if (viewModel.validSettings()) {
+            viewModel.storeAllSettings();
+            closeDialog();
+        }
+    }
+
+    @FXML
+    void exportPreferences() {
+        viewModel.exportPreferences();
+    }
+
+    @FXML
+    void importPreferences() {
+        viewModel.importPreferences();
+    }
+
+    @FXML
+    void showAllPreferences() {
+        viewModel.showPreferences();
+    }
+
+    @FXML
+    void resetPreferences() {
+        viewModel.resetPreferences();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
new file mode 100644
index 00000000000..85647268743
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -0,0 +1,191 @@
+package org.jabref.gui.preferences;
+
+import java.util.List;
+import java.util.prefs.BackingStoreException;
+
+import javafx.beans.property.ReadOnlyListWrapper;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+
+import org.jabref.Globals;
+import org.jabref.JabRefException;
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.GUIGlobals;
+import org.jabref.gui.JabRefFrame;
+import org.jabref.gui.util.FileDialogConfiguration;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.exporter.ExporterFactory;
+import org.jabref.logic.exporter.SavePreferences;
+import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.layout.LayoutFormatterPreferences;
+import org.jabref.logic.util.StandardFileType;
+import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.preferences.JabRefPreferences;
+import org.jabref.preferences.JabRefPreferencesFilter;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PreferencesDialogViewModel extends AbstractViewModel {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesDialogViewModel.class);
+
+    private final DialogService dialogService;
+    private final TaskExecutor taskExecutor;
+    private final JabRefPreferences prefs;
+    private final ObservableList<PrefsTab> preferenceTabs;
+    private final JabRefFrame frame;
+
+    public PreferencesDialogViewModel(DialogService dialogService, TaskExecutor taskExecutor, JabRefFrame frame) {
+        this.dialogService = dialogService;
+        this.taskExecutor = taskExecutor;
+        this.prefs = Globals.prefs;
+        this.frame = frame;
+
+        preferenceTabs = FXCollections.observableArrayList();
+        preferenceTabs.add(new GeneralTabView(prefs));
+        preferenceTabs.add(new FileTabView(prefs));
+        preferenceTabs.add(new TablePrefsTab(prefs));
+        preferenceTabs.add(new TableColumnsTab(prefs, frame));
+        preferenceTabs.add(new PreviewPreferencesTab(dialogService, this.taskExecutor));
+        preferenceTabs.add(new ExternalTabView(prefs, frame));
+        preferenceTabs.add(new GroupsPrefsTab(prefs));
+        preferenceTabs.add(new EntryEditorPrefsTab(prefs));
+        preferenceTabs.add(new BibtexKeyPatternPrefTab(prefs, frame.getCurrentBasePanel()));
+        preferenceTabs.add(new ImportSettingsTab(prefs));
+        preferenceTabs.add(new ExportSortingPrefsTab(prefs));
+        preferenceTabs.add(new NameFormatterTab(prefs));
+        preferenceTabs.add(new XmpPrefsTab(prefs));
+        preferenceTabs.add(new NetworkTab(dialogService, prefs));
+        preferenceTabs.add(new AdvancedTab(dialogService, prefs));
+        preferenceTabs.add(new AppearancePrefsTab(dialogService, prefs));
+    }
+
+    public ObservableList<PrefsTab> getPreferenceTabs() {
+        return new ReadOnlyListWrapper<>(preferenceTabs);
+    }
+
+    public void importPreferences() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.XML)
+                .withDefaultExtension(StandardFileType.XML)
+                .withInitialDirectory(prefs.setLastPreferencesExportPath()).build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> {
+            try {
+                prefs.importPreferences(file);
+                updateAfterPreferenceChanges();
+
+                dialogService.showWarningDialogAndWait(Localization.lang("Import preferences"),
+                        Localization.lang("You must restart JabRef for this to come into effect."));
+            } catch (JabRefException ex) {
+                LOGGER.error("Error while importing preferences", ex);
+                dialogService.showErrorDialogAndWait(Localization.lang("Import preferences"), ex);
+            }
+        });
+    }
+
+    public void exportPreferences() {
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+                .addExtensionFilter(StandardFileType.XML)
+                .withDefaultExtension(StandardFileType.XML)
+                .withInitialDirectory(prefs.setLastPreferencesExportPath())
+                .build();
+
+        dialogService.showFileSaveDialog(fileDialogConfiguration)
+                     .ifPresent(exportFile -> {
+                         try {
+                             storeAllSettings();
+                             prefs.exportPreferences(exportFile);
+                             prefs.setLastPreferencesExportPath(exportFile);
+                         } catch (JabRefException ex) {
+                             LOGGER.warn(ex.getMessage(), ex);
+                             dialogService.showErrorDialogAndWait(Localization.lang("Export preferences"), ex);
+                         }
+                     });
+    }
+
+    public void showPreferences() {
+        new PreferencesFilterDialog(new JabRefPreferencesFilter(prefs)).showAndWait();
+    }
+
+    public void resetPreferences() {
+        boolean resetPreferencesConfirmed = dialogService.showConfirmationDialogAndWait(
+                Localization.lang("Reset preferences"),
+                Localization.lang("Are you sure you want to reset all settings to default values?"),
+                Localization.lang("Reset preferences"),
+                Localization.lang("Cancel"));
+        if (resetPreferencesConfirmed) {
+            try {
+                prefs.clear();
+
+                dialogService.showWarningDialogAndWait(Localization.lang("Reset preferences"),
+                        Localization.lang("You must restart JabRef for this to come into effect."));
+            } catch (BackingStoreException ex) {
+                LOGGER.error("Error while resetting preferences", ex);
+                dialogService.showErrorDialogAndWait(Localization.lang("Reset preferences"), ex);
+            }
+
+            updateAfterPreferenceChanges();
+        }
+    }
+
+    /**
+     * Reloads the JabRefPreferences into the UI
+     */
+    private void updateAfterPreferenceChanges() {
+        setValues();
+
+        List<TemplateExporter> customExporters = prefs.getCustomExportFormats(Globals.journalAbbreviationLoader);
+        LayoutFormatterPreferences layoutPreferences = prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader);
+        SavePreferences savePreferences = prefs.loadForExportFromPreferences();
+        XmpPreferences xmpPreferences = prefs.getXMPPreferences();
+        Globals.exportFactory = ExporterFactory.create(customExporters, layoutPreferences, savePreferences, xmpPreferences);
+        prefs.updateEntryEditorTabList();
+    }
+
+    /**
+     * Checks if all tabs are valid
+     * ToDo: After conversion of all tabs use mvvmfx-validator
+     * ToDo: should be observable for binding of OK-button in View
+     */
+
+    public boolean validSettings() {
+        for (PrefsTab tab : preferenceTabs) {
+            if (!tab.validateSettings()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public void storeAllSettings() {
+        // Run validation checks
+        if (!validSettings()) {
+            return;
+        }
+
+        // Store settings
+        for (PrefsTab tab : preferenceTabs) {
+            tab.storeSettings(); // ToDo: After conversion of all tabs: prefsTab.getViewModel().storeSettings();
+        }
+        prefs.flush();
+
+        GUIGlobals.updateEntryEditorColors();
+        frame.setupAllTables();
+        frame.getGlobalSearchBar().updateHintVisibility();
+        dialogService.notify(Localization.lang("Preferences recorded."));
+    }
+
+    /**
+     * Inserts the JabRefPreferences-values into the the Properties of the ViewModel
+     * ToDo: Reword after conversion of all tabs: resetValues()
+     */
+    public void setValues() {
+        for (PrefsTab prefsTab : preferenceTabs) {
+            prefsTab.setValues(); // ToDo: After conversion of all tabs: prefsTab.getViewModel().setValues();
+        }
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PrefsTab.java b/src/main/java/org/jabref/gui/preferences/PrefsTab.java
index 47bf3fd77cf..d5e794754ea 100644
--- a/src/main/java/org/jabref/gui/preferences/PrefsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/PrefsTab.java
@@ -19,14 +19,14 @@ interface PrefsTab {
      * is ILLEGAL to set values only at construction time, because the dialog
      * will be reused and updated.
      */
-    void setValues();
+    void setValues(); // ToDo: Remove this after conversion of all tabs, done in ViewModel
 
     /**
      * This method is called when the user presses OK in the
      * Preferences dialog. Implementing classes must make sure all
      * settings presented get stored in JabRefPreferences.
      */
-    void storeSettings();
+    void storeSettings(); // ToDo: After conversion of all tabs: viewModel.storeSettings()
 
     /**
      * This method is called before the {@link #storeSettings()} method,
@@ -35,7 +35,7 @@ interface PrefsTab {
      * If the tab is *not* ready, it should display a message to the user
      * informing about the illegal setting.
      */
-    boolean validateSettings();
+    boolean validateSettings(); // ToDo: After conversion of all tabs: viewModel.validateSettings()
 
     /**
      * Should return the localized identifier to use for the tab.
diff --git a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
index b47321f0095..684e830d445 100644
--- a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
+++ b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
@@ -16,7 +16,6 @@ public ShowPreferencesAction(JabRefFrame jabRefFrame, TaskExecutor taskExecutor)
 
     @Override
     public void execute() {
-        PreferencesDialog preferencesDialog = new PreferencesDialog(jabRefFrame, taskExecutor);
-        preferencesDialog.showAndWait();
+        new PreferencesDialogView(jabRefFrame, taskExecutor).show();
     }
 }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 253b64cb8e4..e002caa979b 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -2118,4 +2118,16 @@ public void setActivePushToApplication(PushToApplication application, PushToAppl
             manager.updateApplicationAction();
         }
     }
+
+    public NewLineSeparator getNewLineSeparator() {
+        return NewLineSeparator.parse(get(JabRefPreferences.NEWLINE));
+    }
+
+    public void setNewLineSeparator(NewLineSeparator newLineSeparator) {
+        String escapeChars = newLineSeparator.getEscapeChars();
+        put(JabRefPreferences.NEWLINE, escapeChars);
+
+        // we also have to change Globals variable as globals is not a getter, but a constant
+        OS.NEWLINE = escapeChars;
+    }
 }
diff --git a/src/main/java/org/jabref/preferences/NewLineSeparator.java b/src/main/java/org/jabref/preferences/NewLineSeparator.java
new file mode 100644
index 00000000000..975bdcd88fc
--- /dev/null
+++ b/src/main/java/org/jabref/preferences/NewLineSeparator.java
@@ -0,0 +1,52 @@
+package org.jabref.preferences;
+
+public enum NewLineSeparator {
+    CR,
+    LF,
+    CRLF;
+
+    /**
+     * An enum which contains the possible NewLineSeperators
+     * Possible are CR ("\n"), LF ("\r") and the windows standard CR/LF.
+     */
+
+    public String toString() {
+        switch (this) {
+            case CR:
+                return "CR (\"\\r\")";
+            case LF:
+                return "LF (\"\\n\")";
+            default:
+                return "CR/LF (\"\\r\\n\")";
+        }
+    }
+
+    /**
+     * @return the name of the current mode as String
+     */
+    public String getEscapeChars() {
+        switch (this) {
+            case CR:
+                return "\r";
+            case LF:
+                return "\n";
+            default:
+                return "\r\n";
+        }
+    }
+
+    /**
+     * Returns the {@link NewLineSeparator} that equals the given string.
+     **/
+    public static NewLineSeparator parse(String data) {
+        switch (data) {
+            case "\r":
+                return CR;
+            case "\n":
+                return LF;
+            default:
+                return CRLF;
+        }
+    }
+}
+
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index 64317f87222..527c4fc8222 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -63,6 +63,7 @@ Append\ library=Føj til library
 
 Application=Applikation
 
+
 Apply=Udfør
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Argumenterne sendt til allerede aktiv JabRef-instans. Afslutter.
@@ -298,6 +299,7 @@ entry=post
 
 Entry\ editor=Postredigering
 
+
 Entry\ preview=Forhåndsvisning
 
 Entry\ table=Hovedtabel
@@ -359,7 +361,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Filbiblioteket er ikke sat
 File\ exists=Filen eksisterer
 
 File\ not\ found=Fil ikke fundet
-filename=filnavn
 
 Files\ opened=Filer åbnet
 
@@ -442,8 +443,6 @@ Import\ preferences\ from\ file=Importer indstillinger fra fil
 
 Import\ strings=Importer strenge
 
-Import\ to\ open\ tab=Importer til åbent faneblad
-
 Import\ word\ selector\ definitions=Importer definitioner for hurtigvælgere
 
 Imported\ entries=Importerede poster
@@ -498,6 +497,7 @@ Left=Venstre
 Listen\ for\ remote\ operation\ on\ port=Lyt efter fjernoperationer på port
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Hent og gem indstillinger fra/til jabref.xml ved opstart (memory stick-tilstand)
 
+
 Main\ file\ directory=Hovedbibliotek
 
 Manage\ custom\ exports=Opsæt eksterne eksportfiltre
@@ -537,7 +537,6 @@ Name\ formatter=Navneformatering
 Natbib\ style=Natbib-stil
 
 nested\ AUX\ files='nestede' AUX-filer
-new=ny
 
 New\ BibTeX\ sublibrary=Ny BibTeX-dellibrary
 New\ library\ created.=Opprettede ny library.
@@ -554,7 +553,6 @@ no\ library\ generated=ingen library genereret
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Ingen poster fundet. Kontroller at du bruger korrekt importfilter.
 No\ files\ found.=Ingen filer fundet.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Ingen GUI. Processer kun kommandolinjevalg.
 
 No\ journal\ names\ could\ be\ abbreviated.=Ingen tidsskriftsnavne kunne forkortes.
 
@@ -601,8 +599,6 @@ Options=Valg
 
 or=eller
 
-Output\ or\ export\ file=Gem eller eksporter fil
-
 Override\ default\ file\ directories=Tilsidesæt standard fil-biblioteker
 Overwrite=Overskriv
 
@@ -653,6 +649,7 @@ Processing\ %0=Arbejder %0
 
 Pushed\ citations\ to\ %0=Referencer sendt til %0
 
+
 Quit\ JabRef=Afslut JabRef
 
 Redo=Gentag
@@ -815,14 +812,12 @@ Statically\ group\ entries\ by\ manual\ assignment=Grupper poster statisk ved ma
 
 Strings\ for\ library=Strenge for library
 
-Sublibrary\ from\ AUX=Dellibrary fra AUX-fil
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Skifter mellem fuldt og forkortet tidsskriftsnavn hvis navnet er kendt.
 
 Tabname=Navn på faneblad
 Tertiary\ sort\ criterion=Tertiært sorteringskriterium
 
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Det valgte datoformat er ugyldigt
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Den valgte tegnkodning '%0' kunne ikke kode de følgende tegn\:
 
@@ -859,7 +854,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Denne operation kræver, at en eller flere poster er valgt.
 
-
 Toggle\ entry\ preview=Vis/skjul forhåndsvisning
 Toggle\ groups\ interface=Vis/skjul grupperingspanel
 
@@ -959,14 +953,12 @@ Unable\ to\ open\ link.=Kan ikke åbne link.
 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<BR>i stedet for at åbne programmet påny. For eksempel er dette praktisk, når du åbner filer i<BR>JabRef fra din web browser.<BR>Bemærk at dette vil forhindre dig i at køre mere end en instans af JabRef ad gangen.
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Kør henteværktøj, f.eks. "--fetch\=Medline\:cancer"
 
 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
-Settings\ for\ %0=Indstillinger for %0
 Rename\ field=Omdøb felt
 Rename\ field\ to=Omdøb felt til
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Flyt indhold af et felt til et felt med et andet navn
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index eb622fcade7..3d5c8690a21 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -67,6 +67,7 @@ Append\ library=Bibliothek anhängen
 
 Application=Anwendung
 
+
 Apply=Übernehmen
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Argumente wurden der laufenden JabRef-Instanz übergeben. Schließen läuft.
@@ -311,6 +312,7 @@ entry=Eintrag
 
 Entry\ editor=Eintragseditor
 
+
 Entry\ preview=Eintragsvorschau
 
 Entry\ table=Tabellenansicht
@@ -375,7 +377,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Dateiverzeichnis ist nicht
 File\ exists=Datei ist vorhanden
 
 File\ not\ found=Datei nicht gefunden
-filename=Dateiname
 
 Files\ opened=Dateien geöffnet
 
@@ -470,8 +471,6 @@ Import\ preferences\ from\ file=Einstellungen aus Datei importieren
 
 Import\ strings=Strings importieren
 
-Import\ to\ open\ tab=In geöffnetes Tab importieren
-
 Import\ word\ selector\ definitions=Wortauswahldefinitionen importieren
 
 Imported\ entries=Einträge importiert
@@ -533,6 +532,7 @@ Link=Link
 Listen\ for\ remote\ operation\ on\ port=Port nach externem Zugriff abhören
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Einstellungen beim Start laden von/speichern in jabref.xml (Memory Stick-Modus)
 
+
 Main\ file\ directory=Standard-Verzeichnis für Dateien
 
 Manage\ custom\ exports=Verwalte externe Exportfilter
@@ -573,7 +573,6 @@ Name\ formatter=Namens-Formatierer
 Natbib\ style=Natbib-Stil
 
 nested\ AUX\ files=referenzierte AUX Dateien
-new=neu
 
 New\ BibTeX\ sublibrary=Neue BibTeX-Teilbibliothek
 New\ library\ created.=Neue Bibliothek angelegt.
@@ -590,7 +589,6 @@ no\ library\ generated=keine Bibliothek erstellt und geschrieben
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Keine Einträge gefunden. Bitte vergewissern Sie sich, dass Sie den richtigen Importfilter benutzen.
 No\ files\ found.=Keine Dateien gefunden.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Kein GUI. Nur Kommandozeilenbefehle ausführen.
 
 No\ journal\ names\ could\ be\ abbreviated.=Es konnten keine Zeitschriftentitel abgekürzt werden.
 
@@ -641,8 +639,6 @@ Options=Optionen
 
 or=oder
 
-Output\ or\ export\ file=Speichere oder exportiere Datei
-
 Override\ default\ file\ directories=Standard-Verzeichnisse überschreiben
 Overwrite=Überschreiben
 
@@ -704,6 +700,7 @@ Pull\ changes\ from\ shared\ database=Änderungen der geteilten Datenbank bezieh
 
 Pushed\ citations\ to\ %0=Einträge in %0 eingefügt
 
+
 Quit\ JabRef=JabRef beenden
 
 Redo=Wiederholen
@@ -886,7 +883,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Statisches Gruppieren der Ein
 Status=Status
 Strings\ for\ library=Strings für die Bibliothek
 
-Sublibrary\ from\ AUX=Teilbibliothek aus AUX-Datei
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Wechselt zwischen vollem und abgekürztem Zeitschriftentitel falls bekannt.
 
@@ -894,7 +890,6 @@ Tabname=Tab-Name
 Tertiary\ sort\ criterion=Drittes Sortierkriterium
 
 Test=Test
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Das Datumsformat für neue Einträge ist nicht gültig
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Die gewählte Kodierung '%0' konnte folgende Buchstaben nicht darstellen\:
 
@@ -933,7 +928,6 @@ This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Für diesen
 
 This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=Diese Einstellung kann jederzeit in den Einstellungen geändert werden.
 Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of\ day\ the\ request\ is\ being\ made.)=Zeitzone (Bietet bessere Empfehlungen durch Angabe der Tageszeit, in der die die Anfrage gestellt wird.)
-
 Toggle\ entry\ preview=Eintragsvorschau ein-/ausblenden
 Toggle\ groups\ interface=Gruppenansicht ein-/ausblenden
 
@@ -1035,15 +1029,13 @@ BibTeX\ key\ generator=BibTeX-Key-Generator
 Unable\ to\ open\ link.=Öffnen des Links nicht möglich
 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<BR>und nicht in einem neuen Fenster. Das ist beispielsweise nützlich,<BR>wenn Sie JabRef von einem Webbrowser aus starten.<BR>Beachten Sie, dass damit nicht mehr als eine Instanz von JabRef gestartet werden kann.
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Recherche starten, z.B. "--fetch\=Medline\:cancer"
+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.
 
 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
-Settings\ for\ %0=Einstellungen für %0
 No\ full\ text\ document\ found=Kein Volltext-Dokument gefunden
 Download\ from\ URL=Download von URL
 Rename\ field=Feld umbenennen
@@ -1214,7 +1206,6 @@ Resetting\ preference\ key\ '%0'=Setze Einstellung '0%' zurück
 Unknown\ preference\ key\ '%0'=Unbekannte Einstellung '0%'
 Unable\ to\ clear\ preferences.=Einstellungen konnten nicht zurückgesetzt werden.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Einstellungen zurücksetzen (key1,key2,... oder 'all')
 Find\ unlinked\ files=Nicht verlinkte Dateien finden
 Unselect\ all=Auswahl aufheben
 Expand\ all=Alle aufklappen
@@ -1669,8 +1660,6 @@ Unable\ to\ generate\ new\ library=Kann keine neue Bibliothek generieren
 
 Open\ console=Terminal öffnen
 Use\ default\ terminal\ emulator=Standard Terminal-Emulator verwenden
-Execute\ command=Befehl ausführen
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Hinweis\: %0 als Platzhalter für den Speicherort der Bibliothek benutzen.
 Error\ occured\ while\ executing\ the\ command\ "%0".=Während der Ausführung des Befehls "%0" ist ein Fehler aufgetreten.
 Reformat\ ISSN=Formatiere ISSN
 
@@ -1746,14 +1735,10 @@ Work\ offline=Offline arbeiten.
 Working\ offline.=Arbeite offline.
 Update\ refused.=Aktualisierung verweigert.
 Update\ refused=Aktualisierung verweigert
-Local\ entry=Lokaler Eintrag
-Shared\ entry=Gemeinsam genutzter Eintrag
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Aktualisierung konnte wegen Konflikten nicht durchgeführt werden.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Sie arbeiten nicht mit der neusten Version von BibEntry.
 Local\ version\:\ %0=Lokale Version\: %0
 Shared\ version\:\ %0=Geteilte genutzte Version\: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Bitte führen Sie den gemeinsam genutzten Eintrag mit Ihrem zusammen und klicken Sie auf "Einträge zuammenführen", um das Problem zu beheben.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Durch einen Abbruch dieser Operation werden die Änderungen nicht synchronisiert. Trotzdem abbrechen?
 Shared\ entry\ is\ no\ longer\ present=Geteilter Eintrag ist nicht mehr vorhanden
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Unter Benutzung der "Rückgängig"-Funktion kann der Eintrag wiederhergestellt werden.
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Eine Datenbankverbindung mit den eingegebenen Verbindungsinformationen besteht bereits.
@@ -1891,7 +1876,6 @@ Could\ not\ copy\ file=Datei konnte nicht kopiert werden
 Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=Kopierte %0 Dateien von %1 erfolgreich nach %2
 Rename\ failed=Umbenennen fehlgeschlagen
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef kann nicht auf die Datei zugreifen, da sie von einem anderen Prozess verwendet wird.
-Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Anzeigen der Konsolen-Ausgabe (Nur notwendig wenn der Launcher benutzt wird)
 
 Remove\ line\ breaks=Entfernen der Zeilenumbrüche
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=Entfernen aller Zeilenumbrüche im Inhalt des Feldes.
@@ -1984,6 +1968,7 @@ Export\ name=Filtername
 Main\ layout\ file=Haupt-Layoutdatei
 
 
+Execute\ command=Befehl ausführen
 
 
 
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index c30702ffaee..12a4aea5300 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -66,6 +66,7 @@ Append\ library=Προσάρτηση βιβλιοθήκης
 
 Application=Εφαρμογή
 
+
 Apply=Εφαρμόστε
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Οι παράμετροι περάστηκαν στο τρέχον παράθυρο JabRef. Πραγματοποιείται τερματισμός.
@@ -304,6 +305,7 @@ entry=καταχώρηση
 
 Entry\ editor=Επεξεργαστής κειμένου καταχώρησης
 
+
 Entry\ preview=Προεπισκόπηση καταχώρησης
 
 Entry\ table=Πίνακας καταχωρήσεων
@@ -366,7 +368,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Ο φάκελος αρχε
 File\ exists=Το αρχείο υπάρχει
 
 File\ not\ found=Το αρχείο δε βρέθηκε
-filename=όνομα αρχείου
 
 Files\ opened=Τα αρχεία έχουν ανοίξει
 
@@ -458,8 +459,6 @@ Import\ preferences\ from\ file=Εισαγωγή προτιμήσεων από 
 
 Import\ strings=Εισαγωγή συμβολοσειρών
 
-Import\ to\ open\ tab=Εισαγωγή σε ανοιχτή καρτέλα
-
 Import\ word\ selector\ definitions=Εισαγωγή ορισμών του επιλογέα λέξεων
 
 Imported\ entries=Καταχωρήσεις που έχουν εισαχθεί
@@ -516,6 +515,7 @@ Link=Σύνδεση
 Listen\ for\ remote\ operation\ on\ port=Αναμονή για απομακρυσμένη λειτουργία στη θύρα
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Φόρτωση και Αποθήκευση από/σε jabref.xml κατά την εκκίνηση (λειτουργία memory stick)
 
+
 Main\ file\ directory=Φάκελος κύριου αρχείου
 
 Manage\ custom\ exports=Διαχείριση προσαρμοσμένων εξαγωγών
@@ -556,7 +556,6 @@ Name\ formatter=Μορφοποιητής ονόματος
 Natbib\ style=Στυλ Natbib
 
 nested\ AUX\ files=εμφωλευμένα αρχεία AUX
-new=νέο
 
 New\ BibTeX\ sublibrary=Νέα υπο-βιβλιοθήκη BibTeX
 New\ library\ created.=Δημιουργήθηκε νέα βιβλιοθήκη.
@@ -573,7 +572,6 @@ 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.=Δεν υπάρχει διεπαφή χρήστη. Πραγματοποιείται επεξεργασία μόνο των επιλογών γραμμής εντολών.
 
 No\ journal\ names\ could\ be\ abbreviated.=Δεν ήταν δυνατή η σύντμηση ονομάτων περιοδικών.
 
@@ -623,8 +621,6 @@ Options=Επιλογές
 
 or=ή
 
-Output\ or\ export\ file=Έξοδος ή αρχείο εξαγωγής
-
 Override\ default\ file\ directories=Παράκαμψη των προεπιλεγμένων φακέλων αρχείου
 Overwrite=Αντικατάσταση
 
@@ -685,6 +681,7 @@ Pull\ changes\ from\ shared\ database=Τραβήξτε αλλαγές από κ
 
 Pushed\ citations\ to\ %0=Οι αναφορές μεταφέρθηκαν στο %0
 
+
 Quit\ JabRef=Έξοδος από το JabRef
 
 Redo=Ακύρωση αναίρεσης
@@ -857,7 +854,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Ομαδοποίηση στα
 Status=Κατάσταση
 Strings\ for\ library=Συμβολοσειρές για βιβλιοθήκη
 
-Sublibrary\ from\ AUX=Υπο-βιβλιοθήκη από AUX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Εναλλαγή από πλήρες ή συντετμημένο όνομα περιοδικού, εάν το όνομα του περιοδικού είναι άγνωστο.
 
@@ -865,7 +861,6 @@ Tabname=Όνομα καρτέλας
 Tertiary\ sort\ criterion=Κριτήριο τριτογενούς ταξινόμησης
 
 Test=Έλεγχος
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Η επιλεγμένη μορφή ημερομηνίας για νέες καταχωρήσεις δεν είναι έγκυρη
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Η επιλεγμένη κωδικοποίηση '%0' δεν κατάφερε να κωδικοποιήσει τους παρακάτω χαρακτήρες\:
 
@@ -902,7 +897,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Αυτή η ενέργεια απαιτεί να έχουν επιλεχθεί μία ή περισσότερες καταχωρήσεις.
 
-
 Toggle\ entry\ preview=Εναλλαγή προβολής καταχώρησης
 Toggle\ groups\ interface=Εναλλαγή διεπαφής ομάδων
 
@@ -1005,14 +999,12 @@ Unable\ to\ open\ link.=Αδυναμία ανοίγματος συνδέσμου
 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<BR>αντί να ανοίγει νέο παράθυρο. Για παράδειγμα, αυτό είναι χρήσιμο όταν ανοίγετε ένα αρχείο JabRef<br>από τον περιηγητή ιστού.<BR>Σημειώστε πως αυτό θα σας εμποδίσει από το να τρέξετε περισσότερα από ένα παράθυρα JabRef ταυτόχρονα.
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Τρέξτε ανακτητή, π.χ. "--fetch\=Medline\:cancer"
 
 Reset=Επαναφορά
 
 Use\ IEEE\ LaTeX\ abbreviations=Χρήση των συντομογραφιών IEEE LaTeX
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=Κατά το άνοιγμα συνδέσμου αρχείου, να πραγματοποιείται αναζήτηση για αντίστοιχο αρχείο, όταν δεν καθορίζεται σύνδεσμος
-Settings\ for\ %0=Ρυθμίσεις για %0
 No\ full\ text\ document\ found=Δεν βρέθηκε αρχείο πλήρους κειμένου
 Download\ from\ URL=Κατέβασμα από σύνδεσμο URL
 Rename\ field=Μετονομασία πεδίου
@@ -1183,7 +1175,6 @@ Resetting\ preference\ key\ '%0'=Επαναφορά κλειδιού προτί
 Unknown\ preference\ key\ '%0'=Άγνωστο κλειδί προτίμησης '%0'
 Unable\ to\ clear\ preferences.=Αδυναμία εκκαθάρισης προτιμήσεων.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Επαναφορά προτιμήσεων (κλειδί1,κλειδί2,... ή 'όλα')
 Find\ unlinked\ files=Εύρεση μη συνδεδεμένων αρχείων
 Unselect\ all=Αποεπιλογή όλων
 Expand\ all=Ανάπτυξη όλων
@@ -1638,8 +1629,6 @@ Unable\ to\ generate\ new\ library=Αδυναμία δημιουργίας νέ
 
 Open\ console=Άνοιγμα κονσόλας
 Use\ default\ terminal\ emulator=Χρήση προεπιλεγμένου προσωμοιωτή τερματικού
-Execute\ command=Εκτέλεση εντολής
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Σημείωση\: Χρήση του %0 ως σύμβολο κράτησης θέσης για το αρχείο ανοιχτής βιβλιοθήκης.
 Error\ occured\ while\ executing\ the\ command\ "%0".=Προέκυψε σφάλμα κατά την εκτέλεση της εντολής "%0".
 Reformat\ ISSN=Αναδιαμόρφωση ISSN
 
@@ -1715,14 +1704,10 @@ Work\ offline=Εργασία χωρίς σύνδεση
 Working\ offline.=Πραγματοποιείται εργασία χωρίς σύνδεση.
 Update\ refused.=Η ενημέρωση απορρίφθηκε.
 Update\ refused=Η ενημέρωση απορρίφθηκε
-Local\ entry=Τοπική καταχώρηση
-Shared\ entry=Κοινόχρηστη καταχώρηση
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Αδυναμία ενημέρωσης λόγω συγκρούσεων στις υφιστάμενες αλλαγές.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Δεν χρησιμοποιείτε την πιο πρόσφατη έκδοση του BibEntry.
 Local\ version\:\ %0=Τοπική έκδοση\: %0
 Shared\ version\:\ %0=Κοινόχρηστη έκδοση\: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Παρακαλώ συγχωνεύστε την κοινόχρηστη καταχώρηση με τη δική σας και πατήστε "Συγχώνευση καταχωρήσεων" για να επιλύσετε το πρόβλημα.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Η ακύρωση αυτής της ενέργειας θα αφήσει τις αλλαγές σας ασυγχρόνιστες. Θέλετε σίγουρα να την ακυρώσετε;
 Shared\ entry\ is\ no\ longer\ present=Η κοινόχρηστη καταχώρηση δεν υπάρχει πλέον
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Μπορείτε να επαναφέρετε την καταχώρηση με τη χρήση της λειτουργίας "Αναίρεση".
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Είστε ήδη συνδεδεμένοι σε μια βάση δεδομένων χρησιμοποιώντας τις καταχωρημένες λεπτομέρειες σύνδεσης.
@@ -1860,7 +1845,6 @@ Could\ not\ copy\ file=Αδυναμία αντιγραφής αρχείου
 Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=Αντιγράφτηκαν με επιτυχία %0 αρχεία από %1 στο %2
 Rename\ failed=Η μετονομασία απέτυχε
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=Το JabRef δεν έχει πρόσβαση στο αρχείο γιατί χρησιμοποιείται από κάποια άλλη διεργασία.
-Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Εμφάνιση της κονσόλας εξαγωγής (απαραίτητο μόνο κατά τη χρήση του εκκινητή)
 
 Remove\ line\ breaks=Αφαίρεση αλλαγών γραμμής
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=Αφαιρεί όλες τις αλλαγές γραμμής από τα περιεχόμενα του πεδίου.
@@ -1953,6 +1937,7 @@ Export\ name=Όνομα εξαγωγής
 Main\ layout\ file=Φάκελος κύριας διάταξης
 
 
+Execute\ command=Εκτέλεση εντολής
 
 
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index eb1ffbb0894..bae2e82011d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -67,7 +67,7 @@ Append\ library=Append library
 
 Application=Application
 
-Application\ to\ push\ entries\ to\:=Application to push entries to:
+Application\ to\ push\ entries\ to=Application to push entries to
 
 Apply=Apply
 
@@ -313,6 +313,8 @@ entry=entry
 
 Entry\ editor=Entry editor
 
+Entry\ owner=Entry owner
+
 Entry\ preview=Entry preview
 
 Entry\ table=Entry table
@@ -702,6 +704,8 @@ Pull\ changes\ from\ shared\ database=Pull changes from shared database
 
 Pushed\ citations\ to\ %0=Pushed citations to %0
 
+Push\ applications=Push applications
+
 Quit\ JabRef=Quit JabRef
 
 Redo=Redo
@@ -892,7 +896,6 @@ Tabname=Tabname
 Tertiary\ sort\ criterion=Tertiary sort criterion
 
 Test=Test
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=The chosen date format for new entries is not valid
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=The chosen encoding '%0' could not encode the following characters:
 
@@ -931,7 +934,7 @@ This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=This operat
 
 This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=This setting may be changed in preferences at any time.
 Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of\ day\ the\ request\ is\ being\ made.)=Timezone (Provides for better recommendations by indicating the time of day the request is being made.)
-
+Time\ stamp=Time stamp
 Toggle\ entry\ preview=Toggle entry preview
 Toggle\ groups\ interface=Toggle groups interface
 
@@ -1676,8 +1679,7 @@ Unable\ to\ generate\ new\ library=Unable to generate new library
 
 Open\ console=Open console
 Use\ default\ terminal\ emulator=Use default terminal emulator
-Execute\ command=Execute command
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Note: Use the placeholder %0 for the location of the opened library file.
+Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ library\ file.=Note: Use the placeholder %DIR% for the location of the opened library file.
 Error\ occured\ while\ executing\ the\ command\ \"%0\".=Error occured while executing the command \"%0\".
 Reformat\ ISSN=Reformat ISSN
 
@@ -2066,8 +2068,7 @@ Accept\ changes=Accept changes
 Dismiss\ changes=Dismiss changes
 The\ library\ has\ been\ modified\ by\ another\ program.=The library has been modified by another program.
 
-Browser=Browser
-Execute\ Command=Execute Command
+Execute\ command=Execute command
 Open\ File\ Browser=Open File Browser
 Use\ default\ file\ browser=Use default file browser
 
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index 315ab9b4c83..4aa54610c60 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -67,6 +67,7 @@ Append\ library=Agregar biblioteca
 
 Application=Aplicación
 
+
 Apply=Aplicar
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Argumentos pasados a una instancia JabRef en ejecución. Cerrando el programa.
@@ -103,7 +104,9 @@ by=por
 The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=Los campos en conflicto de estas entradas serán fusionadas en el campo 'Comentario'.
 
 Cancel=Cancelar
+Cannot\ create\ group=No se puede crear el grupo
 
+Cannot\ create\ group.\ Please\ create\ a\ library\ first.=No se puede crear el grupo. Por favor, primero crea una biblioteca.
 
 Cannot\ merge\ this\ change=No se puede incorporar este cambio
 
@@ -134,7 +137,7 @@ Clear=Limpiar
 
 Clear\ fields=Limpiar campos
 
-Close\ entry=Entrada estrecha
+Close\ entry=Cerrar entrada
 
 Close\ dialog=Cerrar diálogo
 
@@ -216,6 +219,7 @@ Default\ encoding=Codificación por defecto
 Default\ grouping\ field=Campo de agrupación por defecto
 
 Default\ pattern=Patrón por defecto
+Execute\ default\ action\ in\ dialog=Ejecutar acción por defecto en el diálogo
 
 Delete=Borrar
 
@@ -308,6 +312,7 @@ entry=entrada
 
 Entry\ editor=Editor de entrada
 
+
 Entry\ preview=Vista previa de la entrada
 
 Entry\ table=Tabla de entrada
@@ -326,6 +331,7 @@ Error\ occurred\ when\ parsing\ entry=Ocurrió un error al analizar la entrada
 
 Error\ opening\ file=Error al abrir el archivo
 
+Error\ while\ fetching\ from\ Mr.DLib.=Error al recuperar desde Mr. DLib.
 
 Error\ while\ writing=Error al escribir
 
@@ -339,7 +345,7 @@ Export\ preferences\ to\ file=Exportar preferencias a archivo
 
 Export\ to\ clipboard=Exportar al portapapeles
 
-Export\ to\ text\ file.=Exportar a archivo de texto.
+Export\ to\ text\ file.=Exportar a un archivo de texto.
 
 Exporting=Exportando
 Extension=Extensión
@@ -370,7 +376,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=¡La carpeta de archivos n
 File\ exists=El archivo ya existe
 
 File\ not\ found=No se ha encontrado el archivo
-filename=nombre de archivo
 
 Files\ opened=Archivos abiertos
 
@@ -397,6 +402,7 @@ found\ in\ AUX\ file=encontrado en archivo AUX
 
 General=General
 
+General\ Fields=Campos generales
 
 Generate=Generar
 
@@ -461,8 +467,6 @@ Import\ preferences\ from\ file=Importar preferencias desde archivo
 
 Import\ strings=Importar cadenas
 
-Import\ to\ open\ tab=Importar en pestaña abierta
-
 Import\ word\ selector\ definitions=Importar definiciones de selector de palabras
 
 Imported\ entries=Importar entradas
@@ -478,6 +482,7 @@ Importing\ in\ unknown\ format=Importando en formato desconocido
 Include\ subgroups\:\ When\ selected,\ view\ entries\ contained\ in\ this\ group\ or\ its\ subgroups=Incluir subgrupos\: Ver entradas contenidas es este grupo o sus subgrupos cuando estén seleccionadas.
 
 Independent\ group\:\ When\ selected,\ view\ only\ this\ group's\ entries=Grupo independiente\: ver sólo las entradas de este grupo cuando esté seleccionado.
+I\ Agree=Acepto
 Insert\ rows=Insertar filas
 
 Intersection=Intersección
@@ -512,6 +517,7 @@ Label=Etiqueta
 Language=Idioma
 
 Last\ modified=Modificado por última vez
+LaTeX\ AUX\ file\:=Archivo LaTeX AUX\:
 
 Left=Dejar
 
@@ -519,6 +525,7 @@ Link=Enlace
 Listen\ for\ remote\ operation\ on\ port=Escuchar para operación remota en el puerto
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Cargar y guardar preferencias desde/a jabref.xml al arrancar (modo lápiz de memoria)
 
+
 Main\ file\ directory=Carpeta del archivo principal
 
 Manage\ custom\ exports=Administrar esportaciones personalizadas
@@ -559,7 +566,6 @@ Name\ formatter=Formateador de nombre
 Natbib\ style=Estilo Natbib
 
 nested\ AUX\ files=Archivos AUX anidados
-new=nuevo
 
 New\ BibTeX\ sublibrary=Nueva biblioteca secundaria BibTeX
 New\ library\ created.=Nueva biblioteca creada.
@@ -576,7 +582,6 @@ no\ library\ generated=No se generó biblioteca
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=No se han encontrado entradas. Asegúrese de que está usando el filtro de importación correcto.
 No\ files\ found.=No se han encontrado archivos.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Sin GUI. Procesar sólo opciones de la línea de comandos.
 
 No\ journal\ names\ could\ be\ abbreviated.=No se pudieron abreviar nombres de revistas.
 
@@ -626,8 +631,6 @@ Options=Opciones
 
 or=o
 
-Output\ or\ export\ file=Sacar o exportar archivo,
-
 Override\ default\ file\ directories=Ignorar carpetas de archivo por defecto
 Overwrite=Sobreescribir
 
@@ -688,6 +691,7 @@ Pull\ changes\ from\ shared\ database=Recuperar cambios desde biblioteca compart
 
 Pushed\ citations\ to\ %0=Se han enviado las citas a %0
 
+
 Quit\ JabRef=Salir de JabRef
 
 Redo=Rehacer
@@ -743,7 +747,9 @@ Removed\ string=Cadena eliminada
 Renamed\ string=Cadena renombrada
 
 Replace=Reemplazar
-Replace\ With\:=Reemplazar Con\:
+Replace\ With\:=Reemplazar con\:
+Limit\ to\ Selected\ Entries=Limitar a las entradas seleccionadas
+Limit\ to\ Fields=Limitar a los campos
 Find\:=Buscar\:
 Find\ and\ Replace=Buscar y reemplazar
 
@@ -762,6 +768,7 @@ Resolve\ strings\ for\ standard\ BibTeX\ fields\ only=Resolver cadenas únicamen
 
 resolved=resuelto
 
+Restart=Reiniciar
 
 Review=Revisar
 Review\ changes=Revisar cambios
@@ -800,6 +807,7 @@ Searching\ for\ files=Buscando archivos
 Secondary\ sort\ criterion=Criterio secundario de ordenación
 
 Select\ all=Seleccionar todo
+Select\ new\ encoding=Seleccionar nueva codificación
 
 Select\ entry\ type=Seleccionar tipo de entrada
 
@@ -810,6 +818,7 @@ Select\ the\ tree\ nodes\ to\ view\ and\ accept\ or\ reject\ changes=Seleccionar
 Set\ field=Establecer campo
 Set\ fields=Establecer campos
 
+Set\ General\ Fields=Configurar campos generales
 
 Settings=Ajustes
 
@@ -859,7 +868,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Agrupar entradas estadística
 Status=Estado
 Strings\ for\ library=Cadenas para biblioteca
 
-Sublibrary\ from\ AUX=Biblioteca secundaria desde AUX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Cambia entre nombre completo y abreviatura de la revista si se conoce en nombe de la revista.
 
@@ -867,7 +875,6 @@ Tabname=Nombre de pestaña
 Tertiary\ sort\ criterion=Criterio de ordenación terciario
 
 Test=Prueba
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=El forma-to de fecha escogido para nuevas entradas no es correcto
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=La codificación de caracteres '%' no puede codificar los siguientes caracteres\:
 
@@ -904,7 +911,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Esta operación requiere seleccionar una o más entradas.
 
-
 Toggle\ entry\ preview=Usar vista previa de la entrada si/no
 Toggle\ groups\ interface=Usar interfaz de grupos si/no
 
@@ -916,12 +922,14 @@ Try\ different\ encoding=Probar una codificación diferente
 Unabbreviate\ journal\ names\ of\ the\ selected\ entries=Desabreviar nombre de revista de las entradas seleccionadas
 Unabbreviated\ %0\ journal\ names.=%0 nombres de revista desabreviados
 
+Unable\ to\ open\ %0=Imposible abrir %0
 Unable\ to\ open\ link.\ The\ application\ '%0'\ associated\ with\ the\ file\ type\ '%1'\ could\ not\ be\ called.=No se puede abrir el enlace. La aplicación '%' asociada con el tipo de archivo '%1' no puede ser lanzada.
 unable\ to\ write\ to=no se puede escribir en
 
 Undo=Deshacer
 
 Union=Unión
+Unknown\ BibTeX\ entries\:=Entradas BibTeX desconocidas\:
 
 unknown\ edit=edición desconocida
 
@@ -1006,14 +1014,12 @@ Unable\ to\ open\ link.=No es posible abrir el enlace.
 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 nuevos archivos seasn abiertos o importados en una instancia de JabRef que ya se esté ejecutando,<BR>en lugar de abrir una nueva instancia. Esto es útil, por ejemplo, cuando se abre un archivo en JabRef desde <br> el navegador de internet.<BR> Tenga en cuenta que esto le impedirá ejecutar más de una instancia de JabRef a la vez.
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Ejecutar recuperador, por ejemplo "--fetch\=Medline\:cancer"
 
 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
-Settings\ for\ %0=Ajustes para %0
 No\ full\ text\ document\ found=No se encontró un archivo de texto completo
 Download\ from\ URL=Descargar desde URL
 Rename\ field=Renombrar campo
@@ -1184,7 +1190,6 @@ Resetting\ preference\ key\ '%0'=Reestableciendo la preferencia con clave '%0'
 Unknown\ preference\ key\ '%0'=Clave de preferencia desconocida '%0'
 Unable\ to\ clear\ preferences.=No es posible limpiar preferencias.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Restablecer preferencias (key1,key2,... or 'todas')
 Find\ unlinked\ files=Buscar archivos desenlazados
 Unselect\ all=Deseleccionar todo
 Expand\ all=Expandir todo
@@ -1489,6 +1494,7 @@ Add\ style\ file=Añadir archivo de estilo
 Current\ style\ is\ '%0'=El estilo actual es '%0'
 Remove\ style=Eliminar estilo
 You\ must\ select\ a\ valid\ style\ file.=Debe seleccionar un fichero de estilo válidoº
+Invalid\ style\ selected=Estilo seleccionado no válido
 
 Reload=Recargar
 
@@ -1512,6 +1518,7 @@ LaTeX\ to\ Unicode=LaTeX a Unicode
 Lower\ case=Minúsuculas
 Minify\ list\ of\ person\ names=Minimizar lista de nombres de persona
 Normalize\ date=Normalizar fecha
+Normalize\ en\ dashes=Normalizar los guiones
 Normalize\ month=Normalizar mes
 Normalize\ month\ to\ BibTeX\ standard\ abbreviation.=Normalizar mes a abreviatura BibTeX estándarº
 Normalize\ names\ of\ persons=Normalizar nombres de persona
@@ -1519,6 +1526,7 @@ Normalize\ page\ numbers=Normalizar números de página
 Normalize\ pages\ to\ BibTeX\ standard.=Normalizar páginas a estándar BibTeX
 Normalizes\ lists\ of\ persons\ to\ the\ BibTeX\ standard.=Normaliza listas de personas a estándar BibTeX
 Normalizes\ the\ date\ to\ ISO\ date\ format.=Normaliza la fecha a formato de fecha ISO
+Normalizes\ the\ en\ dashes.=Normaliza los guiones.
 Ordinals\ to\ LaTeX\ superscript=Ordinales a superíndice LaTeX
 Protect\ terms=Proteger términos
 Add\ enclosing\ braces=Añadir paréntesis
@@ -1636,8 +1644,6 @@ Unable\ to\ generate\ new\ library=No se puede generar la nueva biblioteca
 
 Open\ console=Abrir consola
 Use\ default\ terminal\ emulator=Usar emulador de consola por defecto
-Execute\ command=Ejecutar comando
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Nota\:usar el marcador %0 para la ubicación de la biblioteca abierta
 Error\ occured\ while\ executing\ the\ command\ "%0".=Error durante la ejecución del comando "%0".
 Reformat\ ISSN=Reformatear ISSN
 
@@ -1697,6 +1703,7 @@ Your\ issue\ was\ reported\ in\ your\ browser.=Su problema fue comunicado a trav
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=La información de excepción y registro fue copiada a su portapapeles
 Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Por favor, pegue esta información (con Ctrl+V) en la descripción del problema.
 
+Host=Host
 Port=Puerto
 Library=Biblioteca
 User=Usuario
@@ -1712,14 +1719,10 @@ Work\ offline=Trabajar sin conexión
 Working\ offline.=Trabajando sin conexión
 Update\ refused.=Actualización rechazada.
 Update\ refused=Actualización rechazada
-Local\ entry=Entrada local
-Shared\ entry=Entrada compartida
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=No se pudo actualizar debido a los conflictos de cambio existentes.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=No está trabajando con la versión más reciente de BibEntry.
 Local\ version\:\ %0=Versión local\: %0
 Shared\ version\:\ %0=Versión compartida\: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Por favor, fusione la entrada compartida con la suya y presione "Fusionar entradas" para resolver el problema.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Cancelar la operación dejará sus cambios sin sincronizar. ¿Cancelar de todos modos?
 Shared\ entry\ is\ no\ longer\ present=La entrada compartida ya no está presente.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Puede restaurar la entrada mediante la operación "Deshacer"
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Ya esa conectado a una vase de datos usando los detalles de la conexión introducidos.
@@ -1755,6 +1758,7 @@ Date=Fecha
 File\ annotations=Anotaciones de fichero
 Show\ file\ annotations=Mostrar anotaciones de fichero
 Adobe\ Acrobat\ Reader=Adobe Acrobat Reader
+Sumatra\ Reader=Sumatra Reader
 shared=compartido
 should\ contain\ an\ integer\ or\ a\ literal=debería contener un entero o un literal
 should\ have\ the\ first\ letter\ capitalized=debería tener la primera letra mayúscula
@@ -1791,7 +1795,7 @@ Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=¿Quiere recu
 Firstname\ Lastname=Nombre Apellido
 
 Recommended\ for\ %0=Recomendado para %0
-Show\ 'Related\ Articles'\ tab=Ver ficha de 'Artículos relacionados'
+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)
 
 Could\ not\ open\ website.=No se puede abrir el sitio web
@@ -1804,6 +1808,7 @@ Could\ not\ find\ any\ bibliographic\ information.=No se puede encontrar informa
 BibTeX\ key\ deviates\ from\ generated\ key=La clave BibTeX difiere de la generada
 DOI\ %0\ is\ invalid=El DOI %0 no es válido
 
+Currently\ unknown\:=Actualmente desconocido\:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Diferente personalización, se sobreescribirán los ajustes actuales
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=El tipo de entrada %0 está definido para BibLaTeX pero no para BibTeX
@@ -1829,6 +1834,7 @@ Live=En vivo
 Locked=Bloqueado
 Show\ the\ document\ of\ the\ currently\ selected\ entry.=Mostrar el documento de la entrada seleccionada
 Show\ this\ document\ until\ unlocked.=Mostrar este documento hasta desbloqueo
+Set\ current\ user\ name\ as\ owner.=Establecer el nombre de usuario actual como propietario.
 
 Sort\ all\ subgroups\ (recursively)=Ordenar todos los subgrupos (recursivamente)
 Collect\ and\ share\ telemetry\ data\ to\ help\ improve\ JabRef.=Recopilar y compartir datos de telemetría para ayudar a la mejora de JabRef
@@ -1836,23 +1842,52 @@ Don't\ share=No compartir
 Share\ anonymous\ statistics=Compartir estadísticas anónimas
 Telemetry\:\ Help\ make\ JabRef\ better=Telemetría\: Ayude a mejorar JabRef
 To\ improve\ the\ user\ experience,\ we\ would\ like\ to\ collect\ anonymous\ statistics\ on\ the\ features\ you\ use.\ We\ will\ only\ record\ what\ features\ you\ access\ and\ how\ often\ you\ do\ it.\ We\ will\ neither\ collect\ any\ personal\ data\ nor\ the\ content\ of\ bibliographic\ items.\ If\ you\ choose\ to\ allow\ data\ collection,\ you\ can\ later\ disable\ it\ via\ Options\ ->\ Preferences\ ->\ General.=Para mejorar la experiencia de usuario, nos gustaría recopilar estadísitcas anónimas sobre las funcionalidades de JabRef que usa. Sólo se registrará qué funcionalidades emplea y con qué frecuencia. No se recopilará ningún dato personal ni el contenido de los elementos bibliográficos. Si decide permitir la recopilación de datos, podrá deshabilitarlo posteriormente en Opciones -> Preferencias ->General
-
-
-
+This\ file\ was\ found\ automatically.\ Do\ you\ want\ to\ link\ it\ to\ this\ entry?=Este archivo se encontró automáticamente. ¿Quiere vincularlo a esta entrada?
+Names\ are\ not\ in\ the\ standard\ %0\ format.=Los nombres no están en el formato %0 estándar.
+
+Delete\ '%0'=Eliminar '%0'
+Delete\ from\ disk=Eliminar del disco duro
+Remove\ from\ entry=Eliminar de la entrada
+There\ exists\ already\ a\ group\ with\ the\ same\ name.=Ya existe un grupo con el mismo nombre.
+
+Copy\ linked\ files\ to\ folder...=Copiar archivos enlazados a la carpeta...
+Copied\ file\ successfully=Archivo copiado con éxito
+Copying\ files...=Copiando archivos...
+Copying\ file\ %0\ of\ entry\ %1=Copiando archivo %0 de la entrada %1
+Finished\ copying=Copia finalizada
+Could\ not\ copy\ file=No se puede copiar el archivo
+Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=%0 archivos copiados de %1 a %2 con éxito
+Rename\ failed=Fallo al renombrar
+JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef no puede acceder al archivo porque está siendo usado por otro proceso.
+
+Remove\ line\ breaks=Eliminar saltos de línea
+Removes\ all\ line\ breaks\ in\ the\ field\ content.=Eliminar todos los saltos de línea del contenido del campo.
+Checking\ integrity...=Comprobando la integridad...
 
 Your\ current\ Java\ version\ (%0)\ is\ not\ supported.\ Please\ install\ version\ %1\ or\ higher.=No se admite la versión actual de Java (%0). Por favor, instale la versión %1 o superior.
 
 empty\ BibTeX\ key=vaciar clave BibTeX
+Aux\ file=Archivo Aux
 
+Any\ file=Cualquier archivo
 
 
 
+Delete\ Entry=Eliminar entrada
+Next\ library=Siguiente biblioteca
+Previous\ library=Biblioteca anterior
 add\ group=añadir grupo
+Entry\ is\ contained\ in\ the\ following\ groups\:=La entrada aparece en los siguientes grupos\:
+Delete\ entries=Eliminar entradas
+Keep\ entries=Conservar entradas
+Keep\ entry=Conservar entrada
 
 
 
 
 
+Hide\ panel=Ocultar panel
+Linked\ files=Archivos enlazados
 Jump\ to\ entry=Saltar a la entrada
 Blog=Blog
 Check\ integrity=Verificar Integridad
@@ -1860,11 +1895,15 @@ Copy\ DOI\ url=Copiar la url del DOI
 Copy\ citation=Copiar cita
 Development\ version=Versión de desarrollo
 Export\ selected\ entries=Exportar registros seleccionados
+Find\ duplicates=Buscar duplicados
 Fork\ me\ on\ GitHub=Fork en GitHub
 JabRef\ resources=Recursos sobre JabRef
+Manage\ journal\ abbreviations=Administrar abreviaturas de publicaciones
 Manage\ protected\ terms=gestionar términos protegidos
 New\ %0\ library=Nueva biblioteca %0
+New\ entry\ from\ plain\ text=Nueva entrada desde texto sin formato
 Push\ entries\ to\ external\ application\ (%0)=Agregar registros a aplicación externa (%0)
+Quit=Salir
 View\ change\ log=Ver registro de cambios
 View\ event\ log=Ver visor de eventos
 Website=Sitio web
@@ -1874,8 +1913,22 @@ Override\ default\ font\ settings=Ignorar ajustes de tipo de letra por defecto
 
 Export\ name=Exportar nombre
 Main\ layout\ file=Archivo de configuración principal
+Select\ all\ new\ entries=Seleccionar todas las nuevas entradas
+Select\ the\ entries\ to\ be\ imported\:=Seleccionar las entradas a importar\:
+Add\ new\ String=Añadir nueva cadena de texto
+Remove\ selected\ Strings=Eliminar cadenas de texto seleccionadas
+Open\ Help\ page=Abrir página de ayuda
+Field\ name\:=Nombre del campo\:
+Keyword\:=Palabra clave\:
+OpenOffice/LibreOffice=OpenOffice/LibreOffice
+Open\ document\ viewer=Abrir el visor de documentos
+Open\ entry\ editor=Abrir el editor de entradas
+Find\ and\ replace=Buscar y reemplazar
+
+Found\ documents\:=Documentos encontrados\:
+Accept\ changes=Aceptar cambios
 
-
+Execute\ command=Ejecutar comando
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index 93d9969f5bd..f70c79de204 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -48,6 +48,7 @@ Append\ library=افزودن پایگاه داده
 
 
 
+
 %0\ source=%0 منبع
 
 
@@ -251,6 +252,7 @@ Donate\ to\ JabRef=هدیه دادن به JabRef
 
 
 
+
 
 
 Manage\ external\ file\ types=مدیریت نوع پرونده‌های خارجی
@@ -487,7 +489,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 18023832474..8caf59d7774 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -67,6 +67,7 @@ Append\ library=Joindre au fichier
 
 Application=Application
 
+
 Apply=Appliquer
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Arguments transmis à l'instance JabRef active. Arrêt.
@@ -103,7 +104,9 @@ by=par
 The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=Les champs discordants de ces entrées seront fusionnés dans le champ « Comment ».
 
 Cancel=Annuler
+Cannot\ create\ group=Impossible de créer le groupe
 
+Cannot\ create\ group.\ Please\ create\ a\ library\ first.=Impossible de créer un groupe. Veuillez d'abord créer un fichier.
 
 Cannot\ merge\ this\ change=Cette modification ne peut pas être fusionnée
 
@@ -200,7 +203,7 @@ Cut=Couper
 
 cut\ entries=Couper les entrées
 
-cut\ entry=supprimer l'entrée
+cut\ entry=Couper l'entrée
 
 
 Library\ encoding=Encodage du fichier
@@ -216,6 +219,7 @@ Default\ encoding=Encodage par défaut
 Default\ grouping\ field=Champ par défaut pour les groupes
 
 Default\ pattern=Modèle par défaut
+Execute\ default\ action\ in\ dialog=Exécuter l'action par défaut dans la boîte de dialogue
 
 Delete=Supprimer
 
@@ -282,14 +286,14 @@ Each\ line\ must\ be\ of\ the\ following\ form=Chaque ligne doit être de la for
 
 Edit=Éditer
 
-Edit\ entry=Éditer l'entrée
+Edit\ entry=Modifier l'entrée
 Edit\ file\ type=Éditer le type de fichier
 
-Edit\ group=Éditer le groupe
+Edit\ group=Modifier le groupe
 
 
-Edit\ preamble=Éditer le préambule
-Edit\ strings=Éditer les chaînes
+Edit\ preamble=Modifier le préambule
+Edit\ strings=Modifier les chaînes
 Editor\ options=Options d'éditeur
 
 empty\ library=fichier vide
@@ -308,11 +312,13 @@ entry=entrée
 
 Entry\ editor=Éditeur d'entrée
 
+
 Entry\ preview=Aperçu de l'entrée
 
 Entry\ table=Table des entrées
 
 Entry\ table\ columns=Colonnes de la table des entrées
+Entry\ Title\ (Required\ to\ deliver\ recommendations.)=Titre de l'entrée (requis pour fournir des recommandations)
 
 Entry\ type=Type d'entrée
 
@@ -371,7 +377,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Le répertoire de fichiers
 File\ exists=Le fichier existe
 
 File\ not\ found=Fichier non trouvé
-filename=nom de fichier
 
 Files\ opened=Fichiers ouverts
 
@@ -466,8 +471,6 @@ Import\ preferences\ from\ file=Importer les préférences depuis un fichier
 
 Import\ strings=Importer les chaînes
 
-Import\ to\ open\ tab=Importer dans l'onglet ouvert
-
 Import\ word\ selector\ definitions=Importer les définitions des sélecteurs de mots
 
 Imported\ entries=Entrées importées
@@ -495,8 +498,11 @@ Invalid\ date\ format=Format de date invalide
 Invalid\ URL=URL invalide
 
 Online\ help=Aide en ligne
+JabRef\ Language\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ preferred\ language.)=Langue de JabRef (fournit de meilleures recommandations en indiquant la langue utilisée de l'utilisateur)
 
 JabRef\ preferences=Préférences pour JabRef
+JabRef\ requests\ recommendations\ from\ Mr.\ DLib,\ which\ is\ an\ external\ service.\ To\ enable\ Mr.\ DLib\ to\ calculate\ recommendations,\ some\ of\ your\ data\ must\ be\ shared\ with\ Mr.\ DLib.\ Generally,\ the\ more\ data\ is\ shared\ the\ better\ recommendations\ can\ be\ calculated.\ However,\ we\ understand\ that\ some\ of\ your\ data\ in\ JabRef\ is\ sensitive,\ and\ you\ may\ not\ want\ to\ share\ it.\ Therefore,\ Mr.\ DLib\ offers\ a\ choice\ of\ which\ data\ you\ would\ like\ to\ share.=JabRef demande des recommandations à Mr. DLib, qui est un service externe. Pour permettre à Mr. DLib de formuler les recommandations, certaines de vos données doivent être partagées avec Mr. DLib. Généralement, partager plus de données permet de fournir de meilleures recommandations. Cependant, nous comprenons que certaines de vos données dans JabRef puissent être sensibles, et que vous ne vouliez pas les partager. Par conséquent, Mr. DLib permet de choisir les données que vous souhaitez partager.
+JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLib's\ Web\ Service)=Version de JabRef (requise pour assurer la rétro-compatibilité avec le service Web de Mr. DLib)
 
 Journal\ abbreviations=Abréviations de journaux
 Keep\ both=Garder les deux
@@ -518,6 +524,7 @@ Label=Nom du champ
 Language=Langue
 
 Last\ modified=Dernier modifié
+LaTeX\ AUX\ file\:=Fichier AUX de LaTeX \:
 
 Left=Gauche
 
@@ -525,6 +532,7 @@ Link=Lien
 Listen\ for\ remote\ operation\ on\ port=Écouter le port pour des opérations à distance
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Charger et enregistrer les préférences de/vers jabref.xml au démarrage (mode clef-mémoire)
 
+
 Main\ file\ directory=Répertoire de fichiers principal
 
 Manage\ custom\ exports=Gérer les exportations personnalisées
@@ -565,7 +573,6 @@ Name\ formatter=Formateur de nom
 Natbib\ style=Style Natbib
 
 nested\ AUX\ files=fichiers AUX imbriqués
-new=nouveau
 
 New\ BibTeX\ sublibrary=Nouveau sous-fichier BibTeX
 New\ library\ created.=Nouveau fichier créé.
@@ -579,10 +586,9 @@ no\ base-BibTeX-file\ specified=fichier BibTeX non spécifié
 
 no\ library\ generated=pas de fichier créé
 
-No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Pas d'entrées trouvées. Assurez-vous, SVP, que vous utilisez le filtre d'importation approprié.
+No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Pas d'entrées trouvées. Veuillez vous assurez que vous utilisez le filtre d'importation approprié.
 No\ files\ found.=Fichiers non trouvés.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Pas d'interface utilisateur. Traitement limité aux options de la ligne de commande.
 
 No\ journal\ names\ could\ be\ abbreviated.=Aucun nom de journal n'a pu être abrégé.
 
@@ -625,6 +631,7 @@ Opened\ library=Fichier ouvert
 Opening=Ouverture en cours
 
 Operation\ canceled.=Opération annulée.
+Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ system\ set-up.)=Système d'exploitation (fournit de meilleures recommandations en indiquant la configuration du système de l'utilisateur)
 
 Optional\ fields=Champs optionnels
 
@@ -632,8 +639,6 @@ Options=Options
 
 or=ou
 
-Output\ or\ export\ file=Fichier de sortie ou d'exportation
-
 Override\ default\ file\ directories=Remplacer les répertoires de fichier par défaut
 Overwrite=Ecraser
 
@@ -658,13 +663,13 @@ PDF\ does\ not\ exist=Le PDF n'existe pas
 
 File\ has\ no\ attached\ annotations=Le fichier n'a pas d'annotations liées
 
-Please\ enter\ a\ name\ for\ the\ group.=SVP, entrez un nom pour le groupe.
+Please\ enter\ a\ name\ for\ the\ group.=Veuillez entrer un nom pour le groupe.
 
-Please\ enter\ a\ search\ term.\ For\ example,\ to\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:<p><tt>smith</tt><p>To\ search\ the\ field\ <b>Author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>Title</b>\ for\ <b>electrical</b>,\ enter\:<p><tt>author\=smith\ and\ title\=electrical</tt>=SVP, entrez un terme à recherche. Par exemple, pour rechercher <b>Smith</b> dans tout les champs, entrez \:<p><tt>smith</tt><p>Pour rechercher <b>Smith</b> dans le champ <b>Author</b> et <b>électrique</b> dans le champ <b>Title</b>, entrez \:<p><tt>author\=smith and title\=électrique</tt>
+Please\ enter\ a\ search\ term.\ For\ example,\ to\ search\ all\ fields\ for\ <b>Smith</b>,\ enter\:<p><tt>smith</tt><p>To\ search\ the\ field\ <b>Author</b>\ for\ <b>Smith</b>\ and\ the\ field\ <b>Title</b>\ for\ <b>electrical</b>,\ enter\:<p><tt>author\=smith\ and\ title\=electrical</tt>=Veuillez entrer un terme à recherche. Par exemple, pour rechercher <b>Smith</b> dans tout les champs, entrez \:<p><tt>smith</tt><p>Pour rechercher <b>Smith</b> dans le champ <b>Author</b> et <b>électrique</b> dans le champ <b>Title</b>, entrez \:<p><tt>author\=smith and title\=électrique</tt>
 
 Please\ enter\ the\ field\ to\ search\ (e.g.\ <b>keywords</b>)\ and\ the\ keyword\ to\ search\ it\ for\ (e.g.\ <b>electrical</b>).=SVP, entrez le champ de recherche (par ex. <b>keywords</b>) et le mot-clef à rechercher (par ex. <b>électrique</b>).
 
-Please\ enter\ the\ string's\ label=SVP, entrez le nom de la chaîne
+Please\ enter\ the\ string's\ label=Veuillez entrer le nom de la chaîne
 
 Please\ restart\ JabRef\ for\ preferences\ to\ take\ effect.=Veuillez redémarrer JabRef pour que les préférences soient prises en compte.
 
@@ -695,6 +700,7 @@ Pull\ changes\ from\ shared\ database=Récupérer les modifications depuis la ba
 
 Pushed\ citations\ to\ %0=Envoyer les citations vers %0
 
+
 Quit\ JabRef=Quitter JabRef
 
 Redo=Répéter
@@ -831,7 +837,7 @@ Settings=Paramètres
 
 Shortcut=Raccourci
 
-Show/edit\ %0\ source=Montrer/éditer le source %0
+Show/edit\ %0\ source=Montrer/modifier le source %0
 
 Show\ 'Firstname\ Lastname'=Ordre d'affichage 'Prénom Nom'
 
@@ -877,7 +883,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Grouper manuellement les entr
 Status=État
 Strings\ for\ library=Chaînes pour le fichier
 
-Sublibrary\ from\ AUX=Sous-fichier à partir du LaTeX AUX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Bascule entre les noms de journaux développés et abrégés si le nom de journal est connu.
 
@@ -885,7 +890,6 @@ Tabname=Nom d'onglet
 Tertiary\ sort\ criterion=Critère tertiaire de tri
 
 Test=Test
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Le format de date choisi pour les nouvelles entrées n'est pas valide
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=L'encodage « %0 » choisi ne peut pas encoder les caractères suivants \:
 
@@ -923,7 +927,7 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Cette opération nécessite qu'une ou plusieurs entrées soient sélectionnées.
 
 This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=Ce paramètre peut être changé dans les préférences à tout moment.
-
+Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of\ day\ the\ request\ is\ being\ made.)=Fuseau horaire (fournit de meilleures recommandations en indiquant l'heure locale d'où la demande est faite)
 Toggle\ entry\ preview=Afficher/Masquer l'aperçu
 Toggle\ groups\ interface=Afficher/Masquer l'interface des groupes
 
@@ -943,6 +947,7 @@ unable\ to\ write\ to=Impossible d'écrire sur
 Undo=Annuler
 
 Union=Union
+Unknown\ BibTeX\ entries\:=Entrées BibTeX inconnues \:
 
 unknown\ edit=édition inconnue
 
@@ -982,6 +987,7 @@ Warnings=Messages d'avertissement
 web\ link=Lien internet
 
 What\ do\ you\ want\ to\ do?=Que voulez-vous faire ?
+Whatever\ option\ you\ choose,\ Mr.\ DLib\ may\ share\ its\ data\ with\ research\ partners\ to\ further\ improve\ recommendation\ quality\ as\ part\ of\ a\ 'living\ lab'.\ Mr.\ DLib\ may\ also\ release\ public\ datasets\ that\ may\ contain\ anonymized\ information\ about\ you\ and\ the\ recommendations\ (sensitive\ information\ such\ as\ metadata\ of\ your\ articles\ will\ be\ anonymised\ through\ e.g.\ hashing).\ Research\ partners\ are\ obliged\ to\ adhere\ to\ the\ same\ strict\ data\ protection\ policy\ as\ Mr.\ DLib.=Quelle que soit l'option choisie, Mr. DLib pourrait partager ses données avec des partenaires de recherche afin d'améliorer la qualité des recommandations dans le cadre d'un « living lab ». Mr. DLib pourrait également rendre public des jeux de données pouvant contenir des informations anonymisées à votre sujet et les recommandations formulées (les informations sensibles telles que les métadonnées de vos articles seront anonymisées par le biais de hachage par exemple). Les partenaires de recherche sont tenus d'adhérer à la même politique de protection stricte des données que Mr. Dlib.
 
 When\ adding/removing\ keywords,\ separate\ them\ by=Lors de l'ajout/suppression de mots-clefs, les séparer avec
 Will\ write\ XMP-metadata\ to\ the\ PDFs\ linked\ from\ selected\ entries.=Écrira les métadonnées XMP dans les PDFs liés aux entrées sélectionnées.
@@ -1029,14 +1035,15 @@ Unable\ to\ open\ link.=Impossible d'ouvrir le lien.
 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,\ e.g.\ "--fetch\=Medline\:cancer"=Lance une recherche, par. ex. "--fetch\=Medline\:cancer"
 
 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
-Settings\ for\ %0=Paramètres pour %0
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1.=Ligne %0 \: clef BibTeX corrompue %1.
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1\ (contains\ whitespaces).=Ligne %0 \: clef BibTeX corrompue %1 (contient des espaces).
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1\ (comma\ missing).=Ligne %0 \: clef BibTeX corrompue %1 (virgule manquante).
 No\ full\ text\ document\ found=Aucun texte intégral trouvé
 Download\ from\ URL=Télécharger depuis l'URL
 Rename\ field=Renommer le champ
@@ -1052,7 +1059,7 @@ Autosave=Sauvegarde automatique
 A\ local\ copy\ will\ be\ opened.=Une copie locale sera ouverte.
 Autosave\ local\ libraries=Sauvegarder automatiquement les fichiers locaux
 Automatically\ save\ the\ library\ to=Sauvegarder automatiquement les fichiers dans
-Please\ enter\ a\ valid\ file\ path.=Entrez un chemin de fichier valide, SVP.
+Please\ enter\ a\ valid\ file\ path.=Veuillez entrer un chemin de fichier valide.
 
 
 Export\ in\ current\ table\ sort\ order=Exporter dans l'ordre de tri actuel de la table
@@ -1093,6 +1100,7 @@ Ensure\ unique\ keys\ using\ letters\ (b,\ c,\ ...)=Assurer l'unicité des clefs
 
 General\ file\ directory=Répertoire général
 User-specific\ file\ directory=Répertoire de fichiers spécifique à l'utilisateur
+LaTex\ file\ directory=Répertoire de fichiers LaTeX
 Search\ failed\:\ illegal\ search\ expression=Échec de la recherche \: Expression de recherche illégale
 Show\ ArXiv\ column=Montrer la colonne ArXiv
 
@@ -1144,7 +1152,7 @@ Your\ OpenOffice/LibreOffice\ document\ references\ the\ BibTeX\ key\ '%0',\ whi
 Unable\ to\ synchronize\ bibliography=Impossible de synchroniser la bibliographie
 Combine\ pairs\ of\ citations\ that\ are\ separated\ by\ spaces\ only=Combiner les paires de citations qui ne sont séparées que par des espaces
 Autodetection\ failed=La détection automatique a échouée
-Please\ wait...=Patientez s'il vous plaît...
+Please\ wait...=Veuillez patienter...
 Set\ connection\ parameters=Définir les paramètres de connexion
 Path\ to\ OpenOffice/LibreOffice\ directory=Chemin vers le répertoire d'OpenOffice/LibreOffice
 Path\ to\ OpenOffice/LibreOffice\ executable=Chemin vers l'exécutable d'OpenOffice/LibreOffice
@@ -1158,7 +1166,7 @@ Look\ up\ BibTeX\ entries\ in\ all\ open\ libraries=Rechercher les entrées BibT
 Autodetecting\ paths...=Autodétection des chemins...
 Could\ not\ find\ OpenOffice/LibreOffice\ installation=L'installation d'OpenOffice/LibreOffice n'a pas pu être trouvée
 Found\ more\ than\ one\ OpenOffice/LibreOffice\ executable.=Plus d'un exécutable OpenOffice/LibreOffice a été trouvé.
-Please\ choose\ which\ one\ to\ connect\ to\:=SVP, choisissez celui auquel il faut se connecter \:
+Please\ choose\ which\ one\ to\ connect\ to\:=Veuillez choisir celui auquel il faut se connecter \:
 Choose\ OpenOffice/LibreOffice\ executable=Choisir l'exécutable OpenOffice/LibreOffice
 Select\ document=Sélectionner un document
 HTML\ list=Liste HTML
@@ -1207,7 +1215,6 @@ Resetting\ preference\ key\ '%0'=Réinitialiser la clef de configuration « %0 
 Unknown\ preference\ key\ '%0'=Clef de configuration « %0 » inconnue
 Unable\ to\ clear\ preferences.=Impossible d'initialiser la configuration.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Réinitialiser la configuration (clef1, clef2,... ou 'toutes')
 Find\ unlinked\ files=Rechercher les fichiers non liés
 Unselect\ all=Tout désélectionner
 Expand\ all=Tout étendre
@@ -1262,15 +1269,15 @@ Toggle\ print\ status=Changer le statut d'impression
 Update\ keywords=Mettre à jour les mots-clefs
 Write\ values\ of\ special\ fields\ as\ separate\ fields\ to\ BibTeX=Écrire les valeurs des champs spéciaux dans des champs BibTeX séparés
 You\ have\ changed\ settings\ for\ special\ fields.=Vous avez modifié les paramètres pour les champs spéciaux.
-Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=La connexion à OpenOffice/LibreOffice a été perdue. S'il vous plaît, assurez-vous qu'OpenOffice/LibreOffice soit lancé, et essayez de vous reconnecter.
+Connection\ to\ OpenOffice/LibreOffice\ has\ been\ lost.\ Please\ make\ sure\ OpenOffice/LibreOffice\ is\ running,\ and\ try\ to\ reconnect.=La connexion à OpenOffice/LibreOffice a été perdue. Veuillez vous assurer qu'OpenOffice/LibreOffice est lancé, et essayez de vous reconnecter.
 JabRef\ will\ send\ at\ least\ one\ request\ per\ entry\ to\ a\ publisher.=JabRef fera au moins une requête par entrée à chaque éditeur.
 Correct\ the\ entry,\ and\ reopen\ editor\ to\ display/edit\ source.=Corrigez l'entrée et ré-ouvrez l'éditeur pour afficher/éditer la source.
 Could\ not\ connect\ to\ running\ OpenOffice/LibreOffice.=La connexion à OpenOffice/LibreOffice n'a pas pu être lancée.
 Make\ sure\ you\ have\ installed\ OpenOffice/LibreOffice\ with\ Java\ support.=Assurez-vous qu'OpenOffice/LibreOffice est installé avec le support Java.
-If\ connecting\ manually,\ please\ verify\ program\ and\ library\ paths.=En cas de connexion manuelle, vérifiez les chemins du programme et du fichier.
+If\ connecting\ manually,\ please\ verify\ program\ and\ library\ paths.=En cas de connexion manuelle, veuillez vérifier les chemins du programme et du fichier.
 Error\ message\:=Message d'erreur \:
 If\ a\ pasted\ or\ imported\ entry\ already\ has\ the\ field\ set,\ overwrite.=Si une entrée collée ou importée a ce champ déjà paramétré, l'écraser.
-Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Pas de connexion à un document Writer. S'il vous plaît, assurez-vous qu'un document est ouvert et utiliser le bouton 'Sélectionner un document Writer' pour vous y connecter.
+Not\ connected\ to\ any\ Writer\ document.\ Please\ make\ sure\ a\ document\ is\ open,\ and\ use\ the\ 'Select\ Writer\ document'\ button\ to\ connect\ to\ it.=Pas de connexion à un document Writer. Veuillez vous assurer qu'un document est ouvert et utiliser le bouton « Sélectionner un document Writer » pour vous y connecter.
 Removed\ all\ subgroups\ of\ group\ "%0".=Tous les sous-groupes du groupe « %0 » ont été supprimés.
 To\ disable\ the\ memory\ stick\ mode\ rename\ or\ remove\ the\ jabref.xml\ file\ in\ the\ same\ folder\ as\ JabRef.=Pour désactiver le mode Memory-stick, renommer ou supprimer le fichier jabref.xml dans le même répertoire que JabRef
 Unable\ to\ connect.\ One\ possible\ reason\ is\ that\ JabRef\ and\ OpenOffice/LibreOffice\ are\ not\ both\ running\ in\ either\ 32\ bit\ mode\ or\ 64\ bit\ mode.=Connexion impossible. Une raison potentielle est que JabRef et OpenOffice/LibreOffice ne fonctionnent pas tous les deux soit en mode 32 bits, soit en mode 64 bits.
@@ -1282,8 +1289,8 @@ Your\ style\ file\ specifies\ the\ paragraph\ format\ '%0',\ which\ is\ undefine
 Searching...=Recherche...
 Add\ {}\ to\ specified\ title\ words\ on\ search\ to\ keep\ the\ correct\ case=Ajouter {} aux mots du titre spécifiés lors d'une recherche pour préserver la casse correcte
 Import\ conversions=Importer les conversions
-Please\ enter\ a\ search\ string=Entrez s'il vous plaît une chaîne de recherche
-Please\ open\ or\ start\ a\ new\ library\ before\ searching=S'il vous plaît, ouvrez ou créer un nouveau fichier avant la recherche
+Please\ enter\ a\ search\ string=Veuillez entrer une chaîne de recherche
+Please\ open\ or\ start\ a\ new\ library\ before\ searching=Veuillez ouvrir ou créer un nouveau fichier avant la recherche
 
 Canceled\ merging\ entries=Fusion des entrées interrompues
 
@@ -1306,8 +1313,8 @@ Resetting\ all\ key\ bindings=Réinitialisation de tous les raccourcis clavier
 Hostname=Ordinateur hôte
 Invalid\ setting=Paramétrage invalide
 Network=Réseau
-Please\ specify\ both\ hostname\ and\ port=Entrez à la fois le nom de l'ordinateur hôte et le port, s'il vous plaît
-Please\ specify\ both\ username\ and\ password=Préciser à la fois le nom d'utilisateur et le mot de passe, SVP
+Please\ specify\ both\ hostname\ and\ port=Veuillez entrer le nom de l'ordinateur hôte et le port
+Please\ specify\ both\ username\ and\ password=Veuillez spécifier le nom d'utilisateur et le mot de passe
 
 Use\ custom\ proxy\ configuration=Utiliser une configuration de proxy personnalisée
 Proxy\ requires\ authentication=Le proxy demande une authentification
@@ -1323,6 +1330,7 @@ Export\ sort\ order=Exporter l'ordre de tri
 Export\ sorting=Exportation du tri
 Newline\ separator=Séparateur de ligne
 
+Save\ in\ current\ table\ sort\ order=Enregistrer dans l'ordre de tri actuel de la table
 Save\ entries\ ordered\ as\ specified=Enregistrer les entrées dans l'ordre spécifié
 Show\ extra\ columns=Montrer les colonnes supplémentaires
 Parsing\ error=Erreur de traitement
@@ -1351,7 +1359,7 @@ Opens\ JabRef's\ blog=Ouvre le blog de JabRef
 Opens\ JabRef's\ website=Ouvre le site Internet de JabRef
 
 Could\ not\ open\ browser.=Le navigateur n'a pas pu être lancé.
-Please\ open\ %0\ manually.=Ouvrez %0 manuellement, SVP.
+Please\ open\ %0\ manually.=Veuillez ouvrir manuellement %0 .
 The\ link\ has\ been\ copied\ to\ the\ clipboard.=Le lien a été copié dans le presse-papiers.
 
 Open\ %0\ file=Ouvrir le fichier %0
@@ -1418,7 +1426,7 @@ This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ regular\
 This\ search\ contains\ entries\ in\ which\ any\ field\ contains\ the\ term\ <b>%0</b>=Cette recherche contient des entrées pour lesquelles au moins un champ contient le terme <b>%0</b>
 This\ search\ contains\ entries\ in\ which=Cette recherche contient des entrées pour lequelles
 
-Unable\ to\ autodetect\ OpenOffice/LibreOffice\ installation.\ Please\ choose\ the\ installation\ directory\ manually.=La détection automatique de OpenOffice/LibreOffice a échouée. S'il vous plaît, sélectionnez manuellement le répertoire d'installation.
+Unable\ to\ autodetect\ OpenOffice/LibreOffice\ installation.\ Please\ choose\ the\ installation\ directory\ manually.=La détection automatique de OpenOffice/LibreOffice a échouée. Veuillez sélectionner manuellement le répertoire d'installation.
 
 Close\ library=Fermer le fichier
 Decrease\ table\ font\ size=Diminuer la taille de police du tableau
@@ -1496,8 +1504,8 @@ Usage=Utilisation
 
 
 Adds\ {}\ brackets\ around\ acronyms,\ month\ names\ and\ countries\ to\ preserve\ their\ case.=Ajoute des accolades {} autour des acronymes, des noms de mois et des pays afin de préserver leur casse.
-Are\ you\ sure\ you\ want\ to\ reset\ all\ settings\ to\ default\ values?=Êtes-vous sûr de vouloir rétablir toutes les valeurs par défaut du paramétrage ?
-Reset\ preferences=Rétablir les préférences
+Are\ you\ sure\ you\ want\ to\ reset\ all\ settings\ to\ default\ values?=Êtes-vous sûr de vouloir restaurer toutes les valeurs par défaut du paramétrage ?
+Reset\ preferences=Restaurer les préférences
 Ill-formed\ entrytype\ comment\ in\ BIB\ file=Commentaire de type d'entrées mal construit dans un fichier BIB
 
 Move\ linked\ files\ to\ default\ file\ directory\ %0=Déplacer les fichiers liés vers le répertoire de fichiers par défaut %0
@@ -1512,6 +1520,7 @@ Add\ style\ file=Ajouter un fichier de style
 Current\ style\ is\ '%0'=Le style actuel est « %0 »
 Remove\ style=Supprimer le style
 You\ must\ select\ a\ valid\ style\ file.=Vous devez sélectionner un fichier de style valide.
+Invalid\ style\ selected=Style sélectionné non valide
 
 Reload=Recharger
 
@@ -1551,7 +1560,7 @@ Add\ braces\ encapsulating\ the\ complete\ field\ content.=Ajoute des accolades
 Remove\ enclosing\ braces=Supprimer les paires d'accolades
 Removes\ braces\ encapsulating\ the\ complete\ field\ content.=Supprimer les accolades autour d'un contenu de champ entier.
 Sentence\ case=Casse de la phrase
-Shortens\ lists\ of\ persons\ if\ there\ are\ more\ than\ 2\ persons\ to\ "et\ al.".=Raccourcit avec "et al." les listes de plus de deux personnes.
+Shortens\ lists\ of\ persons\ if\ there\ are\ more\ than\ 2\ persons\ to\ "et\ al.".=Raccourcit avec « et al. » les listes de plus de deux personnes.
 Title\ case=Casse du titre
 Unicode\ to\ LaTeX=Unicode vers LaTeX
 Units\ to\ LaTeX=Unités vers LaTeX
@@ -1649,7 +1658,7 @@ Installed\ version=Version installée
 Remind\ me\ later=Me le rappeler plus tard
 Ignore\ this\ update=Ignorer cette mise à jour
 Could\ not\ connect\ to\ the\ update\ server.=La connexion au serveur de mise à jour a échoué.
-Please\ try\ again\ later\ and/or\ check\ your\ network\ connection.=Essayez plus tard ou vérifier votre connexion réseau.
+Please\ try\ again\ later\ and/or\ check\ your\ network\ connection.=Veuillez réessayer plus tard ou vérifier votre connexion réseau.
 To\ see\ what\ is\ new\ view\ the\ changelog.=Pour voir les nouveautés, affichez le journal des modifications.
 A\ new\ version\ of\ JabRef\ has\ been\ released.=Une nouvelle version de JabRef a été publiée.
 JabRef\ is\ up-to-date.=JabRef est à jour.
@@ -1662,8 +1671,6 @@ Unable\ to\ generate\ new\ library=Impossible de générer un nouveau fichier
 
 Open\ console=Ouvrir la console
 Use\ default\ terminal\ emulator=Utilise l'émulateur de terminal par défaut
-Execute\ command=Lance une commande
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Note \: Utiliser le paramètre %0 comme localisation du fichier ouverte.
 Error\ occured\ while\ executing\ the\ command\ "%0".=Une erreur est survenue lors de l'exécution de la commande « %0 ».
 Reformat\ ISSN=Reformater l'ISSN
 
@@ -1712,7 +1719,7 @@ JabRef\ built\ in\ list=Liste interne de JabRef
 IEEE\ built\ in\ list=List interne de IEEE
 
 Event\ log=Journal des évènements
-We\ now\ give\ you\ insight\ into\ the\ inner\ workings\ of\ JabRef's\ internals.\ This\ information\ might\ be\ helpful\ to\ diagnose\ the\ root\ cause\ of\ a\ problem.\ Please\ feel\ free\ to\ inform\ the\ developers\ about\ an\ issue.=Nous vous donnons à présent un aperçu du fonctionnement interne de JabRef. Cette information pourrait être utile pour diagnostiquer la cause du problème. S'il vous plaît, informez les développeurs des anomalies rencontrées.
+We\ now\ give\ you\ insight\ into\ the\ inner\ workings\ of\ JabRef's\ internals.\ This\ information\ might\ be\ helpful\ to\ diagnose\ the\ root\ cause\ of\ a\ problem.\ Please\ feel\ free\ to\ inform\ the\ developers\ about\ an\ issue.=Nous vous donnons à présent un aperçu du fonctionnement interne de JabRef. Cette information pourrait être utile pour diagnostiquer la cause du problème. Veuillez bien informer les développeurs des anomalies rencontrées.
 Log\ copied\ to\ clipboard.=Journal copié dans le presse-papiers.
 Copy\ Log=Copier le journal
 Clear\ Log=Vider le journal
@@ -1721,7 +1728,7 @@ Issue\ on\ GitHub\ successfully\ reported.=Anomalie signalé avec succès sur Gi
 Issue\ report\ successful=Signalement de l'anomalie réussi
 Your\ issue\ was\ reported\ in\ your\ browser.=Votre anomalie a été affichée dans votre navigateur.
 The\ log\ and\ exception\ information\ was\ copied\ to\ your\ clipboard.=Le journal et les informations d'anomalie ont été copiées dans votre presse-papier.
-Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=SVP, collez ces informations (avec Ctrl+V) dans la description de l'anomalie.
+Please\ paste\ this\ information\ (with\ Ctrl+V)\ in\ the\ issue\ description.=Veuillez coller ces informations (avec Ctrl+V) dans la description de l'anomalie.
 
 Host=Hôte
 Port=Port
@@ -1739,17 +1746,13 @@ Work\ offline=Travail hors-ligne
 Working\ offline.=Travail hors-ligne.
 Update\ refused.=Mise à jour refusée.
 Update\ refused=Mise à jour refusée
-Local\ entry=Entrée locale
-Shared\ entry=Entrée partagée
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=La mise à jour n'a pas pu être effectuée à cause de conflits dans les changements existants.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Vous ne travaillez pas sur la plus récente version de cette entrée.
 Local\ version\:\ %0=Version locale \: %0
 Shared\ version\:\ %0=Version partagée \: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=SVP, fusionnez l'entrée partagée avec la vôtre et cliquez sur "Fusionner les entrées" pour résoudre ce problème.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Annuler cette opération laissera vos changements désynchronisés. Annuler quand même ?
 Shared\ entry\ is\ no\ longer\ present=L'entrée partagée n'est plus présente
 The\ entry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=L'entrée sur laquelle vous travaillez actuellement a été supprimée de la base de données partagée.
-You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Vous pouvez restaurer l'entrée en utilisant l'opération "Annuler".
+You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Vous pouvez restaurer l'entrée en utilisant l'opération « Annuler ».
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Vous êtes déjà connecté à une base de données en utilisant les informations de connexion entrées.
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Citation impossible sans clef BibTeX. Générer les clefs maintenant ?
@@ -1773,6 +1776,7 @@ However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Ainsi, u
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Ouvre un lien à partir duquel la version de développement actuelle peut être téléchargée
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=Afficher les changements dans les versions de JabRef
 Referenced\ BibTeX\ key\ does\ not\ exist=La clef BibTeX référencée n'existe pas
+Full\ text\ document\ for\ entry\ %0\ already\ linked.=Texte intégral pour l'entrée %0 déjà lié.
 Finished\ downloading\ full\ text\ document\ for\ entry\ %0.=Téléchargement terminé pour le texte intégral de l'entrée %0.
 Look\ up\ full\ text\ documents=Télécharger les documents cité
 You\ are\ about\ to\ look\ up\ full\ text\ documents\ for\ %0\ entries.=Vous allez rechercher les textes intégraux pour %0 entrées.
@@ -1787,6 +1791,7 @@ Sumatra\ Reader=Sumatra Reader
 shared=partagé
 should\ contain\ an\ integer\ or\ a\ literal=doit contenir un nombre entier ou en toutes lettres
 should\ have\ the\ first\ letter\ capitalized=doit avoir une première lettre en majuscule
+edition\ of\ book\ reported\ as\ just\ 1=Numéro d'édition du livre déclarée comme uniquement 1
 Tools=Outils
 What's\ new\ in\ this\ version?=Quoi de neuf dans cette version ?
 Want\ to\ help?=Vous voulez aider ?
@@ -1834,6 +1839,8 @@ Could\ not\ find\ any\ bibliographic\ information.=Aucune information bibliograp
 BibTeX\ key\ deviates\ from\ generated\ key=La clef BibTeX diffère de la clef générée
 DOI\ %0\ is\ invalid=Le DOI %0 est invalide
 
+Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Sélectionnez tous les types personnalisés à stocker dans les préférences locales \:
+Currently\ unknown\:=Actuellement inconnu \:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Personnalisation différente, les paramètres actuels seront écrasés
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=Le type d'entrée %0 est uniquement défini pour biblatex et pas pour BibTeX
@@ -1847,7 +1854,7 @@ strings\ included=chaînes incluses
 Default\ table\ font\ size=Taille de police par défaut
 Escape\ underscores=Echapper les soulignements
 Color=Couleur
-Please\ also\ add\ all\ steps\ to\ reproduce\ this\ issue,\ if\ possible.=S'il vous plaît, Ajouter si possible toutes les étapes permettant de reproduire cette anomalie.
+Please\ also\ add\ all\ steps\ to\ reproduce\ this\ issue,\ if\ possible.=Veuillez préciser si possible toutes les étapes permettant de reproduire cette anomalie.
 Fit\ width=Ajuster à la largeur
 Fit\ a\ single\ page=Ajuster à la page
 Zoom\ in=Zoomer
@@ -1885,7 +1892,6 @@ Could\ not\ copy\ file=Le fichier n'a pas pu être copié
 Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=0% fichiers copiés de %1 avec succès vers %2
 Rename\ failed=Échec du renommage
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef ne peut pas accéder au fichier parce qu'il est utilisé par un autre processus.
-Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Afficher la sortie de la console (uniquement nécessaire quand le lanceur est utilisé)
 
 Remove\ line\ breaks=Supprimer les sauts de ligne
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=Supprime tous les sauts de ligne du contenu d'un champ.
@@ -1894,7 +1900,7 @@ Checking\ integrity...=Vérification d'intégrité...
 Remove\ hyphenated\ line\ breaks=Suppression des sauts de ligne associé à un tiret
 Removes\ all\ hyphenated\ line\ breaks\ in\ the\ field\ content.=Supprime du contenu du champ tous les sauts de ligne associés à un tiret.
 Note\ that\ currently,\ JabRef\ does\ not\ run\ with\ Java\ 9.=Notez qu'actuellement, JabRef ne fonctionne pas avec Java 9.
-Your\ current\ Java\ version\ (%0)\ is\ not\ supported.\ Please\ install\ version\ %1\ or\ higher.=Votre version actuelle de Java (%0) n'est pas supportée. Installez la version %1 ou supérieure, s'il vous plaît.
+Your\ current\ Java\ version\ (%0)\ is\ not\ supported.\ Please\ install\ version\ %1\ or\ higher.=Votre version actuelle de Java (%0) n'est pas supportée. Veuillez installer la version %1 ou supérieure.
 
 Could\ not\ retrieve\ entry\ data\ from\ '%0'.=Impossible de récupérer les données sur l'entrée depuis « %0 ».
 Entry\ from\ %0\ could\ not\ be\ parsed.=Entrée de %0 n’a pas pu être analysée.
@@ -1988,20 +1994,84 @@ User\:=Utilisateur \:
 Keystore\ password\:=Mot de passe du magasin de clefs \:
 Keystore\:=Magasin de clefs \:
 Password\:=Mot de passe \:
+Server\ Timezone\:=Fuseau horaire du serveur \:
 Remember\ Password=Mémoriser le mot de passe
 Use\ SSL=Utiliser SSL
+Move\ preprint\ information\ from\ 'URL'\ and\ 'journal'\ field\ to\ the\ 'eprint'\ field=Déplacer les informations du preprint depuis les champs 'URL' et 'journal' vers le champ 'eprint'
 Default\ drag\ &\ drop\ action=Action glisser-déposer par défaut
 Copy\ file\ to\ default\ file\ folder=Copier le fichier vers le répertoire de fichiers par défaut
 Link\ file\ (without\ copying)=Lier un fichier (sans le copier)
 Copy,\ rename\ and\ link\ file=Copier, renommer et lier un fichier
+Type=Type
+Customize\ Export\ Formats=Personnaliser les formats d'exportation
 Export\ name=Nom de l'exportation
+Main\ layout\ file\:=Fichier de mise en page principal \:
 Main\ layout\ file=Principal fichier de mise en page
+Save\ exporter=Enregistrer l'exportateur
+File\ extension\:=Extension de fichier \:
+Export\ format\ name\:=Nom du format d'exportation \:
+Cleared\ connection\ settings=Paramètres de connexion réinitialisés
+Error\ adding\ discovered\ CitationStyles=Erreur lors de l'ajout des styles de citation trouvés
+(more)=(plus)
+Cancel\ import=Annuler l'importation
+Continue\ with\ import=Poursuivre l'importation
+Import\ canceled=Importation annulée
+Select\ all\ new\ entries=Sélectionner toutes les nouvelles entrées
+Select\ the\ entries\ to\ be\ imported\:=Sélectionnez les entrées à importer \:
+Add\ new\ String=Ajouter une nouvelle chaîne
+Remove\ selected\ Strings=Supprimer les chaînes sélectionnées
+Must\ not\ be\ empty\!=Ne doit pas être vide \!
+Open\ Help\ page=Ouvrir la page d'aide
+Add\ new\ field\ name=Ajouter un nouveau nom de champ
+Field\ name\:=Nom de champ \:
+Field\ name\ "%0"\ already\ exists=Le nom de champ « %0 » existe déjà
+No\ field\ name\ selected\!=Aucun nom de champ sélectionné \!
+Remove\ field\ name=Supprimer le nom de champ
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Êtes-vous sûr de vouloir supprimer le nom de champ "%0" ?
+Add\ new\ keyword=Ajouter un nouveau mot-clef
+Keyword\:=Mot-clef \:
+Keyword\ "%0"\ already\ exists=Le mot-clef « %0 » existe déjà
+Remove\ keyword=Supprimer le mot-clef
+Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ "%0"?=Êtes-vous sûr de vouloir supprimer le mot-clef "%0" ?
+Reset\ to\ default=Restaurer les valeurs par défaut
+Edit\ string\ constants=Modifier les constantes de chaîne
+Export\ all\ entries=Exporter toutes les entrées
+Generate\ BibTeX\ keys=Générer les clefs BibTeX
+Groups\ interface=Interface des groupes
+Manage\ field\ names\ &\ content=Gérer les noms de champs et leur contenu
+New\ library=Nouveau fichier
+Next\ citation\ style=Style de citation suivant
+OpenOffice/LibreOffice=OpenOffice/LibreOffice
+Open\ document\ viewer=Ouvrir l'afficheur de document
+Open\ entry\ editor=Ouvrir l'éditeur d'entrée
+Previous\ citation\ style=Style de citation précédent
+Search\ document\ identifier\ online=Rechercher en ligne un identifiant de document
+Search\ for\ unlinked\ local\ files=Rechercher des fichiers locaux non liés
+Search\ full\ text\ documents\ online=Rechercher en ligne des textes intégraux
+Find\ and\ replace=Rechercher et remplacer
+
+Found\ documents\:=Documents trouvés \:
+Use\ selected\ document=Utiliser le document sélectionné
+Accept\ changes=Accepter les modifications
+Dismiss\ changes=Abandonner les modifications
+The\ library\ has\ been\ modified\ by\ another\ program.=Le fichier a été modifié par un autre programme.
 
+Execute\ command=Lance une commande
+Open\ File\ Browser=Ouvrir le navigateur de fichiers
+Use\ default\ file\ browser=Utiliser le navigateur de fichiers par défaut
 
+Set\ rank\ to\ one=Définir le rang à un
+Set\ rank\ to\ two=Définir le rang à deux
+Set\ rank\ to\ three=Définir le rang à trois
+Set\ rank\ to\ four=Définir le rang à quatre
+Set\ rank\ to\ five=Définir le rang à cinq
 
-
+A\ string\ with\ the\ label\ '%0'\ already\ exists.=Une chaîne avec le nom '%0' existe déjà.
 
 Executing\ command\ "%0"...=Exécution de la commande « %0 »...
 
+Rename\ file\ to\ a\ given\ name=Renommer le fichier selon un nom fourni
+New\ Filename=Nouveau nom de fichier
+Rename\ file\ to\ defined\ pattern=Renommer le fichier selon un modèle défini
 
 
diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
index 8bbacc238d9..8287bff1186 100644
--- a/src/main/resources/l10n/JabRef_in.properties
+++ b/src/main/resources/l10n/JabRef_in.properties
@@ -66,6 +66,7 @@ Append\ library=Menambah basisdata
 
 Application=Aplikasi
 
+
 Apply=Terapkan
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Argumen dimasukkan pada JabRef yang sedang dibuka. Dimatikan.
@@ -302,6 +303,7 @@ entry=entri
 
 Entry\ editor=Penyunting entri
 
+
 Entry\ preview=Pratampilan entri
 
 Entry\ table=Tabel entri
@@ -363,7 +365,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Lokasi berkas belum ditent
 File\ exists=Berkas ada
 
 File\ not\ found=Berkas tidak ditemukan
-filename=nama berkas
 
 Files\ opened=Berkas dibuka
 
@@ -454,8 +455,6 @@ Import\ preferences\ from\ file=Impor preferensi dari berkas
 
 Import\ strings=Impor string
 
-Import\ to\ open\ tab=Impor ke tab yang dibuka
-
 Import\ word\ selector\ definitions=Impor definisi pemilih kata
 
 Imported\ entries=entri diimpor
@@ -512,6 +511,7 @@ Link=Tautan
 Listen\ for\ remote\ operation\ on\ port=Menggunakan operasi jarak jauh pada port
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Muat dan Simpan preferensi dari/ke jabref.xml ketika memulai (mode pena simpan)
 
+
 Main\ file\ directory=Lokasi berkas utama
 
 Manage\ custom\ exports=Mengatur ekspor atursendiri
@@ -551,7 +551,6 @@ Name\ formatter=Pemformat nama
 Natbib\ style=Gaya Natbib
 
 nested\ AUX\ files=berkas AUX bertingkat
-new=baru
 
 New\ BibTeX\ sublibrary=Anak basisdata BibTeX baru
 New\ library\ created.=Basisdata baru selesai dibuat.
@@ -568,7 +567,6 @@ no\ library\ generated=tidak ada basisdata dibuat
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Entri tidak ditemukan. Pastikan anda menggunakan penapis impor yang tepat.
 No\ files\ found.=Berkas tidak ditemukan.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Tidak ada GUI. Hanya menggunakan perintah baris.
 
 No\ journal\ names\ could\ be\ abbreviated.=Tidak ada nama jurnal yang bisa disingkat.
 
@@ -618,8 +616,6 @@ Options=Pilihan
 
 or=atau
 
-Output\ or\ export\ file=Keluaran atau berkas ekspor
-
 Override\ default\ file\ directories=Ganti direktori berkas bawaan
 Overwrite=Tindih
 
@@ -680,6 +676,7 @@ Pull\ changes\ from\ shared\ database=Tarik perubahan dari basis data bersama
 
 Pushed\ citations\ to\ %0=Kirim acuan ke %0
 
+
 Quit\ JabRef=Keluar JabRef
 
 Redo=Mengembalikan
@@ -847,7 +844,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Entri grup statik secara pene
 Status=Keadaan
 Strings\ for\ library=String untuk basisdata
 
-Sublibrary\ from\ AUX=Sub-basisdata dari AUX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Menukar antara nama jurnal penuh dan singkatan jika nama jurnal diketahui.
 
@@ -855,7 +851,6 @@ Tabname=Nama tab
 Tertiary\ sort\ criterion=Kriteria ketiga
 
 Test=Coba lihat
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Format hari yang dipilih untuk entri baru tidak sah
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Enkoding yang dipilih '%0' tidak bisa digunakan untuk karakter berikut\:
 
@@ -892,7 +887,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Operasi ini memerlukan satu atau lebih entri yang dipilih.
 
-
 Toggle\ entry\ preview=Gunakan pratampilan entri
 Toggle\ groups\ interface=Gunakan antarmuka grup
 
@@ -994,14 +988,12 @@ Unable\ to\ open\ link.=Tidak bisa membuka tautan.
 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 aktif<br>bukan membuat baru. Hal ini berguna ketika anda membuka berkas di JabRef<br>dari halaman web.<br>Hal ini akan menghindari anda membuka beberapa JabRef pada saat yang sama.
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Jalankan Pengambil, misal. "--fetch\=Medline\:cancer"
 
 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
-Settings\ for\ %0=Pengaturan untuk
 Download\ from\ URL=Unduh dari URL
 Rename\ field=Ganti nama bidang
 Append\ field=Tambahkan bidang
@@ -1171,7 +1163,6 @@ Resetting\ preference\ key\ '%0'=Kembalikan kunci pengaturan '%0'
 Unknown\ preference\ key\ '%0'=Kunci pengaturan '%0' tidak dikenal
 Unable\ to\ clear\ preferences.=Tidak bisa hapus pengaturan.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Kembalikan pengaturan (kunci1,kunci2,... atau 'all')
 Find\ unlinked\ files=Temukan berkas yang tidak bertautan
 Unselect\ all=Tidak memilih semua
 Expand\ all=Bentangkan semua
@@ -1618,8 +1609,6 @@ Unable\ to\ generate\ new\ library=Tidak dapat membuat perpustakaan baru
 
 Open\ console=Buka konsol
 Use\ default\ terminal\ emulator=Gunakan emulator terminal standar
-Execute\ command=Jalankan perintah
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Catatan\: Gunakan placeholder% 0 untuk lokasi file library yang dibuka.
 Error\ occured\ while\ executing\ the\ command\ "%0".=Terjadi kesalahan saat menjalankan perintah "%0".
 Reformat\ ISSN=Reformat ISSN
 
@@ -1695,14 +1684,10 @@ Work\ offline=Bekerja secara offline
 Working\ offline.=Bekerja secara offline.
 Update\ refused.=Update ditolak.
 Update\ refused=Update ditolak
-Local\ entry=Entri lokal
-Shared\ entry=Entri bersama
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Update tidak bisa dilakukan karena konflik perubahan yang ada.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Anda tidak mengerjakan versi terbaru BibEntry.
 Local\ version\:\ %0=Versi lokal\: % 0
 Shared\ version\:\ %0=Versi bersama\: % 0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Harap gabungkan entri bersama dengan Anda dan tekan "Gabungkan entri" untuk mengatasi masalah ini.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Membatalkan operasi ini akan membuat perubahan Anda tidak sinkron. Batalkan pula?
 Shared\ entry\ is\ no\ longer\ present=Entri bersama sudah tidak ada lagi
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Anda dapat mengembalikan entri menggunakan operasi "Undo".
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Anda sudah terhubung ke database menggunakan rincian koneksi yang dimasukkan.
@@ -1840,7 +1825,6 @@ Could\ not\ copy\ file=Tidak bisa menyalin file
 Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=Menyalin % 0 file dari % 1 dengan sukses ke % 2
 Rename\ failed=Ganti nama gagal
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef tidak dapat mengakses file karena sedang digunakan oleh proses lain.
-Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Tampilkan output konsol (hanya diperlukan saat peluncur digunakan)
 
 Remove\ line\ breaks=Hapus jeda baris
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=Menghapus semua jeda baris di bidang konten.
@@ -1890,6 +1874,7 @@ Export\ name=Ekspor nama
 Main\ layout\ file=Berkas tataletak utama
 
 
+Execute\ command=Jalankan perintah
 
 
 
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index 00d2e50e525..cc9564cefb0 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -66,6 +66,7 @@ Append\ library=Accoda libreria
 
 Application=Applicazione
 
+
 Apply=Applica
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Argomenti passati all'istanza attiva di JabRef. Chiusura in corso.
@@ -304,6 +305,7 @@ entry=voce
 
 Entry\ editor=Modifica voci
 
+
 Entry\ preview=Anteprima della voce
 
 Entry\ table=Tabella delle voci
@@ -366,7 +368,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=La cartella dei file non 
 File\ exists=Il file esiste
 
 File\ not\ found=File non trovato
-filename=nome del file
 
 Files\ opened=File aperti
 
@@ -458,8 +459,6 @@ Import\ preferences\ from\ file=Importa preferenze da un file
 
 Import\ strings=Importa stringhe
 
-Import\ to\ open\ tab=Importa nella scheda aperta
-
 Import\ word\ selector\ definitions=Importa le definizioni per la selezione di parole
 
 Imported\ entries=Voci importate
@@ -516,6 +515,7 @@ Link=Collegamento
 Listen\ for\ remote\ operation\ on\ port=Porta in ascolto per operazioni remote
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Carica e salva le preferenze da/in jabref.xml all'avvio (modalità chiavetta di memoria)
 
+
 Main\ file\ directory=Cartella dei file principale
 
 Manage\ custom\ exports=Gestione delle esportazioni personalizzate
@@ -556,7 +556,6 @@ Name\ formatter=Formattazione dei nomi
 Natbib\ style=Stile Natbib
 
 nested\ AUX\ files=File AUX nidificati
-new=nuovo
 
 New\ BibTeX\ sublibrary=Nuova sottolibreria BibTeX
 New\ library\ created.=Nuovo libreria creata
@@ -573,7 +572,6 @@ no\ library\ generated=nessuna libreria creata
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Nessuna voce trovata. Verificare che si stia utilizzando il filtro di importazione appropriato.
 No\ files\ found.=Nessun file trovato.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Senza interfaccia grafica. Elaborate solo le opzioni della riga di comando.
 
 No\ journal\ names\ could\ be\ abbreviated.=Nessun nome di rivista può essere abbreviato.
 
@@ -623,8 +621,6 @@ Options=Opzioni
 
 or=o
 
-Output\ or\ export\ file=File di salvataggio o esportazione
-
 Override\ default\ file\ directories=Alternative alle cartelle di file predefinite
 Overwrite=Sovrascrivi
 
@@ -685,6 +681,7 @@ Pull\ changes\ from\ shared\ database=Recupera le modifiche dalla libreria condi
 
 Pushed\ citations\ to\ %0=Citazioni inviate a %0
 
+
 Quit\ JabRef=Chiudi JabRef
 
 Redo=Ripeti
@@ -857,7 +854,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Raggruppa manualmente le voci
 Status=Stato
 Strings\ for\ library=Stringhe per la libreria
 
-Sublibrary\ from\ AUX=Sottolibreria da file LaTeX AUX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Alterna nomi completi e nomi abbreviati per le riviste delle quali è noto il nome.
 
@@ -865,7 +861,6 @@ Tabname=Nome della scheda
 Tertiary\ sort\ criterion=Criterio di ordinamento terziario
 
 Test=Prova
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Il formato di data scelto per le nuove voci non è valido
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=La codifica scelta '%0' non può codificare i caratteri seguenti\:
 
@@ -902,7 +897,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Per questa operazione una o più voci devono essere selezionate
 
-
 Toggle\ entry\ preview=Mostra/Nascondi l'anteprima
 Toggle\ groups\ interface=Mostra/Nascondi l'interfaccia dei gruppi
 
@@ -1004,15 +998,13 @@ BibTeX\ key\ generator=Generatore di chiavi BibTeX
 Unable\ to\ open\ link.=Impossibile aprire il collegamento.
 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<BR>invece di aprirne una nuova. Per esempio, ciò è utile quando un file viene aperto in JabRef<BR>da un browser web.<BR>Questo tuttavia impedisce di aprire più sessioni di JabRef contemporaneamente.
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Lanciare una ricerca, es. "--fetch\=Medline\:cancer"
+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.
-Settings\ for\ %0=Parametri  per %0
 No\ full\ text\ document\ found=Nessun documento di testo completo trovato
 Download\ from\ URL=Scarica dall'URL
 Rename\ field=Rinomina il campo
@@ -1183,7 +1175,6 @@ Resetting\ preference\ key\ '%0'=Reimposta la chiave delle preferenze '%0'
 Unknown\ preference\ key\ '%0'=Chiave delle preferenze sconosciuta '%0'
 Unable\ to\ clear\ preferences.=Impossibile reimpostatare le preferenze.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Reimposta le preferenze (chiave1,chiave2,... oppure 'all')
 Find\ unlinked\ files=Trovati file non collegati
 Unselect\ all=Deseleziona tutto
 Expand\ all=Espandi tutto
@@ -1638,8 +1629,6 @@ Unable\ to\ generate\ new\ library=Impossibile generare la nuova libreria
 
 Open\ console=Apri la console
 Use\ default\ terminal\ emulator=Usa l'emulatore di terminale predefinito
-Execute\ command=Esegui il comando
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Nota\: Usa il segnaposto %0 come posizione nel file di libreria aperto.
 Error\ occured\ while\ executing\ the\ command\ "%0".=È avvenuto un errore eseguendo il comando "%0".
 Reformat\ ISSN=Riformatta ISSN
 
@@ -1715,14 +1704,10 @@ Work\ offline=Lavora senza connessione
 Working\ offline.=Senza connessione.
 Update\ refused.=Aggiornamento rifiutato.
 Update\ refused=Aggiornamento rifiutato
-Local\ entry=Voce locale
-Shared\ entry=Voce condivisa
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=L'aggiornamento non è stato possibile a causa di un conflitto tra modifiche.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Non stai usando la versione più recente di BibEntry.
 Local\ version\:\ %0=Versione locale\: %0
 Shared\ version\:\ %0=Versione condivisa\: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Accorpa la voce condivisa con la tua e premi "Accorpa voci" per risolvere questo problema.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Cancellare questa operazione lascerà le modifiche non sincronizzate. Cancella comunque?
 Shared\ entry\ is\ no\ longer\ present=La voce condivisa non è più presente
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Puoi ripristinare la voce usando l'"Undo".
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Sei già connesso ad una libreria con i dettagli di connessione specificati.
@@ -1758,7 +1743,7 @@ Date=Data
 File\ annotations=File di annotazioni
 Show\ file\ annotations=Mostra il file delle annotazioni
 Adobe\ Acrobat\ Reader=Adobe Acrobat Reader
-Sumatra\ Reader=Lettore di Sumatra
+Sumatra\ Reader=Sumatra Reader
 shared=condiviso
 should\ contain\ an\ integer\ or\ a\ literal=deve contenere almeno un intero o una lettera
 should\ have\ the\ first\ letter\ capitalized=la prima lettera deve essere maiuscola
@@ -1860,7 +1845,6 @@ Could\ not\ copy\ file=Impossibile copiare il file
 Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=%0 file su %1 sono stati copiati correttamente in %2
 Rename\ failed=Rinomina non riuscita
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef non può accedere al file perché questo è utilizzato da un altro processo.
-Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Visualizza output di console (necessario solo quando viene utilizzato il file di avvio)
 
 Remove\ line\ breaks=Rimuovi interruzioni di riga
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=Rimuove tutte le interruzioni di riga nel contenuto del campo.
@@ -1953,6 +1937,7 @@ Export\ name=Esporta nome
 Main\ layout\ file=File di layout principale
 
 
+Execute\ command=Esegui il comando
 
 
 
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index 8c8cacc3de4..f6f2046ad15 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -66,6 +66,7 @@ Append\ library=データベースを追加
 
 Application=アプリケーション
 
+
 Apply=適用
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=引数は実行中のJabRefインスタンスに渡されました．終了します．
@@ -304,6 +305,7 @@ entry=項目
 
 Entry\ editor=項目エディタ
 
+
 Entry\ preview=項目プレビュー
 
 Entry\ table=項目表
@@ -366,7 +368,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=ファイルディレク
 File\ exists=ファイルが存在します
 
 File\ not\ found=ファイルが見つかりませんでした
-filename=ファイル名
 
 Files\ opened=ファイルは開かれています
 
@@ -458,8 +459,6 @@ Import\ preferences\ from\ file=ファイルから設定を読み込み
 
 Import\ strings=文字列を読み込み
 
-Import\ to\ open\ tab=読み込んでタブを開く
-
 Import\ word\ selector\ definitions=単語選択メニューの定義を読み込み
 
 Imported\ entries=項目を読み込みました
@@ -516,6 +515,7 @@ Link=リンク
 Listen\ for\ remote\ operation\ on\ port=以下のポートでリモート操作を待ち受ける
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=起動時にjabref.xmlの読み込みと保存を行う（メモリースティックモード）
 
+
 Main\ file\ directory=基本ファイルディレクトリ
 
 Manage\ custom\ exports=ユーザー書出の管理
@@ -556,7 +556,6 @@ Name\ formatter=名前の整形
 Natbib\ style=Natbib様式
 
 nested\ AUX\ files=入れ子になっているAUXファイル
-new=新規
 
 New\ BibTeX\ sublibrary=新規BibTeX副データベース
 New\ library\ created.=新規データベースが作成されました．
@@ -573,7 +572,6 @@ 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.=学術誌名を短縮形にすることができませんでした．
 
@@ -623,8 +621,6 @@ Options=オプション
 
 or=または
 
-Output\ or\ export\ file=ファイルを出力するか書き出す
-
 Override\ default\ file\ directories=ファイルディレクトリ既定値の上書き
 Overwrite=上書き
 
@@ -685,6 +681,7 @@ Pull\ changes\ from\ shared\ database=共有データベースから変更点を
 
 Pushed\ citations\ to\ %0=引用を%0に送り込みました
 
+
 Quit\ JabRef=JabRefを終了
 
 Redo=繰り返し
@@ -857,7 +854,6 @@ Statically\ group\ entries\ by\ manual\ assignment=手動割り当てによっ
 Status=状態
 Strings\ for\ library=右のデータベースで用いる文字列
 
-Sublibrary\ from\ AUX=AUXからの部分データベース
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=学術誌名が既知の場合は，完全な学術誌名と短縮形を切り替える．
 
@@ -865,7 +861,6 @@ Tabname=タブ名
 Tertiary\ sort\ criterion=第三整序基準
 
 Test=確認
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=新規項目に選択した日付書式は有効ではありません
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=選択したエンコーディング「%0」は，以下の文字をエンコードすることができませんでした：
 
@@ -902,7 +897,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=この操作を行うには，1つ以上の項目が選択されている必要があります．
 
-
 Toggle\ entry\ preview=項目プレビューを入切
 Toggle\ groups\ interface=グループ制御面を入切
 
@@ -1005,14 +999,12 @@ Unable\ to\ open\ link.=リンクを開くことができませんでした．
 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インスタンスを開かないで，すでに実行されているインスタンスに開いたり<BR>読み込んだりするものです．たとえば，これは，ウェブブラウザからJabRefにファイルを開かせたい時に便利です．<BR>これによって，一度にJabRefのインスタンスを一つしか開けなくなることに注意してください．
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=取得子を実行する．例：「--fetch\=Medline\:cancer」
 
 Reset=リセット
 
 Use\ IEEE\ LaTeX\ abbreviations=IEEEのLaTeX略語を使用
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=ファイルリンクを開く際，リンクが定義されていなければ，一致するファイルを検索する
-Settings\ for\ %0=「%0」の設定
 No\ full\ text\ document\ found=文書全文が見つかりません
 Download\ from\ URL=URLからダウンロード
 Rename\ field=フィールドを改名しました
@@ -1183,7 +1175,6 @@ Resetting\ preference\ key\ '%0'=キー「%0」の設定をリセットします
 Unknown\ preference\ key\ '%0'=キー「%0」という設定は知りません
 Unable\ to\ clear\ preferences.=設定を消去することができませんでした．
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=設定をリセット(キー1・キー2…あるいは「all」)
 Find\ unlinked\ files=リンクされていないファイルを検索
 Unselect\ all=すべての選択を解除
 Expand\ all=すべて展開表示
@@ -1638,8 +1629,6 @@ Unable\ to\ generate\ new\ library=新しいデータベースを生成するこ
 
 Open\ console=コンソールを開く
 Use\ default\ terminal\ emulator=既定の擬似端末を使用する
-Execute\ command=コマンドを実行
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=【註】開かれたデータベースの場所のプレイスホルダーに%0を使用します．
 Error\ occured\ while\ executing\ the\ command\ "%0".=コマンド「%0」を実行中にエラーが発生しました
 Reformat\ ISSN=ISSNを再構成
 
@@ -1715,14 +1704,10 @@ Work\ offline=オフラインで作業
 Working\ offline.=オフラインで作業しています．
 Update\ refused.=更新が拒否されました．
 Update\ refused=更新拒否
-Local\ entry=ローカルの項目
-Shared\ entry=共有項目
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=既存変更点の衝突により更新は実行できませんでした．
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=現在，BibEntryの最新版で作業中ではありません．
 Local\ version\:\ %0=ローカルのバージョン：%0
 Shared\ version\:\ %0=共有のバージョン：%0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=この問題を解決するには，共有項目をローカル項目と統合して「項目を統合」ボタンを押してください．
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=この操作を取り消してしまうと，変更点が同期されないまま残ってしまいます．それでも取り消しますか？
 Shared\ entry\ is\ no\ longer\ present=共有項目がすでに存在しません
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=「取り消し」操作を行って項目を復活させることができます．
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=入力済みの接続詳細情報を使って，データベースにすでに接続されています．
@@ -1860,7 +1845,6 @@ Could\ not\ copy\ file=ファイルをコピーできませんでした
 Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=%1の%0ファイルを%2にコピーしました
 Rename\ failed=改名に失敗しました
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=ファイルが他のプロセスによって使用されているため，JabRefがアクセスすることができません．
-Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=コンソール出力を表 (ロンチャーを使用する場合のみ必要)
 
 Remove\ line\ breaks=改行を取り除く
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=フィールドの内容から改行を全て取り除きます．
@@ -1920,6 +1904,7 @@ Export\ name=書出名
 Main\ layout\ file=基本レイアウトファイル
 
 
+Execute\ command=コマンドを実行
 
 
 
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index 132c2b17ae2..a403ca24f0c 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -67,6 +67,7 @@ Append\ library=Bibliotheek invoegen
 
 Application=Programma
 
+
 Apply=Toepassen
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Argumenten doorgegeven aan de draaiende JabRef instantie. Wordt nu afgesloten.
@@ -308,6 +309,7 @@ entry=invoer
 
 Entry\ editor=Invoerbewerker
 
+
 Entry\ preview=Invoervoorbeeld
 
 Entry\ table=Entry tabel
@@ -371,7 +373,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Bestandsmap is niet ingest
 File\ exists=Bestand bestaat
 
 File\ not\ found=Bestand niet gevonden
-filename=bestandsnaam
 
 Files\ opened=Bestanden geopend
 
@@ -466,8 +467,6 @@ Import\ preferences\ from\ file=Importeer instellingen van bestand
 
 Import\ strings=Tekenreeksen importeren
 
-Import\ to\ open\ tab=Importeer naar open tabblad
-
 Import\ word\ selector\ definitions=Importeer woordselecteerder definities
 
 Imported\ entries=Geïmporteerde invoergegevens
@@ -525,6 +524,7 @@ Link=Link
 Listen\ for\ remote\ operation\ on\ port=Luister naar operatie vanop afstand op poort
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Laden en opstaan voorkeuren van/naar jabref.xml bij het opstarten (geheugenstick-modus)
 
+
 Main\ file\ directory=Hoofdbestand map
 
 Manage\ custom\ exports=Beheer externe exportfilters
@@ -565,7 +565,6 @@ Name\ formatter=Naam formateerder
 Natbib\ style=Natbib stijl
 
 nested\ AUX\ files=geneste AUX bestanden
-new=nieuw
 
 New\ BibTeX\ sublibrary=Nieuwe BibTeX subblibliotheek
 New\ library\ created.=Nieuwe bibliotheek aangemaakt.
@@ -582,7 +581,6 @@ no\ library\ generated=geen bibliotheek gegenereerd
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Geen invoergegevens gevonden. Zorg er a.u.b. voor dat u het juiste importfilter gebruikt.
 No\ files\ found.=Geen bestanden gevonden.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Geen GUI. Alleen proces commandoregel opties.
 
 No\ journal\ names\ could\ be\ abbreviated.=Er konden geen logboeknamen worden afgekort.
 
@@ -632,8 +630,6 @@ Options=Opties
 
 or=of
 
-Output\ or\ export\ file=Geef uitvoer of exporteer bestand
-
 Override\ default\ file\ directories=Wijzig standaard bestandsmappen
 Overwrite=Overschrijven
 
@@ -695,6 +691,7 @@ Pull\ changes\ from\ shared\ database=Trek wijzigingen van de gedeelde database
 
 Pushed\ citations\ to\ %0=Citaten verplaatst naar %0
 
+
 Quit\ JabRef=JabRef afsluiten
 
 Redo=Overdoen
@@ -877,7 +874,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Groepeer invoergegevens stati
 Status=Status
 Strings\ for\ library=Tekenreeksen voor bibliotheek
 
-Sublibrary\ from\ AUX=Sublibrary van AUX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Schakelt tussen volledige en afgekorte logboeknaam als het logboek bekend is.
 
@@ -885,7 +881,6 @@ Tabname=Tabblad naam
 Tertiary\ sort\ criterion=Tertiair sorteercriterium
 
 Test=Test
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Het gekozen datumformaat voor nieuwe invoergegevens is niet geldig
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=De gekozen codering '%0' kan de volgende tekens niet coderen\:
 
@@ -923,7 +918,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Deze operatie vereist dat een of meerdere invoergegevens geselecteerd zijn.
 
 This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=Deze instelling kan op elk moment worden gewijzigd in voorkeuren.
-
 Toggle\ entry\ preview=Invoervoorbeeld schakelen
 Toggle\ groups\ interface=Groepenvenster schakelen
 
@@ -1028,14 +1022,12 @@ BibTeX\ key\ generator=BibTex sleutel generator
 Unable\ to\ open\ link.=Link openen niet mogelijk.
 MIME\ type=MIME type
 
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Ophaler uitvoeren, bijvoorbeeld "--fetch\=Medline\:cancer"
 
 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
-Settings\ for\ %0=Instellingen voor %0
 No\ full\ text\ document\ found=Geen volledig tekstdocument gevonden
 Download\ from\ URL=Download vanaf URL
 Rename\ field=Veld hernoemen
@@ -1206,7 +1198,6 @@ Resetting\ preference\ key\ '%0'=Voorkeur-sleutel '%0' resetten
 Unknown\ preference\ key\ '%0'=Onbekende voorkeur-sleutel '%0'
 Unable\ to\ clear\ preferences.=Niet in staat om voorkeuren te wissen.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Voorkeuren resetten (sleutel1, sleutel2,... of 'alles')
 Find\ unlinked\ files=Niet-gelinkte bestanden vinden
 Unselect\ all=Alles deselecteren
 Expand\ all=Alles uitvouwen
@@ -1661,8 +1652,6 @@ Unable\ to\ generate\ new\ library=Niet mogelijk om een nieuwe bibliotheek te ge
 
 Open\ console=Console openen
 Use\ default\ terminal\ emulator=Gebruik standaard terminal-emulator\n
-Execute\ command=Commando uitvoeren
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Opmerking\: Gebruik de tijdelijke aanduiding %0 voor de locatie van het geopende bibliotheekbestand.
 Error\ occured\ while\ executing\ the\ command\ "%0".=Er is een fout opgetreden tijdens het uitvoeren van commando "%0".
 Reformat\ ISSN=ISSN formatteren
 
@@ -1738,14 +1727,10 @@ Work\ offline=Offline werken
 Working\ offline.=Werk offline.
 Update\ refused.=Update geweigerd.
 Update\ refused=Update geweigerd
-Local\ entry=Lokale invoer
-Shared\ entry=Gedeelde invoer
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Update kon niet worden uitgevoerd vanwege bestaande wijzigingsconflicten.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=U werkt niet aan de nieuwste versie van BibEntry.
 Local\ version\:\ %0=Lokale versie\: %0
 Shared\ version\:\ %0=Gedeelde versie\: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Voeg de gedeelde invoer samen met de uwe en druk op "Items samenvoegen" om dit probleem op te lossen.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Als u deze bewerking annuleert, zullen uw bewerkingen niet zijn gesynchroniseerd. Toch annuleren?
 Shared\ entry\ is\ no\ longer\ present=Gedeelde invoer is niet langer aanwezig
 The\ entry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=De invoer waar u momenteel aan werkt is aan de gedeelde kant verwijderd.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=U kunt de invoer herstellen met de bewerking "Ongedaan maken".
@@ -1884,7 +1869,6 @@ Could\ not\ copy\ file=Kan het bestand niet kopiëren
 Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=%0 bestanden van %1 succesvol gekopieerd naar %2
 Rename\ failed=Hernoemen mislukt
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef kan geen toegang krijgen tot dit bestand omdat het door een ander proces wordt gebruikt.
-Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Laat console-uitvoer zien (alleen nodig wanneer het opstartprogramma wordt gebruikt)
 
 Remove\ line\ breaks=Verwijder regeleinden
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=Verwijder alle regeleinden in de veldinhoud.
@@ -1997,6 +1981,7 @@ Export\ name=Naam exporteren
 Main\ layout\ file=Hoofd layoutbestand
 
 
+Execute\ command=Commando uitvoeren
 
 
 
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index 25d92efa860..55a02745060 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -63,6 +63,7 @@ Append\ library=Legg til inn&hold fra bibliotek
 
 Application=Applikasjon
 
+
 Apply=Utfør
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Argumentene sendt til allerede aktiv JabRef-instans. Avslutter.
@@ -296,6 +297,7 @@ entry=enhet
 
 Entry\ editor=Enhetsskjema
 
+
 Entry\ preview=Forhåndsvisning
 
 Entry\ table=Hovedtabell
@@ -357,7 +359,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Filkatalogen er ikke satt
 File\ exists=Filen eksisterer
 
 File\ not\ found=Fant ikke filen
-filename=filnavn
 
 Files\ opened=Filer åpnet
 
@@ -440,8 +441,6 @@ Import\ preferences\ from\ file=Importer innstillinger fra fil
 
 Import\ strings=Importer strenger
 
-Import\ to\ open\ tab=Importer til åpen tab
-
 Import\ word\ selector\ definitions=Importer definisjoner for hurtigvelgere
 
 Imported\ entries=Importerte enheter
@@ -497,6 +496,7 @@ Left=Venstre
 Listen\ for\ remote\ operation\ on\ port=Lytt etter fjernoperasjoner på port
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Hent og lagre innstillinger fra/til jabef.xml ved oppstart (minnepinne-modus)
 
+
 Main\ file\ directory=Hovedkatalog for filer
 
 Manage\ custom\ exports=Sett opp eksterne eksportfiltre
@@ -536,7 +536,6 @@ Name\ formatter=Navneformaterer
 Natbib\ style=Natbib-stil
 
 nested\ AUX\ files=nøstede AUX-filer
-new=ny
 
 New\ BibTeX\ sublibrary=Nytt BibTeX-delbibiliotek
 New\ library\ created.=Opprettet nytt bibliotek.
@@ -553,7 +552,6 @@ no\ library\ generated=bibliotek ble ikke generert
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Ingen enheter funnet. Kontroller at du bruker riktig importfilter.
 No\ files\ found.=Ingen filer funnet.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Ingen GUI. Bare behandle kommandolinjevalg.
 
 No\ journal\ names\ could\ be\ abbreviated.=Ingen journalnavn kunne forkortes.
 
@@ -601,8 +599,6 @@ Options=Valg
 
 or=eller
 
-Output\ or\ export\ file=Lagre eller eksporter fil
-
 Override\ default\ file\ directories=Overstyr hovekataloger for filer
 Overwrite=Skriv over
 
@@ -653,6 +649,7 @@ Processing\ %0=Arbeider %0
 
 Pushed\ citations\ to\ %0=Sendte enheter til %0
 
+
 Quit\ JabRef=Avslutt JabRef
 
 Redo=Gjenta
@@ -814,14 +811,12 @@ Statically\ group\ entries\ by\ manual\ assignment=Grupper enheter statisk ved m
 
 Strings\ for\ library=Strenger for library
 
-Sublibrary\ from\ AUX=Dellibrary fra AUX-fil
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Bytter mellom fullt og forkortet journalnavn dersom navnet er kjent.
 
 Tabname=Tabnavn
 Tertiary\ sort\ criterion=Tredje sorteringskriterium
 
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Det valgte datoformatet er ugyldig
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Den valgte tegnkodingen '%0' kunne ikke kode følgende tegn\:
 
@@ -858,7 +853,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Denne operasjonen krever at en eller flere enheter er valgt.
 
-
 Toggle\ entry\ preview=Vis/skjul forhåndsvisning
 Toggle\ groups\ interface=Vis/skjul grupperingskontroll
 
@@ -963,7 +957,6 @@ 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
-Settings\ for\ %0=Innstillinger for %0
 Rename\ field=Endre navn på felt
 Rename\ field\ to=Endre navn på felt til
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Flytt innholdet i et felt til et annet felt
@@ -1164,7 +1157,6 @@ Online\ help\ forum=Online hjelpforum
 
 Unable\ to\ generate\ new\ library=Kan ikke generere det nye biblioteket
 
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Merk\: Bruk plassholderen %0 for plasseringen av den åpnede bibliotekfilen.
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index ec8c82f8d16..3ff875f988f 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -63,6 +63,7 @@ Append\ library=Anexar base de dados
 
 Application=Aplicação
 
+
 Apply=Aplicar
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Parâmetros passados ao JabRef em execução. Encerrando o programa.
@@ -299,6 +300,7 @@ entry=referência
 
 Entry\ editor=Editor de referência
 
+
 Entry\ preview=Previsualização da referência
 
 Entry\ table=Tabela de referências
@@ -360,7 +362,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=O diretório do arquivo n
 File\ exists=O arquivo existe
 
 File\ not\ found=Arquivo não encontrado
-filename=nome do arquivo
 
 Files\ opened=Arquivos abertos
 
@@ -444,8 +445,6 @@ Import\ preferences\ from\ file=Importar preferências a partir de um arquivo
 
 Import\ strings=Importar strings
 
-Import\ to\ open\ tab=Importar para abrir aba
-
 Import\ word\ selector\ definitions=Importar definições de seleção de palavra
 
 Imported\ entries=Referências importadas
@@ -501,6 +500,7 @@ Link=Linkar
 Listen\ for\ remote\ operation\ on\ port=Escutar operações remotas na porta
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Carregar e salvar preferências a partir de/para jabref.xml ao iniciar (modo cartão de memória)
 
+
 Main\ file\ directory=Diretório de arquivos principal
 
 Manage\ custom\ exports=Gerenciar exportações personalizadas
@@ -540,7 +540,6 @@ Name\ formatter=Formatador de nomes
 Natbib\ style=Estilo Natbib
 
 nested\ AUX\ files=arquivos AUXiliares aninhados
-new=novo
 
 New\ BibTeX\ sublibrary=Nova sub-base de dados BibTeX
 New\ library\ created.=Nova base de dados criada
@@ -557,7 +556,6 @@ no\ library\ generated=Nenhuma base de dados gerada
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Nenhuma referência encontrada. Por favor, certifique-se que você está utilizando o filtro de importação correto.
 No\ files\ found.=Nenhum arquivo encontrado.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Nenhuma interface gráfica. Apenas processar opções de comandos de linha.
 
 No\ journal\ names\ could\ be\ abbreviated.=Nenhum nome de periódico pôde ser abreviado.
 
@@ -605,8 +603,6 @@ Options=Opções
 
 or=ou
 
-Output\ or\ export\ file=Saída ou arquivo de exportação
-
 Override\ default\ file\ directories=Substituir os diretórios de arquivo padrão
 Overwrite=Sobrescrever
 
@@ -657,6 +653,7 @@ Processing\ %0=Processando %0
 
 Pushed\ citations\ to\ %0=Citações enviadas para %0
 
+
 Quit\ JabRef=Sair do JabRef
 
 Redo=Refazer
@@ -819,7 +816,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Agrupar referências manualme
 
 Strings\ for\ library=Strings para a base de dados
 
-Sublibrary\ from\ AUX=Sub-base de dados a partir do LaTeX AUX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Alterna entre nomes de periódicos abreviados e completos se o nome do periódico é conhecido.
 
@@ -827,7 +823,6 @@ Tabname=Nome da aba
 Tertiary\ sort\ criterion=Critério de ordenação terciário
 
 Test=Teste
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=O formato de data escolhido não é válido
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=A codificação '%0' não pode codificar os seguintes caracteres\:
 
@@ -864,7 +859,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Esta operação exige que uma ou mais referências sejam selecionadas
 
-
 Toggle\ entry\ preview=Habilitar/Desabilitar previsualização da referência
 Toggle\ groups\ interface=Habilitar/Desabilitar interface de grupos
 
@@ -964,14 +958,12 @@ BibTeX\ key\ generator=Gerador de chaves BibTeX
 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<br> ao invés de abrir uma nova instância. Por exemplo, isto é útil quando você abre um arquivo no JabRef<br> a partir de ser navegador web.<BR> Note que isto irá previnir que você execute uma ou mais instâncias do JabRef ao mesmo tempo.
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Executar Pesquisar , e.g., "--fetch\=Medline\:cancer"
 
 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
-Settings\ for\ %0=Configurações para %0
 Rename\ field=Renomear campo
 Rename\ field\ to=Renomear campo para
 Move\ contents\ of\ a\ field\ into\ a\ field\ with\ a\ different\ name=Mover conteúdo de um campo para um campo com nome diferente
@@ -1136,7 +1128,6 @@ Resetting\ preference\ key\ '%0'=Redefinindo preferência '%0'
 Unknown\ preference\ key\ '%0'=Preferência desconhecida '%0"
 Unable\ to\ clear\ preferences.=Não foi possível limpar as preferências
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Redefinir preferências (key1,key2,... ou todas)
 Find\ unlinked\ files=Encontrar arquivos não referenciados
 Unselect\ all=Desmarcar todas
 Expand\ all=Expandir todos
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index 07a89036964..44dc83523b9 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -64,6 +64,7 @@ Append\ library=Добавить БД
 
 Application=Приложение
 
+
 Apply=Применить
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Аргументы переданы в запущенный экземпляр JabRef. Отключение.
@@ -300,6 +301,7 @@ entry=запись
 
 Entry\ editor=Редактор записей
 
+
 Entry\ preview=Предварительный просмотр записи
 
 Entry\ table=Таблица записей
@@ -361,7 +363,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Каталог файло
 File\ exists=Файл существует
 
 File\ not\ found=Файл не найден
-filename=имя файла
 
 Files\ opened=Открытые файлы
 
@@ -446,8 +447,6 @@ Import\ preferences\ from\ file=Импорт пользовательских н
 
 Import\ strings=Импорт строк
 
-Import\ to\ open\ tab=Импорт в открытую вкладку
-
 Import\ word\ selector\ definitions=Импорт определений выбора слов
 
 Imported\ entries=Импортированные записи
@@ -504,6 +503,7 @@ Link=Ссылка
 Listen\ for\ remote\ operation\ on\ port=Прослушивать удаленные подключения для порта
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Загрузка или сохранение пользовательских настроек из/в файл jabref.xml при запуске (режим флеш-памяти)
 
+
 Main\ file\ directory=Основной каталог файлов
 
 Manage\ custom\ exports=Управление пользовательским экспортом
@@ -543,7 +543,6 @@ Name\ formatter=Программа форматирования имени
 Natbib\ style=Стиль Natbib
 
 nested\ AUX\ files=родственный файл AUX
-new=создать
 
 New\ BibTeX\ sublibrary=Создать подчиненную БД BibTeX
 New\ library\ created.=Создана новая БД.
@@ -560,7 +559,6 @@ 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.=Без ИП. Обработка только с использованием командной строки.
 
 No\ journal\ names\ could\ be\ abbreviated.=Названия журналов не могут быть сокращены.
 
@@ -608,8 +606,6 @@ Options=Параметры
 
 or=или
 
-Output\ or\ export\ file=Вывод или экспорт файла
-
 Override\ default\ file\ directories=Переопределить каталоги файлов, заданные по умолчанию
 Overwrite=Перезаписать
 
@@ -661,6 +657,7 @@ Pull\ changes\ from\ shared\ database=Загрузить изменения из
 
 Pushed\ citations\ to\ %0=Цитаты переданы в %0
 
+
 Quit\ JabRef=Выход из JabRef
 
 Redo=Повторить
@@ -826,7 +823,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Фиксированная г
 Status=Статус
 Strings\ for\ library=Строки БД
 
-Sublibrary\ from\ AUX=Подчиненная БД из AUX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Переключение полного/сокращенного имени журнала для известных имен журналов.
 
@@ -834,7 +830,6 @@ Tabname=Имя вкладки
 Tertiary\ sort\ criterion=Третичный критерий сортировки
 
 Test=Тест
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Выбранный формат даты для новых записей недопустим
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=В выбранной кодировке '%0' невозможно прочитать следующие символы\:
 
@@ -871,7 +866,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Для этой операции необходимо выбрать одну или несколько записей.
 
-
 Toggle\ entry\ preview=Показать/скрыть просмотр записи
 Toggle\ groups\ interface=Показать/скрыть интерфейс групп
 
@@ -972,14 +966,12 @@ Unable\ to\ open\ link.=Не удалось перейти по ссылке.
 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<BR>без запуска нового экземпляра приложения. Например, при передаче файла в JabRef<br>из веб-браузера.<BR>Обратите внимание, что эта функция позволяет не запускать несколько экземпляров JabRef одновременно.
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Запуск инструмента выборки, напр.\: "--fetch\=Medline\:cancer"
 
 Reset=Инициализировать
 
 Use\ IEEE\ LaTeX\ abbreviations=Использовать сокращения LaTeX для IEEE
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=При переходе по ссылке выполнять поиск соответствующего файла, если ссылка не определена
-Settings\ for\ %0=Настройки для %0
 Download\ from\ URL=Загрузить из URL-адреса
 Rename\ field=Переименовать поле
 Rename\ field\ to=Переименовать поле в
@@ -1145,7 +1137,6 @@ Resetting\ preference\ key\ '%0'=Сброс ключа пользователь
 Unknown\ preference\ key\ '%0'=Неизвестный ключ пользовательских настроек '%0'
 Unable\ to\ clear\ preferences.=Не удалось очистить пользовательские настройки.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Сброс пользовательских настроек (ключ1, ключ2,... или 'все')
 Find\ unlinked\ files=Поиск несвязанных файлов
 Unselect\ all=Отменить выбор всех
 Expand\ all=Развернуть все
@@ -1572,8 +1563,6 @@ Unable\ to\ generate\ new\ library=Не удалось создать новую
 
 Open\ console=Открыть консоль
 Use\ default\ terminal\ emulator=Использовать эмуляцию терминала по умолчанию
-Execute\ command=Выполнить команду
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Примечание. Используйте подстановочный знак %0 для указания расположения открытой БД.
 Error\ occured\ while\ executing\ the\ command\ "%0".=Ошибка при выполнении команды "%0".
 Reformat\ ISSN=Переформатировать ISSN
 
@@ -1631,14 +1620,10 @@ Work\ offline=Работать автономно
 Working\ offline.=Работа в автономном режиме.
 Update\ refused.=Обновление отклонено.
 Update\ refused=Обновление отклонено
-Local\ entry=Локальная запись
-Shared\ entry=Запись с общим доступом
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Не удалось выполнить обновление из-за существующих конфликтов изменений.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Вы используете не самую последнюю версию BibEntry.
 Local\ version\:\ %0=Локальная версия\: %0
 Shared\ version\:\ %0=Версия с общим доступом\: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Объедините запись с общим доступом и вашу запись, а затем нажмите "Объединение записей" для разрешения этой проблемы.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=При отмене этой операции ваши изменения не будут синхронизированы. Отменить операцию?
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Цитирование записей без ключей BibTeX невозможно. Создать ключи сейчас?
 New\ technical\ report=Технический отчет
@@ -1711,6 +1696,7 @@ Export\ name=Имя экспорта
 Main\ layout\ file=Главный файл макета
 
 
+Execute\ command=Выполнить команду
 
 
 
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index a75d925a7b8..a11067de754 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -62,6 +62,7 @@ Append\ library=Lägg till databas
 
 Application=Program
 
+
 Apply=Tillämpa
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Argumenten skickades till JabRef-instansen som redan kördes. Stänger ned.
@@ -295,6 +296,7 @@ entry=post
 
 Entry\ editor=Posteditor
 
+
 Entry\ preview=Postvisning
 
 Entry\ table=Tabell
@@ -354,7 +356,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Filmapp är inte satt elle
 File\ exists=Filen finns redan
 
 File\ not\ found=Hittar ej filen
-filename=filnamn
 
 Files\ opened=Filer öppnade
 
@@ -436,8 +437,6 @@ Import\ preferences\ from\ file=Importera inställningar från fil
 
 Import\ strings=Importera strängar
 
-Import\ to\ open\ tab=Importera till öppen flik
-
 
 Imported\ entries=Importerade poster
 
@@ -489,6 +488,7 @@ Left=Vänster
 Link=Länk
 Listen\ for\ remote\ operation\ on\ port=Lyssna efter fjärrstyrning på port
 
+
 Main\ file\ directory=Huvudmapp för filer
 
 Manage\ custom\ exports=Hantera egna exporterare
@@ -526,7 +526,6 @@ Name\ formatter=Namnformattering
 Natbib\ style=Natbib-stil
 
 nested\ AUX\ files=nästlade AUX-filer
-new=ny
 
 New\ library\ created.=Skapade ny databas.
 
@@ -587,7 +586,6 @@ Options=Alternativ
 
 or=eller
 
-
 Override\ default\ file\ directories=Ignorerar normala filmappar
 Overwrite=Skriv över
 
@@ -638,6 +636,7 @@ Pull\ changes\ from\ shared\ database=Hämta ändringar från delad databas
 
 Pushed\ citations\ to\ %0=Infogade citeringar i %0
 
+
 Quit\ JabRef=Avsluta JabRef
 
 Redo=Gör igen
@@ -795,7 +794,6 @@ Special\ table\ columns=Speciella kolumner
 
 Strings\ for\ library=Strängar för libraryn
 
-Sublibrary\ from\ AUX=Databas baserad på AUX-fil
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Växlar mellan fullt och förkortat tidskiftsnamn om tidskriften är känd.
 
@@ -803,7 +801,6 @@ Tabname=Fliknamn
 Tertiary\ sort\ criterion=Tredje sorteringskriteriet
 
 Test=Testa
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Det valda datumformatet för nya poster är inte giltigt
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Den valde teckenkodningen '%0' kan inte representera följande tecken
 
@@ -837,7 +834,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Den här operationen kräver att en eller flera poster är valda.
 
-
 Toggle\ entry\ preview=Växla postvisning
 Toggle\ groups\ interface=Växla grupphantering
 
@@ -935,7 +931,6 @@ Reset=Återställ
 
 Use\ IEEE\ LaTeX\ abbreviations=Använd IEEE LaTeX-förkortningar
 
-Settings\ for\ %0=Alternativ för %0
 Download\ from\ URL=Ladda ned från URL
 Rename\ field=Byt namn på fält
 Rename\ field\ to=Byt namn på fält till
@@ -1086,7 +1081,6 @@ Resetting\ preference\ key\ '%0'=Återställer inställningsvärde '%0'
 Unknown\ preference\ key\ '%0'=Okänd inställning '%0'
 Unable\ to\ clear\ preferences.=Kan inte rensa inställningar.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Återställ inställningar (nyckel1,nyckel2,... eller 'all')
 Find\ unlinked\ files=Hitta olänkade filer
 Expand\ all=Expandera alla
 Collapse\ all=Fäll ihop alla
@@ -1478,8 +1472,6 @@ Unable\ to\ generate\ new\ library=Kan inte generera ny databas
 
 Open\ console=Öppna konsoll
 Use\ default\ terminal\ emulator=Använd standardterminalen
-Execute\ command=Kör kommando
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Använd %0 för att infoga mappen för databasfilen.
 Error\ occured\ while\ executing\ the\ command\ "%0".=Fel när kommandot "%0" kördes.
 Reformat\ ISSN=Formattera om ISSN
 
@@ -1533,12 +1525,9 @@ Work\ offline=Arbeta frånkopplad
 Working\ offline.=Arbetar frånkopplad.
 Update\ refused.=Uppdateringen avvisades.
 Update\ refused=Uppdateringen avvisades
-Local\ entry=Lokal post
-Shared\ entry=Delad post
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Du arbetar inte med den senaste versionen av posten.
 Local\ version\:\ %0=Lokal version\: %0
 Shared\ version\:\ %0=Delad version\: %0
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Om denna operation avbryts kommer din ändringar ej bli synkroniserade. Avbryt ändå?
 
 Cannot\ cite\ entries\ without\ BibTeX\ keys.\ Generate\ keys\ now?=Kan inte citera poster utan BibTeX-nycklar. Generera nycklar nu?
 New\ technical\ report=Ny teknisk rapport
@@ -1613,6 +1602,7 @@ Export\ name=Exportnamn
 Main\ layout\ file=Huvudfil för layout
 
 
+Execute\ command=Kör kommando
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index 2f794af9941..423ba89b8a3 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -66,6 +66,7 @@ Append\ library=Ilakip ang library
 
 Application=Ang aplikasyon
 
+
 Apply=Ilapat
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Ang argumento ay pumasa sa pagtakbo ng JabRef halimbawa. Shutting down.
@@ -302,6 +303,7 @@ entry=entry
 
 Entry\ editor=Entry ng taga-bago
 
+
 Entry\ preview=Entry preview
 
 Entry\ table=Talahanayan ng entry
@@ -363,7 +365,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Direktoryo ng file ay hind
 File\ exists=Umiiral ang file
 
 File\ not\ found=Hindi makita ang file
-filename=filename
 
 Files\ opened=Nabuksan ang files
 
@@ -455,8 +456,6 @@ Import\ preferences\ from\ file=I-import ang mga preferences mula sa file
 
 Import\ strings=I-import ang strings
 
-Import\ to\ open\ tab=I-import sa bukas na tab
-
 Import\ word\ selector\ definitions=I-import ang salita na taga pili ng kahulugan
 
 Imported\ entries=Mga imported na entries
@@ -512,6 +511,7 @@ Link=Ang link
 Listen\ for\ remote\ operation\ on\ port=Makinig para sa remote na operasyon sa port
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Mag load at -isave ang preferenes mula/patungo sa jabref.xml sa start-up (memory stick mode)
 
+
 Main\ file\ directory=Pangunahing direktoryo ng file
 
 Manage\ custom\ exports=Pamahalaan ang kustom na pagpapalabas
@@ -551,7 +551,6 @@ Name\ formatter=Pangalan ng taga-format
 Natbib\ style=Natbib na estilo
 
 nested\ AUX\ files=nested ang AUX na files
-new=bago
 
 New\ BibTeX\ sublibrary=Bago ang BibTeX na mababang library
 New\ library\ created.=May bagong library na nagawa.
@@ -568,7 +567,6 @@ no\ library\ generated=walang library ang nabuo
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Walang entries ang nakita. Pakiusap na isigurado ang iyong paggamit sa wastong import filter.
 No\ files\ found.=Walang nakitang file.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Walang GUI. Ang pagproseso lang ng mga opsyon sa command line.
 
 No\ journal\ names\ could\ be\ abbreviated.=Walang talaarawan na pangalan ang puwedeng paikliin.
 
@@ -615,8 +613,6 @@ Options=Mga opsyon
 
 or=o
 
-Output\ or\ export\ file=Output o pagpalabas ng file
-
 Override\ default\ file\ directories=I-override ang mga file na naka-default sa direktoryo
 Overwrite=I-overwrite
 
@@ -676,6 +672,7 @@ Processing\ %0=Nagproproseso %0
 
 Pushed\ citations\ to\ %0=Pinipilit ang pagsipi sa %0
 
+
 Quit\ JabRef=Huminto sa JabRef
 
 Redo=I-redo
@@ -848,7 +845,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Statically na mga grupo ng en
 Status=Katayuan
 Strings\ for\ library=Mga strings para sa library
 
-Sublibrary\ from\ AUX=Sublibrary mula sa AUX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Lilipat sa pagitan ng buong at dinaglat na pangalan ng journal kung kulala ang pangalan ng journal.
 
@@ -856,7 +852,6 @@ Tabname=Tabname
 Tertiary\ sort\ criterion=Kriteryang Tertiaryo ng uri
 
 Test=Pagsusulit
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Ang piniling format ng petsa para sa mga bagong entry ay hindi wasto
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Ang napiling encoding na '%0' ay hindi ma-encode ang mga sumusunod na character\:
 
@@ -893,7 +888,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Ang operasyong ito ay nangangailangan ng isa o higit pang mga entry na mapili.
 
-
 Toggle\ entry\ preview=I-toggle ang preview ng entry
 Toggle\ groups\ interface=I-toggle ang mga interface ng grupo
 
@@ -995,14 +989,12 @@ Unable\ to\ open\ link.=Hindi mabuksan ang link.
 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 <BR> sa halip ng pagbubukas ng isang bagong pagkakataon. Halimbawa, ito ay kapaki-pakinabang kapag binuksan mo ang isang file sa JabRef <br> mula sa iyong web browser. <BR> Tandaan na ito ay pipigil sa iyo mula sa pagpapatakbo ng higit sa isang halimbawa ng JabRef sa isang pagkakataon.
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=Magpatakbo ng fetcher, hal. "--fetch\=Medline\:cancer"
 
 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
-Settings\ for\ %0=Mga setting para sa %0
 Download\ from\ URL=I-download mula sa URL
 Rename\ field=Palitan ang pangalan ng patlang
 Append\ field=Ilagay ang field
@@ -1170,7 +1162,6 @@ Resetting\ preference\ key\ '%0'=Paghahanda muli sa preference na susi '%0'
 Unknown\ preference\ key\ '%0'=Hindi malaman kung akong preference na susi '%0'
 Unable\ to\ clear\ preferences.=Hindi maaring linawin ang mga preferences.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=I-reset ang preferences (key1,key2,... or 'lahat')
 Find\ unlinked\ files=Humanap ng mga unlinked na files
 Unselect\ all=Tanggalin ang lahat na napili
 Expand\ all=Palawakin ang lahat
@@ -1445,14 +1436,10 @@ Work\ offline=Magtrabaho offline
 Working\ offline.=Nagtatrabaho offline.
 Update\ refused.=Ang pag-update ay tumanggi.
 Update\ refused=Ang pag-update ay tumanggi
-Local\ entry=Lokal na entry
-Shared\ entry=Ibinahagi ang entry
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Hindi maisasagawa ang pag-update dahil sa mga umiiral na conflict.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Hindi ka nagtatrabaho sa pinakabagong bersyon ng BibEntry.
 Local\ version\:\ %0=Lokal na bersyon\: %0
 Shared\ version\:\ %0=Ibinahagi na bersyon\: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Mangyaring pagsamahin ang nakabahaging entry sa iyo at pindutin ang "Pagsamahin ang mga entry" upang malutas ang problemant ito.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Ang pagkansela sa operasyon ito ay iiwan ang iyong mga pagbabago na hindi naka-sync. Kanselahin pa rin?
 Shared\ entry\ is\ no\ longer\ present=Ang nakabahaging entry ay wala na
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Maaari mong ibalik ang entry gamit ang "I-undo" na operasyon.
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Nakakonekta ka na sa database gamit ang mga detalye ng koneksyon.
@@ -1531,7 +1518,6 @@ Could\ not\ copy\ file=Hindi makopya ang file
 Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=Kinokopya ang %0 mga file ng %1 matagumpay sa %2
 Rename\ failed=Nabigo ang pagpalit ng pangalan
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=Hindi ma-access ng JabRef ang file dahil ginagamit ito ng isa pang proseso.
-Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Ipakita ang console output (kinakailangan lamang kapag ginagamit ang launcher)
 
 Remove\ line\ breaks=Alisin ang mga break ng linya
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=Tinanggal ang lahat ng break ng linya sa nilalaman ng patlang.
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 3a3cf1498e1..2fb0ca809d4 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -45,7 +45,7 @@ Add\ subgroup=Altgrup ekle
 
 Added\ group\ "%0".="%0" grubu eklendi.
 
-Added\ string=Dizgi eklendi
+Added\ string=Dizge eklendi
 
 Additionally,\ entries\ whose\ <b>%0</b>\ field\ does\ not\ contain\ <b>%1</b>\ can\ be\ assigned\ manually\ to\ this\ group\ by\ selecting\ them\ then\ using\ either\ drag\ and\ drop\ or\ the\ context\ menu.\ This\ process\ adds\ the\ term\ <b>%1</b>\ to\ each\ entry's\ <b>%0</b>\ field.\ Entries\ can\ be\ removed\ manually\ from\ this\ group\ by\ selecting\ them\ then\ using\ the\ context\ menu.\ This\ process\ removes\ the\ term\ <b>%1</b>\ from\ each\ entry's\ <b>%0</b>\ field.=Ek olarak, <b>%0</b> alanları <b>%1</b> içermeyen girdiler seçilip, bu gruba sürükle ve bırak ya da bağlam menüsü kullanılarak elle atanabilir. Bu süreç her bir girdinin <b>%0</b> alanına <b>%1</b> terimini ekler. Girdiler
 
@@ -67,6 +67,7 @@ Append\ library=Veritabanını sonuna ekle
 
 Application=Uygulama
 
+
 Apply=Uygula
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Argümanlar çalışan JabRef oturumuna aktarıldı. Kapatılıyor.
@@ -103,7 +104,9 @@ by=ile
 The\ conflicting\ fields\ of\ these\ entries\ will\ be\ merged\ into\ the\ 'Comment'\ field.=Bu girdilerin çakışan alanları 'Yorum' alanına katıştırılır.
 
 Cancel=İptal
+Cannot\ create\ group=Grup oluşturulamıyor
 
+Cannot\ create\ group.\ Please\ create\ a\ library\ first.=Grup oluşturulamıyor. Lütfen önce bir kütüphane oluşturun.
 
 Cannot\ merge\ this\ change=Bu değişiklik birleştirilemiyor
 
@@ -216,6 +219,7 @@ Default\ encoding=Öntanımlı kodlama
 Default\ grouping\ field=Öntanımlı gruplama alanı
 
 Default\ pattern=Öntanımlı desen
+Execute\ default\ action\ in\ dialog=İletişim kutusundaki öntanımlı eylemi yürüt
 
 Delete=Sil
 
@@ -308,11 +312,13 @@ entry=girdi
 
 Entry\ editor=Girdi düzenleyici
 
+
 Entry\ preview=Girdi önizlemesi
 
 Entry\ table=Girdi tablosu
 
 Entry\ table\ columns=Girdi tablosu sütunları
+Entry\ Title\ (Required\ to\ deliver\ recommendations.)=Girdi Başlığı (öneride bulunmak için şart.)
 
 Entry\ type=Girdi türü
 
@@ -371,7 +377,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Dosya dizini kurulmadı ya
 File\ exists=Dosya mevcut
 
 File\ not\ found=Dosya bulunamadı
-filename=dosya adı
 
 Files\ opened=Açılmış dosyalar
 
@@ -466,8 +471,6 @@ Import\ preferences\ from\ file=Dosyadan içe aktarma tercihleri
 
 Import\ strings=Dizgeleri içe aktar
 
-Import\ to\ open\ tab=Sekme açmak için içe aktar
-
 Import\ word\ selector\ definitions=Sözcük seçici tanımlarını içe aktar
 
 Imported\ entries=İçe aktarılmış girdiler
@@ -495,8 +498,11 @@ Invalid\ date\ format=Geçersiz tarih biçemi
 Invalid\ URL=Geçersiz URL
 
 Online\ help=Çevrimiçi yardım
+JabRef\ Language\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ preferred\ language.)=JabRef Dili (kullanıcının tercih ettiği dili belirtmek daha iyi öneriler sağlar.)
 
 JabRef\ preferences=JabRef tercihler
+JabRef\ requests\ recommendations\ from\ Mr.\ DLib,\ which\ is\ an\ external\ service.\ To\ enable\ Mr.\ DLib\ to\ calculate\ recommendations,\ some\ of\ your\ data\ must\ be\ shared\ with\ Mr.\ DLib.\ Generally,\ the\ more\ data\ is\ shared\ the\ better\ recommendations\ can\ be\ calculated.\ However,\ we\ understand\ that\ some\ of\ your\ data\ in\ JabRef\ is\ sensitive,\ and\ you\ may\ not\ want\ to\ share\ it.\ Therefore,\ Mr.\ DLib\ offers\ a\ choice\ of\ which\ data\ you\ would\ like\ to\ share.=JabRef, harici bir servis olan Mr. DLib'den öneriler alır. Mr. DLib'in öneri hesaplamalarını aktifleştirmek için, verilerinizin bazıları Mr. DLib'le paylaşılmalıdır. Genel olarak, ne kadar çok veri paylaşılırsa o kadar iyi öneriler hesaplanabilir. Bununla birlikte, JabRef'teki verilerinizin bazılarının duyarlı olduğunu ve paylaşmak istemeyebileceğinizi anlıyoruz. Bu nedenle, Mr. DLib hangi verilerinizi paylaşmak istediğinizi sizin tercihinize bırakıyor.
+JabRef\ Version\ (Required\ to\ ensure\ backwards\ compatibility\ with\ Mr.\ DLib's\ Web\ Service)=JabRef Sürümü (Mr. DLib'in Web Servisinin geriye dönük uyumluluğu için şart)
 
 Journal\ abbreviations=Dergi kısaltmaları
 Keep\ both=İkisini de tut
@@ -518,6 +524,7 @@ Label=Etiket
 Language=Dil
 
 Last\ modified=Son değiştirme
+LaTeX\ AUX\ file\:=LaTeX AUX dosyası\:
 
 Left=Sol
 
@@ -525,6 +532,7 @@ Link=Bağlantı
 Listen\ for\ remote\ operation\ on\ port=Bağlantı noktasındaki uzak işlemi dinle
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Başlangıçta tercihleri jabref.xml'den yükle ya da buraya kaydet (bellek çubuğu kipi)
 
+
 Main\ file\ directory=Ana dosya dizini
 
 Manage\ custom\ exports=Özel dışa aktarımları yönet
@@ -565,7 +573,6 @@ Name\ formatter=Ad biçemleyici
 Natbib\ style=Natbib stili
 
 nested\ AUX\ files=içiçe AUX dosyaları
-new=yeni
 
 New\ BibTeX\ sublibrary=Yeni BibTeX alt veritabanı
 New\ library\ created.=Yeni veritabanı oluşturuldu.
@@ -582,7 +589,6 @@ no\ library\ generated=veritabanı üretilmedi
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Girdi bulunmadı. Lütfen doğru içe aktarma süzgecini kullandığınızdan emin olun.
 No\ files\ found.=Hiçbir dosya bulunmadı.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Grafik kullanıcı arayüzü yok. Yalnızca komut satırı seçenekleri işlenecek.
 
 No\ journal\ names\ could\ be\ abbreviated.=Hiçbir dergi adı kısaltılamadı.
 
@@ -625,6 +631,7 @@ Opened\ library=Açık veritabanı
 Opening=Açılıyor
 
 Operation\ canceled.=İşlem iptal edildi.
+Operating\ System\ (Provides\ for\ better\ recommendations\ by\ giving\ an\ indication\ of\ user's\ system\ set-up.)=İşletim Sistemi (Kullanıcının sistem ayarlarını belirterek daha iyi öneriler sağlar.)
 
 Optional\ fields=Tercihe bağlı alanlar
 
@@ -632,8 +639,6 @@ Options=Seçenekler
 
 or=ya da
 
-Output\ or\ export\ file=Çıktı ya da dışa aktarım dosyası
-
 Override\ default\ file\ directories=Öntanımlı dosya dizinlerini geçersiz kıl
 Overwrite=Üzerine yaz
 
@@ -695,6 +700,7 @@ Pull\ changes\ from\ shared\ database=Paylaşılmış veritabaınından değişi
 
 Pushed\ citations\ to\ %0=Atıflar %0'a itelendi
 
+
 Quit\ JabRef=JabRef'ten çık
 
 Redo=Yeniden yap
@@ -877,7 +883,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Elle atanmış durağan grup
 Status=Durum
 Strings\ for\ library=Veritabanı için dizgeler
 
-Sublibrary\ from\ AUX=Yardımcıdan (AUX) altveritabanı
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Dergi adı biliniyorsa tam ve kısaltılmış dergi adı arasında geçiş yapar.
 
@@ -885,7 +890,6 @@ Tabname=Sekmeadı
 Tertiary\ sort\ criterion=Üçüncül sıralama ölçütü
 
 Test=Deneme
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Yeni girdiler için seçilen tarih biçemi geçersiz
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Seçilen '%0' kodlaması şu karakterleri kodlayamıyor\:
 
@@ -923,7 +927,7 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Bu işlem, bir ya da daha çok girdinin seçili olmasını gerektirir.
 
 This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=Tercihlerdeki bu ayar herhangi bir zamanda değiştirilebilir.
-
+Timezone\ (Provides\ for\ better\ recommendations\ by\ indicating\ the\ time\ of\ day\ the\ request\ is\ being\ made.)=Saat dilimi (İstemde bulunulan saati belirterek daha iyi öneriler sağlar.)
 Toggle\ entry\ preview=Girdi önizlemeyi aç/kapat
 Toggle\ groups\ interface=Grup arayüzünü aç/kapat
 
@@ -943,6 +947,7 @@ unable\ to\ write\ to=Şuraya yazılamadı
 Undo=Geriye al
 
 Union=Bileşim
+Unknown\ BibTeX\ entries\:=Bilinmeyen BibTeX girdileri\:
 
 unknown\ edit=bilinmeyen düzenleme
 
@@ -982,6 +987,7 @@ Warnings=Uyarılar
 web\ link=sanaldoku linki
 
 What\ do\ you\ want\ to\ do?=Ne yapmak istersiniz?
+Whatever\ option\ you\ choose,\ Mr.\ DLib\ may\ share\ its\ data\ with\ research\ partners\ to\ further\ improve\ recommendation\ quality\ as\ part\ of\ a\ 'living\ lab'.\ Mr.\ DLib\ may\ also\ release\ public\ datasets\ that\ may\ contain\ anonymized\ information\ about\ you\ and\ the\ recommendations\ (sensitive\ information\ such\ as\ metadata\ of\ your\ articles\ will\ be\ anonymised\ through\ e.g.\ hashing).\ Research\ partners\ are\ obliged\ to\ adhere\ to\ the\ same\ strict\ data\ protection\ policy\ as\ Mr.\ DLib.=Hangi seçeneği seçerseniz seçin, Mr. DLib verilerini, 'yaşayan laboratuvar'ın parçası olarak, öneri kalitesini daha da arttırmak amacıyla araştırma ortaklarıyla paylaşabilir. Mr. DLib, hakkınızda anonimleştirilimiş bilgi içeren genel veri kümelerini ve önerileri (makalelerinizin metaverisi gibi duyarlı bilgiler karmaşıklaştırma gibi yöntemlerle anonimleştirilerek) genel kullanıma açabilir. Araştırma ortakları, Mr DLib'in katı veri koruma politikasının aynısına uymak zorundadır.
 
 When\ adding/removing\ keywords,\ separate\ them\ by=Anahtar sözcük ekler/çıkarırken, onları şöyle ayırın
 Will\ write\ XMP-metadata\ to\ the\ PDFs\ linked\ from\ selected\ entries.=Seçili girdilerle bağlantılı PDFlere XMP metaverisi yazılacak.
@@ -1028,15 +1034,16 @@ BibTeX\ key\ generator=BibTeX anahtar oluşturucusu
 Unable\ to\ open\ link.=Bağlantı açılamadı.
 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 aktrı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,\ e.g.\ "--fetch\=Medline\:cancer"=Getiriciyi Çalıştır, Örnek "--fetch\=Medline\:cancer"
+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.
 
 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
-Settings\ for\ %0=%0 için ayarlar
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1.=Satır %0\: Bozulmuş BibTeX-anahtarı bulundu %1.
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1\ (contains\ whitespaces).=Satır %0\: Bozulmuş BibTeX-anahtarı bulundu %1 (beyaz boşluk içeriyor).
+Line\ %0\:\ Found\ corrupted\ BibTeX\ key\ %1\ (comma\ missing).=Satır %0\: Bozulmuş BibTeX-anahtarı bulundu %1 (virgül kayıp).
 No\ full\ text\ document\ found=Tam metin belge bulunamadı
 Download\ from\ URL=URL'den indir
 Rename\ field=Alanın adını değiştir
@@ -1093,6 +1100,7 @@ Ensure\ unique\ keys\ using\ letters\ (b,\ c,\ ...)=Harf kullanarak (b, c, ...)
 
 General\ file\ directory=Genel dosya dizini
 User-specific\ file\ directory=Kullanıcıya özel dosya dizini
+LaTex\ file\ directory=LaTex dosya dizini
 Search\ failed\:\ illegal\ search\ expression=Arama başarısız\: uygunsuz arama dizgesi
 Show\ ArXiv\ column=ArXiv sütununu göster
 
@@ -1207,7 +1215,6 @@ Resetting\ preference\ key\ '%0'=Tercih anahtarı '%0' yeniden atanıyor
 Unknown\ preference\ key\ '%0'=Bilinmeyen tercih anahtarı '%0'
 Unable\ to\ clear\ preferences.=Tercihler silinemedi.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=Tercihleri sıfırla (anahtar1,anahtar2,... ya da 'tümü')
 Find\ unlinked\ files=Bağlantısız dosyaları bul
 Unselect\ all=Tüm seçimleri kaldır
 Expand\ all=Tümünü genişlet
@@ -1323,6 +1330,7 @@ Export\ sort\ order=Sıralama kriterlerini dışa aktar
 Export\ sorting=Sıralamayı dışa aktar
 Newline\ separator=Satırbaşı ayracı
 
+Save\ in\ current\ table\ sort\ order=Mevcut tablo sıralama ayarıyla kaydet
 Save\ entries\ ordered\ as\ specified=Girdileri belirtilen sırada kaydet
 Show\ extra\ columns=Ekstra sütunları göster
 Parsing\ error=Çözümleme hatası
@@ -1512,6 +1520,7 @@ Add\ style\ file=Stil dosyası ekle
 Current\ style\ is\ '%0'=Mevcut stil '%0'dır
 Remove\ style=Stili sil
 You\ must\ select\ a\ valid\ style\ file.=Geçerli bir stil dosyası seçmelisiniz.
+Invalid\ style\ selected=Geçersiz stil seçildi
 
 Reload=Yeniden yükle
 
@@ -1662,8 +1671,6 @@ Unable\ to\ generate\ new\ library=Yeni veritabanı oluşturulamadı
 
 Open\ console=Konsolu aç
 Use\ default\ terminal\ emulator=Öntanımlı uçbirim öykünücüsünü kullan
-Execute\ command=Komutu çalıştır
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=Not\:Açık veritabanının konumu için %0 yer tutucusunu kullan.
 Error\ occured\ while\ executing\ the\ command\ "%0".="%0" komutu çalıştırılırken hata oluştu.
 Reformat\ ISSN=ISSN'i yeniden biçimlendir
 
@@ -1739,14 +1746,10 @@ Work\ offline=Çevrimdışı çalış
 Working\ offline.=Çevrimdışı çalışılıyor.
 Update\ refused.=Güncelleme reddedildi.
 Update\ refused=Güncelleme reddedildi
-Local\ entry=Yerel girdi
-Shared\ entry=Paylaşılmış girdi
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Mevcut değişiklik çelişkileri nedeniyle güncelleme yapılamadı.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=BibEntry'nin en son sürümünde çalışmıyorsunuz.
 Local\ version\:\ %0=Yerel sürüm\: %0
 Shared\ version\:\ %0=Paylaşılmış sürüm\: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Bu sorunu çözmek için lütfen paylaşılmış girdiyle sizinkini birleştirin ve "Girdileri birleştir"'e basın.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Bu işlemi iptal etmek değişkliklerinizi eşzamanlanmamış halde bırakacak. Yine de iptal edilsin mi?
 Shared\ entry\ is\ no\ longer\ present=Paylaşılmış girdi artık mevcut değil
 The\ entry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=Üzerinde çalıştığınız girdi paylaşılmış tarafta silindi.
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.="Geri al" işlemiyle girdiyi restore edebilirsiniz.
@@ -1773,6 +1776,7 @@ However,\ a\ new\ database\ was\ created\ alongside\ the\ pre-3.6\ one.=Ancak, 3
 Opens\ a\ link\ where\ the\ current\ development\ version\ can\ be\ downloaded=Mevcut geliştirme sürümünün indirilebileceği bir bağlantı açar
 See\ what\ has\ been\ changed\ in\ the\ JabRef\ versions=JabRef sürümlerinde nelerin değişmiş olduğuu görün
 Referenced\ BibTeX\ key\ does\ not\ exist=Başvurulan BibTeX anahtarı mevcut değil
+Full\ text\ document\ for\ entry\ %0\ already\ linked.=%0 girdisi için tam metin belgesi zaten bağlantılı.
 Finished\ downloading\ full\ text\ document\ for\ entry\ %0.=%0 girdisi için tam metin belgesinin indirilmesi bitti.
 Look\ up\ full\ text\ documents=Tam metin belgelerini ara
 You\ are\ about\ to\ look\ up\ full\ text\ documents\ for\ %0\ entries.=%0 adet girdi için tam metin belgeleri aramak üzeresiniz.
@@ -1787,6 +1791,7 @@ Sumatra\ Reader=Sumatra Okuyucu
 shared=paylaşıldı
 should\ contain\ an\ integer\ or\ a\ literal=bir tamsayı ya da harf içermelidir
 should\ have\ the\ first\ letter\ capitalized=İlk harf büyük olmalıdır
+edition\ of\ book\ reported\ as\ just\ 1=kitabın sürümü yalnızca 1 olarak rapor edildi
 Tools=Araçlar
 What's\ new\ in\ this\ version?=Bu sürümde neler yeni?
 Want\ to\ help?=Yardım etmek ister misiniz?
@@ -1834,6 +1839,8 @@ Could\ not\ find\ any\ bibliographic\ information.=Hiç bibliyografya bilgisi bu
 BibTeX\ key\ deviates\ from\ generated\ key=BibTeX anahtarı oluşturulan anahtardan farklı
 DOI\ %0\ is\ invalid=%0 DOI geçersiz
 
+Select\ all\ customized\ types\ to\ be\ stored\ in\ local\ preferences\:=Tüm özelleştirilmiş türleri yerel tercihlerde sakla\:
+Currently\ unknown\:=Halen bilinmiyor\:
 Different\ customization,\ current\ settings\ will\ be\ overwritten=Farklı kişiselleştirme, güncel ayarların üzerine yazılacak
 
 Entry\ type\ %0\ is\ only\ defined\ for\ Biblatex\ but\ not\ for\ BibTeX=%0 girdi türü yalnızca Biblatex için tanımlanmış BibTeX için değil
@@ -1885,7 +1892,6 @@ Could\ not\ copy\ file=Dosya kopyalanamadı
 Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=%1 dosyanın %0'ı başarıyla %2'ye kopyalandı
 Rename\ failed=Yeniden adlandırma başarısız oldu
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef dosyaya erişemiyor çünkü dosya başka bir süreç tarafından kullanılıyor.
-Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=Consol çıktısını göster (sadece başlatıcı kullanıldığında gereklidir)
 
 Remove\ line\ breaks=Satır sonlarını kaldır
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=Alan içeriğindeki tüm satır sonlarını kaldırır.
@@ -1988,20 +1994,84 @@ User\:=Kullanıcı\:
 Keystore\ password\:=Anahtar deposunun parolası\:
 Keystore\:=Anahtar deposu\:
 Password\:=Parola\:
+Server\ Timezone\:=Sunucu saat dilimi\:
 Remember\ Password=Parolayı Hatırla
 Use\ SSL=SSL kullan
+Move\ preprint\ information\ from\ 'URL'\ and\ 'journal'\ field\ to\ the\ 'eprint'\ field=Yazdırma öncesi bilgileri 'URL' ve 'dergi' alanından 'eprint' alanına taşı
 Default\ drag\ &\ drop\ action=Öntanımlı sürükle ve bırak eylemi
 Copy\ file\ to\ default\ file\ folder=Dosyayı öntanımlı dosya klasörüne kopyala
 Link\ file\ (without\ copying)=Dosyayı bağlantıla (kopyalamadan)
 Copy,\ rename\ and\ link\ file=Dosyayı kopyala, yeniden adlandır ve bağlantıla
+Type=Tür
+Customize\ Export\ Formats=Dışa aktarma Biçimlerini Özelleştir
 Export\ name=Adı dışa aktar
+Main\ layout\ file\:=Ana yerleşim dosyası\:
 Main\ layout\ file=Ana yerleşim dosyası
+Save\ exporter=Dışa aktarıcıyı kaydet
+File\ extension\:=Dosya uzantısı\:
+Export\ format\ name\:=Biçim adını dışa aktar\:
+Cleared\ connection\ settings=Bağlantı ayarları silindi
+Error\ adding\ discovered\ CitationStyles=Keşfedilmiş Atıf Stillerini eklemede hata
+(more)=(daha fazla)
+Cancel\ import=İçe aktarmayı iptal et
+Continue\ with\ import=İçe aktarmaya devam et
+Import\ canceled=İçe aktarım iptal edildi
+Select\ all\ new\ entries=Tüm yeni girdileri seç
+Select\ the\ entries\ to\ be\ imported\:=İçe aktarılacak girdileri seç\:
+Add\ new\ String=Yeni Dizge Ekle
+Remove\ selected\ Strings=Seçili dizgeleri sil
+Must\ not\ be\ empty\!=Boş olmamalı\!
+Open\ Help\ page=Yardım sayfasını Aç
+Add\ new\ field\ name=Yeni alan adı ekle
+Field\ name\:=Alan adı\:
+Field\ name\ "%0"\ already\ exists="%0" alan adı zaten var
+No\ field\ name\ selected\!=Alan adı seçilmedi\!
+Remove\ field\ name=Alan adını sil
+Are\ you\ sure\ you\ want\ to\ remove\ field\ name\:\ "%0"?=Alan adını silmek istediğinizden emin misiniz\: "%0"?
+Add\ new\ keyword=Yeni anahtar sözcük ekle
+Keyword\:=Anahtar sözcük\:
+Keyword\ "%0"\ already\ exists=Anahtar kelime "%0" zaten var
+Remove\ keyword=Anahtar sözcüğü sil
+Are\ you\ sure\ you\ want\ to\ remove\ keyword\:\ "%0"?=Anahtar sözcüğü silmek istediğinizden emin misiniz\: "%0"?
+Reset\ to\ default=Öntanımlıya sıfırla
+Edit\ string\ constants=Dizge sabitlerini düzenle
+Export\ all\ entries=Tüm girdileri dışa aktar
+Generate\ BibTeX\ keys=BibTeX anahtarlarını oluştur
+Groups\ interface=Grup arayüzü
+Manage\ field\ names\ &\ content=Alan ad ve içeriklerini yönet
+New\ library=Yeni kütüphane
+Next\ citation\ style=Yeni atıf stili
+OpenOffice/LibreOffice=OpenOfis/LibreOfis
+Open\ document\ viewer=Belge görüntüleyiciyi aç
+Open\ entry\ editor=Girdi düzenleyiciyi aç
+Previous\ citation\ style=Önceki atıf stili
+Search\ document\ identifier\ online=Belge tanımlayıcıyı çevrim içi ara
+Search\ for\ unlinked\ local\ files=Bağlantılı olmayan yerel dosyaları ara
+Search\ full\ text\ documents\ online=Çevrim içi tam metin belgeleri ara
+Find\ and\ replace=Bul ve değiştir
+
+Found\ documents\:=Bulunan belgeler\:
+Use\ selected\ document=Seçili dokümanı kullan
+Accept\ changes=Değişiklikleri kabul et
+Dismiss\ changes=Değişiklikleri sil
+The\ library\ has\ been\ modified\ by\ another\ program.=Kütüphane başka bir program tarafından değiştirildi.
 
+Execute\ command=Komutu çalıştır
+Open\ File\ Browser=Dosya Tarayıcıyı Aç
+Use\ default\ file\ browser=Öntanımlı dosya tarayıcıyı kullan
 
+Set\ rank\ to\ one=Rütbeyi bire ayarla
+Set\ rank\ to\ two=Rütbeyi ikiye ayarla
+Set\ rank\ to\ three=Rütbeyi üçe ayarla
+Set\ rank\ to\ four=Rütbeyi dörde ayarla
+Set\ rank\ to\ five=Rütbeyi beşe ayarla
 
-
+A\ string\ with\ the\ label\ '%0'\ already\ exists.='%0' etiketine sahip bir dizge zaten mevcut.
 
 Executing\ command\ "%0"...="%0" komutu çalıştırılıyor...
 
+Rename\ file\ to\ a\ given\ name=Dosyayı verilmiş bir isimle yeniden adlandır
+New\ Filename=Yeni Dosya adı
+Rename\ file\ to\ defined\ pattern=Dosyayı tanımlı bir desenle yeniden adlandır
 
 
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index 532ed8586ec..8c0b3694b2d 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -66,6 +66,7 @@ Append\ library=Nối CSDL
 
 Application=Ứng dụng
 
+
 Apply=Áp dụng
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=Các đối số được truyền cho phiên JabRef đang chạy. Đang tắt.
@@ -304,6 +305,7 @@ entry=mục
 
 Entry\ editor=Trình chỉnh sửa mục
 
+
 Entry\ preview=Xem trước mục
 
 Entry\ table=Bảng nhập vào
@@ -365,7 +367,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=Thư mục tập tin khôn
 File\ exists=Tập tin đã có
 
 File\ not\ found=Không thấy tập tin
-filename=tên tập tin
 
 Files\ opened=Các tập tin đã mở
 
@@ -449,8 +450,6 @@ Import\ preferences\ from\ file=Nhập các tùy thích từ tập tin
 
 Import\ strings=Nhập các chuỗi
 
-Import\ to\ open\ tab=Nhập vào thẻ đang mở
-
 Import\ word\ selector\ definitions=Nhập các định nghĩa trình chọn từ
 
 Imported\ entries=Các mục được nhập
@@ -507,6 +506,7 @@ Link=Liên kết
 Listen\ for\ remote\ operation\ on\ port=Lắng nghe lệnh chạy từ xa tại cổng
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=Nạp và lưu các tùy thích từ/đến tập tin jabref.xml khi khởi động (chế độ thẻ nhớ)
 
+
 Main\ file\ directory=Thư mục tập tin chính
 
 Manage\ custom\ exports=Quản lý các phép xuất tùy chọn
@@ -546,7 +546,6 @@ Name\ formatter=Trình định dạng tên
 Natbib\ style=Kiểu Natbib
 
 nested\ AUX\ files=các tập tin AUX lồng nhau
-new=mới
 
 New\ BibTeX\ sublibrary=CSDL con BibTeX mới
 New\ library\ created.=CSDL mới được tao ra.
@@ -563,7 +562,6 @@ no\ library\ generated=Không có CSDL nào được tạo ra
 No\ entries\ found.\ Please\ make\ sure\ you\ are\ using\ the\ correct\ import\ filter.=Không tìm thấy mục nào. Hãy đảm bảo rằng bạn đang dùng bộ lọc nhập đúng.
 No\ files\ found.=Không tìm thấy tập tin nào.
 
-No\ GUI.\ Only\ process\ command\ line\ options.=Không có GDĐH. Chỉ xử lý các tùy chọn dòng lệnh.
 
 No\ journal\ names\ could\ be\ abbreviated.=Không có tên tạp chí nào có thể viết tắt.
 
@@ -612,8 +610,6 @@ Options=Tùy chọn
 
 or=hoặc
 
-Output\ or\ export\ file=Đầu ra hoặc tập tin xuất
-
 Override\ default\ file\ directories=Ghi đè các thư mục tập tin mặc định
 Overwrite=Ghi đè
 
@@ -673,6 +669,7 @@ Pull\ changes\ from\ shared\ database=Cập nhập thông tin từ CSDL chia s
 
 Pushed\ citations\ to\ %0=Các trích dẫn đã được đưa qua %0
 
+
 Quit\ JabRef=Thoát JabRef
 
 Redo=Lặp lại lệnh
@@ -836,7 +833,6 @@ Statically\ group\ entries\ by\ manual\ assignment=Gộp nhóm các mục theo c
 Status=Trạng thái
 Strings\ for\ library=Các chuỗi dùng cho CSDL
 
-Sublibrary\ from\ AUX=CSDL con từ AUX
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=Chuyển đổi giữa tên đầy đủ và tên viết tắt tạp chí nếu biết tên tạp chí đó.
 
@@ -844,7 +840,6 @@ Tabname=Tên bảng
 Tertiary\ sort\ criterion=Tiêu chuẩn phân loại cấp ba
 
 Test=Kiểm tra
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=Định dạng ngày được chọn cho các mục mới không hợp lệ
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=Mã hóa đã chọn '%0' không thể mã hóa được các ký tự sau\:
 
@@ -881,7 +876,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=Lệnh này yêu cầu phải chọn trước một hoặc nhiều mục.
 
-
 Toggle\ entry\ preview=Bật/tắt xem trước mục
 Toggle\ groups\ interface=Bật/tắt giao diện nhóm
 
@@ -988,7 +982,6 @@ 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
-Settings\ for\ %0=Các thiết lập dùng cho %0
 Download\ from\ URL=Kéo từ URL
 Rename\ field=Đổi tên dữ liệu
 Rename\ field\ to=Đổi tên dữ liệu thành
@@ -1173,14 +1166,10 @@ Work\ offline=Làm việc ẩn
 Working\ offline.=Đang làm việc ẩn.
 Update\ refused.=Cập nhật bị từ chối.
 Update\ refused=Cập nhật bị từ chối
-Local\ entry=Mục cục bộ
-Shared\ entry=Mục chia sẻ
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=Cập nhật không thể được thực hiện vì hiện đang có thay đổi xung đột.
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=Bạn không làm việc trên phiên bản mới nhất của BibEntry.
 Local\ version\:\ %0=Phiên bản cục bộ\: %0
 Shared\ version\:\ %0=Phiên bản chia sẻ\: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=Xin vui lòng phối mục chia sẻ với mục của bạn và nhấn "Phối các mục" để giải quyết lỗi này.
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=Huỷ bỏ thao tác này bạn sẽ rời khỏi thay đổi không đồng bộ hóa của bạn. Bạn vẫn muốn hủy?
 Shared\ entry\ is\ no\ longer\ present=Mục chia sẻ hiện không còn nữa
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=Bạn có thể phục hồi mục bằng cách sử dụng thao tác "Hoàn tác".
 You\ are\ already\ connected\ to\ a\ database\ using\ entered\ connection\ details.=Bạn đã được kết nối với CSDL bằng sử dụng cách nhập chi tiết kết nối.
diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
index 3044d4213f3..8715d393794 100644
--- a/src/main/resources/l10n/JabRef_zh.properties
+++ b/src/main/resources/l10n/JabRef_zh.properties
@@ -67,6 +67,7 @@ Append\ library=追加文献库
 
 Application=应用程序
 
+
 Apply=应用
 
 Arguments\ passed\ on\ to\ running\ JabRef\ instance.\ Shutting\ down.=参数传递给了正在执行的 JabRef 实例，关闭自身程序。
@@ -308,6 +309,7 @@ entry=记录
 
 Entry\ editor=记录编辑器
 
+
 Entry\ preview=预览记录
 
 Entry\ table=记录列表
@@ -371,7 +373,6 @@ File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=文件目录未设置或
 File\ exists=文件已存在
 
 File\ not\ found=无法找到文件
-filename=文件名
 
 Files\ opened=已打开文件
 
@@ -466,8 +467,6 @@ Import\ preferences\ from\ file=从文件中导入首选项设置
 
 Import\ strings=导入简写字串
 
-Import\ to\ open\ tab=导入到打开标签页
-
 Import\ word\ selector\ definitions=导入词组下拉菜单项
 
 Imported\ entries=已导入记录
@@ -525,6 +524,7 @@ Link=链接
 Listen\ for\ remote\ operation\ on\ port=监听端口
 Load\ and\ Save\ preferences\ from/to\ jabref.xml\ on\ start-up\ (memory\ stick\ mode)=加载/保存首选项设置从/到 jabref.xml 文件(记忆棒模式)
 
+
 Main\ file\ directory=文件主目录
 
 Manage\ custom\ exports=管理自定义导出器
@@ -565,7 +565,6 @@ Name\ formatter=姓名格式化器
 Natbib\ style=Natbib 格式
 
 nested\ AUX\ files=nested AUX 文件
-new=新建
 
 New\ BibTeX\ sublibrary=新建 BibTeX 子文献库
 New\ library\ created.=创建了新文献库。
@@ -582,7 +581,6 @@ 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.=没有可供缩写的期刊全称。
 
@@ -632,8 +630,6 @@ Options=选项
 
 or=或
 
-Output\ or\ export\ file=输出或导出文件
-
 Override\ default\ file\ directories=跳过默认文件目录
 Overwrite=覆盖
 
@@ -695,6 +691,7 @@ Pull\ changes\ from\ shared\ database=从共享数据库更新数据
 
 Pushed\ citations\ to\ %0=已推送文献引用到 %0
 
+
 Quit\ JabRef=退出 JabRef
 
 Redo=重做
@@ -877,7 +874,6 @@ Statically\ group\ entries\ by\ manual\ assignment=手动创建静态分组
 Status=状态
 Strings\ for\ library=简写字串列表——文献库
 
-Sublibrary\ from\ AUX=从 AUX 文件生成的子文献库
 
 Switches\ between\ full\ and\ abbreviated\ journal\ name\ if\ the\ journal\ name\ is\ known.=在已知的期刊名简写和全称之间切换。
 
@@ -885,7 +881,6 @@ Tabname=标签页名
 Tertiary\ sort\ criterion=次要依据
 
 Test=测试
-The\ chosen\ date\ format\ for\ new\ entries\ is\ not\ valid=为新记录选择的日期格式非法
 
 The\ chosen\ encoding\ '%0'\ could\ not\ encode\ the\ following\ characters\:=选择的编码 '%0' 无法支持下列字符\:
 
@@ -923,7 +918,6 @@ This\ operation\ requires\ all\ selected\ entries\ to\ have\ BibTeX\ keys\ defin
 This\ operation\ requires\ one\ or\ more\ entries\ to\ be\ selected.=这个操作要求选中一条或多条记录。
 
 This\ setting\ may\ be\ changed\ in\ preferences\ at\ any\ time.=此设置可以随时在首选项中更改。
-
 Toggle\ entry\ preview=打开/关闭记录预览
 Toggle\ groups\ interface=打开/关闭组界面
 
@@ -1029,14 +1023,12 @@ Unable\ to\ open\ link.=无法打开链接。
 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 窗口<BR>来进行这些操作。例如，当您从浏览器中调用 JabRef 打开一个文件时，这个选项将比较有用。<BR>注意：它将阻止您同时运行多个 JabRef 实例。
-Run\ fetcher,\ e.g.\ "--fetch\=Medline\:cancer"=运行抓取器，例如 "--fetch\=Medline\:cancer"
 
 Reset=重置
 
 Use\ IEEE\ LaTeX\ abbreviations=使用 IEEE LaTeX 缩写
 
 When\ opening\ file\ link,\ search\ for\ matching\ file\ if\ no\ link\ is\ defined=打开文件时，如果文件链接未定义，则自动寻找匹配的文件。
-Settings\ for\ %0=%0 的设置
 No\ full\ text\ document\ found=未发现完整的文档
 Download\ from\ URL=从 URL 下载
 Rename\ field=重命名域
@@ -1207,7 +1199,6 @@ Resetting\ preference\ key\ '%0'=重置首选项 '%0'
 Unknown\ preference\ key\ '%0'=位置的首选项 '%0'
 Unable\ to\ clear\ preferences.=无法清除所有选项.
 
-Reset\ preferences\ (key1,key2,...\ or\ 'all')=重置首选项 (key1,key2,... 或 "全部")
 Find\ unlinked\ files=查找未链入的文件
 Unselect\ all=取消全选
 Expand\ all=展开全部
@@ -1662,8 +1653,6 @@ Unable\ to\ generate\ new\ library=无法生成新库
 
 Open\ console=打开终端程序
 Use\ default\ terminal\ emulator=使用默认的模拟终端
-Execute\ command=执行命令
-Note\:\ Use\ the\ placeholder\ %0\ for\ the\ location\ of\ the\ opened\ library\ file.=注意\: 使用 %0 占位符来表示当前打开的文献库文件位置.
 Error\ occured\ while\ executing\ the\ command\ "%0".=执行 "%0" 命令时出错。
 Reformat\ ISSN=重新格式化 ISSN
 
@@ -1739,14 +1728,10 @@ Work\ offline=脱机工作
 Working\ offline.=脱机工作中。
 Update\ refused.=更新被拒绝。
 Update\ refused=更新被拒绝
-Local\ entry=本地条目
-Shared\ entry=共享条目
 Update\ could\ not\ be\ performed\ due\ to\ existing\ change\ conflicts.=由于现有的更改冲突，更新无法执行。
 You\ are\ not\ working\ on\ the\ newest\ version\ of\ BibEntry.=您没有使用最新版本的BibEntry。
 Local\ version\:\ %0=本地版本： %0
 Shared\ version\:\ %0=共享版本\: %0
-Please\ merge\ the\ shared\ entry\ with\ yours\ and\ press\ "Merge\ entries"\ to\ resolve\ this\ problem.=请将共享条目与您的合并，然后按“合并条目”以解决此问题。
-Canceling\ this\ operation\ will\ leave\ your\ changes\ unsynchronized.\ Cancel\ anyway?=取消此操作将使您的更改不同步。确定取消？
 Shared\ entry\ is\ no\ longer\ present=共享条目不再存在
 The\ entry\ you\ currently\ work\ on\ has\ been\ deleted\ on\ the\ shared\ side.=您当前处理的条目已在共享端被删除。
 You\ can\ restore\ the\ entry\ using\ the\ "Undo"\ operation.=您可以使用 "撤消" 操作还原条目。
@@ -1885,7 +1870,6 @@ Could\ not\ copy\ file=无法复制文件
 Copied\ %0\ files\ of\ %1\ sucessfully\ to\ %2=已成功复制 %1 中的 %0 文件到 %2
 Rename\ failed=重命名失败
 JabRef\ cannot\ access\ the\ file\ because\ it\ is\ being\ used\ by\ another\ process.=JabRef 无法访问该文件, 因为另一个进程正在使用它。
-Show\ console\ output\ (only\ necessary\ when\ the\ launcher\ is\ used)=显示控制台输出（只需要在使用启动器时显示）
 
 Remove\ line\ breaks=移除换行符
 Removes\ all\ line\ breaks\ in\ the\ field\ content.=移除字段内容中的所有换行符。
@@ -1998,6 +1982,7 @@ Export\ name=导出名称
 Main\ layout\ file=主 layout 文件
 
 
+Execute\ command=执行命令
 
 
 
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
index fab6942fc8b..e67ffd1bdb8 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -23,6 +23,7 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.metadata.FilePreferences;
 import org.jabref.preferences.JabRefPreferences;
+import org.jabref.testutils.category.FetcherTest;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -152,7 +153,7 @@ void deleteWhenDialogCancelledReturnsFalseAndDoesNotRemoveFile() {
         assertTrue(Files.exists(tempFile));
     }
 
-    @Test
+    @FetcherTest
     void downloadDoesNotOverwriteFileTypeExtension() throws MalformedURLException {
         linkedFile = new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");