diff --git a/CHANGELOG.md b/CHANGELOG.md index ed83bb94f8d..d12bc7b4c9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,8 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - We integrated support for the [paper recommender system Mr.DLib](http://help.jabref.org/en/EntryEditor#related-articles-tab) in a new tab in the entry editor. - We renamed "database" to "library" to have a real distinction to SQL and NoSQL databases. [#2095](https://github.com/JabRef/jabref/issues/2095) - Removed the apache.commons.collections library +- The `Move linked files to default file directory`-Cleanup operation respects the `File directory pattern` setting +- We separated the `Move file` and `Rename Pdfs` logic and context menu entries in the `General`-Tab for the Field `file` to improve the semantics ### Fixed - We fixed an issue where authors with multiple surnames were not presented correctly in the main table. [#2534](https://github.com/JabRef/jabref/issues/2534) @@ -43,11 +45,12 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - The field `issue` is now always exported to the corresponding `issue` field in MS-Office XML. - We fixed an issue with repeated escaping of the %-sign when running the LaTeXCleanup more than once. [#2451](https://github.com/JabRef/jabref/issues/2451) - We fixed the import of MS-Office XML files, when the `month` field contained an invalid value. - - ArXiV fetcher now checks similarity of entry when using DOI retrieval to avoid false positives [#2575](https://github.com/JabRef/jabref/issues/2575) - - Sciencedirect/Elsevier fetcher is now able to scrape new HTML structure [#2576](https://github.com/JabRef/jabref/issues/2576) - - Fixed the synchronization logic of keywords and special fields and vice versa [#2580](https://github.com/JabRef/jabref/issues/2580) - - + - ArXiV fetcher now checks similarity of entry when using DOI retrieval to avoid false positives. [#2575](https://github.com/JabRef/jabref/issues/2575) + - Sciencedirect/Elsevier fetcher is now able to scrape new HTML structure. [#2576](https://github.com/JabRef/jabref/issues/2576) + - Fixed the synchronization logic of keywords and special fields and vice versa. [#2580](https://github.com/JabRef/jabref/issues/2580) + - We fixed an issue introduced with Version 3.8.2 where executing the `Rename PDFs`-Cleanup operation moved the files to the file directory. [#2526](https://github.com/JabRef/jabref/issues/2526) + - We fixed an issue where the `Move linked files to default file directory`-Cleanup operation did not move the files to the location of the bib-file. [#2454](https://github.com/JabRef/jabref/issues/2454) + - We fixed an issue where executeing `Move file` on a selected file in the `General`-Tab could overwrite an existing file. [#2385](https://github.com/JabRef/jabref/issues/2358) ### Removed diff --git a/src/main/java/org/jabref/gui/externalfiles/MoveFileAction.java b/src/main/java/org/jabref/gui/externalfiles/MoveFileAction.java index ffb4a024eaf..0c39d40cb13 100644 --- a/src/main/java/org/jabref/gui/externalfiles/MoveFileAction.java +++ b/src/main/java/org/jabref/gui/externalfiles/MoveFileAction.java @@ -22,19 +22,13 @@ import org.jabref.logic.journals.JournalAbbreviationLoader; import org.jabref.logic.l10n.Localization; import org.jabref.logic.util.io.FileUtil; -import org.jabref.model.FieldChange; import org.jabref.model.entry.ParsedFileField; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * Action for moving a file that is linked from an entry in JabRef. */ public class MoveFileAction extends AbstractAction { - private static final Log LOGGER = LogFactory.getLog(MoveFileAction.class); - private final JabRefFrame frame; private final EntryEditor eEditor; private final FileListEditor editor; @@ -56,7 +50,6 @@ public void actionPerformed(ActionEvent event) { } FileListEntry entry = editor.getTableModel().getEntry(selected); - // Check if the current file exists: String ln = entry.link; ParsedFileField field = entry.toParsedFileField(); @@ -66,14 +59,13 @@ public void actionPerformed(ActionEvent event) { // TODO: notify that this operation cannot be done on remote links return; } - System.out.println("Parsed file Field " + field); // Get an absolute path representation: List dirs = frame.getCurrentBasePanel().getBibDatabaseContext() .getFileDirectories(prefs.getFileDirectoryPreferences()); Optional fileDir = frame.getCurrentBasePanel().getBibDatabaseContext() .getFirstExistingFileDir(prefs.getFileDirectoryPreferences()); if (!fileDir.isPresent()) { - JOptionPane.showMessageDialog(frame, Localization.lang("File_directory_is_not_set_or_does_not_exist!"), + JOptionPane.showMessageDialog(frame, Localization.lang("File directory is not set or does not exist!"), Localization.lang("Move file"), JOptionPane.ERROR_MESSAGE); return; } @@ -83,122 +75,22 @@ public void actionPerformed(ActionEvent event) { } if ((file != null) && Files.exists(file)) { - // Ok, we found the file. Now get a new name: - System.out.println("Cleanup of file " + file); - //Problem: All listed files are cleaned up MoveFilesCleanup moveFiles = new MoveFilesCleanup(frame.getCurrentBasePanel().getBibDatabaseContext(), prefs.getFileDirPattern(), prefs.getFileDirectoryPreferences(), prefs.getLayoutFormatterPreferences(), field); String[] options = {Localization.lang("Move file"), Localization.lang("Cancel")}; - int dialogResult = JOptionPane.showOptionDialog(frame, "Move file to file directory" + fileDir.get(), - "Move", + int dialogResult = JOptionPane.showOptionDialog(frame, + Localization.lang("Move file to file directory?") + " " + fileDir.get(), + Localization.lang("Move file"), JOptionPane.INFORMATION_MESSAGE, JOptionPane.YES_NO_CANCEL_OPTION, null, options, options[0]); if (dialogResult == JOptionPane.YES_OPTION) { - List fieldChanges = moveFiles.cleanup((eEditor.getEntry())); - fieldChanges.stream().findFirst().ifPresent(x -> System.out.println(x.getNewValue())); - } - - //myCleanUp.cleanup(); - /* File newFile = null; - boolean repeat = true; - while (repeat) { - repeat = false; - String chosenFile; - if (toFileDir) { - // Determine which name to suggest: - String suggName = FileUtil - .createFileNameFromPattern(eEditor.getDatabase(), eEditor.getEntry(), - Globals.prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN), - Globals.prefs.getLayoutFormatterPreferences(Globals.journalAbbreviationLoader)) - .concat(entry.type.isPresent() ? "." + entry.type.get().getExtension() : ""); - CheckBoxMessage cbm = new CheckBoxMessage(Localization.lang("Move file to file directory?"), - Localization.lang("Rename to '%0'", suggName), - Globals.prefs.getBoolean(JabRefPreferences.RENAME_ON_MOVE_FILE_TO_FILE_DIR)); - int answer; - // Only ask about renaming file if the file doesn't have the proper name already: - if (suggName.equals(file.getName())) { - answer = JOptionPane.showConfirmDialog(frame, Localization.lang("Move file to file directory?"), - MOVE_RENAME, JOptionPane.YES_NO_OPTION); - } else { - answer = JOptionPane.showConfirmDialog(frame, cbm, MOVE_RENAME, JOptionPane.YES_NO_OPTION); - } - if (answer != JOptionPane.YES_OPTION) { - return; - } - Globals.prefs.putBoolean(JabRefPreferences.RENAME_ON_MOVE_FILE_TO_FILE_DIR, cbm.isSelected()); - StringBuilder sb = new StringBuilder(dirs.get(found)); - if (!dirs.get(found).endsWith(File.separator)) { - sb.append(File.separator); - } - if (cbm.isSelected()) { - // Rename: - sb.append(suggName); - } else { - // Do not rename: - sb.append(file.getName()); - } - chosenFile = sb.toString(); - } else { - Optional path = new FileDialog(frame, file.getPath()).saveNewFile(); - if (path.isPresent()) { - chosenFile = path.get().toString(); - } else { - return; - } - } - newFile = new File(chosenFile); - + moveFiles.cleanup((eEditor.getEntry())); } - if ((newFile != null) && !newFile.equals(file)) { - try { - boolean success = file.renameTo(newFile); - if (!success) { - success = FileUtil.copyFile(file.toPath(), newFile.toPath(), true); - } - if (success) { - // Remove the original file: - Files.deleteIfExists(file.toPath()); - - // Relativise path, if possible. - String canPath = new File(dirs.get(found)).getCanonicalPath(); - if (newFile.getCanonicalPath().startsWith(canPath)) { - if ((newFile.getCanonicalPath().length() > canPath.length()) - && (newFile.getCanonicalPath().charAt(canPath.length()) == File.separatorChar)) { - - String newLink = newFile.getCanonicalPath().substring(1 + canPath.length()); - editor.getTableModel().setEntry(selected, - new FileListEntry(entry.description, newLink, entry.type)); - } else { - String newLink = newFile.getCanonicalPath().substring(canPath.length()); - editor.getTableModel().setEntry(selected, - new FileListEntry(entry.description, newLink, entry.type)); - } - - } else { - String newLink = newFile.getCanonicalPath(); - editor.getTableModel().setEntry(selected, - new FileListEntry(entry.description, newLink, entry.type)); - } - eEditor.updateField(editor); - frame.output(Localization.lang("File moved")); - } else { - JOptionPane.showMessageDialog(frame, Localization.lang("Move file failed"), MOVE_RENAME, - JOptionPane.ERROR_MESSAGE); - } - - } catch (SecurityException | IOException ex) { - LOGGER.warn("Could not move file", ex); - JOptionPane.showMessageDialog(frame, - Localization.lang("Could not move file '%0'.", file.getAbsolutePath()) + ex.getMessage(), - MOVE_RENAME, JOptionPane.ERROR_MESSAGE); - } - - }*/ } else { // File doesn't exist, so we can't move it. JOptionPane.showMessageDialog(frame, Localization.lang("Could not find file '%0'.", entry.link), diff --git a/src/main/java/org/jabref/gui/externalfiles/RenameFileAction.java b/src/main/java/org/jabref/gui/externalfiles/RenameFileAction.java index 8a7b8936fd3..dee2f891080 100644 --- a/src/main/java/org/jabref/gui/externalfiles/RenameFileAction.java +++ b/src/main/java/org/jabref/gui/externalfiles/RenameFileAction.java @@ -22,7 +22,6 @@ import org.jabref.logic.journals.JournalAbbreviationLoader; import org.jabref.logic.l10n.Localization; import org.jabref.logic.util.io.FileUtil; -import org.jabref.model.FieldChange; import org.jabref.model.entry.ParsedFileField; public class RenameFileAction extends AbstractAction { @@ -48,9 +47,7 @@ public void actionPerformed(ActionEvent e) { } FileListEntry entry = editor.getTableModel().getEntry(selected); - ParsedFileField field = entry.toParsedFileField(); - System.out.println("Parsed file Field " + field); // Check if the current file exists: String ln = entry.link; boolean httpLink = ln.toLowerCase(Locale.ENGLISH).startsWith("http"); @@ -63,7 +60,7 @@ public void actionPerformed(ActionEvent e) { Optional fileDir = frame.getCurrentBasePanel().getBibDatabaseContext() .getFirstExistingFileDir(prefs.getFileDirectoryPreferences()); if (!fileDir.isPresent()) { - JOptionPane.showMessageDialog(frame, Localization.lang("File_directory_is_not_set_or_does_not_exist!"), + JOptionPane.showMessageDialog(frame, Localization.lang("File directory is not set or does not exist!"), Localization.lang("Rename file"), JOptionPane.ERROR_MESSAGE); return; } @@ -73,7 +70,6 @@ public void actionPerformed(ActionEvent e) { } if ((file != null) && Files.exists(file)) { - System.out.println("Cleanup Rename of file " + file); RenamePdfCleanup pdfCleanup = new RenamePdfCleanup(false, frame.getCurrentBasePanel().getBibDatabaseContext(), prefs.getFileNamePattern(), @@ -81,17 +77,16 @@ public void actionPerformed(ActionEvent e) { prefs.getFileDirectoryPreferences(), field); String targetFileName = pdfCleanup.getTargetFileName(field, eEditor.getEntry()); - System.out.println("TargetFileName " + targetFileName); String[] options = {Localization.lang("Rename file"), Localization.lang("Cancel")}; - - int dialogResult = JOptionPane.showOptionDialog(frame, "Rename file to " + targetFileName, "Rename", + int dialogResult = JOptionPane.showOptionDialog(frame, + Localization.lang("Rename file to") + " " + targetFileName, + Localization.lang("Rename file"), JOptionPane.INFORMATION_MESSAGE, JOptionPane.YES_NO_CANCEL_OPTION, null, options, options[0]); //indicates Rename pressed if (dialogResult == JOptionPane.YES_OPTION) { - List fieldChanges = pdfCleanup.cleanup(eEditor.getEntry()); - fieldChanges.stream().findFirst().ifPresent(System.out::println); + pdfCleanup.cleanup(eEditor.getEntry()); } } diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java index 5649cd3582c..c5a0e1b9ec2 100644 --- a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java +++ b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java @@ -35,7 +35,7 @@ public class MoveFilesCleanup implements CleanupJob { private final String fileDirPattern; private static final Log LOGGER = LogFactory.getLog(MoveFilesCleanup.class); - private ParsedFileField singleFieldCleanup; + private ParsedFileField singleFileFieldCleanup; public MoveFilesCleanup(BibDatabaseContext databaseContext, String fileDirPattern, FileDirectoryPreferences fileDirectoryPreferences, LayoutFormatterPreferences layoutPrefs) { @@ -50,7 +50,7 @@ public MoveFilesCleanup(BibDatabaseContext databaseContext, String fileDirPatter ParsedFileField field) { this(databaseContext, fileDirPattern, fileDirectoryPreferences, prefs); - this.singleFieldCleanup = field; + this.singleFileFieldCleanup = field; } @Override @@ -73,10 +73,10 @@ public List cleanup(BibEntry entry) { List fileList; List newFileList; - if (singleFieldCleanup != null) { - fileList = Arrays.asList(singleFieldCleanup); - - newFileList = typedEntry.getFiles().stream().filter(x -> !x.equals(singleFieldCleanup)) + if (singleFileFieldCleanup != null) { + fileList = Arrays.asList(singleFileFieldCleanup); + //Add all other except the current selected file + newFileList = typedEntry.getFiles().stream().filter(name -> !name.equals(singleFileFieldCleanup)) .collect(Collectors.toList()); } else { newFileList = new ArrayList<>(); diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java index 70d3b093b51..705bc4419ef 100644 --- a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java +++ b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java @@ -163,12 +163,9 @@ public String getTargetFileName(ParsedFileField flEntry, BibEntry entry) { StringBuilder targetFileName = new StringBuilder(FileUtil .createFileNameFromPattern(databaseContext.getDatabase(), entry, fileNamePattern, layoutPrefs) .trim()); - //Add extension to newFilename targetFileName.append('.').append(FileUtil.getFileExtension(realOldFilename).orElse("pdf")); - return targetFileName.toString(); - } public int getUnsuccessfulRenames() { diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties index ce786f81193..97788a7d8d2 100644 --- a/src/main/resources/l10n/JabRef_da.properties +++ b/src/main/resources/l10n/JabRef_da.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Forespørgsel_'%0'_med_ Move_file=Flyt_fil Rename_file=omdøb_fil -File_moved=Fil_flyttet Move_file_failed=Flytning_af_fil_mislykkedes Could_not_move_file_'%0'.=Kunne_ikke_flytte_fil_'%0'. Could_not_find_file_'%0'.=Kunne_ikke_finde_filen_'%0'. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Vis_søgeresultater_i_et_vindue Show_global_search_results_in_a_window= Search_in_all_open_libraries= Move_file_to_file_directory?=Flyt_fil_til_filbibliotek? -Rename_to_'%0'=Omdøb_til_'%0' You_have_changed_the_menu_and_label_font_size.=Du_har_ændret_menu-_og_tekst-skriftstørrelsen. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=Libraryn_er_beskyttet._Kan_ikke_gemme_før_eksterne_ændringer_er_gennemset. diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties index f0546ff8a9d..0d0eb9e684d 100644 --- a/src/main/resources/l10n/JabRef_de.properties +++ b/src/main/resources/l10n/JabRef_de.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Die_Abfrage_'%0'_mit_de Move_file=Datei_verschoben Rename_file=Datei_umbenennen -File_moved=Datei_verschoben Move_file_failed=Fehler_beim_Verschieben_der_Datei Could_not_move_file_'%0'.=Datei_'%0'_konnte_nicht_verschoben_werden. Could_not_find_file_'%0'.=Datei_'%0'_nicht_gefunden. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Suchergebnisse_in_einem_Fenster_anzeigen Show_global_search_results_in_a_window=Globale_Suchergebnisse_in_einem_Fenster_anzeigen Search_in_all_open_libraries=Suche_in_allen_offenen_Datenbanken Move_file_to_file_directory?=Datei_in_Dateiverzeichnis_verschieben? -Rename_to_'%0'=Umbenennen_in_'%0' You_have_changed_the_menu_and_label_font_size.=Sie_haben_die_Schriftgröße_für_Menüs_und_Label_geändert. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=Die_Datenbank_ist_geschützt._Speichern_nicht_möglich,_bis_externe_Änderungen_geprüft_wurden. diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties index 98980086948..046c754df0d 100644 --- a/src/main/resources/l10n/JabRef_en.properties +++ b/src/main/resources/l10n/JabRef_en.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Query_'%0'_with_fetcher Move_file=Move_file Rename_file=Rename_file -File_moved=File_moved Move_file_failed=Move_file_failed Could_not_move_file_'%0'.=Could_not_move_file_'%0'. Could_not_find_file_'%0'.=Could_not_find_file_'%0'. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Show_search_results_in_a_window Show_global_search_results_in_a_window=Show_global_search_results_in_a_window Search_in_all_open_libraries=Search_in_all_open_libraries Move_file_to_file_directory?=Move_file_to_file_directory? -Rename_to_'%0'=Rename_to_'%0' You_have_changed_the_menu_and_label_font_size.=You_have_changed_the_menu_and_label_font_size. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed. diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties index 0bdd33f7938..15bc0dd8bb1 100644 --- a/src/main/resources/l10n/JabRef_es.properties +++ b/src/main/resources/l10n/JabRef_es.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=La_consulta_'%0'_con_el Move_file=Mover_archivo Rename_file=renombrar_archivo -File_moved=Archivo_movido Move_file_failed=Error_al_mover_de_archivos Could_not_move_file_'%0'.=No_se_puede_mover_el_archivo_'%0'. Could_not_find_file_'%0'.=No_se_encuentra_el_archivo_'%0'. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Mostrar_los_resultados_de_la_búsqueda_en_una_ve Show_global_search_results_in_a_window= Search_in_all_open_libraries= Move_file_to_file_directory?=¿Mover_archivo_a_la_carpeta_de_archivos? -Rename_to_'%0'=Renombrar_a_'%0' You_have_changed_the_menu_and_label_font_size.=Ha_cambiado_el_tamaño_de_tipo_de_letra_para_el_menu_y_etiqueta. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=La_base_de_datos_está_protegida._No_se_puede_guardar_hasta_que_los_cambios_externos_hayan_sido_revisados. diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties index bb9efdcb0ff..b08808a0b2c 100644 --- a/src/main/resources/l10n/JabRef_fa.properties +++ b/src/main/resources/l10n/JabRef_fa.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.= Move_file= Rename_file= -File_moved= Move_file_failed= Could_not_move_file_'%0'.= Could_not_find_file_'%0'.= @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window= Show_global_search_results_in_a_window= Search_in_all_open_libraries= Move_file_to_file_directory?= -Rename_to_'%0'= You_have_changed_the_menu_and_label_font_size.= Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.= diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties index af711cc1c86..496b427a65f 100644 --- a/src/main/resources/l10n/JabRef_fr.properties +++ b/src/main/resources/l10n/JabRef_fr.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Le_requête_'%0'_pour_l Move_file=Déplacer_fichier Rename_file=Renommer_le_fichier -File_moved=Fichier_déplacé Move_file_failed=Echec_du_déplacement_du_fichier Could_not_move_file_'%0'.=Le_fichier_'%0'_n'a_pas_pu_être_déplacé. Could_not_find_file_'%0'.=Le_fichier_'%0'_n'a_pas_pu_être_trouvé. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Afficher_les_résultats_de_recherche_dans_une_fe Show_global_search_results_in_a_window=Afficher_les_résultats_de_recherche_globale_dans_une_fenêtre Search_in_all_open_libraries=Rechercher_sur_tous_les_fichierss_ouverts Move_file_to_file_directory?=Déplacer_le_fichier_vers_le_répertoire_de_fichiers_? -Rename_to_'%0'=Renommer_vers_'%0' You_have_changed_the_menu_and_label_font_size.=Vous_avez_modifié_la_taille_de_police_des_menus_et_des_étiquettes. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=Le_fichier_est_protégée._L'enregistrement_ne_peut_être_effectué_tant_que_les_changements_externes_n'auront_pas_été_vérifiés. diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties index b313191f909..3f942296095 100644 --- a/src/main/resources/l10n/JabRef_in.properties +++ b/src/main/resources/l10n/JabRef_in.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Kueri_'%0'_dengan_penga Move_file=Memindah_berkas Rename_file=Menamai_berkas -File_moved=Berkas_dipindah Move_file_failed=Gagal_memindah_berkas Could_not_move_file_'%0'.=Tidak_bisa_meindah_berkas_'%0'. Could_not_find_file_'%0'.=Tidak_bisa_menemukan_berkas_'%0'. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Tampilkan_hasil_pencarian_di_jendela Show_global_search_results_in_a_window= Search_in_all_open_libraries= Move_file_to_file_directory?=Pindah_berkas_ke_direktori_berkas? -Rename_to_'%0'=Ganti_nama_menjadi_'%0' You_have_changed_the_menu_and_label_font_size.=Ukuran_huruf_menu_dan_label_sudah_anda_ubah. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=Basisdata_dilindungi._Tidak_bisa_disimpan_sebelum_perubahan_eksternal_diperiksa. diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties index 984abd8d60f..bea98d15a6b 100644 --- a/src/main/resources/l10n/JabRef_it.properties +++ b/src/main/resources/l10n/JabRef_it.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=La_query_'%0'_con_l'uti Move_file=Sposta_file Rename_file=Rinomina_il_file -File_moved=File_spostato Move_file_failed=Spostamento_del_file_fallito Could_not_move_file_'%0'.=Impossibile_spostare_il_file_'%0'. Could_not_find_file_'%0'.=Impossibile_trovare_il_file_'%0'. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Mostra_i_risultati_della_ricerca_in_una_finestra Show_global_search_results_in_a_window=Mostra_i_risultati_della_ricerca_globale_in_una_finestra Search_in_all_open_libraries=Cerca_in_tutti_i_library_aperti Move_file_to_file_directory?=Spostare_i_file_nella_cartella_dei_file_principale? -Rename_to_'%0'=Rinomina_in_'%0' You_have_changed_the_menu_and_label_font_size.=Sono_state_modificate_le_dimensioni_del_carattere_di_menu_ed_etichette. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=Il_library_è_protetto._Le_modifiche_esterne_devono_evvere_state_riviste_prima_di_poter_salvare. diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties index ecc54182119..d4e2b913fb2 100644 --- a/src/main/resources/l10n/JabRef_ja.properties +++ b/src/main/resources/l10n/JabRef_ja.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=取得子「%1」を使 Move_file= Rename_file= -File_moved=ファイルを移動しました Move_file_failed=ファイルの移動に失敗 Could_not_move_file_'%0'.=ファイルを%0移動できませんでした Could_not_find_file_'%0'.=ファイル「%0」を見つけられませんでした。 @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=検索結果をウィンドウに表示 Show_global_search_results_in_a_window=大域検索の結果をウィンドウに表示 Search_in_all_open_libraries=全データベースを検索 Move_file_to_file_directory?=ファイルをファイルディレクトリに移動しますか？ -Rename_to_'%0'=「%0」に改名 You_have_changed_the_menu_and_label_font_size.=メニュートラベルのフォント寸法が変更されました。 Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=データベースは保護されています。外部からの変更を検査しない限り、保存することができません。 diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties index 6f6d5335518..28d18f985fc 100644 --- a/src/main/resources/l10n/JabRef_nl.properties +++ b/src/main/resources/l10n/JabRef_nl.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.= Move_file= Rename_file= -File_moved= Move_file_failed= Could_not_move_file_'%0'.= Could_not_find_file_'%0'.= @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window= Show_global_search_results_in_a_window= Search_in_all_open_libraries= Move_file_to_file_directory?= -Rename_to_'%0'= You_have_changed_the_menu_and_label_font_size.= Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.= diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties index c9532d037d2..6829796cfa4 100644 --- a/src/main/resources/l10n/JabRef_no.properties +++ b/src/main/resources/l10n/JabRef_no.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=S\u00f8ket_'%0'_med_ned Move_file=Flytt_fil Rename_file=endre_navn_p\u00e5_fil -File_moved=Flyttet_fil Move_file_failed=Flytting_av_fil_mislyktes Could_not_move_file_'%0'.=Kunne_ikke_flytte_filen_'%0'. Could_not_find_file_'%0'.=Kunne_ikke_finne_filen_'%0'. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Vis_s\u00f8keresultatene_i_et_vundu Show_global_search_results_in_a_window= Search_in_all_open_libraries= Move_file_to_file_directory?=Flytt_filen_til_hovedkatalogen_for_filer? -Rename_to_'%0'=Endre_navn_til_'%0' You_have_changed_the_menu_and_label_font_size.=Du_har_endret_skriftst\u00f8rrelser. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=Libraryn_er_beskyttet._Kan_ikke_lagre_f\u00f8r_eksterne_endringer_har_blitt_gjennomg\u00e5tt. diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties index d57bc18f308..57f3bdb90e8 100644 --- a/src/main/resources/l10n/JabRef_pt_BR.properties +++ b/src/main/resources/l10n/JabRef_pt_BR.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Consulta_'%0'_com_ferra Move_file=Mover_arquivo Rename_file=Renomear_arquivo -File_moved=Arquivo_movido Move_file_failed=Movimentação_do_arquivo_falhou Could_not_move_file_'%0'.=Não_foi_possível_mover_o_arquivo_'%0'. Could_not_find_file_'%0'.=Não_foi_possível_encontrar_o_arquivo_'%0'. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Exibir_resultados_de_busca_em_uma_janela Show_global_search_results_in_a_window= Search_in_all_open_libraries= Move_file_to_file_directory?=Mover_arquivo_para_o_diretório_de_arquivos? -Rename_to_'%0'=Renomear_para_'%0' You_have_changed_the_menu_and_label_font_size.=Você_alterou_o_menu_e_tamanho_de_fonte_dos_rótulos. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=A_base_de_dados_está_protegida._Não_é_possível_salvar_antes_que_mudanças_externas_sejam_revisadas. diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties index 5cc2134b4d0..4821b1b4342 100644 --- a/src/main/resources/l10n/JabRef_ru.properties +++ b/src/main/resources/l10n/JabRef_ru.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Не_найдено_р Move_file=Переместить_файл Rename_file=Ппереименовать_файл -File_moved=Файл_перемещен Move_file_failed=Ошибка_перемещения_файла Could_not_move_file_'%0'.=Не_удалось_переместить_файл_'%0'. Could_not_find_file_'%0'.=Не_удалось_найти_файл_'%0'. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Показать_результаты_в_окн Show_global_search_results_in_a_window= Search_in_all_open_libraries=Поиск_во_всех_открытых_БД Move_file_to_file_directory?=Файл_будет_перемещен_в_каталог_файлов._Продолжить? -Rename_to_'%0'=Переименовать_в_'%0' You_have_changed_the_menu_and_label_font_size.=Кегль_меню_и_надписи_изменен_пользователем. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=Защищенная_БД._Невозможно_сохранить_без_просмотра_внешних_изменений. diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties index e92886730e3..0b32d130b65 100644 --- a/src/main/resources/l10n/JabRef_sv.properties +++ b/src/main/resources/l10n/JabRef_sv.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.= Move_file=Flytta_fil Rename_file=Döp_om_fil -File_moved=Filen_flyttad Move_file_failed=Gick_inte_att_flytta_fil Could_not_move_file_'%0'.=Kunde_inte_flytta_filen_'%0' Could_not_find_file_'%0'.=Kunde_inte_hitta_filen_'%0'. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Visa_sökresultaten_i_ett_fönster Show_global_search_results_in_a_window= Search_in_all_open_libraries= Move_file_to_file_directory?=Flytta_fil_till_filmapp? -Rename_to_'%0'=Byt_namn_till_'%0' You_have_changed_the_menu_and_label_font_size.= Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=Libraryn_är_skyddad._Kan_inte_spara_innan_externa_ändringar_är_kontrollerade. diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties index 1d412ec0f0e..13e091f4374 100644 --- a/src/main/resources/l10n/JabRef_tr.properties +++ b/src/main/resources/l10n/JabRef_tr.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.='%1'_getiricisiyle_'%0' Move_file=Dosya_Taşı_adlandır Rename_file=Yeniden_adlandır -File_moved=Dosya_taşındı Move_file_failed=Dosya_taşıma_başarısız Could_not_move_file_'%0'.='%0'_dosya_taşınamıyor. Could_not_find_file_'%0'.='%0'_dosyası_bulunamadı. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Arama_sonuçlarını_bir_pencerede_göster Show_global_search_results_in_a_window= Search_in_all_open_libraries=Tüm_açık_veri_tabanlarında_ara Move_file_to_file_directory?=Dosya,_dosya_dizinine_taşınsın_mı? -Rename_to_'%0'='%0'_olarak_yeniden_adlandır You_have_changed_the_menu_and_label_font_size.=Menü_ve_etiket_yazıtipi_boyutunu_değiştirdiniz. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=Veritabanı_korunuyor._Harici_değişiklikler_gözden_geçirilene_dek_kaydedemezsiniz. diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties index 3c19c0a9894..9203cb74275 100644 --- a/src/main/resources/l10n/JabRef_vi.properties +++ b/src/main/resources/l10n/JabRef_vi.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=Phép_truy_vấn_'%0'_b Move_file=Chuyển_tin Rename_file=Đặt_lại_tên_tập_tin -File_moved=Tập_tin_bị_di_chuyển Move_file_failed=Việc_chuyển_tập_tin_thất_bại Could_not_move_file_'%0'.=Không_thể_chuyển_tập_tin_'%0'. Could_not_find_file_'%0'.=Không_tìm_thấy_tập_tin_'%0'. @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=Hiển_thị_kết_quả_tìm_trong_một_cửa_ Show_global_search_results_in_a_window= Search_in_all_open_libraries=Tìm_kiếm_trong_tất_cả_CSDL_đang_mở Move_file_to_file_directory?=Di_chuyển_tập_tin_vào_thư_mục_tập_tin? -Rename_to_'%0'=Đổi_tên_thành_'%0' You_have_changed_the_menu_and_label_font_size.=Bạn_đã_thay_đổi_menu_và_cỡ_phông_nhãn. Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=CSDL_được_bảo_vệ._Không_thể_lưu_cho_đến_khi_những_thay_đổi_ngoài_được_xem_xét. diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties index fb3e3810fbf..99b8db5b7b9 100644 --- a/src/main/resources/l10n/JabRef_zh.properties +++ b/src/main/resources/l10n/JabRef_zh.properties @@ -1386,7 +1386,6 @@ Query_'%0'_with_fetcher_'%1'_did_not_return_any_results.=使用抓取器'%1'请 Move_file=移动_文件 Rename_file=重命名_文件 -File_moved=文件移动完成 Move_file_failed=移动文件失败 Could_not_move_file_'%0'.=无法移动文件_'%0' Could_not_find_file_'%0'.=无法找到文件_'%0'。 @@ -1400,7 +1399,6 @@ Show_search_results_in_a_window=在新窗口中显示查询结果 Show_global_search_results_in_a_window=在窗口中显示全局搜索结果 Search_in_all_open_libraries=在所有打开的数据库中搜索 Move_file_to_file_directory?=移动文件到文件目录? -Rename_to_'%0'=重命名为_'%0' You_have_changed_the_menu_and_label_font_size.=您已经修改了菜单和标签的字号。 Library_is_protected._Cannot_save_until_external_changes_have_been_reviewed.=数据库受保护中，在外部修改未被复查前无法执行保存操作。