Fix modifier. Fix conflicts.

JabRef · Sep 2, 2016 · 2ec2e0d · 2ec2e0d
1 parent a63c857
commit 2ec2e0d
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/src/main/java/net/sf/jabref/gui/shared/OpenSharedDatabaseDialog.java b/src/main/java/net/sf/jabref/gui/shared/OpenSharedDatabaseDialog.java
@@ -51,7 +51,7 @@
 
 public class OpenSharedDatabaseDialog extends JDialog {
 
-    protected static final Log LOGGER = LogFactory.getLog(OpenSharedDatabaseDialog.class);
+    private static final Log LOGGER = LogFactory.getLog(OpenSharedDatabaseDialog.class);
 
     private final JabRefFrame frame;
 

diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
@@ -1725,6 +1725,5 @@ Look_up_full_text_documents=
 You_are_about_to_look_up_full_text_documents_for_%0_entries.=
 
 last_four_nonpunctuation_characters_should_be_numerals=
-Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=
 
 Remember_password?=
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
@@ -1637,5 +1637,4 @@ Look_up_full_text_documents=
 You_are_about_to_look_up_full_text_documents_for_%0_entries.=
 
 last_four_nonpunctuation_characters_should_be_numerals=
-Connecting...=
 Remember_password?=
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
@@ -1710,8 +1710,4 @@ Look_up_full_text_documents=Tam_netin_belgeri_ara
 You_are_about_to_look_up_full_text_documents_for_%0_entries.=%0_adet_girdi_için_tam_metin_belgeleri_aramak_üzeresiniz.
 
 last_four_nonpunctuation_characters_should_be_numerals=
-Finished_downloading_full_text_document_for_entry_%0.=
-Full_text_document_download_failed_for_entry_%0.=
-Look_up_full_text_documents=
-You_are_about_to_look_up_full_text_documents_for_%0_entries.=
 Remember_password?=