From cbd26f11f54f4a46c2597b6ba564b76aa9d68c88 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Mon, 16 Mar 2020 09:36:07 +0100
Subject: [PATCH] Small improvements in preferences dialog (#6130)

* Changed special buttons to icon buttons

* Changed ComboBox lists to use proper display name and added spinner to font size

* Fixed KeyPress event

* Reworded biblatex to BibLaTeX

* l10n

* Removed obsolete special pdf treatment in preferences

* CHANGELOG.md and removed forgotten bindings

* Fixed wrong biblatex fix

* checkstyle
---
 CHANGELOG.md                                  |  5 ++-
 .../jabref/gui/desktop/os/DefaultDesktop.java |  6 ----
 .../java/org/jabref/gui/desktop/os/Linux.java | 23 -------------
 .../jabref/gui/desktop/os/NativeDesktop.java  |  9 -----
 .../java/org/jabref/gui/desktop/os/OSX.java   |  6 ----
 .../org/jabref/gui/desktop/os/Windows.java    | 22 ------------
 .../org/jabref/gui/exporter/SaveAction.java   |  2 +-
 .../java/org/jabref/gui/icon/IconTheme.java   |  1 +
 .../jabref/gui/preferences/AppearanceTab.fxml |  8 ++---
 .../gui/preferences/AppearanceTabView.java    | 14 +++++---
 .../preferences/AppearanceTabViewModel.java   |  4 +++
 .../jabref/gui/preferences/ExternalTab.fxml   | 21 ------------
 .../gui/preferences/ExternalTabView.java      | 17 ----------
 .../gui/preferences/ExternalTabViewModel.java | 22 ------------
 .../jabref/gui/preferences/FileTabView.java   |  4 +++
 .../jabref/gui/preferences/GeneralTab.fxml    |  2 +-
 .../gui/preferences/GeneralTabView.java       | 10 ++++++
 .../gui/preferences/NameFormatterTab.fxml     |  4 +--
 .../gui/preferences/NameFormatterTabView.java | 24 ++++++++++---
 .../NameFormatterTabViewModel.java            |  5 ++-
 .../gui/preferences/PreferencesDialog.fxml    | 34 +++++++++++++++----
 .../gui/preferences/TableColumnsTabView.java  |  6 ++--
 .../gui/preferences/XmpPrivacyTabView.java    | 10 +++++-
 .../jabref/preferences/JabRefPreferences.java | 13 ++-----
 .../jabref/preferences/NewLineSeparator.java  | 13 ++++---
 src/main/resources/l10n/JabRef_en.properties  |  9 ++---
 26 files changed, 114 insertions(+), 180 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06ccea5405f..89470a03de6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,15 +15,18 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 - We improved the arXiv fetcher. Now it should find entries even more reliably and does no longer include the version (e.g `v1`) in the `eprint` field. [forum#1941](https://discourse.jabref.org/t/remove-version-in-arxiv-import/1941)
 - We moved the group search bar and the button "New group" from bottom to top position to make it more prominent. [#6112](https://github.com/JabRef/jabref/pull/6112)
-
+- We changed the buttons for import/export/show all/reset of preferences to smaller icon buttons in the preferences dialog. [#6130](https://github.com/JabRef/jabref/pull/6130)
 
 ### Fixed
 
 - We fixed an issue where opening a library from the recent libraries menu was not possible. [#5939](https://github.com/JabRef/jabref/issues/5939)
 - We fixed an issue with inconsistent capitalization of file extensions when downloading files [#6115](https://github.com/JabRef/jabref/issues/6115)
+- We fixed the display of language and encoding in the preferences dialog. [#6130](https://github.com/JabRef/jabref/pull/6130)
 
 ### Removed
 
+- We removed the obsolete `External programs / Open PDF` section in the preferences, as the default application to open PDFs is now set in the `Manage external file types` dialog. [#6130](https://github.com/JabRef/jabref/pull/6130)
+
 ## [5.0] – 2020-03-06
 
 ### Changed
diff --git a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
index 4b7d1f66fda..457503ae272 100644
--- a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
@@ -4,7 +4,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,11 +32,6 @@ public void openConsole(String absolutePath) throws IOException {
         LOGGER.error("This feature is not supported by your Operating System.");
     }
 
-    @Override
-    public void openPdfWithParameters(String filePath, List<String> parameters) throws IOException {
-        //TODO imlement default
-    }
-
     @Override
     public String detectProgramPath(String programName, String directoryName) {
         return programName;
diff --git a/src/main/java/org/jabref/gui/desktop/os/Linux.java b/src/main/java/org/jabref/gui/desktop/os/Linux.java
index 579b4986774..ff48658a5ff 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Linux.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Linux.java
@@ -6,23 +6,17 @@
 import java.io.InputStreamReader;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
-import java.util.StringJoiner;
 
 import org.jabref.JabRefExecutorService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.util.StreamGobbler;
-import org.jabref.preferences.JabRefPreferences;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.preferences.JabRefPreferences.ADOBE_ACROBAT_COMMAND;
-import static org.jabref.preferences.JabRefPreferences.USE_PDF_READER;
-
 public class Linux implements NativeDesktop {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Linux.class);
@@ -108,23 +102,6 @@ public void openConsole(String absolutePath) throws IOException {
         }
     }
 
-    @Override
-    public void openPdfWithParameters(String filePath, List<String> parameters) throws IOException {
-
-        String application;
-        if (JabRefPreferences.getInstance().get(USE_PDF_READER).equals(JabRefPreferences.getInstance().get(ADOBE_ACROBAT_COMMAND))) {
-            application = "acroread";
-
-            StringJoiner sj = new StringJoiner(" ");
-            sj.add(application);
-            parameters.forEach((param) -> sj.add(param));
-
-            openFileWithApplication(filePath, sj.toString());
-        } else {
-            openFile(filePath, "PDF");
-        }
-    }
-
     @Override
     public String detectProgramPath(String programName, String directoryName) {
         return programName;
diff --git a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
index ed54cf78e0e..f4c2014384b 100644
--- a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.List;
 
 public interface NativeDesktop {
     void openFile(String filePath, String fileType) throws IOException;
@@ -21,14 +20,6 @@ public interface NativeDesktop {
 
     void openConsole(String absolutePath) throws IOException;
 
-    /**
-     * This method opens a pdf using the giving the parameters to the executing pdf reader
-     * @param filePath absolute path to the pdf file to be opened
-     * @param parameters console parameters depending on the pdf reader
-     * @throws IOException
-     */
-    void openPdfWithParameters(String filePath, List<String> parameters) throws  IOException;
-
     String detectProgramPath(String programName, String directoryName);
 
     /**
diff --git a/src/main/java/org/jabref/gui/desktop/os/OSX.java b/src/main/java/org/jabref/gui/desktop/os/OSX.java
index c4a6c495431..9abd006cdce 100644
--- a/src/main/java/org/jabref/gui/desktop/os/OSX.java
+++ b/src/main/java/org/jabref/gui/desktop/os/OSX.java
@@ -5,7 +5,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.List;
 import java.util.Optional;
 
 import org.jabref.gui.externalfiletype.ExternalFileType;
@@ -42,11 +41,6 @@ public void openConsole(String absolutePath) throws IOException {
         Runtime.getRuntime().exec("open -a Terminal " + absolutePath, null, new File(absolutePath));
     }
 
-    @Override
-    public void openPdfWithParameters(String filePath, List<String> parameters) throws IOException {
-        //TODO implement
-    }
-
     @Override
     public String detectProgramPath(String programName, String directoryName) {
         return programName;
diff --git a/src/main/java/org/jabref/gui/desktop/os/Windows.java b/src/main/java/org/jabref/gui/desktop/os/Windows.java
index 5de0f056f65..00367d1b2c9 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Windows.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Windows.java
@@ -4,16 +4,10 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.List;
 import java.util.Optional;
 
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.preferences.JabRefPreferences;
-
-import static org.jabref.preferences.JabRefPreferences.ADOBE_ACROBAT_COMMAND;
-import static org.jabref.preferences.JabRefPreferences.SUMATRA_PDF_COMMAND;
-import static org.jabref.preferences.JabRefPreferences.USE_PDF_READER;
 
 public class Windows implements NativeDesktop {
     private static String DEFAULT_EXECUTABLE_EXTENSION = ".exe";
@@ -69,20 +63,4 @@ public void openConsole(String absolutePath) throws IOException {
         process.directory(new File(absolutePath));
         process.start();
     }
-
-    @Override
-    public void openPdfWithParameters(String filePath, List<String> parameters) throws IOException {
-        String pdfReaderPath = JabRefPreferences.getInstance().get(USE_PDF_READER);
-        if (pdfReaderPath.equals(SUMATRA_PDF_COMMAND) || pdfReaderPath.equals(ADOBE_ACROBAT_COMMAND)) {
-            String[] command = new String[parameters.size() + 2];
-            command[0] = "\"" + Paths.get(pdfReaderPath).toString() + "\"";
-            for (int i = 1; i < command.length - 1; i++) {
-                command[i] = "\"" + parameters.get(i - 1) + "\"";
-            }
-            command[command.length - 1] = "\"" + filePath + "\"";
-            new ProcessBuilder(command).start();
-        } else {
-            openFile(filePath, "PDF");
-        }
-    }
 }
diff --git a/src/main/java/org/jabref/gui/exporter/SaveAction.java b/src/main/java/org/jabref/gui/exporter/SaveAction.java
index 3c2a4f4b824..eadd350770a 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAction.java
@@ -11,7 +11,7 @@
  */
 public class SaveAction extends SimpleCommand {
 
-    public enum SaveMethod {SAVE, SAVE_AS, SAVE_SELECTED}
+    public enum SaveMethod { SAVE, SAVE_AS, SAVE_SELECTED }
 
     private final SaveMethod saveMethod;
     private final JabRefFrame frame;
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 76d9684c13f..3e7efb6cd8a 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -228,6 +228,7 @@ public enum JabRefIcons implements JabRefIcon {
         GITHUB(MaterialDesignIcon.GITHUB_CIRCLE), /*css: github-circle*/
         TOGGLE_ENTRY_PREVIEW(MaterialDesignIcon.LIBRARY_BOOKS), /*css: library-books */
         TOGGLE_GROUPS(MaterialDesignIcon.VIEW_LIST), /*css: view-list */
+        SHOW_PREFERENCES_LIST(MaterialDesignIcon.VIEW_LIST), /*css: view-list */
         WRITE_XMP(MaterialDesignIcon.IMPORT), /* css: import */
         FILE_WORD(MaterialDesignIcon.FILE_WORD), /*css: file-word */
         FILE_EXCEL(MaterialDesignIcon.FILE_EXCEL), /*css: file-excel */
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
index ed2f9605c5e..e7e95fc0e5a 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
@@ -7,8 +7,8 @@
 <?import javafx.scene.layout.VBox?>
 
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.control.TextField?>
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Spinner?>
 <fx:root prefWidth="650.0" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/11.0.1"
          xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.AppearanceTabView">
     <fx:define>
@@ -18,9 +18,9 @@
 
     <Label styleClass="sectionHeader" text="%Font"/>
     <CheckBox fx:id="fontOverride" text="%Override default font settings"/>
-    <HBox spacing="4.0" alignment="CENTER_LEFT">
-        <Label text="%Size:" disable="${!fontOverride.selected}"/>
-        <TextField fx:id="fontSize" prefWidth="40" alignment="CENTER_RIGHT" disable="${!fontOverride.selected}"/>
+    <HBox alignment="CENTER_LEFT" spacing="4.0">
+        <Label text="%Size" disable="${!fontOverride.selected}"/>
+        <Spinner fx:id="fontSize" prefWidth="60.0" editable="true"/>
         <padding>
             <Insets left="20.0"/>
         </padding>
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
index 54eebaeac8e..d2d13f3199c 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabView.java
@@ -2,11 +2,11 @@
 
 import javafx.application.Platform;
 import javafx.fxml.FXML;
+import javafx.geometry.Pos;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.RadioButton;
-import javafx.scene.control.TextField;
+import javafx.scene.control.Spinner;
 
-import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.IconValidationDecorator;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
@@ -17,7 +17,7 @@
 public class AppearanceTabView extends AbstractPreferenceTabView<AppearanceTabViewModel> implements PreferencesTab {
 
     @FXML public CheckBox fontOverride;
-    @FXML public TextField fontSize;
+    @FXML public Spinner<Integer> fontSize;
     @FXML public RadioButton themeLight;
     @FXML public RadioButton themeDark;
 
@@ -38,8 +38,12 @@ public void initialize () {
         this.viewModel = new AppearanceTabViewModel(dialogService, preferences);
 
         fontOverride.selectedProperty().bindBidirectional(viewModel.fontOverrideProperty());
-        fontSize.setTextFormatter(ControlHelper.getIntegerTextFormatter());
-        fontSize.textProperty().bindBidirectional(viewModel.fontSizeProperty());
+
+        // Spinner does neither support alignment nor disableProperty in FXML
+        fontSize.disableProperty().bind(fontOverride.selectedProperty().not());
+        fontSize.getEditor().setAlignment(Pos.CENTER_RIGHT);
+        fontSize.setValueFactory(AppearanceTabViewModel.fontSizeValueFactory);
+        fontSize.getEditor().textProperty().bindBidirectional(viewModel.fontSizeProperty());
 
         themeLight.selectedProperty().bindBidirectional(viewModel.themeLightProperty());
         themeDark.selectedProperty().bindBidirectional(viewModel.themeDarkProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
index f2ee9d7a59b..46acbc077b5 100644
--- a/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/AppearanceTabViewModel.java
@@ -7,6 +7,7 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.scene.control.SpinnerValueFactory;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.ThemeLoader;
@@ -20,6 +21,9 @@
 
 public class AppearanceTabViewModel implements PreferenceTabViewModel {
 
+    public static SpinnerValueFactory<Integer> fontSizeValueFactory =
+            new SpinnerValueFactory.IntegerSpinnerValueFactory(9, Integer.MAX_VALUE);
+
     private final BooleanProperty fontOverrideProperty = new SimpleBooleanProperty();
     private final StringProperty fontSizeProperty = new SimpleStringProperty();
     private final BooleanProperty themeLightProperty = new SimpleBooleanProperty();
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml b/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
index 9823c1d4c39..6ce6a71a772 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTab.fxml
@@ -79,27 +79,6 @@
                 GridPane.columnIndex="2" GridPane.rowIndex="1"/>
     </GridPane>
 
-    <Label styleClass="sectionHeader" text="%Open PDF"/>
-    <GridPane alignment="CENTER_LEFT" hgap="10.0" vgap="4.0">
-        <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="200.0"/>
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="350.0"/>
-            <ColumnConstraints hgrow="SOMETIMES"/>
-        </columnConstraints>
-        <rowConstraints>
-            <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
-            <RowConstraints minHeight="30.0" vgrow="SOMETIMES"/>
-        </rowConstraints>
-        <RadioButton fx:id="usePDFAcrobat" text="%Adobe Acrobat Reader" toggleGroup="$openPDF"/>
-        <TextField fx:id="usePDFAcrobatCommand" prefWidth="350.0" GridPane.columnIndex="1"/>
-        <Button fx:id="usePDFAcrobatBrowse" onAction="#usePDFAcrobatCommandBrowse" text="%Browse"
-                GridPane.columnIndex="2"/>
-        <RadioButton fx:id="usePDFSumatra" text="%Sumatra Reader" toggleGroup="$openPDF" GridPane.rowIndex="1"/>
-        <TextField fx:id="usePDFSumatraCommand" prefWidth="350.0" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-        <Button fx:id="usePDFSumatraBrowse" onAction="#usePDFSumatraCommandBrowse" text="%Browse"
-                GridPane.columnIndex="2" GridPane.rowIndex="1"/>
-    </GridPane>
-
     <Label styleClass="sectionHeader" text="%Open File Browser"/>
     <GridPane alignment="CENTER_LEFT" hgap="10.0" vgap="4.0">
         <columnConstraints>
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTabView.java b/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
index 106dcff3f2a..10470f9dfd0 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTabView.java
@@ -28,13 +28,6 @@ public class ExternalTabView extends AbstractPreferenceTabView<ExternalTabViewMo
     @FXML private TextField useTerminalCommand;
     @FXML private Button useTerminalBrowse;
 
-    @FXML private RadioButton usePDFAcrobat;
-    @FXML private TextField usePDFAcrobatCommand;
-    @FXML private Button usePDFAcrobatBrowse;
-    @FXML private RadioButton usePDFSumatra;
-    @FXML private TextField usePDFSumatraCommand;
-    @FXML private Button usePDFSumatraBrowse;
-
     @FXML private RadioButton useFileBrowserDefault;
     @FXML private RadioButton useFileBrowserSpecial;
     @FXML private TextField useFileBrowserSpecialCommand;
@@ -75,16 +68,6 @@ public void initialize() {
         useTerminalCommand.disableProperty().bind(useTerminalSpecial.selectedProperty().not());
         useTerminalBrowse.disableProperty().bind(useTerminalSpecial.selectedProperty().not());
 
-        usePDFAcrobat.selectedProperty().bindBidirectional(viewModel.usePDFAcrobatProperty());
-        usePDFAcrobatCommand.textProperty().bindBidirectional(viewModel.usePDFAcrobatCommandProperty());
-        usePDFAcrobatCommand.disableProperty().bind(usePDFAcrobat.selectedProperty().not());
-        usePDFAcrobatBrowse.disableProperty().bind(usePDFAcrobat.selectedProperty().not());
-
-        usePDFSumatra.selectedProperty().bindBidirectional(viewModel.usePDFSumatraProperty());
-        usePDFSumatraCommand.textProperty().bindBidirectional(viewModel.usePDFSumatraCommandProperty());
-        usePDFSumatraCommand.disableProperty().bind(usePDFSumatra.selectedProperty().not());
-        usePDFSumatraBrowse.disableProperty().bind(usePDFSumatra.selectedProperty().not());
-
         useFileBrowserDefault.selectedProperty().bindBidirectional(viewModel.useFileBrowserDefaultProperty());
         useFileBrowserSpecial.selectedProperty().bindBidirectional(viewModel.useFileBrowserSpecialProperty());
         useFileBrowserSpecialCommand.textProperty().bindBidirectional(viewModel.useFileBrowserSpecialCommandProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
index ab115772783..ca658cfa309 100644
--- a/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ExternalTabViewModel.java
@@ -23,7 +23,6 @@
 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;
 
@@ -74,17 +73,6 @@ public void setValues() {
         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));
@@ -100,16 +88,6 @@ public void storeSettings() {
         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());
diff --git a/src/main/java/org/jabref/gui/preferences/FileTabView.java b/src/main/java/org/jabref/gui/preferences/FileTabView.java
index 825291e056d..d31dcb97ba9 100644
--- a/src/main/java/org/jabref/gui/preferences/FileTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/FileTabView.java
@@ -13,6 +13,7 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
@@ -68,6 +69,9 @@ public void initialize() {
         resolveStringsAll.selectedProperty().bindBidirectional(viewModel.resolveStringsAllProperty());
         resolveStringsExcept.textProperty().bindBidirectional(viewModel.resolvStringsExceptProperty());
         resolveStringsExcept.disableProperty().bind(resolveStringsAll.selectedProperty().not());
+        new ViewModelListCellFactory<NewLineSeparator>()
+                .withText(NewLineSeparator::getDisplayName)
+                .install(newLineSeparator);
         newLineSeparator.itemsProperty().bind(viewModel.newLineSeparatorListProperty());
         newLineSeparator.valueProperty().bindBidirectional(viewModel.selectedNewLineSeparatorProperty());
         alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
index 31583c049a8..5f16d0db1c5 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
@@ -39,7 +39,7 @@
     <CheckBox fx:id="allowIntegerEdition" text="%Allow integers in 'edition' field in BibTeX mode"/>
     <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="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)"/>
 
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
index 0a3ecee5bbe..6cbf95476f5 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
@@ -15,6 +15,7 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.util.IconValidationDecorator;
+import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
@@ -65,12 +66,21 @@ public GeneralTabView(JabRefPreferences preferences) {
     public void initialize() {
         this.viewModel = new GeneralTabViewModel(dialogService, preferences);
 
+        new ViewModelListCellFactory<Language>()
+                .withText(Language::getDisplayName)
+                .install(language);
         language.itemsProperty().bind(viewModel.languagesListProperty());
         language.valueProperty().bindBidirectional(viewModel.selectedLanguageProperty());
 
+        new ViewModelListCellFactory<Charset>()
+                .withText(Charset::displayName)
+                .install(defaultEncoding);
         defaultEncoding.itemsProperty().bind(viewModel.encodingsListProperty());
         defaultEncoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
 
+        new ViewModelListCellFactory<BibDatabaseMode>()
+                .withText(BibDatabaseMode::getFormattedName)
+                .install(biblatexMode);
         biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
         biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
 
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTab.fxml b/src/main/java/org/jabref/gui/preferences/NameFormatterTab.fxml
index c6c4d1f9c67..1053c1347f8 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/NameFormatterTab.fxml
@@ -23,7 +23,7 @@
                     <TableColumn fx:id="formatterStringColumn"
                                  minWidth="50.0" prefWidth="368" sortable="false" text="%Format string"/>
                     <TableColumn fx:id="actionsColumn" maxWidth="30.0" minWidth="30.0" prefWidth="30.0"
-                                 editable="false" resizable="false"/>
+                                 editable="false" resizable="false" reorderable="false"/>
                 </columns>
                 <columnResizePolicy>
                     <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
@@ -36,7 +36,7 @@
         </VBox>
         <VBox>
             <Button fx:id="formatterHelp" prefHeight="25.0" prefWidth="25.0"/>
-            <VBox VBox.vgrow="ALWAYS"/>
+            <VBox VBox.vgrow="ALWAYS" />
             <Button styleClass="icon-button,narrow" onAction="#addFormatter"
                     prefHeight="25.0" prefWidth="25.0">
                 <graphic>
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java b/src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java
index 4b28dcd8c33..e6883ca04d9 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/NameFormatterTabView.java
@@ -7,6 +7,7 @@
 import javafx.scene.control.TextField;
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 
 import org.jabref.Globals;
 import org.jabref.gui.actions.ActionFactory;
@@ -44,8 +45,6 @@ public NameFormatterTabView(JabRefPreferences preferences) {
     public void initialize () {
         this.viewModel = new NameFormatterTabViewModel(dialogService, preferences);
 
-        formatterList.setEditable(true);
-
         formatterNameColumn.setSortable(true);
         formatterNameColumn.setReorderable(false);
         formatterNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
@@ -69,21 +68,38 @@ public void initialize () {
         actionsColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         new ValueTableCellFactory<NameFormatterItemModel, String>()
                 .withGraphic(name -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
-                .withTooltip(name -> Localization.lang("Remove") + " " + name)
+                .withTooltip(name -> Localization.lang("Remove formatter %0", name))
                 .withOnMouseClickedEvent(item -> evt ->
                         viewModel.removeFormatter(formatterList.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 
-        formatterList.setOnKeyPressed(event -> {
+        formatterList.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             if (event.getCode() == KeyCode.DELETE) {
                 viewModel.removeFormatter(formatterList.getSelectionModel().getSelectedItem());
+                event.consume();
             }
         });
 
+        formatterList.setEditable(true);
         formatterList.itemsProperty().bindBidirectional(viewModel.formatterListProperty());
 
         addFormatterName.textProperty().bindBidirectional(viewModel.addFormatterNameProperty());
+        addFormatterName.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+            if (event.getCode() == KeyCode.ENTER) {
+                addFormatterString.requestFocus();
+                addFormatterString.selectAll();
+                event.consume();
+            }
+        });
+
         addFormatterString.textProperty().bindBidirectional(viewModel.addFormatterStringProperty());
+        addFormatterString.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+            if (event.getCode() == KeyCode.ENTER) {
+                viewModel.addFormatter();
+                addFormatterName.requestFocus();
+                event.consume();
+            }
+        });
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
         actionFactory.configureIconButton(StandardActions.HELP_NAME_FORMATTER, new HelpAction(HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER), formatterHelp);
diff --git a/src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java b/src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java
index 17cd46bc184..71a3c230fca 100644
--- a/src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/NameFormatterTabViewModel.java
@@ -61,12 +61,11 @@ public void addFormatter() {
         if (!StringUtil.isNullOrEmpty(addFormatterNameProperty.getValue()) &&
                 !StringUtil.isNullOrEmpty(addFormatterStringProperty.getValue())) {
 
-            NameFormatterItemModel newFormatter = new NameFormatterItemModel(
-                    addFormatterNameProperty.getValue(), addFormatterStringProperty.getValue());
+            formatterListProperty.add(new NameFormatterItemModel(
+                    addFormatterNameProperty.getValue(), addFormatterStringProperty.getValue()));
 
             addFormatterNameProperty.setValue("");
             addFormatterStringProperty.setValue("");
-            formatterListProperty.add(newFormatter);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
index d7ee3befc3e..2890eb4884d 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialog.fxml
@@ -10,6 +10,8 @@
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.VBox?>
 <?import org.controlsfx.control.textfield.CustomTextField?>
+<?import org.jabref.gui.icon.JabRefIconView?>
+<?import javafx.scene.layout.HBox?>
 <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">
@@ -23,23 +25,43 @@
                 </CustomTextField>
                 <ListView fx:id="preferenceTabList" VBox.vgrow="ALWAYS"/>
                 <VBox prefHeight="10.0" VBox.vgrow="SOMETIMES"/>
-                <VBox alignment="BOTTOM_LEFT" spacing="3.0">
+                <HBox alignment="BOTTOM_LEFT" spacing="3.0">
                     <padding>
                         <Insets bottom="3.0" left="3.0" right="3.0" top="3.0"/>
                     </padding>
-                    <Button maxWidth="Infinity" onAction="#importPreferences" text="%Import preferences">
+                    <Button styleClass="icon-button,narrow" maxWidth="Infinity" onAction="#importPreferences" HBox.hgrow="ALWAYS">
+                        <graphic>
+                            <JabRefIconView glyph="IMPORT"/>
+                        </graphic>
                         <tooltip>
                             <Tooltip text="%Import preferences from file"/>
                         </tooltip>
                     </Button>
-                    <Button maxWidth="Infinity" onAction="#exportPreferences" text="%Export preferences">
+                    <Button styleClass="icon-button,narrow" maxWidth="Infinity" onAction="#exportPreferences" HBox.hgrow="ALWAYS">
+                        <graphic>
+                            <JabRefIconView glyph="EXPORT"/>
+                        </graphic>
                         <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"/>
-                </VBox>
+                    <Button styleClass="icon-button,narrow" maxWidth="Infinity" onAction="#showAllPreferences" HBox.hgrow="ALWAYS">
+                        <graphic>
+                            <JabRefIconView glyph="SHOW_PREFERENCES_LIST"/>
+                        </graphic>
+                        <tooltip>
+                            <Tooltip text="%Show preferences"/>
+                        </tooltip>
+                    </Button>
+                    <Button styleClass="icon-button,narrow" maxWidth="Infinity" onAction="#resetPreferences" HBox.hgrow="ALWAYS">
+                        <graphic>
+                            <JabRefIconView glyph="REFRESH"/>
+                        </graphic>
+                        <tooltip>
+                            <Tooltip text="%Reset preferences"/>
+                        </tooltip>
+                    </Button>
+                </HBox>
             </VBox>
             <ScrollPane fx:id="preferencesContainer" maxHeight="Infinity" maxWidth="Infinity"/>
         </SplitPane>
diff --git a/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java b/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java
index b1f05c01d1e..1012ba68224 100644
--- a/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/TableColumnsTabView.java
@@ -9,6 +9,7 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
@@ -83,9 +84,10 @@ private void setupTable() {
                 .install(actionsColumn);
 
         viewModel.selectedColumnModelProperty().setValue(columnsList.getSelectionModel());
-        columnsList.setOnKeyPressed(event -> {
+        columnsList.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             if (event.getCode() == KeyCode.DELETE) {
                 viewModel.removeColumn(columnsList.getSelectionModel().getSelectedItem());
+                event.consume();
             }
         });
 
@@ -97,7 +99,7 @@ private void setupTable() {
         addColumnName.itemsProperty().bind(viewModel.availableColumnsProperty());
         addColumnName.valueProperty().bindBidirectional(viewModel.addColumnProperty());
         addColumnName.setConverter(TableColumnsTabViewModel.columnNameStringConverter);
-        addColumnName.setOnKeyPressed(event -> {
+        addColumnName.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             if (event.getCode() == KeyCode.ENTER) {
                 viewModel.insertColumnInList();
                 event.consume();
diff --git a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java b/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java
index 3f18f58c4c6..1763b759651 100644
--- a/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/XmpPrivacyTabView.java
@@ -8,6 +8,7 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BindingsHelper;
@@ -69,9 +70,10 @@ public void initialize () {
                         item -> evt -> viewModel.removeFilter(filterList.getFocusModel().getFocusedItem()))
                 .install(actionsColumn);
 
-        filterList.setOnKeyPressed(event -> {
+        filterList.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             if (event.getCode() == KeyCode.DELETE) {
                 viewModel.removeFilter(filterList.getSelectionModel().getSelectedItem());
+                event.consume();
             }
         });
 
@@ -84,6 +86,12 @@ public void initialize () {
         addFieldName.itemsProperty().bind(viewModel.availableFieldsProperty());
         addFieldName.valueProperty().bindBidirectional(viewModel.addFieldNameProperty());
         addFieldName.setConverter(FieldsUtil.fieldStringConverter);
+        addFieldName.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+            if (event.getCode() == KeyCode.ENTER) {
+                viewModel.addField();
+                event.consume();
+            }
+        });
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.xmpFilterListValidationStatus(), filterList));
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index c426bbec82d..1ef1fa19bf3 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -205,9 +205,6 @@ public class JabRefPreferences implements PreferencesService {
     public static final String KEY_PATTERN_REPLACEMENT = "KeyPatternReplacement";
     public static final String CONSOLE_COMMAND = "consoleCommand";
     public static final String USE_DEFAULT_CONSOLE_APPLICATION = "useDefaultConsoleApplication";
-    public static final String ADOBE_ACROBAT_COMMAND = "adobeAcrobatCommand";
-    public static final String SUMATRA_PDF_COMMAND = "sumatraCommand";
-    public static final String USE_PDF_READER = "usePDFReader";
     public static final String USE_DEFAULT_FILE_BROWSER_APPLICATION = "userDefaultFileBrowserApplication";
     public static final String FILE_BROWSER_COMMAND = "fileBrowserCommand";
 
@@ -644,15 +641,9 @@ private JabRefPreferences() {
         defaults.put(USE_DEFAULT_FILE_BROWSER_APPLICATION, Boolean.TRUE);
         if (OS.WINDOWS) {
             defaults.put(CONSOLE_COMMAND, "C:\\Program Files\\ConEmu\\ConEmu64.exe /single /dir \"%DIR\"");
-            defaults.put(ADOBE_ACROBAT_COMMAND, "C:\\Program Files (x86)\\Adobe\\Acrobat Reader DC\\Reader");
-            defaults.put(SUMATRA_PDF_COMMAND, "C:\\Program Files\\SumatraPDF");
-            defaults.put(USE_PDF_READER, ADOBE_ACROBAT_COMMAND);
             defaults.put(FILE_BROWSER_COMMAND, "explorer.exe /select, \"%DIR\"");
         } else {
             defaults.put(CONSOLE_COMMAND, "");
-            defaults.put(ADOBE_ACROBAT_COMMAND, "");
-            defaults.put(SUMATRA_PDF_COMMAND, "");
-            defaults.put(USE_PDF_READER, "");
             defaults.put(FILE_BROWSER_COMMAND, "");
         }
 
@@ -1997,7 +1988,7 @@ public PushToApplication getActivePushToApplication(PushToApplicationsManager ma
     }
 
     public void setActivePushToApplication(PushToApplication application, PushToApplicationsManager manager) {
-        if (application.getApplicationName() != get(PUSH_TO_APPLICATION)) {
+        if (!application.getApplicationName().equals(get(PUSH_TO_APPLICATION))) {
             put(PUSH_TO_APPLICATION, application.getApplicationName());
             manager.updateApplicationAction();
         }
@@ -2008,7 +1999,7 @@ public NewLineSeparator getNewLineSeparator() {
     }
 
     public void setNewLineSeparator(NewLineSeparator newLineSeparator) {
-        String escapeChars = newLineSeparator.getEscapeChars();
+        String escapeChars = newLineSeparator.toString();
         put(JabRefPreferences.NEWLINE, escapeChars);
 
         // we also have to change Globals variable as globals is not a getter, but a constant
diff --git a/src/main/java/org/jabref/preferences/NewLineSeparator.java b/src/main/java/org/jabref/preferences/NewLineSeparator.java
index 975bdcd88fc..6870cfc50b9 100644
--- a/src/main/java/org/jabref/preferences/NewLineSeparator.java
+++ b/src/main/java/org/jabref/preferences/NewLineSeparator.java
@@ -1,16 +1,15 @@
 package org.jabref.preferences;
 
+/**
+ * An enum which contains the possible NewLineSeperators
+ * Possible are CR ("\n"), LF ("\r") and the windows standard CR/LF.
+ */
 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() {
+    public String getDisplayName() {
         switch (this) {
             case CR:
                 return "CR (\"\\r\")";
@@ -24,7 +23,7 @@ public String toString() {
     /**
      * @return the name of the current mode as String
      */
-    public String getEscapeChars() {
+    public String toString() {
         switch (this) {
             case CR:
                 return "\r";
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index d01aea778bc..3915f9ca525 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -561,8 +561,6 @@ No\ journal\ names\ could\ be\ abbreviated.=No journal names could be abbreviate
 
 No\ journal\ names\ could\ be\ unabbreviated.=No journal names could be unabbreviated.
 
-Open\ PDF=Open PDF
-
 not=not
 
 not\ found=not found
@@ -1698,8 +1696,6 @@ Author=Author
 Date=Date
 File\ annotations=File annotations
 Show\ file\ annotations=Show file annotations
-Adobe\ Acrobat\ Reader=Adobe Acrobat Reader
-Sumatra\ Reader=Sumatra Reader
 shared=shared
 should\ contain\ an\ integer\ or\ a\ literal=should contain an integer or a literal
 should\ have\ the\ first\ letter\ capitalized=should have the first letter capitalized
@@ -1777,7 +1773,7 @@ Show\ this\ document\ until\ unlocked.=Show this document until unlocked.
 Set\ current\ user\ name\ as\ owner.=Set current user name as owner.
 
 Sort\ all\ subgroups\ (recursively)=Sort all subgroups (recursively)
-Collect\ and\ share\ telemetry\ data\ to\ help\ improve\ JabRef.=Collect and share telemetry data to help improve JabRef.
+Collect\ and\ share\ telemetry\ data\ to\ help\ improve\ JabRef=Collect and share telemetry data to help improve JabRef
 Don't\ share=Don't share
 Share\ anonymous\ statistics=Share anonymous statistics
 Telemetry\:\ Help\ make\ JabRef\ better=Telemetry: Help make JabRef better
@@ -2035,7 +2031,6 @@ Light\ theme=Light theme
 Dark\ theme=Dark theme
 Overwrite\ existing\ keys=Overwrite existing keys
 Key\ patterns=Key patterns
-Size\:=Size:
 Font\ settings=Font settings
 Override\ font\ settings=Override font settings
 Override\ font\ size=Override font size
@@ -2116,3 +2111,5 @@ Unable\ to\ open\ ShortScience.=Unable to open ShortScience.
 
 Shared\ database=Shared database
 Lookup=Lookup
+
+Remove\ formatter\ %0=Remove formatter %0