Merge remote-tracking branch 'upstream/master' into macsign

* upstream/master:
  Hint message for TextFieldTableCells commit JFX bug (#6772)
  Add new authors

AUTHORS

@@ -227,6 +227,7 @@ Malik Atalla
 Malte Deiseroth
 Manuel Siebeneicher
 Manuel Wtfjoke
+Marcel Luethi
 Marco Konersmann
 Mariana Prudencio
 Marius Kleiner
@@ -297,6 +298,7 @@ Peter Ansell
 Philip Johnson
 Prasan Yapa
 Predrag Milanovic
+Qing
 Quentin Fritz
 Rachel Wu
 Raik Nagel
@@ -331,6 +333,7 @@ Scott Townsend
 Seb Wills
 Serban Iordache
 Shikun Xiong
+ShiqingLiu
 Shitikanth
 shubhamatlani
 Simon Harrer
@@ -384,6 +387,7 @@ Vincent W. Yang
 Vlad Topala
 Waida Fan
 Waluyo Adi Siswanto
+WangAooa
 Ward Poelmans
 Wenbo Yang
 wuw

CHANGELOG.md

@@ -34,6 +34,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added the field "entrytype" to the export sort criteria [#6531](https://github.com/JabRef/jabref/pull/6531)
 - We added the possibility to change the display order of the fields in the entry editor. The order can now be configured using drag and drop in the "Customize entry types" dialog [#6152](https://github.com/JabRef/jabref/pull/6152)
 - We added a missing restart warning for AutoComplete in the preferences dialog. [#6351](https://github.com/JabRef/jabref/issues/6351)
+- We added a note to the citation key pattern preferences dialog as a temporary workaround for a JavaFX bug, about committing changes in a table cell, if the focus is lost. [#5825](https://github.com/JabRef/jabref/issues/5825)
 
 ### Changed
 

src/main/java/org/jabref/gui/preferences/CitationKeyPatternTab.fxml

@@ -10,6 +10,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?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/11.0.1"
          xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.CitationKeyPatternTabView">
     <fx:define>
@@ -56,8 +57,9 @@
         <HBox HBox.hgrow="ALWAYS"/>
         <Button fx:id="keyPatternHelp" prefWidth="20.0"/>
     </HBox>
+    <Label text="%( Note: Press return to commit changes in the table! )"/>
     <AnchorPane>
-        <HBox fx:id="keyPatternContainer" prefWidth="650.0" prefHeight="220.0"/>
+        <HBox fx:id="keyPatternContainer" prefWidth="650.0" prefHeight="180.0"/>
         <Button text="%Reset All" onAction="#resetAllKeyPatterns" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
     </AnchorPane>
 </fx:root>

src/main/resources/l10n/JabRef_en.properties

@@ -2255,6 +2255,8 @@ Close\ other\ libraries=Close other libraries
 Close\ others=Close others
 Reveal\ in\ file\ explorer=Reveal in file explorer
 
+(\ Note\:\ Press\ return\ to\ commit\ changes\ in\ the\ table\!\ )=( Note\: Press return to commit changes in the table\! )
+
 Reset=Reset
 Reset\ entry\ types\ and\ fields\ to\ defaults=Reset entry types and fields to defaults
 This\ will\ reset\ all\ entry\ types\ to\ their\ default\ values\ and\ remove\ all\ custom\ entry\ types=This will reset all entry types to their default values and remove all custom entry types