Skip to content

Commit

Permalink
Merge pull request #2748 from JabRef/fix2095
Browse files Browse the repository at this point in the history
Fix wrong usage of "library" in the context of SQL databases
  • Loading branch information
koppor committed Apr 16, 2017
2 parents e436627 + 0e083de commit 5d58792
Show file tree
Hide file tree
Showing 19 changed files with 72 additions and 72 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public void openSharedDatabase() {

if (isSharedDatabaseAlreadyPresent()) {
JOptionPane.showMessageDialog(ConnectToSharedDatabaseDialog.this,
Localization.lang("You are already connected to a library using entered connection details."),
Localization.lang("You are already connected to a database using entered connection details."),
Localization.lang("Warning"), JOptionPane.WARNING_MESSAGE);
return;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/jabref/gui/shared/MigrationHelpDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ public MigrationHelpDialog(ConnectToSharedDatabaseDialog openSharedDatabaseDialo
super(openSharedDatabaseDialog, Localization.lang("Migration help information"), MigrationHelpDialog.class);

String migrationMessage = Localization
.lang("Entered library has obsolete structure and is no longer supported.");
.lang("Entered database has obsolete structure and is no longer supported.");
JLabel migrationLabel = new JLabel(migrationMessage);
migrationLabel.setAlignmentX(Component.LEFT_ALIGNMENT);

String helpMessage = Localization.lang("Click here to learn about the migration of pre-3.6 libraries.");
String helpMessage = Localization.lang("Click here to learn about the migration of pre-3.6 databases.");
JLabel helpLabel = new HelpAction(HelpFile.SQL_DATABASE_MIGRATION).getHelpLabel(helpMessage);
helpLabel.setAlignmentX(Component.LEFT_ALIGNMENT);

String informationMessage = Localization.lang("However, a new library was created alongside the pre-3.6 one.");
String informationMessage = Localization.lang("However, a new database was created alongside the pre-3.6 one.");
JLabel informationLabel = new JLabel(informationMessage);
informationLabel.setAlignmentX(Component.LEFT_ALIGNMENT);

Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_da.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ Shared_entry_is_no_longer_present=
The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.=
You_can_restore_the_entry_using_the_"Undo"_operation.=
Remember_password?=
You_are_already_connected_to_a_library_using_entered_connection_details.=
You_are_already_connected_to_a_database_using_entered_connection_details.=

Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
New_technical_report=
Expand All @@ -2251,9 +2251,9 @@ There_was_one_file_that_could_not_be_imported.=
There_were_%0_files_which_could_not_be_imported.=

Migration_help_information=
Entered_library_has_obsolete_structure_and_is_no_longer_supported.=
However,_a_new_library_was_created_alongside_the_pre-3.6_one.=
Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.=
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=
However,_a_new_database_was_created_alongside_the_pre-3.6_one.=
Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=
Opens_JabRef's_Facebook_page=
Opens_JabRef's_blog=
Opens_JabRef's_website=
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ Shared_entry_is_no_longer_present=Geteilter_Eintrag_ist_nicht_mehr_vorhanden
The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.=Der_Eintrag,_welchen_Sie_zur_Zeit_bearbeiten,_ist_auf_der_geteilten_Datenbank_nicht_mehr_vorhanden.
You_can_restore_the_entry_using_the_"Undo"_operation.=Unter_Benutzung_der_"Rückgängig"-Funktion_kann_der_Eintrag_wiederhergestellt_werden.
Remember_password?=Passwort_merken?
You_are_already_connected_to_a_library_using_entered_connection_details.=Eine_Datenbankverbindung_mit_den_eingegebenen_Verbindungsinformationen_besteht_bereits.
You_are_already_connected_to_a_database_using_entered_connection_details.=Eine_Datenbankverbindung_mit_den_eingegebenen_Verbindungsinformationen_besteht_bereits.

Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=Kann_keine_Einträge_ohne_BibTeX-Key_zitieren._Keys_jetzt_generieren?
New_technical_report=Neuer_technischer_Bericht
Expand All @@ -2251,9 +2251,9 @@ There_was_one_file_that_could_not_be_imported.=Eine_Datei_konnte_nicht_importier
There_were_%0_files_which_could_not_be_imported.=%0_Dateien_konnten_nicht_importiert_werden.

Migration_help_information=Hilfe_zur_Migration
Entered_library_has_obsolete_structure_and_is_no_longer_supported.=Die_gewählte_Datenbank_nutzt_eine_veraltete,_nicht_mehr_unterstützte_Struktur.
However,_a_new_library_was_created_alongside_the_pre-3.6_one.=Dennoch_wurde_eine_neue_Datenbank_neben_der_alten_Datenbank_erzeugt.
Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.=Klicken_um_Informationen_zur_Migration_von_vor-3.6-Datenbanken_zu_erhalten.
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=Die_gewählte_Datenbank_nutzt_eine_veraltete,_nicht_mehr_unterstützte_Struktur.
However,_a_new_database_was_created_alongside_the_pre-3.6_one.=Dennoch_wurde_eine_neue_Datenbank_neben_der_alten_Datenbank_erzeugt.
Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=Klicken_um_Informationen_zur_Migration_von_vor-3.6-Datenbanken_zu_erhalten.
Opens_JabRef's_Facebook_page=Öffnet_JabRefs_Facebookseite
Opens_JabRef's_blog=Öffnet_JabRefs_Blog
Opens_JabRef's_website=Öffnet_JabRefs_Webseite
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ Shared_entry_is_no_longer_present=Shared_entry_is_no_longer_present
The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.=The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.
You_can_restore_the_entry_using_the_"Undo"_operation.=You_can_restore_the_entry_using_the_"Undo"_operation.
Remember_password?=Remember_password?
You_are_already_connected_to_a_library_using_entered_connection_details.=You_are_already_connected_to_a_library_using_entered_connection_details.
You_are_already_connected_to_a_database_using_entered_connection_details.=You_are_already_connected_to_a_database_using_entered_connection_details.

Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?
New_technical_report=New_technical_report
Expand All @@ -2251,9 +2251,9 @@ There_was_one_file_that_could_not_be_imported.=There_was_one_file_that_could_not
There_were_%0_files_which_could_not_be_imported.=There_were_%0_files_which_could_not_be_imported.

Migration_help_information=Migration_help_information
Entered_library_has_obsolete_structure_and_is_no_longer_supported.=Entered_library_has_obsolete_structure_and_is_no_longer_supported.
However,_a_new_library_was_created_alongside_the_pre-3.6_one.=However,_a_new_library_was_created_alongside_the_pre-3.6_one.
Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.=Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=Entered_database_has_obsolete_structure_and_is_no_longer_supported.
However,_a_new_database_was_created_alongside_the_pre-3.6_one.=However,_a_new_database_was_created_alongside_the_pre-3.6_one.
Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=Click_here_to_learn_about_the_migration_of_pre-3.6_databases.
Opens_JabRef's_Facebook_page=Opens_JabRef's_Facebook_page
Opens_JabRef's_blog=Opens_JabRef's_blog
Opens_JabRef's_website=Opens_JabRef's_website
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_es.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ Shared_entry_is_no_longer_present=La_entrada_compartida_ya_no_está_presente.
The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.=La_BibEntry_en_la_que_trabaja_actualmente_ha_sido_eliminada_en_la_parte_compartida.
You_can_restore_the_entry_using_the_"Undo"_operation.=Puede_restaurar_la_entrada_mediante_la_operación_"Deshacer"
Remember_password?=¿Recordar_contraseña?
You_are_already_connected_to_a_library_using_entered_connection_details.=Ya_esa_conectado_a_una_vase_de_datos_usando_los_detalles_de_la_conexión_introducidos.
You_are_already_connected_to_a_database_using_entered_connection_details.=Ya_esa_conectado_a_una_vase_de_datos_usando_los_detalles_de_la_conexión_introducidos.

Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=No_se_puede_citar_entradas_sin_las_claves_BibTeX._¿Generar_ahora?
New_technical_report=Nuevo_informe_técnico
Expand All @@ -2251,9 +2251,9 @@ There_was_one_file_that_could_not_be_imported.=No_se_pudo_importar_un_archivo.
There_were_%0_files_which_could_not_be_imported.=No_se_pudieron_importar_%0_archivos.

Migration_help_information=Información_de_ayuda_para_la_migración
Entered_library_has_obsolete_structure_and_is_no_longer_supported.=La_base_de_datos_introducida_tiene_una_estructura_obsoleta_y_no_se_soporta.
However,_a_new_library_was_created_alongside_the_pre-3.6_one.=En_todo_caso,_una_nueva_base_de_datos_ha_sido_creada_junto_a_la_previa_a_la_versión_3.6.
Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.=Haga_click_aquí_para_aprender_sobre_la_migración_de_bases_de_datos_de_versiones_previas_a_la_3.6
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=La_base_de_datos_introducida_tiene_una_estructura_obsoleta_y_no_se_soporta.
However,_a_new_database_was_created_alongside_the_pre-3.6_one.=En_todo_caso,_una_nueva_base_de_datos_ha_sido_creada_junto_a_la_previa_a_la_versión_3.6.
Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=Haga_click_aquí_para_aprender_sobre_la_migración_de_bases_de_datos_de_versiones_previas_a_la_3.6
Opens_JabRef's_Facebook_page=Abrir_Facebook_de_JabRef
Opens_JabRef's_blog=Abrir_el_blog_de_JabRef
Opens_JabRef's_website=Abrir_el_sitio_web_de_JabRef
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_fa.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ Shared_entry_is_no_longer_present=
The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.=
You_can_restore_the_entry_using_the_"Undo"_operation.=
Remember_password?=
You_are_already_connected_to_a_library_using_entered_connection_details.=
You_are_already_connected_to_a_database_using_entered_connection_details.=

Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
New_technical_report=
Expand All @@ -2251,9 +2251,9 @@ There_was_one_file_that_could_not_be_imported.=
There_were_%0_files_which_could_not_be_imported.=

Migration_help_information=
Entered_library_has_obsolete_structure_and_is_no_longer_supported.=
However,_a_new_library_was_created_alongside_the_pre-3.6_one.=
Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.=
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=
However,_a_new_database_was_created_alongside_the_pre-3.6_one.=
Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=
Opens_JabRef's_Facebook_page=
Opens_JabRef's_blog=
Opens_JabRef's_website=
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ Shared_entry_is_no_longer_present=L'entrée_partagée_n'est_plus_présente
The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.=L'entrée_sur_laquelle_vous_travaillez_actuellement_a_été_supprimée_de_la_base_partagée.
You_can_restore_the_entry_using_the_"Undo"_operation.=Vous_pouvez_restaurer_l'entrée_en_utilisant_l'opération_"Annuler".
Remember_password?=Mémoriser_le_mot_de_passe_?
You_are_already_connected_to_a_library_using_entered_connection_details.=Vous_êtes_déjà_connecté_à_un_fichier_en_utilisant_les_informations_de_connexion_entrées.
You_are_already_connected_to_a_database_using_entered_connection_details.=Vous_êtes_déjà_connecté_à_un_fichier_en_utilisant_les_informations_de_connexion_entrées.

Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=Citation_impossible_sans_clef_BibTeX._Générer_les_clefs_maintenant?
New_technical_report=Nouveau_rapport_technique
Expand All @@ -2251,9 +2251,9 @@ There_was_one_file_that_could_not_be_imported.=Un_fichier_n'a_pas_pu_être_impor
There_were_%0_files_which_could_not_be_imported.=%0_fichiers_n'ont_pas_pu_être_importés.

Migration_help_information=Aide_sur_la_migration
Entered_library_has_obsolete_structure_and_is_no_longer_supported.=Ce_fichier_a_une_structure_obsolète_qui_n'est_plus_gérée.
However,_a_new_library_was_created_alongside_the_pre-3.6_one.=Ainsi,_un_nouveau_fichier_a_été_créée_en_parallèle_de_celle_antérieure_à_la_version_3.6.
Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.=Cliquer_ici_pour_plus_de_détails_sur_la_migration_des_fichiers_antérieurs_à_la_version_3.6.
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=Ce_fichier_a_une_structure_obsolète_qui_n'est_plus_gérée.
However,_a_new_database_was_created_alongside_the_pre-3.6_one.=Ainsi,_un_nouveau_fichier_a_été_créée_en_parallèle_de_celle_antérieure_à_la_version_3.6.
Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=Cliquer_ici_pour_plus_de_détails_sur_la_migration_des_fichiers_antérieurs_à_la_version_3.6.
Opens_JabRef's_Facebook_page=Ouvre_la_page_Facebook_de_JabRef
Opens_JabRef's_blog=Ouvre_le_blog_de_JabRef
Opens_JabRef's_website=Ouvre_le_site_Internet_de_JabRef
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_in.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ Shared_entry_is_no_longer_present=
The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.=
You_can_restore_the_entry_using_the_"Undo"_operation.=
Remember_password?=
You_are_already_connected_to_a_library_using_entered_connection_details.=
You_are_already_connected_to_a_database_using_entered_connection_details.=

Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
New_technical_report=
Expand All @@ -2251,9 +2251,9 @@ There_was_one_file_that_could_not_be_imported.=
There_were_%0_files_which_could_not_be_imported.=

Migration_help_information=
Entered_library_has_obsolete_structure_and_is_no_longer_supported.=
However,_a_new_library_was_created_alongside_the_pre-3.6_one.=
Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.=
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=
However,_a_new_database_was_created_alongside_the_pre-3.6_one.=
Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=
Opens_JabRef's_Facebook_page=
Opens_JabRef's_blog=
Opens_JabRef's_website=
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_it.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ Shared_entry_is_no_longer_present=La_voce_condivisa_non_è_più_presente
The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.=La_BibEntry_su_cui_stai_lavorando_è_stata_cancellata_dalla_parte_che_l'ha_condivisa.
You_can_restore_the_entry_using_the_"Undo"_operation.=Puoi_ripristinare_la_voce_usando_l'"Undo".
Remember_password?=Devo_ricordare_la_password?
You_are_already_connected_to_a_library_using_entered_connection_details.=Sei_già_connesso_ad_una_libreria_con_i_dettagli_di_connessione_specificati.
You_are_already_connected_to_a_database_using_entered_connection_details.=Sei_già_connesso_ad_una_libreria_con_i_dettagli_di_connessione_specificati.

Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=Non_posso_citare_voci_senza_chiavi_BibTeX._Le_genero_ora?
New_technical_report=Nuovo_rapporto_tecnico
Expand All @@ -2251,9 +2251,9 @@ There_was_one_file_that_could_not_be_imported.=Un_file_non_è_stato_importato.
There_were_%0_files_which_could_not_be_imported.=%0_file_non_sono_stati_importati.

Migration_help_information=Informazioni_per_la_migrazione
Entered_library_has_obsolete_structure_and_is_no_longer_supported.=La_libreria_selezionata_ha_una_struttura_obsoleta_e_non_è_più_supportata.
However,_a_new_library_was_created_alongside_the_pre-3.6_one.=Tuttavia_è_stata_creata_una_nuova_libreria_oltre_a_quello_pre-3.6.
Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.=Clicca_qui_per_informazioni_sulla_migrazione_di_librerie_pre-3.6
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=La_libreria_selezionata_ha_una_struttura_obsoleta_e_non_è_più_supportata.
However,_a_new_database_was_created_alongside_the_pre-3.6_one.=Tuttavia_è_stata_creata_una_nuova_libreria_oltre_a_quello_pre-3.6.
Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=Clicca_qui_per_informazioni_sulla_migrazione_di_librerie_pre-3.6
Opens_JabRef's_Facebook_page=Apri_la_pagina_Facebook_di_JabRef
Opens_JabRef's_blog=Apri_il_blog_di_JabRef
Opens_JabRef's_website=Apri_il_sito_web_di_JabRef
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_ja.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ Shared_entry_is_no_longer_present=共有項目がすでに存在しません
The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.=現在作業しているBibEntryが共有側で削除されています。
You_can_restore_the_entry_using_the_"Undo"_operation.=「取り消し」操作を行って項目を復活させることができます。
Remember_password?=パスワードを記憶しますか?
You_are_already_connected_to_a_library_using_entered_connection_details.=入力済みの接続詳細情報を使って、データベースにすでに接続されています。
You_are_already_connected_to_a_database_using_entered_connection_details.=入力済みの接続詳細情報を使って、データベースにすでに接続されています。

Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=BibTeX鍵がないと、項目を引用することができません。ここで鍵を生成しますか?
New_technical_report=新規technical_report
Expand All @@ -2251,9 +2251,9 @@ There_was_one_file_that_could_not_be_imported.=読み込みのできなかった
There_were_%0_files_which_could_not_be_imported.=読み込みのできなかったファイルが%0個ありました。

Migration_help_information=移出入ヘルプ情報
Entered_library_has_obsolete_structure_and_is_no_longer_supported.=入力されたデータベースは旧式の構造を持っていて、もうサポートされていません。
However,_a_new_library_was_created_alongside_the_pre-3.6_one.=しかしながら、pre-3.6データベースに従って、新しいデータベースが生成されました。
Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.=pre-3.6データベースの移出入について知るには、ここをクリックしてください。
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=入力されたデータベースは旧式の構造を持っていて、もうサポートされていません。
However,_a_new_database_was_created_alongside_the_pre-3.6_one.=しかしながら、pre-3.6データベースに従って、新しいデータベースが生成されました。
Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=pre-3.6データベースの移出入について知るには、ここをクリックしてください。
Opens_JabRef's_Facebook_page=JabRefのFacebookページを開きます
Opens_JabRef's_blog=JabRefのブログを開きます
Opens_JabRef's_website=JabRefのウェブサイトを開きます
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_nl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ Shared_entry_is_no_longer_present=
The_BibEntry_you_currently_work_on_has_been_deleted_on_the_shared_side.=
You_can_restore_the_entry_using_the_"Undo"_operation.=
Remember_password?=
You_are_already_connected_to_a_library_using_entered_connection_details.=
You_are_already_connected_to_a_database_using_entered_connection_details.=

Cannot_cite_entries_without_BibTeX_keys._Generate_keys_now?=
New_technical_report=
Expand All @@ -2251,9 +2251,9 @@ There_was_one_file_that_could_not_be_imported.=
There_were_%0_files_which_could_not_be_imported.=

Migration_help_information=
Entered_library_has_obsolete_structure_and_is_no_longer_supported.=
However,_a_new_library_was_created_alongside_the_pre-3.6_one.=
Click_here_to_learn_about_the_migration_of_pre-3.6_libraries.=
Entered_database_has_obsolete_structure_and_is_no_longer_supported.=
However,_a_new_database_was_created_alongside_the_pre-3.6_one.=
Click_here_to_learn_about_the_migration_of_pre-3.6_databases.=
Opens_JabRef's_Facebook_page=
Opens_JabRef's_blog=
Opens_JabRef's_website=
Expand Down
Loading

0 comments on commit 5d58792

Please sign in to comment.