From 84ad057bc8cedb12fcee98724f9b8bd2f52c4e86 Mon Sep 17 00:00:00 2001
From: yinpe <11810305@mail.sustech.edu.cn>
Date: Sun, 4 Apr 2021 12:39:08 +0800
Subject: [PATCH 1/4] fix: change save and export

---
 .../gui/commonfxcontrols/SaveOrderConfigPanel.fxml   |  6 +++---
 .../gui/commonfxcontrols/SaveOrderConfigPanel.java   |  6 +++---
 .../libraryproperties/LibraryPropertiesDialog.fxml   |  2 +-
 src/main/resources/l10n/JabRef_en.properties         | 12 +++---------
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
index b4ce57f91d7..a5992d1457e 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.fxml
@@ -16,12 +16,12 @@
         <ToggleGroup fx:id="saveOrderToggleGroup"/>
     </fx:define>
 
-    <RadioButton fx:id="exportInOriginalOrder" text="%Export entries in their original order"
+    <RadioButton fx:id="exportInOriginalOrder" text="%Keep original order"
                  toggleGroup="$saveOrderToggleGroup"/>
-    <RadioButton fx:id="exportInTableOrder" text="%Export in current table sort order"
+    <RadioButton fx:id="exportInTableOrder" text="%Use current table sort order"
                  toggleGroup="$saveOrderToggleGroup"/>
     <RadioButton fx:id="exportInSpecifiedOrder"
-                 text="%Export entries ordered as specified" toggleGroup="$saveOrderToggleGroup"/>
+                 text="%Use specified order" toggleGroup="$saveOrderToggleGroup"/>
 
     <GridPane hgap="10.0" vgap="4.0">
         <columnConstraints>
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
index b3ae2db5549..6a77750545f 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
@@ -71,9 +71,9 @@ private void initialize() {
     }
 
     public void changeExportDescriptionToSave() {
-        exportInOriginalOrder.setText(Localization.lang("Save entries in their original order"));
-        exportInSpecifiedOrder.setText(Localization.lang("Save entries ordered as specified"));
-        exportInTableOrder.setText(Localization.lang("Save in current table sort order"));
+        exportInOriginalOrder.setText(Localization.lang("Keep original order"));
+        exportInSpecifiedOrder.setText(Localization.lang("Use specified order"));
+        exportInTableOrder.setText(Localization.lang("Use current table sort order"));
     }
 
     public BooleanProperty saveInOriginalProperty() {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
index cae304a8e33..a21e814b1e2 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialog.fxml
@@ -80,7 +80,7 @@
                 <CheckBox fx:id="protect"
                           text="%Refuse to save the library before external changes have been reviewed."/>
 
-                <Label styleClass="sectionHeader" text="%Export sort order"/>
+                <Label styleClass="sectionHeader" text="%Save sort order"/>
                 <SaveOrderConfigPanel fx:id="saveOrderConfigPanel"/>
 
                 <Label styleClass="sectionHeader" text="%Save actions"/>
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 6eb511b34cf..e9446f09bbf 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -736,8 +736,6 @@ Save\ before\ closing=Save before closing
 Save\ library=Save library
 Save\ library\ as...=Save library as...
 
-Save\ entries\ in\ their\ original\ order=Save entries in their original order
-
 Saved\ selected\ to\ '%0'.=Saved selected to '%0'.
 
 Saving=Saving
@@ -956,10 +954,6 @@ A\ local\ copy\ will\ be\ opened.=A local copy will be opened.
 Autosave\ local\ libraries=Autosave local libraries
 Automatically\ save\ the\ library\ to=Automatically save the library to
 Please\ enter\ a\ valid\ file\ path.=Please enter a valid file path.
-
-
-Export\ in\ current\ table\ sort\ order=Export in current table sort order
-Export\ entries\ in\ their\ original\ order=Export entries in their original order
 Error\ opening\ file\ '%0'.=Error opening file '%0'.
 
 Formatter\ not\ found\:\ %0=Formatter not found: %0
@@ -1196,13 +1190,13 @@ Attention\:\ Password\ is\ stored\ in\ plain\ text\!=Attention: Password is stor
 Clear\ connection\ settings=Clear connection settings
 
 Open\ folder=Open folder
-Export\ entries\ ordered\ as\ specified=Export entries ordered as specified
 Export\ sort\ order=Export sort order
 Save\ sort\ order=Save sort order
 Newline\ separator=Newline separator
 
-Save\ in\ current\ table\ sort\ order=Save in current table sort order
-Save\ entries\ ordered\ as\ specified=Save entries ordered as specified
+Keep\ original\ order=Keep original order
+Use\ current\ table\ sort\ order=Use current table sort order
+Use\ specified\ order=Use specified order
 Show\ extra\ columns=Show extra columns
 Parsing\ error=Parsing error
 illegal\ backslash\ expression=illegal backslash expression

From 5ff0da01b2f66d8c91daccd66e2a184be6d6be88 Mon Sep 17 00:00:00 2001
From: yinpe <11810305@mail.sustech.edu.cn>
Date: Mon, 5 Apr 2021 12:01:22 +0800
Subject: [PATCH 2/4] fix: remove method changeExportDescriptionToSave

---
 .../jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
index 6a77750545f..f00d9a0b5ce 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
@@ -70,12 +70,6 @@ private void initialize() {
         saveTerDesc.selectedProperty().bindBidirectional(viewModel.saveTertiaryDescPropertySelected());
     }
 
-    public void changeExportDescriptionToSave() {
-        exportInOriginalOrder.setText(Localization.lang("Keep original order"));
-        exportInSpecifiedOrder.setText(Localization.lang("Use specified order"));
-        exportInTableOrder.setText(Localization.lang("Use current table sort order"));
-    }
-
     public BooleanProperty saveInOriginalProperty() {
         return viewModel.saveInOriginalProperty();
     }

From 74b30e50d9c0a46577fd07a9610c22cc6776fa73 Mon Sep 17 00:00:00 2001
From: yinpe <11810305@mail.sustech.edu.cn>
Date: Mon, 5 Apr 2021 12:09:10 +0800
Subject: [PATCH 3/4] fix: remove method changeExportDescriptionToSave

---
 .../gui/libraryproperties/LibraryPropertiesDialogView.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
index 0a58302ae75..ae5027555d6 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogView.java
@@ -79,7 +79,6 @@ private void initialize() {
         protect.disableProperty().bind(viewModel.protectDisableProperty());
         protect.selectedProperty().bindBidirectional(viewModel.libraryProtectedProperty());
 
-        saveOrderConfigPanel.changeExportDescriptionToSave();
         saveOrderConfigPanel.saveInOriginalProperty().bindBidirectional(viewModel.saveInOriginalProperty());
         saveOrderConfigPanel.saveInTableOrderProperty().bindBidirectional(viewModel.saveInTableOrderProperty());
         saveOrderConfigPanel.saveInSpecifiedOrderProperty().bindBidirectional(viewModel.saveInSpecifiedOrderProperty());

From 6cdea3150f51dd2e859281261b390bcd5fcd9b7c Mon Sep 17 00:00:00 2001
From: yinpe <11810305@mail.sustech.edu.cn>
Date: Mon, 5 Apr 2021 15:42:28 +0800
Subject: [PATCH 4/4] fix: remove unused import

---
 .../org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
index f00d9a0b5ce..55bb2b66941 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
@@ -11,7 +11,6 @@
 
 import org.jabref.gui.util.FieldsUtil;
 import org.jabref.gui.util.ViewModelListCellFactory;
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
 import com.airhacks.afterburner.views.ViewLoader;