Merge remote-tracking branch 'origin/master' into jdk9

# Conflicts: # build.gradle
JabRef · Jul 24, 2019 · 1431d78 · 1431d78
2 parents bac9895 + 00f7216
commit 1431d78
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -145,7 +145,7 @@ dependencies {
     antlr4 'org.antlr:antlr4:4.7.2'
     compile 'org.antlr:antlr4-runtime:4.7.2'
 
-    compile 'mysql:mysql-connector-java:8.0.16'
+    compile 'mysql:mysql-connector-java:8.0.17'
 
     compile 'org.postgresql:postgresql:42.2.6'
 
@@ -191,9 +191,9 @@ dependencies {
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.4.0'
 
     testCompile 'junit:junit:4.12'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
-    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.0'
-    testCompile 'org.junit.platform:junit-platform-launcher:1.5.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.5.1'
+    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.5.1'
+    testCompile 'org.junit.platform:junit-platform-launcher:1.5.1'
 
     testRuntime 'org.apache.logging.log4j:log4j-core:2.12.0'
     testRuntime 'org.apache.logging.log4j:log4j-jul:2.12.0'

diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -85,7 +85,7 @@ public enum StandardActions implements Action {
     TOOGLE_OO(Localization.lang("OpenOffice/LibreOffice"), IconTheme.JabRefIcons.FILE_OPENOFFICE, KeyBinding.OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION),
     TOGGLE_WEB_SEARCH(Localization.lang("Web search"), Localization.lang("Toggle web search interface"), IconTheme.JabRefIcons.WWW, KeyBinding.WEB_SEARCH),
 
-    PARSE_TEX(Localization.lang("LaTeX references search"), IconTheme.JabRefIcons.APPLICATION_TEXSTUDIO),
+    PARSE_TEX(Localization.lang("Search for Citations in LaTeX Files"), IconTheme.JabRefIcons.APPLICATION_TEXSTUDIO),
     NEW_SUB_LIBRARY_FROM_AUX(Localization.lang("New sublibrary based on AUX file") + "...", Localization.lang("New BibTeX sublibrary") + Localization.lang("This feature generates a new library based on which entries are needed in an existing LaTeX document."), IconTheme.JabRefIcons.NEW),
     WRITE_XMP(Localization.lang("Write XMP-metadata to PDFs"), Localization.lang("Will write XMP-metadata to the PDFs linked from selected entries."), KeyBinding.WRITE_XMP),
     OPEN_FOLDER(Localization.lang("Open folder"), Localization.lang("Open folder"), KeyBinding.OPEN_FOLDER),

diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexDialogView.java b/src/main/java/org/jabref/gui/texparser/ParseTexDialogView.java
@@ -48,7 +48,7 @@ public ParseTexDialogView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
         this.validationVisualizer = new ControlsFxVisualizer();
 
-        this.setTitle(Localization.lang("LaTeX references search"));
+        this.setTitle(Localization.lang("Search for Citations in LaTeX Files"));
 
         ViewLoader.view(this)
                   .load()

diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexResultView.java b/src/main/java/org/jabref/gui/texparser/ParseTexResultView.java
@@ -26,11 +26,9 @@ public class ParseTexResultView extends BaseDialog<Void> {
     public ParseTexResultView(TexParserResult texParserResult) {
         this.texParserResult = texParserResult;
 
-        this.setTitle(Localization.lang("LaTeX references search results"));
+        this.setTitle(Localization.lang("LaTeX Citations Search Results"));
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
     }
 
     @FXML

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -2109,8 +2109,8 @@ Import\ preferences\ from\ a\ file=Import preferences from a file
 Matching=Matching
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Same as --import, but will be imported to the opened tab
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Allow integers in 'edition' field in BibTeX mode
-LaTeX\ references\ search=LaTeX references search
-LaTeX\ references\ search\ results=LaTeX references search results
+Search\ for\ Citations\ in\ LaTeX\ Files=Search for Citations in LaTeX Files
+LaTeX\ Citations\ Search\ Results=LaTeX Citations Search Results
 LaTeX\ files\ directory\:=LaTeX files directory:
 LaTeX\ files\ found\:=LaTeX files found:
 files=files