Fix #1115 Wrong warning message when importing duplicate entries

JabRef · Apr 6, 2016 · 6488cf7 · 6488cf7
1 parent fb5f74c
commit 6488cf7
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -89,6 +89,7 @@ to [sourceforge feature requests](https://sourceforge.net/p/jabref/features/) by
 - Fixed [#991](https://github.com/JabRef/jabref/issues/991): Entry is now correctly removed from the BibDatabase
 - Fixed [#1062](https://github.com/JabRef/jabref/issues/1062): Merge entry with DOI information now also applies changes to entry type
 - Fixed [#535](https://github.com/JabRef/jabref/issues/535): Add merge action to right click menu
+- Fixed [#1115](https://github.com/JabRef/jabref/issues/1115): Wrong warning message when importing duplicate entries
 
 
 ### Removed

diff --git a/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java b/src/main/java/net/sf/jabref/gui/ImportInspectionDialog.java
@@ -609,7 +609,7 @@ public void actionPerformed(ActionEvent event) {
                     // is indicated by the entry's group hit status:
                     if (entry.isGroupHit()) {
                         CheckBoxMessage cbm = new CheckBoxMessage(
-                                Localization.lang("There are possible duplicates (marked with a 'D' icon) that haven't been resolved. Continue?"),
+                                Localization.lang("There are possible duplicates (marked with an icon) that haven't been resolved. Continue?"),
                                 Localization.lang("Disable this confirmation dialog"), false);
                         int answer = JOptionPane.showConfirmDialog(ImportInspectionDialog.this,
                                 cbm, Localization.lang("Duplicates found"), JOptionPane.YES_NO_OPTION);

diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
@@ -767,7 +767,7 @@ The_regular_expression_<b>%0</b>_is_invalid\:=Regulærudtrykket_<b>%0</b>_er_ugy
 The_search_is_case_insensitive.=Søgningen_skelner_ikke_mellem_store_og_små_bogstaver.
 The_search_is_case_sensitive.=Søgningen_skelner_mellem_store_og_små_bogstaver.
 The_string_has_been_removed_locally=Strengen_er_blevet_slettet_lokalt
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Der_findes_mulige_dubletter_(mærket_med_et_'D'-ikon)_som_ikke_er_blevet_håndteret._Fortsæt?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Der_findes_mulige_dubletter_(mærket_med_et_ikon)_som_ikke_er_blevet_håndteret._Fortsæt?
 This_entry_has_no_BibTeX_key._Generate_key_now?=Denne_post_har_ingen_BibTeX-nøgle._Generer_nøgle_nu?
 This_entry_is_incomplete=Denne_post_er_ufuldstændig
 This_entry_type_cannot_be_removed.=Denne_posttype_kan_ikke_slettes.

diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
@@ -1417,7 +1417,7 @@ The_search_is_case_sensitive.=Groß-/Kleinschreibung_wird_unterschieden.
 
 The_string_has_been_removed_locally=Der_String_wurde_lokal_entfernt
 
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Es_gibt_mögliche_Duplikate_(markiert_mit_'D'),_die_nicht_geklärt_werden_konnten._Fortfahren?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Es_gibt_mögliche_Duplikate_(markiert_mit_einem_Icon),_die_nicht_geklärt_werden_konnten._Fortfahren?
 This_entry_has_no_BibTeX_key._Generate_key_now?=Dieser_Eintrag_hat_keinen_BibTeX-Key._Soll_jetzt_einer_erstellt_werden?
 
 This_entry_is_incomplete=Dieser_Eintrag_ist_unvollständig

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
@@ -1344,7 +1344,7 @@ The_search_is_case_sensitive.=The_search_is_case_sensitive.
 
 The_string_has_been_removed_locally=The_string_has_been_removed_locally
 
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=This_entry_has_no_BibTeX_key._Generate_key_now?
 

diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
@@ -717,7 +717,7 @@ The_regular_expression_<b>%0</b>_is_invalid\:=La_expresión_regular_<b>%0</b>_no
 The_search_is_case_insensitive.=La_búsqueda_no_distingue_mayúsculas/minúsculas
 The_search_is_case_sensitive.=La_búsqueda_distingue_mayúsculas/minúsculas
 The_string_has_been_removed_locally=La_cadena_ha_sido_eliminada_localmente
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Hay_posibles_duplicados_(marcados_con_el_icono_'D')_que_no_han_sido_resueltos._¿Continuar?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Hay_posibles_duplicados_(marcados_con_el_icono)_que_no_han_sido_resueltos._¿Continuar?
 This_entry_has_no_BibTeX_key._Generate_key_now?=Esta_entrada_no_tiene_clave_BibTeX._¿Generar_ahora?
 This_entry_is_incomplete=Esta_entrada_está_incompleta¡u+
 This_entry_type_cannot_be_removed.=Este_tipo_de_entrada_no_puede_ser_eliminada.

diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
@@ -1375,7 +1375,7 @@ The_search_is_case_sensitive.=
 
 The_string_has_been_removed_locally=
 
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=
 

diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
@@ -717,7 +717,7 @@ The_regular_expression_<b>%0</b>_is_invalid\:=L'expression_régulière_<b>%0</b>
 The_search_is_case_insensitive.=La_recherche_n'est_pas_sensible_à_la_casse.
 The_search_is_case_sensitive.=La_recherche_est_sensible_à_la_casse.
 The_string_has_been_removed_locally=La_chaîne_a_été_supprimée_localement
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Il_y_a_des_doublons_potentiels_(marqué_avec_un_icône_'D')_qui_n'ont_pas_été_traités._Continuer_?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Il_y_a_des_doublons_potentiels_(marqué_avec_un_icône)_qui_n'ont_pas_été_traités._Continuer_?
 This_entry_has_no_BibTeX_key._Generate_key_now?=Cette_entrée_n'a_pas_de_clef_BibTeX._En_générer_une_maintenant_?
 This_entry_is_incomplete=Cette_entrée_est_incomplète
 This_entry_type_cannot_be_removed.=Ce_type_d'entrée_ne_peut_pas_être_supprimé.

diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties
@@ -716,7 +716,7 @@ The_regular_expression_<b>%0</b>_is_invalid\:=Ekspresi_reguler_<b>%0</b>_tidak_s
 The_search_is_case_insensitive.=Pencarian_tidak_meperhitungkan_huruf_besar_kecil.
 The_search_is_case_sensitive.=Pencarian_meperhitungkan_huruf_besar_kecil.
 The_string_has_been_removed_locally=String_sudah_dihapus_secara_lokal
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Ada_kemungkinan_sama_(ditandai_dengan_ikon_'D')_yang_belum_diselesaikan._Teruskan?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Ada_kemungkinan_sama_(ditandai_dengan_ikon)_yang_belum_diselesaikan._Teruskan?
 This_entry_has_no_BibTeX_key._Generate_key_now?=Entri_ini_belum_mempunyai_kunci_BibTeX._Membuat_kunci_sekarang?
 This_entry_is_incomplete=Entri_belum_lengkap
 This_entry_type_cannot_be_removed.=Tipe_entri_tidak_bisa_dihapus.

diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
@@ -781,7 +781,7 @@ The_regular_expression_<b>%0</b>_is_invalid\:=L'espressione_regolare_<b>%0</b>_n
 The_search_is_case_insensitive.=La_ricerca_non_distingue_maiuscole_e_minuscole.
 The_search_is_case_sensitive.=La_ricerca_distingue_maiuscole_e_minuscole.
 The_string_has_been_removed_locally=La_stringa_\u00e8_stata_rimossa_localmente
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Ci_sono_dei_potenziali_duplicati_(contrassegnati_con_una_icona_'D')_che_non_possono_essere_risolti._Continuare?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Ci_sono_dei_potenziali_duplicati_(contrassegnati_con_una_icona_'D')_che_non_possono_essere_risolti._Continuare?
 This_entry_has_no_BibTeX_key._Generate_key_now?=Questa_voce_\u00e8_priva_di_una_chiave_BibTeX._Generarla_ora?
 This_entry_is_incomplete=La_voce_\u00e8_incompleta
 This_entry_type_cannot_be_removed.=Questo_tipo_di_voce_non_pu\u00f2_essere_eliminato.

diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
@@ -1396,7 +1396,7 @@ The_search_is_case_sensitive.=検索は大小文字を区別します。
 
 The_string_has_been_removed_locally=文字列はローカルで削除されました
 
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=解消されていない重複と思われるものが存在します（「D」アイコンで標識されています）。先に進みますか？
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=解消されていない重複と思われるものが存在します（「D」アイコンで標識されています）。先に進みますか？
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=この項目にはBibTeX鍵がありません。いま生成しますか？
 

diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
@@ -1415,7 +1415,7 @@ The_search_is_case_sensitive.=De_zoekopdracht_is_hoofdlettergevoelig.
 
 The_string_has_been_removed_locally=De_constante_werd_lokaal_verwijderd
 
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Er_zijn_mogelijke_dubbels_(aangeduid_met_een_'D'_icoon)_die_nog_niet_opgelost_werden._Verdergaan?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Er_zijn_mogelijke_dubbels_(aangeduid_met_een_icoon)_die_nog_niet_opgelost_werden._Verdergaan?
 This_entry_has_no_BibTeX_key._Generate_key_now?=
 
 This_entry_is_incomplete=Deze_entry_is_onvolledig

diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
@@ -1515,7 +1515,7 @@ The_search_is_case_sensitive.=S\u00f8ket_skiller_mellom_store_og_sm\u00e5_boksta
 
 The_string_has_been_removed_locally=Strengen_har_blitt_slettet_lokalt
 
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Det_finnes_mulige_duplikater_(merket_med_et_'D'-ikon)_som_ikke_har_blitt_h\u00e5ndtert._Fortsette?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Det_finnes_mulige_duplikater_(merket_med_et_ikon)_som_ikke_har_blitt_h\u00e5ndtert._Fortsette?
 
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=Denne_enheten_har_ingen_BibTeX-n\u00f8kkel._Generer_n\u00f8kkel_n\u00e5?

diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -717,7 +717,7 @@ The_regular_expression_<b>%0</b>_is_invalid\:=A_expressão_regular_<b>%0</b>_é_
 The_search_is_case_insensitive.=A_busca_não_é_sensível_ao_caso.
 The_search_is_case_sensitive.=A_busca_é_sensível_ao_caso.
 The_string_has_been_removed_locally=Esta_string_foi_removida_localmente
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Existem_possíveis_duplicatadas_(marcadas_com_um_ícone_'D')_que_não_foram_resolvidas._Continuar?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Existem_possíveis_duplicatadas_(marcadas_com_um_ícone)_que_não_foram_resolvidas._Continuar?
 This_entry_has_no_BibTeX_key._Generate_key_now?=Esta_referência_não_possui_chave_BibTeX._Deseja_gerar_uma_chave?
 This_entry_is_incomplete=Esta_referência_está_incompleta
 This_entry_type_cannot_be_removed.=Este_tipo_de_referência_não_pode_ser_removida.

diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
@@ -1368,7 +1368,7 @@ The_search_is_case_sensitive.=Поиск_с_учетом_регистра.
 
 The_string_has_been_removed_locally=Строка_удалена_локально
 
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Возможно_наличие_неразрешенных_дубликатов_(отмечены_знаком_'D')._Продолжить?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Возможно_наличие_неразрешенных_дубликатов_(отмечены_знаком)._Продолжить?
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=Отсутствует_ключ_BibTeX_для_записи._Создать_ключ_сейчас?
 

diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
@@ -1186,7 +1186,7 @@ The_search_is_case_insensitive.=
 The_search_is_case_sensitive.=
 The_string_has_been_removed_locally=
 There_are_no_available_databases_to_be_imported=
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=
 These_files_are_not_linked_in_the_active_database.=
 This_action_will_modify_the_following_field(s)_in_at_least_one_entry_each\:=
 This_could_cause_undesired_changes_to_your_entries.=

diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
@@ -717,7 +717,7 @@ The_regular_expression_<b>%0</b>_is_invalid\:=Düzenli_ifade_<b>%0</b>_geçersiz
 The_search_is_case_insensitive.=Arama_büyük/küçük_harfe_duyarsız.
 The_search_is_case_sensitive.=Arama_büyük/küçük_harfe_duyarlı.
 The_string_has_been_removed_locally=Dizge_yerel_olarak_silindi
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Çözümlenmemiş,_olası_çift_nüshalar_mevcut_('D'_simgesiyle_işaretlenmiş)._Devam_edilsin_mi?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Çözümlenmemiş,_olası_çift_nüshalar_mevcut_(simgesiyle_işaretlenmiş)._Devam_edilsin_mi?
 This_entry_has_no_BibTeX_key._Generate_key_now?=Bu_girdinin_BibTeX_anahtarı_yok._Şimdi_oluşturulsun_mu?
 This_entry_is_incomplete=Girdi_eksik
 This_entry_type_cannot_be_removed.=Bu_girdi_türü_silinemiyor.

diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
@@ -1398,7 +1398,7 @@ The_search_is_case_sensitive.=Phép_tìm_có_phân_biệt_chữ_hoa/thường.
 
 The_string_has_been_removed_locally=Chuỗi_này_đã_bị_loại_bỏ_cục_bộ
 
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=Có_thể_có_các_mục_bị_trùng_(được_đánh_dấu_bằng_biểu_tượng_'D')_chưa_được_giải_quyết._Có_tiếp_tục_không?
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=Có_thể_có_các_mục_bị_trùng_(được_đánh_dấu_bằng_biểu_tượng)_chưa_được_giải_quyết._Có_tiếp_tục_không?
 
 This_entry_has_no_BibTeX_key._Generate_key_now?=Mục_này_không_có_khóa_BibTeX._Tạo_khóa_bây_giờ?
 

diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties
@@ -731,7 +731,7 @@ The_regular_expression_<b>%0</b>_is_invalid\:=正则表达式_<b>%0</b>_是非
 The_search_is_case_insensitive.=该查询是不区分大小写的。
 The_search_is_case_sensitive.=该查询是区分大小写的。
 The_string_has_been_removed_locally=简写字串被本地移除
-There_are_possible_duplicates_(marked_with_a_'D'_icon)_that_haven't_been_resolved._Continue?=存在可能仍未解决的重复项(以'D'图标标记)，是否继续？
+There_are_possible_duplicates_(marked_with_an_icon)_that_haven't_been_resolved._Continue?=存在可能仍未解决的重复项(以'D'图标标记)，是否继续？
 This_database_uses_outdated_file_links.=
 This_entry_has_no_BibTeX_key._Generate_key_now?=此记录没有_BibTeX_键，现在生成它？
 This_entry_is_incomplete=该记录是不完整的