diff --git a/src/main/java/net/sf/jabref/JabRefPreferences.java b/src/main/java/net/sf/jabref/JabRefPreferences.java index 19d995cd6d8..f81de34bf3f 100644 --- a/src/main/java/net/sf/jabref/JabRefPreferences.java +++ b/src/main/java/net/sf/jabref/JabRefPreferences.java @@ -48,7 +48,7 @@ import net.sf.jabref.logic.cleanup.FieldFormatterCleanup; import net.sf.jabref.logic.formatter.BibtexFieldFormatters; import net.sf.jabref.logic.formatter.bibtexfields.*; -import net.sf.jabref.logic.formatter.casechanger.CaseKeeper; +import net.sf.jabref.logic.formatter.casechanger.ProtectTermsFormatter; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.labelpattern.GlobalLabelPattern; import net.sf.jabref.logic.openoffice.OpenOfficePreferences; @@ -342,13 +342,13 @@ public class JabRefPreferences { CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX); List activeFormatterCleanups = new ArrayList<>(); - activeFormatterCleanups.add(new FieldFormatterCleanup("pages", BibtexFieldFormatters.PAGE_NUMBERS)); - activeFormatterCleanups.add(new FieldFormatterCleanup("date", BibtexFieldFormatters.DATE)); - activeFormatterCleanups.add(new FieldFormatterCleanup("month", new MonthFormatter())); - activeFormatterCleanups.add(new FieldFormatterCleanup("title", new CaseKeeper())); - activeFormatterCleanups.add(new FieldFormatterCleanup("title", new UnitFormatter())); - activeFormatterCleanups.add(new FieldFormatterCleanup("title", new LatexFormatter())); - activeFormatterCleanups.add(new FieldFormatterCleanup("title", new HTMLToLatexFormatter())); + activeFormatterCleanups.add(new FieldFormatterCleanup("pages", BibtexFieldFormatters.NORMALIZE_PAGES)); + activeFormatterCleanups.add(new FieldFormatterCleanup("date", BibtexFieldFormatters.NORMALIZE_DATE)); + activeFormatterCleanups.add(new FieldFormatterCleanup("month", new NormalizeMonthFormatter())); + activeFormatterCleanups.add(new FieldFormatterCleanup("title", new ProtectTermsFormatter())); + activeFormatterCleanups.add(new FieldFormatterCleanup("title", new UnitsToLatexFormatter())); + activeFormatterCleanups.add(new FieldFormatterCleanup("title", new LatexCleanupFormatter())); + activeFormatterCleanups.add(new FieldFormatterCleanup("title", new HtmlToLatexFormatter())); FieldFormatterCleanups formatterCleanups = new FieldFormatterCleanups(true, activeFormatterCleanups); CLEANUP_DEFAULT_PRESET = new CleanupPreset(EnumSet.complementOf(deactivedJobs), formatterCleanups); } diff --git a/src/main/java/net/sf/jabref/exporter/FieldFormatterCleanups.java b/src/main/java/net/sf/jabref/exporter/FieldFormatterCleanups.java index 2a6cdb4bd56..cbcd32da7a1 100644 --- a/src/main/java/net/sf/jabref/exporter/FieldFormatterCleanups.java +++ b/src/main/java/net/sf/jabref/exporter/FieldFormatterCleanups.java @@ -7,6 +7,9 @@ import net.sf.jabref.logic.formatter.CaseChangers; import net.sf.jabref.logic.formatter.Formatter; import net.sf.jabref.logic.formatter.IdentityFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.NormalizeMonthFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.OrdinalsToSuperscriptFormatter; import net.sf.jabref.logic.util.strings.StringUtil; import net.sf.jabref.model.entry.BibEntry; @@ -27,8 +30,11 @@ public class FieldFormatterCleanups { availableFormatters.addAll(BibtexFieldFormatters.ALL); availableFormatters.addAll(CaseChangers.ALL); - String defaultFormatterString = "pages[PageNumbersFormatter]month[MonthFormatter]booktitle[SuperscriptFormatter]"; - DEFAULT_SAVE_ACTIONS = new FieldFormatterCleanups(false, defaultFormatterString); + List defaultFormatters = new ArrayList<>(); + defaultFormatters.add(new FieldFormatterCleanup("pages", new NormalizePagesFormatter())); + defaultFormatters.add(new FieldFormatterCleanup("month", new NormalizeMonthFormatter())); + defaultFormatters.add(new FieldFormatterCleanup("booktitle", new OrdinalsToSuperscriptFormatter())); + DEFAULT_SAVE_ACTIONS = new FieldFormatterCleanups(false, defaultFormatters); } public FieldFormatterCleanups(boolean enabled, String formatterString) { diff --git a/src/main/java/net/sf/jabref/gui/dbproperties/FieldFormatterCleanupsPanel.java b/src/main/java/net/sf/jabref/gui/dbproperties/FieldFormatterCleanupsPanel.java index df8ec89c26b..1b8e5f408bc 100644 --- a/src/main/java/net/sf/jabref/gui/dbproperties/FieldFormatterCleanupsPanel.java +++ b/src/main/java/net/sf/jabref/gui/dbproperties/FieldFormatterCleanupsPanel.java @@ -147,7 +147,7 @@ private JPanel getSelectorPanel() { builder.add(selectFieldCombobox).xy(1, 1); List formatterNames = fieldFormatterCleanups.getAvailableFormatters().stream() - .map(formatter -> formatter.getKey()).collect(Collectors.toList()); + .map(formatter -> formatter.getName()).collect(Collectors.toList()); List formatterDescriptions = fieldFormatterCleanups.getAvailableFormatters().stream() .map(formatter -> formatter.getDescription()).collect(Collectors.toList()); formattersCombobox = new JComboBox<>(formatterNames.toArray()); @@ -224,9 +224,9 @@ private FieldFormatterCleanup getFieldFormatterCleanup() { private Formatter getFieldFormatter() { Formatter selectedFormatter = null; - String selectedFormatterKey = formattersCombobox.getSelectedItem().toString(); + String selectedFormatterName = formattersCombobox.getSelectedItem().toString(); for (Formatter formatter : fieldFormatterCleanups.getAvailableFormatters()) { - if (formatter.getKey().equals(selectedFormatterKey)) { + if (formatter.getName().equals(selectedFormatterName)) { selectedFormatter = formatter; break; } diff --git a/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/ConversionMenu.java b/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/ConversionMenu.java index 87deccbad11..b7d033d4699 100644 --- a/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/ConversionMenu.java +++ b/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/ConversionMenu.java @@ -17,8 +17,9 @@ */ package net.sf.jabref.gui.fieldeditors.contextmenu; +import net.sf.jabref.logic.formatter.BibtexFieldFormatters; +import net.sf.jabref.logic.formatter.Formatter; import net.sf.jabref.logic.l10n.Localization; -import net.sf.jabref.logic.util.strings.Converters; import javax.swing.JMenu; import javax.swing.JMenuItem; @@ -34,9 +35,9 @@ public class ConversionMenu extends JMenu { public ConversionMenu(JTextComponent opener) { super(Localization.lang("Convert")); // create menu items, one for each case changer - for (final Converters.Converter converter : Converters.ALL) { + for (Formatter converter : BibtexFieldFormatters.CONVERTERS) { JMenuItem menuItem = new JMenuItem(converter.getName()); - menuItem.addActionListener(e -> opener.setText(converter.convert(opener.getText()))); + menuItem.addActionListener(e -> opener.setText(converter.format(opener.getText()))); this.add(menuItem); } } diff --git a/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/FieldTextMenu.java b/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/FieldTextMenu.java index 91db1813eb9..e238d5ed7d5 100644 --- a/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/FieldTextMenu.java +++ b/src/main/java/net/sf/jabref/gui/fieldeditors/contextmenu/FieldTextMenu.java @@ -11,9 +11,9 @@ import net.sf.jabref.gui.actions.CopyAction; import net.sf.jabref.gui.actions.PasteAction; import net.sf.jabref.gui.fieldeditors.FieldEditor; +import net.sf.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.util.strings.StringUtil; -import net.sf.jabref.logic.formatter.bibtexfields.AuthorsFormatter; public class FieldTextMenu implements MouseListener { private final FieldEditor field; @@ -109,7 +109,7 @@ public void actionPerformed(ActionEvent evt) { return; } String input = field.getText(); - field.setText(new AuthorsFormatter().format(input)); + field.setText(new NormalizeNamesFormatter().format(input)); } } } diff --git a/src/main/java/net/sf/jabref/gui/maintable/MainTableColumn.java b/src/main/java/net/sf/jabref/gui/maintable/MainTableColumn.java index 311fde48c95..935a62e4701 100644 --- a/src/main/java/net/sf/jabref/gui/maintable/MainTableColumn.java +++ b/src/main/java/net/sf/jabref/gui/maintable/MainTableColumn.java @@ -3,7 +3,7 @@ import net.sf.jabref.bibtex.BibtexSingleFieldProperties; import net.sf.jabref.bibtex.InternalBibtexFields; import net.sf.jabref.logic.layout.LayoutFormatter; -import net.sf.jabref.logic.layout.format.FormatChars; +import net.sf.jabref.logic.layout.format.LatexToUnicodeFormatter; import net.sf.jabref.model.database.BibDatabase; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.EntryUtil; @@ -22,7 +22,7 @@ public class MainTableColumn { private final Optional database; - private final LayoutFormatter toUnicode = new FormatChars(); + private final LayoutFormatter toUnicode = new LatexToUnicodeFormatter(); public MainTableColumn(String columnName) { this.columnName = columnName; diff --git a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java index ec63c4304cb..82507df426b 100644 --- a/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java +++ b/src/main/java/net/sf/jabref/gui/mergeentries/MergeEntries.java @@ -204,7 +204,7 @@ private void initialize() { int tmpLabelWidth; for (String field : joint) { jointStrings[row - 2] = field; - label = new JLabel(CaseChangers.UPPER_FIRST.format(field)); + label = new JLabel(CaseChangers.TO_SENTENCE_CASE.format(field)); font = label.getFont(); label.setFont(font.deriveFont(font.getStyle() | Font.BOLD)); mergePanel.add(label, cc.xy(1, row)); diff --git a/src/main/java/net/sf/jabref/importer/fetcher/ACMPortalFetcher.java b/src/main/java/net/sf/jabref/importer/fetcher/ACMPortalFetcher.java index 009110a53b4..b4d684e2270 100644 --- a/src/main/java/net/sf/jabref/importer/fetcher/ACMPortalFetcher.java +++ b/src/main/java/net/sf/jabref/importer/fetcher/ACMPortalFetcher.java @@ -22,9 +22,9 @@ import net.sf.jabref.importer.ImportInspector; import net.sf.jabref.importer.OutputPrinter; import net.sf.jabref.importer.fileformat.BibtexParser; -import net.sf.jabref.logic.formatter.bibtexfields.HTMLToLatexFormatter; -import net.sf.jabref.logic.formatter.bibtexfields.UnitFormatter; -import net.sf.jabref.logic.formatter.casechanger.CaseKeeper; +import net.sf.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.UnitsToLatexFormatter; +import net.sf.jabref.logic.formatter.casechanger.ProtectTermsFormatter; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.net.URLDownload; import net.sf.jabref.model.entry.BibEntry; @@ -54,9 +54,9 @@ public class ACMPortalFetcher implements PreviewEntryFetcher { private static final Log LOGGER = LogFactory.getLog(ACMPortalFetcher.class); - private final HTMLToLatexFormatter htmlConverter = new HTMLToLatexFormatter(); - private final CaseKeeper caseKeeper = new CaseKeeper(); - private final UnitFormatter unitFormatter = new UnitFormatter(); + private final HtmlToLatexFormatter htmlToLatexFormatter = new HtmlToLatexFormatter(); + private final ProtectTermsFormatter protectTermsFormatter = new ProtectTermsFormatter(); + private final UnitsToLatexFormatter unitsToLatexFormatter = new UnitsToLatexFormatter(); private String terms; private static final String START_URL = "http://portal.acm.org/"; @@ -196,12 +196,12 @@ public void getEntries(Map selection, ImportInspector inspector // Unit formatting if (Globals.prefs.getBoolean(JabRefPreferences.USE_UNIT_FORMATTER_ON_SEARCH)) { - title = unitFormatter.format(title); + title = unitsToLatexFormatter.format(title); } // Case keeping if (Globals.prefs.getBoolean(JabRefPreferences.USE_CASE_KEEPER_ON_SEARCH)) { - title = caseKeeper.format(title); + title = protectTermsFormatter.format(title); } entry.setField("title", title); }); @@ -377,7 +377,7 @@ private static Optional downloadEntryBibTeX(String id, boolean downloa */ private String convertHTMLChars(String text) { - return htmlConverter.format(text); + return htmlToLatexFormatter.format(text); } /** diff --git a/src/main/java/net/sf/jabref/importer/fetcher/CiteSeerXFetcher.java b/src/main/java/net/sf/jabref/importer/fetcher/CiteSeerXFetcher.java index b482c8f5509..cb99497181d 100644 --- a/src/main/java/net/sf/jabref/importer/fetcher/CiteSeerXFetcher.java +++ b/src/main/java/net/sf/jabref/importer/fetcher/CiteSeerXFetcher.java @@ -17,9 +17,9 @@ import net.sf.jabref.importer.ImportInspector; import net.sf.jabref.importer.OutputPrinter; +import net.sf.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter; import net.sf.jabref.model.entry.IdGenerator; import net.sf.jabref.logic.net.URLDownload; -import net.sf.jabref.logic.formatter.bibtexfields.AuthorsFormatter; import net.sf.jabref.model.entry.BibEntry; import javax.swing.*; @@ -159,7 +159,7 @@ private static BibEntry getSingleCitation(String urlString) throws IOException { m = CiteSeerXFetcher.AUTHOR_PATTERN.matcher(cont); if (m.find()) { String authors = m.group(1); - entry.setField("author", new AuthorsFormatter().format(authors)); + entry.setField("author", new NormalizeNamesFormatter().format(authors)); } // Find year: diff --git a/src/main/java/net/sf/jabref/importer/fetcher/DOItoBibTeXFetcher.java b/src/main/java/net/sf/jabref/importer/fetcher/DOItoBibTeXFetcher.java index f0f1aea96b5..15bf27e25f3 100644 --- a/src/main/java/net/sf/jabref/importer/fetcher/DOItoBibTeXFetcher.java +++ b/src/main/java/net/sf/jabref/importer/fetcher/DOItoBibTeXFetcher.java @@ -27,6 +27,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; +import net.sf.jabref.logic.formatter.casechanger.ProtectTermsFormatter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,8 +36,7 @@ import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.Globals; import net.sf.jabref.JabRefPreferences; -import net.sf.jabref.logic.formatter.bibtexfields.UnitFormatter; -import net.sf.jabref.logic.formatter.casechanger.CaseKeeper; +import net.sf.jabref.logic.formatter.bibtexfields.UnitsToLatexFormatter; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.net.URLDownload; import net.sf.jabref.logic.util.DOI; @@ -45,8 +45,8 @@ public class DOItoBibTeXFetcher implements EntryFetcher { private static final Log LOGGER = LogFactory.getLog(DOItoBibTeXFetcher.class); - private final CaseKeeper caseKeeper = new CaseKeeper(); - private final UnitFormatter unitFormatter = new UnitFormatter(); + private final ProtectTermsFormatter protectTermsFormatter = new ProtectTermsFormatter(); + private final UnitsToLatexFormatter unitsToLatexFormatter = new UnitsToLatexFormatter(); @Override @@ -136,12 +136,12 @@ public BibEntry getEntryFromDOI(String doiStr, OutputPrinter status) { entry.getFieldOptional("title").ifPresent(title -> { // Unit formatting if (Globals.prefs.getBoolean(JabRefPreferences.USE_UNIT_FORMATTER_ON_SEARCH)) { - title = unitFormatter.format(title); + title = unitsToLatexFormatter.format(title); } // Case keeping if (Globals.prefs.getBoolean(JabRefPreferences.USE_CASE_KEEPER_ON_SEARCH)) { - title = caseKeeper.format(title); + title = protectTermsFormatter.format(title); } entry.setField("title", title); }); diff --git a/src/main/java/net/sf/jabref/importer/fetcher/DiVAtoBibTeXFetcher.java b/src/main/java/net/sf/jabref/importer/fetcher/DiVAtoBibTeXFetcher.java index a6f6ca71fef..9b0921f6eb0 100644 --- a/src/main/java/net/sf/jabref/importer/fetcher/DiVAtoBibTeXFetcher.java +++ b/src/main/java/net/sf/jabref/importer/fetcher/DiVAtoBibTeXFetcher.java @@ -25,6 +25,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; +import net.sf.jabref.logic.formatter.casechanger.ProtectTermsFormatter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,8 +35,7 @@ import net.sf.jabref.Globals; import net.sf.jabref.JabRefPreferences; import net.sf.jabref.logic.formatter.bibtexfields.UnicodeToLatexFormatter; -import net.sf.jabref.logic.formatter.bibtexfields.UnitFormatter; -import net.sf.jabref.logic.formatter.casechanger.CaseKeeper; +import net.sf.jabref.logic.formatter.bibtexfields.UnitsToLatexFormatter; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.net.URLDownload; @@ -44,8 +44,8 @@ public class DiVAtoBibTeXFetcher implements EntryFetcher { private static final Log LOGGER = LogFactory.getLog(DiVAtoBibTeXFetcher.class); private static final String URL_PATTERN = "http://www.diva-portal.org/smash/getreferences?referenceFormat=BibTex&pids=%s"; - private final CaseKeeper caseKeeper = new CaseKeeper(); - private final UnitFormatter unitFormatter = new UnitFormatter(); + private final ProtectTermsFormatter protectTermsFormatter = new ProtectTermsFormatter(); + private final UnitsToLatexFormatter unitsToLatexFormatter = new UnitsToLatexFormatter(); @Override public void stopFetching() { @@ -96,12 +96,12 @@ public boolean processQuery(String query, ImportInspector inspector, OutputPrint entry.getFieldOptional("title").ifPresent(title -> { // Unit formatting if (Globals.prefs.getBoolean(JabRefPreferences.USE_UNIT_FORMATTER_ON_SEARCH)) { - title = unitFormatter.format(title); + title = unitsToLatexFormatter.format(title); } // Case keeping if (Globals.prefs.getBoolean(JabRefPreferences.USE_CASE_KEEPER_ON_SEARCH)) { - title = caseKeeper.format(title); + title = protectTermsFormatter.format(title); } entry.setField("title", title); }); diff --git a/src/main/java/net/sf/jabref/importer/fetcher/IEEEXploreFetcher.java b/src/main/java/net/sf/jabref/importer/fetcher/IEEEXploreFetcher.java index 4cf9e71eb74..58c3027cfaa 100644 --- a/src/main/java/net/sf/jabref/importer/fetcher/IEEEXploreFetcher.java +++ b/src/main/java/net/sf/jabref/importer/fetcher/IEEEXploreFetcher.java @@ -37,6 +37,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; +import net.sf.jabref.logic.formatter.casechanger.ProtectTermsFormatter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.json.JSONArray; @@ -46,9 +47,8 @@ import net.sf.jabref.*; import net.sf.jabref.importer.*; import net.sf.jabref.importer.fileformat.BibtexParser; -import net.sf.jabref.logic.formatter.bibtexfields.HTMLToLatexFormatter; -import net.sf.jabref.logic.formatter.bibtexfields.UnitFormatter; -import net.sf.jabref.logic.formatter.casechanger.CaseKeeper; +import net.sf.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.UnitsToLatexFormatter; import net.sf.jabref.logic.journals.JournalAbbreviationLoader; import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.net.URLDownload; @@ -78,9 +78,9 @@ public class IEEEXploreFetcher implements EntryFetcher { private static final String SUPER_TEXT_RESULT = "\\\\textsuperscript\\{$1\\}"; private static final String SUPER_EQ_RESULT = "\\$\\^\\{$1\\}\\$"; - private final CaseKeeper caseKeeper = new CaseKeeper(); - private final UnitFormatter unitFormatter = new UnitFormatter(); - private final HTMLToLatexFormatter htmlConverter = new HTMLToLatexFormatter(); + private final ProtectTermsFormatter protectTermsFormatter = new ProtectTermsFormatter(); + private final UnitsToLatexFormatter unitsToLatexFormatter = new UnitsToLatexFormatter(); + private final HtmlToLatexFormatter htmlToLatexFormatter = new HtmlToLatexFormatter(); private final JCheckBox absCheckBox = new JCheckBox(Localization.lang("Include abstracts"), false); private boolean shouldContinue; @@ -259,7 +259,7 @@ private String preprocessBibtexResultsPage(String bibtexPage) { result = result.replaceAll("(? map) { String s = map.get(aSubsup); if (s.toUpperCase().equals(s)) { - s = CaseChangers.TITLE.format(s); + s = CaseChangers.TO_TITLE_CASE.format(s); map.put(aSubsup, s); } } diff --git a/src/main/java/net/sf/jabref/importer/fileformat/PdfContentImporter.java b/src/main/java/net/sf/jabref/importer/fileformat/PdfContentImporter.java index ead41aaadf6..52b455a19d7 100644 --- a/src/main/java/net/sf/jabref/importer/fileformat/PdfContentImporter.java +++ b/src/main/java/net/sf/jabref/importer/fileformat/PdfContentImporter.java @@ -76,7 +76,7 @@ private static String removeNonLettersAtEnd(String input) { } private static String streamlineNames(String names) { - // TODO: replace with AuthorsFormatter?! + // TODO: replace with NormalizeNamesFormatter?! String res; // supported formats: // Matthias Schrepfer1, Johannes Wolf1, Jan Mendling1, and Hajo A. Reijers2 diff --git a/src/main/java/net/sf/jabref/logic/cleanup/CleanupWorker.java b/src/main/java/net/sf/jabref/logic/cleanup/CleanupWorker.java index f87448e8131..2b0fbd27093 100644 --- a/src/main/java/net/sf/jabref/logic/cleanup/CleanupWorker.java +++ b/src/main/java/net/sf/jabref/logic/cleanup/CleanupWorker.java @@ -81,7 +81,7 @@ private List determineCleanupActions() { jobs.add(new UpgradePdfPsToFileCleanup(Arrays.asList("pdf", "ps"))); } if (preset.isCleanUpSuperscripts()) { - jobs.add(new FormatterCleanup(BibtexFieldFormatters.SUPERSCRIPTS)); + jobs.add(new FormatterCleanup(BibtexFieldFormatters.ORDINALS_TO_LATEX_SUPERSCRIPT)); } if (preset.isCleanUpDOI()) { jobs.add(new DoiCleanup()); diff --git a/src/main/java/net/sf/jabref/logic/cleanup/DoiCleanup.java b/src/main/java/net/sf/jabref/logic/cleanup/DoiCleanup.java index e213158b456..c3bb8cd2005 100644 --- a/src/main/java/net/sf/jabref/logic/cleanup/DoiCleanup.java +++ b/src/main/java/net/sf/jabref/logic/cleanup/DoiCleanup.java @@ -19,7 +19,7 @@ import java.util.Optional; import net.sf.jabref.logic.FieldChange; -import net.sf.jabref.logic.formatter.bibtexfields.EraseFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.ClearFormatter; import net.sf.jabref.logic.util.DOI; import net.sf.jabref.model.entry.BibEntry; @@ -82,7 +82,7 @@ public List cleanup(BibEntry entry) { } private void removeFieldValue(BibEntry entry, String field, List changes) { - CleanupJob eraser = new FieldFormatterCleanup(field, new EraseFormatter()); + CleanupJob eraser = new FieldFormatterCleanup(field, new ClearFormatter()); changes.addAll(eraser.cleanup(entry)); } } diff --git a/src/main/java/net/sf/jabref/logic/cleanup/FieldFormatterCleanup.java b/src/main/java/net/sf/jabref/logic/cleanup/FieldFormatterCleanup.java index cb19ff63395..1086cfc850c 100644 --- a/src/main/java/net/sf/jabref/logic/cleanup/FieldFormatterCleanup.java +++ b/src/main/java/net/sf/jabref/logic/cleanup/FieldFormatterCleanup.java @@ -113,7 +113,7 @@ public int hashCode() { @Override public String toString() { - return field + ": " + formatter.getKey(); + return field + ": " + formatter.getName(); } /** diff --git a/src/main/java/net/sf/jabref/logic/formatter/BibtexFieldFormatters.java b/src/main/java/net/sf/jabref/logic/formatter/BibtexFieldFormatters.java index 8d6d2a10dd0..56836c5170d 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/BibtexFieldFormatters.java +++ b/src/main/java/net/sf/jabref/logic/formatter/BibtexFieldFormatters.java @@ -1,23 +1,29 @@ package net.sf.jabref.logic.formatter; import net.sf.jabref.logic.formatter.bibtexfields.*; +import net.sf.jabref.logic.layout.format.LatexToUnicodeFormatter; + import java.util.Arrays; import java.util.List; public class BibtexFieldFormatters { - public static final PageNumbersFormatter PAGE_NUMBERS = new PageNumbersFormatter(); - public static final SuperscriptFormatter SUPERSCRIPTS = new SuperscriptFormatter(); - public static final DateFormatter DATE = new DateFormatter(); - public static final MonthFormatter MONTH_FORMATTER = new MonthFormatter(); - public static final AuthorsFormatter AUTHORS_FORMATTER = new AuthorsFormatter(); - public static final LatexFormatter LATEX_FORMATTER = new LatexFormatter(); - public static final UnitFormatter UNIT_FORMATTER = new UnitFormatter(); + public static final NormalizePagesFormatter NORMALIZE_PAGES = new NormalizePagesFormatter(); + public static final OrdinalsToSuperscriptFormatter + ORDINALS_TO_LATEX_SUPERSCRIPT = new OrdinalsToSuperscriptFormatter(); + public static final NormalizeDateFormatter NORMALIZE_DATE = new NormalizeDateFormatter(); + public static final NormalizeMonthFormatter NORMALIZE_MONTH = new NormalizeMonthFormatter(); + public static final NormalizeNamesFormatter NORMALIZE_PERSON_NAMES = new NormalizeNamesFormatter(); + public static final LatexCleanupFormatter LATEX_CLEANUP = new LatexCleanupFormatter(); + public static final UnitsToLatexFormatter UNITS_TO_LATEX = new UnitsToLatexFormatter(); public static final RemoveBracesFormatter REMOVE_BRACES_FORMATTER = new RemoveBracesFormatter(); - public static final HTMLToLatexFormatter HTML_TO_LATEX = new HTMLToLatexFormatter(); + public static final HtmlToLatexFormatter HTML_TO_LATEX = new HtmlToLatexFormatter(); public static final UnicodeToLatexFormatter UNICODE_TO_LATEX = new UnicodeToLatexFormatter(); - public static final EraseFormatter ERASE = new EraseFormatter(); + public static final LatexToUnicodeFormatter LATEX_TO_UNICODE = new LatexToUnicodeFormatter(); + public static final ClearFormatter CLEAR = new ClearFormatter(); + + public static final List ALL = Arrays.asList(NORMALIZE_PAGES, ORDINALS_TO_LATEX_SUPERSCRIPT, + NORMALIZE_DATE, NORMALIZE_PERSON_NAMES, LATEX_CLEANUP, NORMALIZE_MONTH, UNITS_TO_LATEX, + REMOVE_BRACES_FORMATTER, HTML_TO_LATEX, UNICODE_TO_LATEX, CLEAR); - public static final List ALL = Arrays.asList(PAGE_NUMBERS, SUPERSCRIPTS, DATE, AUTHORS_FORMATTER, - LATEX_FORMATTER, MONTH_FORMATTER, UNIT_FORMATTER, REMOVE_BRACES_FORMATTER, HTML_TO_LATEX, UNICODE_TO_LATEX, - ERASE); + public static final List CONVERTERS = Arrays.asList(HTML_TO_LATEX, UNICODE_TO_LATEX, LATEX_TO_UNICODE); } diff --git a/src/main/java/net/sf/jabref/logic/formatter/CaseChangers.java b/src/main/java/net/sf/jabref/logic/formatter/CaseChangers.java index 4a917f84ff3..dd25064cf91 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/CaseChangers.java +++ b/src/main/java/net/sf/jabref/logic/formatter/CaseChangers.java @@ -29,12 +29,13 @@ * This can be done by starting at the letter position and moving forward and backword to see if there is a '{' and '}, respectively. */ public class CaseChangers { - public static final LowerCaseChanger LOWER = new LowerCaseChanger(); - public static final UpperCaseChanger UPPER = new UpperCaseChanger(); - public static final UpperFirstCaseChanger UPPER_FIRST = new UpperFirstCaseChanger(); - public static final UpperEachFirstCaseChanger UPPER_EACH_FIRST = new UpperEachFirstCaseChanger(); - public static final TitleCaseChanger TITLE = new TitleCaseChanger(); - public static final CaseKeeper CASE_KEEPER = new CaseKeeper(); + public static final LowerCaseFormatter TO_LOWER_CASE = new LowerCaseFormatter(); + public static final UpperCaseFormatter TO_UPPER_CASE = new UpperCaseFormatter(); + public static final SentenceCaseFormatter TO_SENTENCE_CASE = new SentenceCaseFormatter(); + public static final CapitalizeFormatter CAPITALIZE = new CapitalizeFormatter(); + public static final TitleCaseFormatter TO_TITLE_CASE = new TitleCaseFormatter(); + public static final ProtectTermsFormatter PROTECT_CAPITALS = new ProtectTermsFormatter(); - public static final List ALL = Arrays.asList(LOWER, UPPER, UPPER_FIRST, UPPER_EACH_FIRST, TITLE, CASE_KEEPER); + public static final List ALL = Arrays.asList(TO_LOWER_CASE, TO_UPPER_CASE, TO_SENTENCE_CASE, CAPITALIZE, TO_TITLE_CASE, + PROTECT_CAPITALS); } diff --git a/src/main/java/net/sf/jabref/logic/formatter/Formatter.java b/src/main/java/net/sf/jabref/logic/formatter/Formatter.java index 6159819efe1..ba24b8a09e9 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/Formatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/Formatter.java @@ -41,4 +41,27 @@ public interface Formatter { * @return the description string, always non empty */ String getDescription(); + + /** + * Returns a default hashcode of the formatter based on its key. + * + * @return the hash of the key of the formatter + */ + default int defaultHashCode() { + return getKey().hashCode(); + } + + /** + * Indicates whether some other object is the same formatter as this one based on the key. + * + * @param obj the object to compare the formatter to + * @return true if the object is a formatter with the same key + */ + default boolean defaultEquals(Object obj) { + if(obj instanceof Formatter) { + return getKey().equals(((Formatter)obj).getKey()); + } else { + return false; + } + } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/IdentityFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/IdentityFormatter.java index aabe2ffb556..3bcbffca4c4 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/IdentityFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/IdentityFormatter.java @@ -11,12 +11,12 @@ public class IdentityFormatter implements Formatter { @Override public String getName() { - return "IdentityFormatter"; + return Localization.lang("Identity"); } @Override public String getKey() { - return getName(); + return "identity"; } @Override @@ -29,4 +29,15 @@ public String format(String value) { public String getDescription() { return Localization.lang("Does nothing."); } + + @Override + public int hashCode() { + return defaultHashCode(); + } + + @Override + public boolean equals(Object obj) { + return defaultEquals(obj); + } + } diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/EraseFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/ClearFormatter.java similarity index 72% rename from src/main/java/net/sf/jabref/logic/formatter/bibtexfields/EraseFormatter.java rename to src/main/java/net/sf/jabref/logic/formatter/bibtexfields/ClearFormatter.java index a39014a5fe8..493030c612d 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/EraseFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/ClearFormatter.java @@ -5,16 +5,16 @@ import java.util.Objects; -public class EraseFormatter implements Formatter { +public class ClearFormatter implements Formatter { @Override public String getName() { - return "Erase all"; + return Localization.lang("Clear"); } @Override public String getKey() { - return "EraseFormatter"; + return "clear"; } @Override @@ -25,6 +25,6 @@ public String format(String oldString) { @Override public String getDescription() { - return Localization.lang("Completely erases %s."); + return Localization.lang("Completely the field."); } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/HTMLToLatexFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java similarity index 95% rename from src/main/java/net/sf/jabref/logic/formatter/bibtexfields/HTMLToLatexFormatter.java rename to src/main/java/net/sf/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java index 9844ed6a182..06de2cc9ad0 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/HTMLToLatexFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java @@ -30,9 +30,9 @@ import net.sf.jabref.logic.layout.LayoutFormatter; import net.sf.jabref.logic.util.strings.HTMLUnicodeConversionMaps; -public class HTMLToLatexFormatter implements LayoutFormatter, Formatter { +public class HtmlToLatexFormatter implements LayoutFormatter, Formatter { - private static final Log LOGGER = LogFactory.getLog(HTMLToLatexFormatter.class); + private static final Log LOGGER = LogFactory.getLog(HtmlToLatexFormatter.class); private static final int MAX_TAG_LENGTH = 100; @@ -133,7 +133,7 @@ public String format(String text) { @Override public String getDescription() { - return Localization.lang("Changes HTML expressions in %s to their LaTeX equivalent."); + return Localization.lang("Converts HTML code to LaTeX code."); } private int readTag(String text, int position) { @@ -148,11 +148,11 @@ private int readTag(String text, int position) { @Override public String getName() { - return "HTMLConverter"; + return Localization.lang("HTML to LaTeX"); } @Override public String getKey() { - return "HtmlConverter"; + return "html_to_latex"; } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/LatexFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java similarity index 89% rename from src/main/java/net/sf/jabref/logic/formatter/bibtexfields/LatexFormatter.java rename to src/main/java/net/sf/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java index 5bfff73fda3..3c0691c369d 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/LatexFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java @@ -3,16 +3,16 @@ import net.sf.jabref.logic.formatter.Formatter; import net.sf.jabref.logic.l10n.Localization; -public class LatexFormatter implements Formatter { +public class LatexCleanupFormatter implements Formatter { @Override public String getName() { - return "Latex"; + return Localization.lang("LaTeX cleanup"); } @Override public String getKey() { - return "LatexFormatter"; + return "latex_cleanup"; } @Override @@ -37,7 +37,7 @@ public String format(String oldString) { @Override public String getDescription() { - return Localization.lang("Cleans latex code in %s."); + return Localization.lang("Cleans up LaTeX code."); } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/DateFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java similarity index 84% rename from src/main/java/net/sf/jabref/logic/formatter/bibtexfields/DateFormatter.java rename to src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java index 0675365dff8..a0c1cab008f 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/DateFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java @@ -11,15 +11,15 @@ /** * This class transforms date to the format yyyy-mm-dd or yyyy-mm.. */ -public class DateFormatter implements Formatter { +public class NormalizeDateFormatter implements Formatter { @Override public String getName() { - return "Date"; + return Localization.lang("Normalize date"); } @Override public String getKey() { - return "DateFormatter"; + return "normalize_date"; } /** @@ -43,7 +43,7 @@ public String format(String value) { @Override public String getDescription() { - return Localization.lang("Normalizes dates in %s to the BibLaTeX standard yyyy-mm-dd or yyyy-mm."); + return Localization.lang("Normalizes the date to ISO date format."); } /* @@ -70,4 +70,14 @@ private Optional tryParseDate(String dateString) { return Optional.empty(); } + + @Override + public int hashCode() { + return defaultHashCode(); + } + + @Override + public boolean equals(Object obj) { + return defaultEquals(obj); + } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/MonthFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java similarity index 73% rename from src/main/java/net/sf/jabref/logic/formatter/bibtexfields/MonthFormatter.java rename to src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java index 331cc9e0515..78af11aeba0 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/MonthFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java @@ -6,16 +6,16 @@ import java.util.Objects; -public class MonthFormatter implements Formatter { +public class NormalizeMonthFormatter implements Formatter { @Override public String getName() { - return "Month"; + return Localization.lang("Normalize month"); } @Override public String getKey() { - return "MonthFormatter"; + return "normalize_month"; } @Override @@ -31,6 +31,6 @@ public String format(String value) { @Override public String getDescription() { - return Localization.lang("Normalizes content of %s to the format #mon#."); + return Localization.lang("Normalize month to BibTex standard abbreviation."); } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/AuthorsFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java similarity index 92% rename from src/main/java/net/sf/jabref/logic/formatter/bibtexfields/AuthorsFormatter.java rename to src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java index 99ff710a236..cc5c754d59e 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/AuthorsFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java @@ -22,9 +22,9 @@ import java.util.regex.Pattern; /** - * Class for normalizing author lists to BibTeX format. + * Formatter normalizing a list of person names to the BibTeX format. */ -public class AuthorsFormatter implements Formatter { +public class NormalizeNamesFormatter implements Formatter { private static final Pattern LAST_F_F = Pattern.compile("(\\p{javaUpperCase}[\\p{javaLowerCase}]+) (\\p{javaUpperCase}+)"); private static final Pattern LAST_FDOT_F = Pattern.compile("(\\p{javaUpperCase}[\\p{javaLowerCase}]+) ([\\. \\p{javaUpperCase}]+)"); private static final Pattern F_F_LAST = Pattern.compile("(\\p{javaUpperCase}+) (\\p{javaUpperCase}[\\p{javaLowerCase}]+)"); @@ -33,17 +33,14 @@ public class AuthorsFormatter implements Formatter { @Override public String getName() { - return "BibTex authors format"; + return Localization.lang("Normalize names of persons"); } @Override public String getKey() { - return "AuthorsFormatter"; + return "normalize_names"; } - /** - * - */ @Override public String format(String value) { boolean andSep = false; @@ -124,7 +121,7 @@ public String format(String value) { StringBuilder stringBuilder = new StringBuilder(); for (int i = 0; i < authors.length; i++) { - String norm = AuthorsFormatter.normalizeName(authors[i]); + String norm = NormalizeNamesFormatter.normalizeName(authors[i]); stringBuilder.append(norm); if (i < (authors.length - 1)) { stringBuilder.append(" and "); @@ -135,12 +132,12 @@ public String format(String value) { @Override public String getDescription() { - return Localization.lang("Normalizes lists of persons in %s to the BibTeX standard."); + return Localization.lang("Normalizes lists of persons to the BibTeX standard."); } private static String normalizeName(String oldName) { String name = oldName; - Matcher matcher = AuthorsFormatter.LAST_F_F.matcher(name); + Matcher matcher = NormalizeNamesFormatter.LAST_F_F.matcher(name); if (matcher.matches()) { String initials = matcher.group(2); StringBuilder stringBuilder = new StringBuilder(matcher.group(1)); @@ -148,7 +145,7 @@ private static String normalizeName(String oldName) { fixInitials(initials, stringBuilder); return stringBuilder.toString(); } - matcher = AuthorsFormatter.LAST_FDOT_F.matcher(name); + matcher = NormalizeNamesFormatter.LAST_FDOT_F.matcher(name); if (matcher.matches()) { String initials = matcher.group(2).replaceAll("[\\. ]+", ""); StringBuilder stringBuilder = new StringBuilder(matcher.group(1)); @@ -157,7 +154,7 @@ private static String normalizeName(String oldName) { return stringBuilder.toString(); } - matcher = AuthorsFormatter.F_F_LAST.matcher(name); + matcher = NormalizeNamesFormatter.F_F_LAST.matcher(name); if (matcher.matches()) { String initials = matcher.group(1); StringBuilder stringBuilder = new StringBuilder(matcher.group(2)); @@ -165,7 +162,7 @@ private static String normalizeName(String oldName) { fixInitials(initials, stringBuilder); return stringBuilder.toString(); } - matcher = AuthorsFormatter.FDOT_F_LAST.matcher(name); + matcher = NormalizeNamesFormatter.FDOT_F_LAST.matcher(name); if (matcher.matches()) { String initials = matcher.group(1).replaceAll("[\\. ]+", ""); StringBuilder stringBuilder = new StringBuilder(matcher.group(2)); @@ -201,7 +198,7 @@ private static String normalizeName(String oldName) { } } else { // Only a single part. Check if it looks like a name or initials: - Matcher nameMatcher = AuthorsFormatter.SINGLE_NAME.matcher(firstNameParts[0]); + Matcher nameMatcher = NormalizeNamesFormatter.SINGLE_NAME.matcher(firstNameParts[0]); if (nameMatcher.matches()) { stringBuilder.append(firstNameParts[0]); } else { @@ -217,7 +214,7 @@ private static String normalizeName(String oldName) { String[] parts = name.split(" +"); boolean allNames = true; for (String part : parts) { - matcher = AuthorsFormatter.SINGLE_NAME.matcher(part); + matcher = NormalizeNamesFormatter.SINGLE_NAME.matcher(part); if (!matcher.matches()) { allNames = false; break; diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/PageNumbersFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java similarity index 84% rename from src/main/java/net/sf/jabref/logic/formatter/bibtexfields/PageNumbersFormatter.java rename to src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java index 0014ea9b59a..ef25bbc08c4 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/PageNumbersFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java @@ -16,7 +16,7 @@ * To make it easier to maintain Scribe-compatible databases, the standard styles convert * a single dash (as in 7-33) to the double dash used in TEX to denote number ranges (as in 7--33). */ -public class PageNumbersFormatter implements Formatter { +public class NormalizePagesFormatter implements Formatter { private static final Pattern PAGES_DETECT_PATTERN = Pattern.compile("\\A(\\d+)-{1,2}(\\d+)\\Z"); @@ -26,12 +26,12 @@ public class PageNumbersFormatter implements Formatter { @Override public String getName() { - return "Page numbers"; + return Localization.lang("Normalize page numbers"); } @Override public String getKey() { - return "PageNumbersFormatter"; + return "normalize_page_numbers"; } /** @@ -73,6 +73,16 @@ public String format(String value) { @Override public String getDescription() { - return Localization.lang("Ensures that pages numbers in %s are of the form num--num."); + return Localization.lang("Normalize pages to BibTeX standard."); + } + + @Override + public int hashCode() { + return defaultHashCode(); + } + + @Override + public boolean equals(Object obj) { + return defaultEquals(obj); } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/SuperscriptFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java similarity index 89% rename from src/main/java/net/sf/jabref/logic/formatter/bibtexfields/SuperscriptFormatter.java rename to src/main/java/net/sf/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java index 5fbfd4b59e8..83a0a8e291a 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/SuperscriptFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java @@ -25,7 +25,7 @@ /** * This class transforms ordinal numbers into LaTex superscripts. */ -public class SuperscriptFormatter implements Formatter { +public class OrdinalsToSuperscriptFormatter implements Formatter { // find possible superscripts on word boundaries private static final Pattern SUPERSCRIPT_DETECT_PATTERN = Pattern.compile("\\b(\\d+)(st|nd|rd|th)\\b", @@ -35,12 +35,12 @@ public class SuperscriptFormatter implements Formatter { @Override public String getName() { - return "Superscripts"; + return Localization.lang("Ordinals to LaTeX superscript"); } @Override public String getKey() { - return "SuperscriptFormatter"; + return "ordinals_to_superscript"; } /** @@ -69,6 +69,6 @@ public String format(String value) { @Override public String getDescription() { - return Localization.lang("Transforms ordinal numbers in %s into LaTex superscripts."); + return Localization.lang("Converts ordinals to LaTeX superscripts."); } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java index 01465485862..bbe02f54069 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java @@ -12,12 +12,12 @@ public class RemoveBracesFormatter implements Formatter { @Override public String getName() { - return "Remove enclosing double braces"; + return Localization.lang("Remove enclosing braces"); } @Override public String getKey() { - return "RemoveBracesFormatter"; + return "remove_braces"; } @Override @@ -43,7 +43,7 @@ public String format(String value) { @Override public String getDescription() { - return Localization.lang("Removes all matching braces around the contents of %s."); + return Localization.lang("Removes braces encapsulating the complete field content."); } /** diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java index 1dad0cabf9a..8cb7c31b3db 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java @@ -80,16 +80,16 @@ public String format(String text) { @Override public String getDescription() { - return Localization.lang("Converts unicode characters in %s to their LaTeX equivalent."); + return Localization.lang("Converts Unicode characters to LaTeX encoding."); } @Override public String getName() { - return "UnicodeConverter"; + return Localization.lang("Unicode to LaTeX"); } @Override public String getKey() { - return "UnicodeConverter"; + return "unicode_to_latex"; } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/UnitFormatter.java b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java similarity index 89% rename from src/main/java/net/sf/jabref/logic/formatter/bibtexfields/UnitFormatter.java rename to src/main/java/net/sf/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java index d2f05d91bc6..7d0c4deeb9a 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/UnitFormatter.java +++ b/src/main/java/net/sf/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java @@ -22,7 +22,7 @@ import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.util.strings.StringLengthComparator; -public class UnitFormatter implements Formatter { +public class UnitsToLatexFormatter implements Formatter { private static final String[] UNIT_LIST = new String[] { "A", // Ampere @@ -94,13 +94,13 @@ public class UnitFormatter implements Formatter { private static final String[] UNIT_COMBINATIONS; static { - int uLLength = UnitFormatter.UNIT_LIST.length; - int uPLLength = UnitFormatter.UNIT_PREFIX_LIST.length; + int uLLength = UnitsToLatexFormatter.UNIT_LIST.length; + int uPLLength = UnitsToLatexFormatter.UNIT_PREFIX_LIST.length; int uCLength = uLLength * uPLLength; UNIT_COMBINATIONS = new String[uCLength]; for (int i = 0; i < uLLength; i++) { for (int j = 0; j < uPLLength; j++) { - UnitFormatter.UNIT_COMBINATIONS[(i * uPLLength) + j] = UnitFormatter.UNIT_PREFIX_LIST[j] + UnitFormatter.UNIT_LIST[i]; + UnitsToLatexFormatter.UNIT_COMBINATIONS[(i * uPLLength) + j] = UnitsToLatexFormatter.UNIT_PREFIX_LIST[j] + UnitsToLatexFormatter.UNIT_LIST[i]; } } @@ -108,7 +108,7 @@ public class UnitFormatter implements Formatter { private static String format(String text, String[] listOfWords) { - Arrays.sort(listOfWords, new StringLengthComparator()); // LengthComparator from CaseKeeper.java + Arrays.sort(listOfWords, new StringLengthComparator()); // LengthComparator from ProtectTermsFormatter.java // Replace the hyphen in 12-bit etc with a non-breaking hyphen, will also avoid bad casing of 12-Bit String result = text.replaceAll("([0-9,\\.]+)-([Bb][Ii][Tt])", "$1\\\\mbox\\{-\\}$2"); @@ -134,7 +134,7 @@ public String format(String text) { if (text.isEmpty()) { return text; } - return format(text, UnitFormatter.UNIT_COMBINATIONS); + return format(text, UnitsToLatexFormatter.UNIT_COMBINATIONS); } @Override @@ -144,12 +144,12 @@ public String getDescription() { @Override public String getName() { - return Localization.lang("UnitFormatter"); + return Localization.lang("Units to LaTeX"); } @Override public String getKey() { - return "UnitFormatter"; + return "units_to_latex"; } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperEachFirstCaseChanger.java b/src/main/java/net/sf/jabref/logic/formatter/casechanger/CapitalizeFormatter.java similarity index 69% rename from src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperEachFirstCaseChanger.java rename to src/main/java/net/sf/jabref/logic/formatter/casechanger/CapitalizeFormatter.java index 234ce135119..6e1f6247a77 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperEachFirstCaseChanger.java +++ b/src/main/java/net/sf/jabref/logic/formatter/casechanger/CapitalizeFormatter.java @@ -3,16 +3,16 @@ import net.sf.jabref.logic.formatter.Formatter; import net.sf.jabref.logic.l10n.Localization; -public class UpperEachFirstCaseChanger implements Formatter { +public class CapitalizeFormatter implements Formatter { @Override public String getName() { - return Localization.lang("Upper Each First"); + return Localization.lang("Capitalize"); } @Override public String getKey() { - return "UpperEachFirstCaseChanger"; + return "capitalize"; } /** @@ -30,6 +30,6 @@ public String format(String input) { @Override public String getDescription() { return Localization.lang( - "Converts the first character of each word in %s to upper case (and all others to lower case), but does not change words starting with \"{\"."); + "Changes the first letter of all words to capital case and the remaining letters to lower case."); } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/casechanger/LowerCaseChanger.java b/src/main/java/net/sf/jabref/logic/formatter/casechanger/LowerCaseFormatter.java similarity index 61% rename from src/main/java/net/sf/jabref/logic/formatter/casechanger/LowerCaseChanger.java rename to src/main/java/net/sf/jabref/logic/formatter/casechanger/LowerCaseFormatter.java index 02002d392af..29de6f5f2ed 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/casechanger/LowerCaseChanger.java +++ b/src/main/java/net/sf/jabref/logic/formatter/casechanger/LowerCaseFormatter.java @@ -3,16 +3,16 @@ import net.sf.jabref.logic.formatter.Formatter; import net.sf.jabref.logic.l10n.Localization; -public class LowerCaseChanger implements Formatter { +public class LowerCaseFormatter implements Formatter { @Override public String getName() { - return Localization.lang("lower"); + return Localization.lang("Lower case"); } @Override public String getKey() { - return "LowerCaseChanger"; + return "lower_case"; } /** @@ -29,21 +29,16 @@ public String format(String input) { @Override public int hashCode() { - return getKey().hashCode(); + return defaultHashCode(); } @Override public boolean equals(Object obj) { - if(obj instanceof Formatter) { - return getKey().equals(((Formatter)obj).getKey()); - } else { - return false; - } + return defaultEquals(obj); } @Override public String getDescription() { - return Localization.lang( - "Converts all characters in %s to lower case, but does not change words starting with \"{\""); + return Localization.lang("Changes all letters to lower case."); } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/casechanger/CaseKeeper.java b/src/main/java/net/sf/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java similarity index 93% rename from src/main/java/net/sf/jabref/logic/formatter/casechanger/CaseKeeper.java rename to src/main/java/net/sf/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java index 0134e5ffcd2..b7929921d0c 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/casechanger/CaseKeeper.java +++ b/src/main/java/net/sf/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java @@ -22,7 +22,7 @@ import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.util.strings.StringLengthComparator; -public class CaseKeeper implements Formatter { +public class ProtectTermsFormatter implements Formatter { private String format(String text, List listOfWords) { String result = text; @@ -53,12 +53,12 @@ public String getDescription() { @Override public String getName() { - return Localization.lang("CaseKeeper"); + return Localization.lang("Protect terms"); } @Override public String getKey() { - return "CaseKeeper"; + return "protect_terms"; } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperFirstCaseChanger.java b/src/main/java/net/sf/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java similarity index 65% rename from src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperFirstCaseChanger.java rename to src/main/java/net/sf/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java index c2fe5e69535..e60f71aa88b 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperFirstCaseChanger.java +++ b/src/main/java/net/sf/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java @@ -4,16 +4,16 @@ import net.sf.jabref.logic.formatter.Formatter; import net.sf.jabref.logic.l10n.Localization; -public class UpperFirstCaseChanger implements Formatter { +public class SentenceCaseFormatter implements Formatter { @Override public String getName() { - return Localization.lang("Upper first"); + return Localization.lang("Sentence case"); } @Override public String getKey() { - return "UpperFirstCaseChanger"; + return "sentence_case"; } /** @@ -21,7 +21,7 @@ public String getKey() { */ @Override public String format(String input) { - Title title = new Title(CaseChangers.LOWER.format(input)); + Title title = new Title(CaseChangers.TO_LOWER_CASE.format(input)); title.getWords().stream().findFirst().ifPresent(Word::toUpperFirst); @@ -31,6 +31,6 @@ public String format(String input) { @Override public String getDescription() { return Localization.lang( - "Converts the first character of the first word in %s to upper case (and the remaining characters of the first word to lower case), but does not change anything if word starts with \"{\"."); + "Capitalize the first word, changes other words to lower case."); } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/casechanger/TitleCaseChanger.java b/src/main/java/net/sf/jabref/logic/formatter/casechanger/TitleCaseFormatter.java similarity index 82% rename from src/main/java/net/sf/jabref/logic/formatter/casechanger/TitleCaseChanger.java rename to src/main/java/net/sf/jabref/logic/formatter/casechanger/TitleCaseFormatter.java index a9770d29d91..97a6a80c7b9 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/casechanger/TitleCaseChanger.java +++ b/src/main/java/net/sf/jabref/logic/formatter/casechanger/TitleCaseFormatter.java @@ -3,16 +3,16 @@ import net.sf.jabref.logic.formatter.Formatter; import net.sf.jabref.logic.l10n.Localization; -public class TitleCaseChanger implements Formatter { +public class TitleCaseFormatter implements Formatter { @Override public String getName() { - return Localization.lang("Title"); + return Localization.lang("Title case"); } @Override public String getKey() { - return "TitleCaseChanger"; + return "title_case"; } /** @@ -42,6 +42,6 @@ public String format(String input) { @Override public String getDescription() { return Localization.lang( - "Converts all words in %s to upper case, but converts articles, prepositions, and conjunctions to lower case."); + "Capitalize all words, but converts articles, prepositions, and conjunctions to lower case."); } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperCaseChanger.java b/src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperCaseFormatter.java similarity index 73% rename from src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperCaseChanger.java rename to src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperCaseFormatter.java index 4720f88bdcc..6e5fb075017 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperCaseChanger.java +++ b/src/main/java/net/sf/jabref/logic/formatter/casechanger/UpperCaseFormatter.java @@ -3,16 +3,16 @@ import net.sf.jabref.logic.formatter.Formatter; import net.sf.jabref.logic.l10n.Localization; -public class UpperCaseChanger implements Formatter { +public class UpperCaseFormatter implements Formatter { @Override public String getName() { - return Localization.lang("UPPER"); + return Localization.lang("Upper case"); } @Override public String getKey() { - return "UpperCaseChanger"; + return "upper_case"; } /** @@ -30,6 +30,6 @@ public String format(String input) { @Override public String getDescription() { return Localization.lang( - "Converts all characters in %s to upper case, but does not change words starting with \"{\"."); + "Changes all letters to upper case."); } } diff --git a/src/main/java/net/sf/jabref/logic/formatter/minifier/AuthorsMinifier.java b/src/main/java/net/sf/jabref/logic/formatter/minifier/MinifyNameListFormatter.java similarity index 86% rename from src/main/java/net/sf/jabref/logic/formatter/minifier/AuthorsMinifier.java rename to src/main/java/net/sf/jabref/logic/formatter/minifier/MinifyNameListFormatter.java index 34e95c8495e..d931cd23223 100644 --- a/src/main/java/net/sf/jabref/logic/formatter/minifier/AuthorsMinifier.java +++ b/src/main/java/net/sf/jabref/logic/formatter/minifier/MinifyNameListFormatter.java @@ -8,15 +8,15 @@ /** * Replaces three or more authors with and others */ -public class AuthorsMinifier implements Formatter { +public class MinifyNameListFormatter implements Formatter { @Override public String getName() { - return "Minify authors"; + return Localization.lang("Minify list of person names"); } @Override public String getKey() { - return "MinifyAuthors"; + return "minify_name_list"; } /** @@ -42,7 +42,7 @@ public String format(String value) { @Override public String getDescription() { - return Localization.lang("Replaces three or more authors with \"and others\"."); + return Localization.lang("Shortens lists of persons if there are more than 2 persons to \"et al.\"."); } private String abbreviateAuthor(String authorField) { diff --git a/src/main/java/net/sf/jabref/logic/layout/format/FormatChars.java b/src/main/java/net/sf/jabref/logic/layout/format/LatexToUnicodeFormatter.java similarity index 88% rename from src/main/java/net/sf/jabref/logic/layout/format/FormatChars.java rename to src/main/java/net/sf/jabref/logic/layout/format/LatexToUnicodeFormatter.java index 64b68cc460d..93e78bc9ee8 100644 --- a/src/main/java/net/sf/jabref/logic/layout/format/FormatChars.java +++ b/src/main/java/net/sf/jabref/logic/layout/format/LatexToUnicodeFormatter.java @@ -16,6 +16,8 @@ package net.sf.jabref.logic.layout.format; import net.sf.jabref.Globals; +import net.sf.jabref.logic.formatter.Formatter; +import net.sf.jabref.logic.l10n.Localization; import net.sf.jabref.logic.util.strings.StringUtil; import net.sf.jabref.logic.layout.LayoutFormatter; import net.sf.jabref.logic.util.strings.HTMLUnicodeConversionMaps; @@ -26,10 +28,20 @@ * This formatter converts LaTeX character sequences their equivalent unicode characters, * and removes other LaTeX commands without handling them. */ -public class FormatChars implements LayoutFormatter { +public class LatexToUnicodeFormatter implements LayoutFormatter, Formatter { private static final Map CHARS = HTMLUnicodeConversionMaps.LATEX_UNICODE_CONVERSION_MAP; + @Override + public String getName() { + return Localization.lang("LaTeX to Unicode"); + } + + @Override + public String getKey() { + return "latex_to_unicode"; + } + @Override public String format(String inField) { if (inField.isEmpty()) { @@ -55,7 +67,7 @@ public String format(String inField) { if (incommand) { /* Close Command */ String command = currentCommand.toString(); - Object result = FormatChars.CHARS.get(command); + Object result = LatexToUnicodeFormatter.CHARS.get(command); if (result == null) { sb.append(command); } else { @@ -94,7 +106,7 @@ public String format(String inField) { } else { combody = field.substring(i, i + 1); } - Object result = FormatChars.CHARS.get(command + combody); + Object result = LatexToUnicodeFormatter.CHARS.get(command + combody); if (result != null) { sb.append((String) result); @@ -106,7 +118,7 @@ public String format(String inField) { // Are we already at the end of the string? if ((i + 1) == field.length()) { String command = currentCommand.toString(); - Object result = FormatChars.CHARS.get(command); + Object result = LatexToUnicodeFormatter.CHARS.get(command); /* If found, then use translated version. If not, * then keep * the text of the parameter intact. @@ -138,7 +150,7 @@ public String format(String inField) { argument = part; if (argument != null) { // handle common case of general latex command - Object result = FormatChars.CHARS.get(command + argument); + Object result = LatexToUnicodeFormatter.CHARS.get(command + argument); // If found, then use translated version. If not, then keep // the // text of the parameter intact. @@ -152,7 +164,7 @@ public String format(String inField) { // This end brace terminates a command. This can be the case in // constructs like {\aa}. The correct behaviour should be to // substitute the evaluated command and swallow the brace: - Object result = FormatChars.CHARS.get(command); + Object result = LatexToUnicodeFormatter.CHARS.get(command); if (result == null) { // If the command is unknown, just print it: sb.append(command); @@ -160,7 +172,7 @@ public String format(String inField) { sb.append((String) result); } } else { - Object result = FormatChars.CHARS.get(command); + Object result = LatexToUnicodeFormatter.CHARS.get(command); if (result == null) { sb.append(command); } else { @@ -193,4 +205,9 @@ public String format(String inField) { "\u00A0"); } + @Override + public String getDescription() { + return Localization.lang("Converts LaTeX encoding to Unicode characters."); + } + } diff --git a/src/main/java/net/sf/jabref/logic/util/strings/Converters.java b/src/main/java/net/sf/jabref/logic/util/strings/Converters.java deleted file mode 100644 index 0d2c337eded..00000000000 --- a/src/main/java/net/sf/jabref/logic/util/strings/Converters.java +++ /dev/null @@ -1,90 +0,0 @@ -/* Copyright (C) 2015-2016 JabRef contributors. - Copyright (C) 2015-2016 Oscar Gustafsson. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -package net.sf.jabref.logic.util.strings; - -import java.util.*; - -import net.sf.jabref.logic.formatter.bibtexfields.HTMLToLatexFormatter; -import net.sf.jabref.logic.formatter.bibtexfields.UnicodeToLatexFormatter; -import net.sf.jabref.logic.layout.format.FormatChars; - -/** - * Class with static methods for converting strings from HTML and Unicode to LaTeX encoding. - * - * @author Oscar Gustafsson - */ -public class Converters { - - private static final HTMLToLatexFormatter HTML_CONVERTER = new HTMLToLatexFormatter(); - private static final UnicodeToLatexFormatter UNICODE_CONVERTER = new UnicodeToLatexFormatter(); - - public static final LatexToUnicodeConverter LATEX_TO_UNICODE = new LatexToUnicodeConverter(); - public static final UnicodeToLatexConverter UNICODE_TO_LATEX = new UnicodeToLatexConverter(); - public static final HTMLToLatexConverter HTML_TO_LATEX = new HTMLToLatexConverter(); - - public static final List ALL = Arrays.asList(Converters.HTML_TO_LATEX, Converters.UNICODE_TO_LATEX, - Converters.LATEX_TO_UNICODE); - - public interface Converter { - - String getName(); - - String convert(String input); - } - - public static class UnicodeToLatexConverter implements Converter { - - @Override - public String getName() { - return "Unicode to LaTeX"; - } - - @Override - public String convert(String input) { - return Converters.UNICODE_CONVERTER.format(input); - } - } - - public static class LatexToUnicodeConverter implements Converter { - - private final FormatChars formatter = new FormatChars(); - - @Override - public String getName() { - return "LaTeX to Unicode"; - } - - @Override - public String convert(String input) { - return formatter.format(input); - } - } - - public static class HTMLToLatexConverter implements Converter { - - @Override - public String getName() { - return "HTML to LaTeX"; - } - - @Override - public String convert(String input) { - return Converters.HTML_CONVERTER.format(input); - } - } -} diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties index 3dbade0d7c8..d7a3f967a9c 100644 --- a/src/main/resources/l10n/JabRef_da.properties +++ b/src/main/resources/l10n/JabRef_da.properties @@ -461,7 +461,6 @@ Link_to_file_%0=Link_til_filen_%0 Listen_for_remote_operation_on_port=Lyt_efter_fjernoperationer_på_port Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Hent_og_gem_indstillinger_fra/til_jabref.xml_ved_opstart_(memory_stick-tilstand) Look_and_feel=Udseende -lower=små_bogstaver Main_file_directory=Hovedbibliotek Main_layout_file=Hoved-layoutfil @@ -817,9 +816,6 @@ Updated_group_selection=Gruppevalg_opdateret Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Opgrader_eksterne_PDF-_og_PS-links_til_at_bruge_'%0'-feltet. Upgrade_file=Opgrader_fil Upgrade_old_external_file_links_to_use_the_new_feature=Opgrader_gamle_eksterne_links_for_at_bruge_den_nye_funktion -UPPER=STORE_BOGSTAVER -Upper_Each_First=Stort_Forbogstav -Upper_first=Stort_første_forbogstav usage=brug Use_autocompletion_for_the_following_fields=Brug_autoudfyldning_for_følgende_felter Use_other_look_and_feel=Brug_andet_udseende @@ -1466,10 +1462,8 @@ Please_specify_both_username_and_password= Proxy_requires_authentication= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -1588,24 +1582,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -1621,3 +1599,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties index 99ad262675f..9d1acd3249f 100644 --- a/src/main/resources/l10n/JabRef_de.properties +++ b/src/main/resources/l10n/JabRef_de.properties @@ -833,7 +833,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Ein Look_and_feel=Aussehen -lower=kleinbuchstaben Main_file_directory=Standard-Verzeichnis_für_Dateien Main_layout_file=Haupt-Layoutdatei @@ -1496,9 +1495,6 @@ Updated_group_selection=Gruppenauswahl_aktualisiert Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Externe_PDF/PS-Links_aktualisieren,_um_das_Feld_'%0'_zu_benutzen. Upgrade_file=Datei_aktualisiert Upgrade_old_external_file_links_to_use_the_new_feature=Alte_Links_zu_externen_Dateien_aktualisieren,_um_die_neue_Funktion_zu_nutzen -UPPER=GROSSBUCHSTABEN -Upper_Each_First=Jeden_Ersten_Buchstaben_Groß -Upper_first=Ersten_Buchstaben_groß usage=Benutzung Use_autocompletion_for_the_following_fields=Autovervollständigung_für_folgende_Felder_benutzen @@ -2188,10 +2184,8 @@ Proxy_requires_authentication=Proxy_erfordert_Authentifizierung An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -2312,24 +2306,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -2345,3 +2323,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties index ec3952ce52e..15a04c8f912 100644 --- a/src/main/resources/l10n/JabRef_en.properties +++ b/src/main/resources/l10n/JabRef_en.properties @@ -801,7 +801,6 @@ Listen_for_remote_operation_on_port=Listen_for_remote_operation_on_port Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode) Look_and_feel=Look_and_feel -lower=lower Main_file_directory=Main_file_directory Main_layout_file=Main_layout_file @@ -1422,9 +1421,6 @@ Updated_group_selection=Updated_group_selection Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Upgrade_external_PDF/PS_links_to_use_the_'%0'_field. Upgrade_file=Upgrade_file Upgrade_old_external_file_links_to_use_the_new_feature=Upgrade_old_external_file_links_to_use_the_new_feature -UPPER=UPPER -Upper_Each_First=Upper_Each_First -Upper_first=Upper_first usage=usage Use_autocompletion_for_the_following_fields=Use_autocompletion_for_the_following_fields @@ -2088,10 +2084,8 @@ This_search_contains_entries_in_which_any_field_contains_the_term_%0=This This_search_contains_entries_in_which=This_search_contains_entries_in_which An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used. -CaseKeeper=CaseKeeper Note\:_A_full_text_search_is_currently_not_supported_for_%0=Note\:_A_full_text_search_is_currently_not_supported_for_%0 Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.=Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually. -UnitFormatter=UnitFormatter JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

=JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

This_database_uses_outdated_file_links.=This_database_uses_outdated_file_links. @@ -2175,24 +2169,6 @@ Usage=Usage Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.=Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case. -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.=Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent. -Cleans_latex_code_in_%s.=Cleans_latex_code_in_%s. -Completely_erases_%s.=Completely_erases_%s. -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"=Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{" -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".=Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{". -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.=Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case. -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".=Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{". -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".=Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{". -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.=Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent. -Converts_units_in_%s_to_LaTeX_code.=Converts_units_in_%s_to_LaTeX_code. -Does_nothing.=Does_nothing. -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.=Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num. -Normalizes_content_of_%s_to_the_format_\#mon\#.=Normalizes_content_of_%s_to_the_format_\#mon\#. -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.=Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm. -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.=Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard. -Removes_all_matching_braces_around_the_contents_of_%s.=Removes_all_matching_braces_around_the_contents_of_%s. -Replaces_three_or_more_authors_with_"and_others".=Replaces_three_or_more_authors_with_"and_others". -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.=Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts. Are_you_sure_you_want_to_reset_all_settings_to_default_values?=Are_you_sure_you_want_to_reset_all_settings_to_default_values? Reset_preferences=Reset_preferences Ill-formed_entrytype_comment_in_bib_file=Ill-formed_entrytype_comment_in_bib_file @@ -2216,4 +2192,43 @@ Current_style_is_'%0'=Current_style_is_'%0' Remove_style=Remove_style Select_one_of_the_available_styles_or_add_a_style_file_from_disk.=Select_one_of_the_available_styles_or_add_a_style_file_from_disk. You_must_select_a_valid_style_file.=You_must_select_a_valid_style_file. -Reload=Reload \ No newline at end of file +Reload=Reload + +Capitalize=Capitalize +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.=Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case. +Capitalize_the_first_word,_changes_other_words_to_lower_case.=Capitalize_the_first_word,_changes_other_words_to_lower_case. +Changes_all_letters_to_lower_case.=Changes_all_letters_to_lower_case. +Changes_all_letters_to_upper_case.=Changes_all_letters_to_upper_case. +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.=Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case. +Cleans_up_LaTeX_code.=Cleans_up_LaTeX_code. +Completely_the_field.=Completely_the_field. +Converts_HTML_code_to_LaTeX_code.=Converts_HTML_code_to_LaTeX_code. +Converts_LaTeX_encoding_to_Unicode_characters.=Converts_LaTeX_encoding_to_Unicode_characters. +Converts_Unicode_characters_to_LaTeX_encoding.=Converts_Unicode_characters_to_LaTeX_encoding. +Converts_ordinals_to_LaTeX_superscripts.=Converts_ordinals_to_LaTeX_superscripts. +Converts_units_in_%s_to_LaTeX_code.=Converts_units_in_%s_to_LaTeX_code. +HTML_to_LaTeX=HTML_to_LaTeX +LaTeX_cleanup=LaTeX_cleanup +LaTeX_to_Unicode=LaTeX_to_Unicode +Lower_case=Lower_case +Minify_list_of_person_names=Minify_list_of_person_names +Normalize_date=Normalize_date +Normalize_month=Normalize_month +Normalize_month_to_BibTex_standard_abbreviation.=Normalize_month_to_BibTex_standard_abbreviation. +Normalize_names_of_persons=Normalize_names_of_persons +Normalize_page_numbers=Normalize_page_numbers +Normalize_pages_to_BibTeX_standard.=Normalize_pages_to_BibTeX_standard. +Normalizes_lists_of_persons_to_the_BibTeX_standard.=Normalizes_lists_of_persons_to_the_BibTeX_standard. +Normalizes_the_date_to_ISO_date_format.=Normalizes_the_date_to_ISO_date_format. +Ordinals_to_LaTeX_superscript=Ordinals_to_LaTeX_superscript +Protect_terms=Protect_terms +Remove_enclosing_braces=Remove_enclosing_braces +Removes_braces_encapsulating_the_complete_field_content.=Removes_braces_encapsulating_the_complete_field_content. +Sentence_case=Sentence_case +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".=Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.". +Title_case=Title_case +Unicode_to_LaTeX=Unicode_to_LaTeX +Units_to_LaTeX=Units_to_LaTeX +Upper_case=Upper_case +Does_nothing.=Does_nothing. +Identity=Identity \ No newline at end of file diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties index b8fdad6bb66..407b5448de1 100644 --- a/src/main/resources/l10n/JabRef_es.properties +++ b/src/main/resources/l10n/JabRef_es.properties @@ -430,7 +430,6 @@ Link_to_file_%0=Enlazar_al_archivo_%0 Listen_for_remote_operation_on_port=Escuchar_para_operación_remota_en_el_puerto Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Cargar_y_guardar_preferencias_desde/a_jabref.xml_al_arrancar_(modo_lápiz_de_memoria) Look_and_feel=Aspecto -lower=inferior Main_file_directory=Carpeta_del_archivo_principal Main_layout_file=Archivo_de_configuración_principal Manage=Administrar @@ -765,9 +764,6 @@ Updated_group_selection=Actualizar_selección_de_grupo Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Actualizar_enlaces_a_PDF/PS_externos_para_usar_el_campo_'%0'. Upgrade_file=Actualizar_archivo Upgrade_old_external_file_links_to_use_the_new_feature=Actualizar_enlaces_a_archivos_externos_para_usar_la_nueva_característica. -UPPER=SUPERIOR -Upper_Each_First=Mayúsculas_En_Iniciales_De_Palabra -Upper_first=Sólo_mayúscula_inicial usage=Uso Use_autocompletion_for_the_following_fields=Usar_autocompletar_para_los_siguientes_campos Use_other_look_and_feel=Usar_otro_aspecto @@ -1374,10 +1370,8 @@ Please_specify_both_username_and_password= Proxy_requires_authentication= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -1497,24 +1491,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -1530,3 +1508,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties index 2f92834957b..ac80074b90c 100644 --- a/src/main/resources/l10n/JabRef_fa.properties +++ b/src/main/resources/l10n/JabRef_fa.properties @@ -800,7 +800,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)= -lower= Main_file_directory= Main_layout_file= @@ -1453,9 +1452,6 @@ Updated_group_selection= Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.= Upgrade_file= Upgrade_old_external_file_links_to_use_the_new_feature= -UPPER= -Upper_Each_First= -Upper_first= usage= Use_autocompletion_for_the_following_fields= @@ -2143,10 +2139,8 @@ Please_specify_both_username_and_password= Proxy_requires_authentication= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -2266,24 +2260,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -2307,3 +2285,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties index 0f1f0d41591..40ef2d1205a 100644 --- a/src/main/resources/l10n/JabRef_fr.properties +++ b/src/main/resources/l10n/JabRef_fr.properties @@ -430,7 +430,6 @@ Link_to_file_%0=Lien_vers_le_fichier_%0 Listen_for_remote_operation_on_port=Ecouter_le_port_pour_des_opérations_à_distance Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Charger_et_enregistrer_les_préférences_de/vers_jabref.xml_au_démarrage_(mode_clef_mémoire) Look_and_feel=Apparence -lower=minuscule Main_file_directory=Répertoire_de_fichiers_principal Main_layout_file=Principal_fichier_de_mise_en_page Manage=Gérer @@ -765,9 +764,6 @@ Updated_group_selection=Sélection_de_groupe_mise_à_jour Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Mettre_à_jour_les_liens_externes_PDF/PS_pour_utiliser_le_champ_'%0'. Upgrade_file=Mettre_à_jour_le_fichier Upgrade_old_external_file_links_to_use_the_new_feature=Mettre_à_jour_les_anciens_liens_vers_les_fichiers_externes_pour_utiliser_cette_nouvelle_fonction -UPPER=MAJUSCULE -Upper_Each_First=Majuscule_Chaque_Initiale -Upper_first=Majuscule_initiale usage=usage Use_autocompletion_for_the_following_fields=Utiliser_l'auto-génération_pour_les_champs_suivants Use_other_look_and_feel=Utiliser_une_autre_apparence @@ -1404,10 +1400,8 @@ Please_specify_both_username_and_password=Préciser_à_la_fois_le_nom_d'utilisat Proxy_requires_authentication=Le_proxy_demande_une_authentification An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=Un_fichier_de_sauvegarde_automatique_a_été_trouvé_pour_cette_base_de_données._Cela_pourrait_indiquer_que_JabRef_ne_s'est_pas_fermé_proprement_la_dernière_fois_que_ce_fichier_a_été_utilisé. -CaseKeeper=Gardien_de_Casse Note\:_A_full_text_search_is_currently_not_supported_for_%0=Note_\:_La_recherche_sur_le_texte_complet_n'est_actuellement_pas_disponible_pour_%0 Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.=La_détection_automatique_de_OpenOffice/LibreOffice_a_échouée._S'il_voul_plait,_sélectionnez_manuellement_le_répertoire_d'installation. -UnitFormatter=Formateur_d'Unité JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

=JabRef_ne_gère_plus_les_champs_'ps'_et_'pdf'.
Les_liens_vers_les_fichiers_sont_maintenant_enregistrés_dans_le_champ_'file'_et_les_fichiers_sont_enregistrés_dans_un_répertoire_externe.
Pour_utiliser_cette_fonctionnalité,_JabRef_a_besoin_de_mettre_à_jour_les_liens_vers_les_fichiers.

This_database_uses_outdated_file_links.=Cette_base_de_données_utilise_des_liens_de_fichier_périmés @@ -1477,24 +1471,8 @@ No_entry_found_for_ISBN_%0_at_www.ebook.de=Aucune_entrée_trouvée_pour_l'ISBN_% Run_field_formatter\:=Lancer_le_formatage_des_champs_: Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.=Ajoute_des_accolades_{}_autour_des_acronymes,_des_noms_de_mois_et_des_pays_dans_%s_afin_de_préserver_leur_casse. -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.=Change_les_expressions_HTML_de_%s_en_leur_équivalent_LaTeX. -Cleans_latex_code_in_%s.=Nettoie_le_code_LaTeX_dans_%s. -Completely_erases_%s.=Efface_définitivement_%s. -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"=Convertit_tous_les_caractères_de_%s_en_minuscules,_sauf_pour_les_mots_commençant_avec_"{". -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".=Convertit_tous_les_caractères_de_%s_en_majuscules,_sauf_pour_les_mots_commençant_avec_"{". -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.=Convertit_tous_les_caractères_de_%s_en_majuscules,_mais_mets_les_articles,_prépositions_et_conjonctions_en_minuscules. -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".=Convertit_le_premier_caractère_de_chaque_mot_de_%s_en_majuscule_(et_tous_les_autres_en_minuscules),_sauf_pour_les_mots_commençant_avec_"{". -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".=Convertit_le_premier_caractère_du_premier_mot_de_%s_en_majuscule_(et_mets_les_autres_caractères_du_premier_mot_en_minuscules),_mais_ne_change_rien_si_le_mot_commence_avec_"{". -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.=Convertit_les_caractères_Unicode_de_%s_en_leur_équivalent_LaTeX. Converts_units_in_%s_to_LaTeX_code.=Convertit_les_unités_de_%s_en_code_LaTeX. Does_nothing.=Ne_fait_rien. -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.=Vérifie_que_les_numéros_de_pages_de_%s_sont_de_la_forme_num-num. -Normalizes_content_of_%s_to_the_format_\#mon\#.=Harmonise_le_contenu_de_%s_au_format_#mon#. -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.=Harmonise_les_dates_de_%s_au_format_BibLaTeX_yyyy-mm-dd_ou_yyyy-mm. -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.=Harmonise_les_listes_de_personnes_de_%s_au_format_BibTeX. -Removes_all_matching_braces_around_the_contents_of_%s.=Supprime_tous_les_couples_d'accolades_autour_des_contenus_de_%s. -Replaces_three_or_more_authors_with_"and_others".=Remplace_trois_auteurs_ou_plus_par_"and_others". -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.=Transforme_les_numéros_ordinaux_de_%s_en_exposants_LaTeX. the_given_field=le_champ_donné @@ -1561,3 +1539,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_in.properties b/src/main/resources/l10n/JabRef_in.properties index 45af1cf66ae..60e9c0323c0 100644 --- a/src/main/resources/l10n/JabRef_in.properties +++ b/src/main/resources/l10n/JabRef_in.properties @@ -429,7 +429,6 @@ Link_to_file_%0=Tautan_ke_berkas_%0 Listen_for_remote_operation_on_port=Menggunakan_operasi_jarak_jauh_pada_port Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Muat_dan_Simpan_preferensi_dari/ke_jabref.xml_ketika_memulai_(mode_pena_simpan) Look_and_feel=Penampilan_artistik -lower=bawah Main_file_directory=Lokasi_berkas_utama Main_layout_file=Berkas_tataletak_utama Manage=Mengatur @@ -764,9 +763,6 @@ Updated_group_selection=Pilihan_grup_diperbarui Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Perbarui_tautan_eksternal_PDF/PS_untuk_digunakan_bidang_'%0'. Upgrade_file=Naiktaraf_berkas Upgrade_old_external_file_links_to_use_the_new_feature=Naiktaraf_tautan_berkas_eksternal_lama_untuk_digunakan_di_fitur_baru -UPPER=ATAS -Upper_Each_First=Utamakan_setiap_atas -Upper_first=Dahulukan_atas usage=penggunaan Use_autocompletion_for_the_following_fields=Gunakan_otomatis_melengkapi_pada_bidang_berikut Use_other_look_and_feel=Gunakan_gaya_penampilan_lain @@ -1383,10 +1379,8 @@ Please_specify_both_username_and_password= Proxy_requires_authentication= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -1509,24 +1503,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -1542,3 +1520,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties index e3e55091686..95472f122e5 100644 --- a/src/main/resources/l10n/JabRef_it.properties +++ b/src/main/resources/l10n/JabRef_it.properties @@ -465,7 +465,6 @@ Link_to_file_%0=Collegamento_al_file_%0 Listen_for_remote_operation_on_port=Porta_in_ascolto_per_operazioni_remote Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Carica_e_salva_le_preferenze_da/in_jabref.xml_all'avvio_(modalit\u00e0_chiavetta_di_memoria) Look_and_feel=Aspetto -lower=minuscolo Main_file_directory=Cartella_dei_file_principale Main_layout_file=File_di_layout_principale @@ -831,9 +830,6 @@ Updated_group_selection=Selezione_di_gruppo_aggiornata Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Aggiornare_i_collegamenti_esterni_PDF/PS_per_utilizzare_il_campo_'%0'. Upgrade_file=Aggiornamento_del_file Upgrade_old_external_file_links_to_use_the_new_feature=Aggiornare_i_vecchi_collegamenti_ai_file_esterni_per_utilizzare_la_nuova_funzione -UPPER=MAIUSCOLO -Upper_Each_First=Prime_Lettere_In_Maiuscolo -Upper_first=Prima_lettera_in_maiuscolo usage=uso Use_autocompletion_for_the_following_fields=Usa_l'autocompletamento_per_i_seguenti_campi Use_other_look_and_feel=Usa_un_altro_"Look-and-Feel" @@ -1481,10 +1477,8 @@ Please_specify_both_username_and_password= Proxy_requires_authentication= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -1605,24 +1599,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -1638,3 +1616,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties index 1aba0e3d816..f9283d868a0 100644 --- a/src/main/resources/l10n/JabRef_ja.properties +++ b/src/main/resources/l10n/JabRef_ja.properties @@ -815,7 +815,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=起 Look_and_feel=操作性 -lower=下げる Main_file_directory=基本ファイルディレクトリ Main_layout_file=基本レイアウトファイル @@ -1476,9 +1475,6 @@ Updated_group_selection=グループ選択を更新しました Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=外部PDF/PSリンクを「%0」フィールドを使用するように更新 Upgrade_file=ファイルを更新 Upgrade_old_external_file_links_to_use_the_new_feature=古い外部ファイルリンクを新機能を利用するように更新 -UPPER=UPPER -Upper_Each_First=Upper_Each_First -Upper_first=Upper_first usage=使用法 Use_autocompletion_for_the_following_fields=右記のフィールドで自動補完を使用 @@ -2161,10 +2157,8 @@ New_%0_database= Export_Sorting= No_entry_found_for_ISBN_%0_at_www.ebook.de= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= Abbreviate= @@ -2243,24 +2237,8 @@ Unabbreviate_journal_names= Unabbreviating...= Usage= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= Are_you_sure_you_want_to_reset_all_settings_to_default_values?= Reset_preferences= Ill-formed_entrytype_comment_in_bib_file= @@ -2283,3 +2261,40 @@ Remove_style= Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties index 4e14ef5ac59..58c6d7ed4a8 100644 --- a/src/main/resources/l10n/JabRef_nl.properties +++ b/src/main/resources/l10n/JabRef_nl.properties @@ -833,7 +833,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)= Look_and_feel="Look_and_feel" -lower= Main_file_directory= @@ -1495,9 +1494,6 @@ Updated_group_selection=Groep_selectie_geupdate Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.= Upgrade_file= Upgrade_old_external_file_links_to_use_the_new_feature= -UPPER= -Upper_Each_First= -Upper_first= usage=gebruik Use_autocompletion_for_the_following_fields= @@ -2158,10 +2154,8 @@ Please_specify_both_username_and_password= Proxy_requires_authentication= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -2267,24 +2261,8 @@ Unabbreviating...= Usage= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= Are_you_sure_you_want_to_reset_all_settings_to_default_values?= Reset_preferences= @@ -2315,3 +2293,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties index 07b7a1cebfd..681511e2fed 100644 --- a/src/main/resources/l10n/JabRef_no.properties +++ b/src/main/resources/l10n/JabRef_no.properties @@ -892,7 +892,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Hen Look_and_feel=Utseende -lower=sm\u00e5_bokstaver Main_file_directory=Hovedkatalog_for_filer @@ -1612,11 +1611,8 @@ Upgrade_file=Oppgrader_fil Upgrade_old_external_file_links_to_use_the_new_feature=Oppgrader_gamle_eksterne_linker_for_\u00e5_bruke_den_nye_funksjonen -UPPER=STORE_BOKSTAVER -Upper_Each_First=Stor_Forbokstav -Upper_first=Stor_forbokstav_f\u00f8rst usage=bruk @@ -2554,10 +2550,8 @@ Please_specify_both_username_and_password= Proxy_requires_authentication= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -2664,24 +2658,8 @@ Unabbreviating...= Usage= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= Are_you_sure_you_want_to_reset_all_settings_to_default_values?= Reset_preferences= @@ -2712,3 +2690,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties index 4fb836c322d..109d8f1f1b0 100644 --- a/src/main/resources/l10n/JabRef_pt_BR.properties +++ b/src/main/resources/l10n/JabRef_pt_BR.properties @@ -430,7 +430,6 @@ Link_to_file_%0=Link_para_o_arquivo_%0 Listen_for_remote_operation_on_port=Escutar_operações_remotas_na_porta Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Carregar_e_salvar_preferências_a_partir_de/para_jabref.xml_ao_iniciar_(modo_cartão_de_memória) Look_and_feel=Aparência -lower=minúsculo Main_file_directory=Diretório_de_arquivos_principal Main_layout_file=Arquivo_de_leiaute_principal Manage=Gerenciar @@ -765,9 +764,6 @@ Updated_group_selection=Seleção_de_grupo_atualizada Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Atualizar_links_PDF/PS_externos_para_utilizar_o_campo_'%0' Upgrade_file=Atualizar_arquivo Upgrade_old_external_file_links_to_use_the_new_feature=Atualize_os_links_de_arquivos_externos_para_utilizar_o_novo_recurso -UPPER=MAIÚSCULO -Upper_Each_First=Primeira_letra_de_cada_palavra_em_maiúsculo -Upper_first=Primeira_letra_em_maiúsculo usage=utilização Use_autocompletion_for_the_following_fields=Utilizar_o_autocompletar_para_os_seguintes_campos Use_other_look_and_feel=Utilizar_uma_outra_aparência @@ -1401,10 +1397,8 @@ Please_specify_both_username_and_password= Proxy_requires_authentication= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -1524,24 +1518,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -1557,3 +1535,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties index b49986b455f..bd5d15aee8f 100644 --- a/src/main/resources/l10n/JabRef_ru.properties +++ b/src/main/resources/l10n/JabRef_ru.properties @@ -801,7 +801,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=З Look_and_feel=Интерфейс -lower=строчные Main_file_directory=Основной_каталог_файлов Main_layout_file=Главный_файл_макета @@ -1449,9 +1448,6 @@ Updated_group_selection=Выбор_группы_изменен Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Обновить_ссылки_на_внешние_PDF/PS_для_использования_в_поле_'%0'. Upgrade_file=Обновить_файл Upgrade_old_external_file_links_to_use_the_new_feature=Обновить_старые_ссылки_на_внешние_файлы_для_использования_новых_функций -UPPER=ПРОПИСНЫЕ -Upper_Each_First=Каждое_слово_с_прописной -Upper_first=Начинать_с_прописной usage=использование Use_autocompletion_for_the_following_fields=Автозавершение_для_следующих_полей @@ -2125,10 +2121,8 @@ Please_specify_both_username_and_password= Proxy_requires_authentication= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -2249,24 +2243,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -2283,3 +2261,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties index b79b9e1a1d4..e42c8604657 100644 --- a/src/main/resources/l10n/JabRef_sv.properties +++ b/src/main/resources/l10n/JabRef_sv.properties @@ -160,7 +160,6 @@ Cannot_move_group_"%0"_left.= Cannot_move_group_"%0"_right.= Cannot_move_group_"%0"_up.= Cannot_use_port_%0_for_remote_operation;_another_application_may_be_using_it._Try_specifying_another_port.= -CaseKeeper= Case_sensitive= Change_case= Change_entry_type=Ändra_posttyp @@ -173,7 +172,6 @@ Changed_look_and_feel_settings= Changed_preamble=Ändrade_preamble Changed_special_field_settings= Changed_type_to_'%0'_for=Ändrade_typ_till_'%0'_för -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= Changes_have_been_made_to_the_following_metadata_elements= Character_encoding_'%0'_is_not_supported.=Teckenkodningen_'%0'_stöds_inte. Characters_to_ignore=Bokstäver_att_ignorera @@ -193,7 +191,6 @@ Cite_selected_entries_with_extra_information= Cite_selected_entries_with_in-text_citation= Cite_special=Specialcitering Class_name=Klassnamn -Cleans_latex_code_in_%s.= Cleanup=Städa_upp Cleanup_entries=Städa_upp_poster Cleanup_entry=Städa_upp_post @@ -225,7 +222,6 @@ Color_for_marking_incomplete_entries= Column_width=Kolumnbredd Combine_pairs_of_citations_that_are_separated_by_spaces_only= Command_line_id=Kommandorads-id -Completely_erases_%s.= Confirm_selection=Bekräfta_val Connect=Anslut Connect_to_SQL_database=Anslut_till_SQL-databas @@ -240,12 +236,6 @@ Continue?=Fortsätt? Convert=Konvertera Convert_1st,_2nd,_..._to_real_superscripts= Convert_to_BibLatex_format_(for_example,_move_the_value_of_the_'journal'_field_to_'journaltitle')= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"=Konvertera_alla_bokstäver_i_%s_till_gemener,_men_ändra_ej_ord_som_börjar_med_"{" -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".=Konvertera_alla_bokstäver_i_%s_till_versaler,_men_ändra_ej_ord_som_börjar_med_"{" -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Copied=Kopierade Copied_cell_contents=Kopierade_cellinnehåll @@ -405,7 +395,6 @@ Enforce_legal_characters_in_BibTeX_keys= Ensure_that_the_bibliography_is_up-to-date= Ensure_unique_keys_using_letters_(a,_b,_...)= Ensure_unique_keys_using_letters_(b,_c,_...)= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= Enter_URL=Ange_URL Enter_URL_to_download=Ange_URL_att_ladda_ned Entries_added_to_an_email= @@ -804,9 +793,6 @@ None= None_of_the_selected_entries_have_BibTeX_keys.=Ingen_av_de_valda_posterna_har_någon_BibTeX-nyckel. Normal_search_active.= Normalize_to_BibTeX_name_format= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.= Not_overwriting_existing_key._To_change_this_setting,_open_Options_->_Prefererences_->_BibTeX_key_generator= Note\:_A_full_text_search_is_currently_not_supported_for_%0= @@ -981,7 +967,6 @@ Removed_all_subgroups_of_group_"%0".= Removed_group_"%0".= Removed_group_"%0"_and_its_subgroups.= Removed_string= -Removes_all_matching_braces_around_the_contents_of_%s.= Rename_PDFs_to_given_filename_format_pattern= Rename_field=Byt_namn_på_fält Rename_field_to=Byt_namn_på_fält_till @@ -994,7 +979,6 @@ Replace_original_entry=Ersätt_ursprunglig_post Replace_string=Ersätt_sträng Replace_with=Ersätt_med Replaced=Ersatte -Replaces_three_or_more_authors_with_"and_others".= Required_fields=Obligatoriska_fält Reset=Återställ Reset_all=Återställ_alla @@ -1254,11 +1238,9 @@ Toggled_print_status_for_%0_entries= Toggled_quality_for_%0_entries= Toggled_relevance_for_%0_entries= Toogle_quality_assured= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= Treatment_of_first_names=Hantering_av_förnamn Try_different_encoding=Prova_en_annan_teckenkodning Two_stars=Två_stjärnor -UPPER=VERSALER Unabbreviate=Expandera_förkortning Unabbreviate_journal_names=Expandera_förkortade_tidskriftsnamn Unabbreviate_journal_names_of_the_selected_entries=Expandera_förkortade_tidskriftsnamn_för_de_valda_posterna @@ -1278,7 +1260,6 @@ Unable_to_synchronize_bibliography= Undefined_file_type=Odefinierad_filtyp Undo=Ångra Union= -UnitFormatter= Unknown_DOI\:_'%0'.=Okänt_DOI\:_'%0' Unknown_DiVA_entry\:_'%0'.=Okänd_DiVA-post\:_'%0' Unknown_BibTeX_entries= @@ -1305,8 +1286,6 @@ Updated_group_selection= Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.= Upgrade_file=Uppgradera_fil Upgrade_old_external_file_links_to_use_the_new_feature= -Upper_Each_First=Ord_Börjar_Med_Versaler -Upper_first=Första_börjar_med_versal Usage= Use=Använd Use_EMACS_23_insertion_string= @@ -1417,7 +1396,6 @@ key=nyckel keys_in_database=nycklar_i_databas large_capitals_are_not_masked_using_curly_brackets_{}= link_should_refer_to_a_correct_file_path= -lower=gemener modify_group= move_group=flytta_grupp nested_aux_files=nästlade_aux-filer @@ -1474,3 +1452,40 @@ Remove_style=Ta_bort_stil Select_one_of_the_available_styles_or_add_a_style_file_from_disk.=Välj_en_av_de_tillgängliga_stilarna_eller_lägg_till_en_stilfil_från_disk. You_must_select_a_valid_style_file.=Du_måste_välja_en_giltig_stilfil. Reload=Ladda_om + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties index 3f263d2c17e..6bf9e947e78 100644 --- a/src/main/resources/l10n/JabRef_tr.properties +++ b/src/main/resources/l10n/JabRef_tr.properties @@ -430,7 +430,6 @@ Link_to_file_%0=%0_dosyasına_bağla Listen_for_remote_operation_on_port=Bağlantı_noktasındaki_uzak_işlemi_dinle Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=Başlangıçta_tercihleri_jabref.xml'den_yükle_ya_da_buraya_kaydet_(bellek_çubuğu_kipi) Look_and_feel=Görünüm_ve_tema -lower=küçük Main_file_directory=Ana_dosya_dizini Main_layout_file=Ana_yerleşim_dosyası Manage=Yönet @@ -765,9 +764,6 @@ Updated_group_selection=Grup_seçimi_güncellendi Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Harici_PDF/PS_linklerini_'%0'_alanını_kullanmak_üzere_yeni_sürüme_yükselt. Upgrade_file=Dosyayı_yeni_sürüme_yükselt Upgrade_old_external_file_links_to_use_the_new_feature=Eski_harici_dosya_linklerini_yeni_özelliği_kullanmak_üzere_yeni_sürüme_yükselt -UPPER=DAHA_ÜSTTE -Upper_Each_First=Daha_Üstteki_Her_Birinci -Upper_first=Daha_üstteki_önce usage=kullanım Use_autocompletion_for_the_following_fields=Aşağıdaki_alanlar_için_otomatik_tamamlamayı_kullan Use_other_look_and_feel=Diğer_görünüm_ve_tema_kullan @@ -1401,11 +1397,9 @@ Please_specify_both_username_and_password=Lütfen_hem_kullanıcı_adı_hem_de_pa Proxy_requires_authentication=Vekil_sunucu_kimlik_denetleme_gerektiriyor An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.=Bu_veri_tabanı_için_bir_otomatik_kaydetme_dosyası_bulundu._Bu,_dosya_son_kullanıldığında_JabRef'in_temiz_şekilde_kapanmadığını_belitebilir. -CaseKeeper=CaseKeeper Note\:_A_full_text_search_is_currently_not_supported_for_%0=Not\:%0_için_tam_metin_arama_henüz_desteklenmiyor Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.=OpenOffice/LibreOffice_kurulumu_otomatik_olarak_bulunamadı._Lütfen_kurulum_dizinini_kendiniz_seçiniz. -UnitFormatter=BirimBiçemleyici JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

=JabRef_artık_'ps'_ya_da_'pdf!_alanlarını_desteklemiyor._
Dosya_bağlantıları_artık_'dosya'_alanında_ve_dosyalar_da_harici_bir_dosya_dizininde_depolanıyor.
Bu_özelliği_kullanabilmek_için_JabRef_dosya_bağlantılarını_yükseltmek_zorunda.

This_database_uses_outdated_file_links.=Bu_veri_tabanı_güncelliğini_yitirmiş_dosya_bağlantıları_kullanıyor. @@ -1525,24 +1519,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -1558,3 +1536,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties index 0b6246e6a23..94bc62358d0 100644 --- a/src/main/resources/l10n/JabRef_vi.properties +++ b/src/main/resources/l10n/JabRef_vi.properties @@ -818,7 +818,6 @@ Load_and_Save_preferences_from/to_jabref.xml_on_start-up_(memory_stick_mode)=N Look_and_feel=Hình_thức -lower=cận_dưới Main_file_directory=Thư_mục_tập_tin_chính Main_layout_file=Tập_tin_trình_bày_chính @@ -1479,9 +1478,6 @@ Updated_group_selection=Phép_chọn_nhóm_đã_được_cập_nhật Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Nâng_cấp_các_liên_kết_ngoài_PDF/PS_để_sử_dụng_trường_'%0'. Upgrade_file=Nâng_cấp_tập_tin Upgrade_old_external_file_links_to_use_the_new_feature=Nâng_cấp_các_liên_kết_tập_tin_ngoài_để_sử_dụng_tính_chất_mới -UPPER=TRÊN -Upper_Each_First=Phía_trên_mỗi_mục_đầu_tiên -Upper_first=Phía_trên_đầu_tiên usage=cách_dùng Use_autocompletion_for_the_following_fields=Dùng_tính_chất_tự_điền_đầy_đủ_cho_các_trường_sau @@ -2153,10 +2149,8 @@ Please_specify_both_username_and_password= Proxy_requires_authentication= An_autosave_file_was_found_for_this_database._This_could_indicate_that_JabRef_didn't_shut_down_cleanly_last_time_the_file_was_used.= -CaseKeeper= Note\:_A_full_text_search_is_currently_not_supported_for_%0= Unable_to_autodetect_OpenOffice/LibreOffice_installation._Please_choose_the_installation_directory_manually.= -UnitFormatter= JabRef_no_longer_supports_'ps'_or_'pdf'_fields.
File_links_are_now_stored_in_the_'file'_field_and_files_are_stored_in_an_external_file_directory.
To_make_use_of_this_feature,_JabRef_needs_to_upgrade_file_links.

= This_database_uses_outdated_file_links.= @@ -2276,24 +2270,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -2309,3 +2287,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/main/resources/l10n/JabRef_zh.properties b/src/main/resources/l10n/JabRef_zh.properties index f9049271436..16f7e3a53d8 100644 --- a/src/main/resources/l10n/JabRef_zh.properties +++ b/src/main/resources/l10n/JabRef_zh.properties @@ -163,7 +163,6 @@ Cannot_move_group_"%0"_left.=无法左移分组_"%0"。 Cannot_move_group_"%0"_right.=无法右移分组_"%0"。 Cannot_move_group_"%0"_up.=无法上移分组_"%0"。 Cannot_use_port_%0_for_remote_operation;_another_application_may_be_using_it._Try_specifying_another_port.=无法使用端口_%0_进行远程操作;该端口可能被其它应用程序占用,请使用其它端口。 -CaseKeeper= Case_sensitive=区分大小写 Change_case=修改大小写 Change_entry_type=更改记录类型 @@ -176,7 +175,6 @@ Changed_look_and_feel_settings=已修改显示效果_(look_and_feel)_设置 Changed_preamble=已修改导言区_(preamble) Changed_special_field_settings= Changed_type_to_'%0'_for= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= Changes_have_been_made_to_the_following_metadata_elements=下列元数据元素被改变 Character_encoding_'%0'_is_not_supported.=,不支持编码_'%0'。 Characters_to_ignore=要忽略的字符 @@ -196,7 +194,6 @@ Cite_selected_entries_with_extra_information= Cite_selected_entries_with_in-text_citation= Cite_special= Class_name=类名 -Cleans_latex_code_in_%s.= Cleanup= Cleanup_entries= Cleanup_entry= @@ -228,7 +225,6 @@ Color_for_marking_incomplete_entries=标记不完整记录的颜色 Column_width=列宽 Combine_pairs_of_citations_that_are_separated_by_spaces_only= Command_line_id=命令行_id -Completely_erases_%s.= Confirm_selection=确认选择 Connect=连接 Connect_to_SQL_database=连接_SQL_数据库 @@ -243,12 +239,6 @@ Continue?= Convert= Convert_1st,_2nd,_..._to_real_superscripts= Convert_to_BibLatex_format_(for_example,_move_the_value_of_the_'journal'_field_to_'journaltitle')= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Copied=已复制 Copied_cell_contents=已拷贝单元格内容 @@ -408,7 +398,6 @@ Enforce_legal_characters_in_BibTeX_keys=强制在_BibTeX_键值中使用合法 Ensure_that_the_bibliography_is_up-to-date= Ensure_unique_keys_using_letters_(a,_b,_...)=使用字母_(a,_b,_...)_保证键值唯一 Ensure_unique_keys_using_letters_(b,_c,_...)=使用字母_(b,_c,_...)_保证键值唯一 -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= Enter_URL=输入_URL Enter_URL_to_download=输入要下载的_URL Entries_added_to_an_email= @@ -807,9 +796,6 @@ None= None_of_the_selected_entries_have_BibTeX_keys.= Normal_search_active.= Normalize_to_BibTeX_name_format= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= Not_connected_to_any_Writer_document._Please_make_sure_a_document_is_open,_and_use_the_'Select_Writer_document'_button_to_connect_to_it.= Not_overwriting_existing_key._To_change_this_setting,_open_Options_->_Prefererences_->_BibTeX_key_generator= Note\:_A_full_text_search_is_currently_not_supported_for_%0= @@ -984,7 +970,6 @@ Removed_all_subgroups_of_group_"%0".= Removed_group_"%0".=已移除分组_"%0"。 Removed_group_"%0"_and_its_subgroups.=已移除分组_"%0"_和它的子分组。 Removed_string=已移除简写字串 -Removes_all_matching_braces_around_the_contents_of_%s.= Rename_PDFs_to_given_filename_format_pattern= Rename_field=重命名域 Rename_field_to=重命名该域为 @@ -997,7 +982,6 @@ Replace_original_entry= Replace_string=替换字符串 Replace_with=替换为 Replaced=被替换 -Replaces_three_or_more_authors_with_"and_others".= Required_fields=必选域 Reset=重置 Reset_all=重置所有 @@ -1257,11 +1241,9 @@ Toggled_print_status_for_%0_entries= Toggled_quality_for_%0_entries= Toggled_relevance_for_%0_entries= Toogle_quality_assured= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= Treatment_of_first_names= Try_different_encoding=尝试其它编码 Two_stars=二星 -UPPER=大写全部 Unabbreviate= Unabbreviate_journal_names= Unabbreviate_journal_names_of_the_selected_entries=展开选中记录的缩写期刊名称 @@ -1281,7 +1263,6 @@ Unable_to_synchronize_bibliography= Undefined_file_type=未定义的文件类型 Undo=撤销 Union=并集 -UnitFormatter= Unknown_DOI\:_'%0'.= Unknown_DiVA_entry\:_'%0'.= Unknown_BibTeX_entries=未知的_BibTeX_记录 @@ -1308,8 +1289,6 @@ Updated_group_selection=更新分组选择 Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=升级外部_PDF/PS_链接以使用_'%0'_域。 Upgrade_file=升级文件 Upgrade_old_external_file_links_to_use_the_new_feature=升级旧外部文件链接以使用新特性 -Upper_Each_First=大写词首 -Upper_first=大写句首 Usage= Use= Use_EMACS_23_insertion_string= @@ -1996,7 +1975,6 @@ Select_export_format= Warning\:_%0_out_of_%1_entries_have_undefined_BibTeX_key.= large_capitals_are_not_masked_using_curly_brackets_{}= link_should_refer_to_a_correct_file_path= -lower=小写全部 modify_group=修改分组 move_group=移动分组 nested_aux_files=nested_aux_文件 @@ -2075,24 +2053,8 @@ Disable_highlight_groups_matching_entries= Run_field_formatter\:= Adds_{}_brackets_around_acronyms,_month_names_and_countries_in_%s_to_preserve_their_case.= -Changes_HTML_expressions_in_%s_to_their_LaTeX_equivalent.= -Cleans_latex_code_in_%s.= -Completely_erases_%s.= -Converts_all_characters_in_%s_to_lower_case,_but_does_not_change_words_starting_with_"{"= -Converts_all_characters_in_%s_to_upper_case,_but_does_not_change_words_starting_with_"{".= -Converts_all_words_in_%s_to_upper_case,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= -Converts_the_first_character_of_each_word_in_%s_to_upper_case_(and_all_others_to_lower_case),_but_does_not_change_words_starting_with_"{".= -Converts_the_first_character_of_the_first_word_in_%s_to_upper_case_(and_the_remaining_characters_of_the_first_word_to_lower_case),_but_does_not_change_anything_if_word_starts_with_"{".= -Converts_unicode_characters_in_%s_to_their_LaTeX_equivalent.= Converts_units_in_%s_to_LaTeX_code.= Does_nothing.= -Ensures_that_pages_numbers_in_%s_are_of_the_form_num--num.= -Normalizes_content_of_%s_to_the_format_\#mon\#.= -Normalizes_dates_in_%s_to_the_BibLaTeX_standard_yyyy-mm-dd_or_yyyy-mm.= -Normalizes_lists_of_persons_in_%s_to_the_BibTeX_standard.= -Removes_all_matching_braces_around_the_contents_of_%s.= -Replaces_three_or_more_authors_with_"and_others".= -Transforms_ordinal_numbers_in_%s_into_LaTex_superscripts.= the_given_field= @@ -2112,3 +2074,40 @@ Select_one_of_the_available_styles_or_add_a_style_file_from_disk.= You_must_select_a_valid_style_file.= Reload= + +Capitalize= +Capitalize_all_words,_but_converts_articles,_prepositions,_and_conjunctions_to_lower_case.= +Capitalize_the_first_word,_changes_other_words_to_lower_case.= +Changes_all_letters_to_lower_case.= +Changes_all_letters_to_upper_case.= +Changes_the_first_letter_of_all_words_to_capital_case_and_the_remaining_letters_to_lower_case.= +Cleans_up_LaTeX_code.= +Completely_the_field.= +Converts_HTML_code_to_LaTeX_code.= +Converts_LaTeX_encoding_to_Unicode_characters.= +Converts_Unicode_characters_to_LaTeX_encoding.= +Converts_ordinals_to_LaTeX_superscripts.= +HTML_to_LaTeX= +LaTeX_cleanup= +LaTeX_to_Unicode= +Lower_case= +Minify_list_of_person_names= +Normalize_date= +Normalize_month= +Normalize_month_to_BibTex_standard_abbreviation.= +Normalize_names_of_persons= +Normalize_page_numbers= +Normalize_pages_to_BibTeX_standard.= +Normalizes_lists_of_persons_to_the_BibTeX_standard.= +Normalizes_the_date_to_ISO_date_format.= +Ordinals_to_LaTeX_superscript= +Protect_terms= +Remove_enclosing_braces= +Removes_braces_encapsulating_the_complete_field_content.= +Sentence_case= +Shortens_lists_of_persons_if_there_are_more_than_2_persons_to_"et_al.".= +Title_case= +Unicode_to_LaTeX= +Units_to_LaTeX= +Upper_case= +Identity= diff --git a/src/test/java/net/sf/jabref/MetaDataTest.java b/src/test/java/net/sf/jabref/MetaDataTest.java index 70409133b68..13dc6424173 100644 --- a/src/test/java/net/sf/jabref/MetaDataTest.java +++ b/src/test/java/net/sf/jabref/MetaDataTest.java @@ -1,6 +1,8 @@ package net.sf.jabref; import net.sf.jabref.exporter.FieldFormatterCleanups; +import net.sf.jabref.logic.cleanup.FieldFormatterCleanup; +import net.sf.jabref.logic.formatter.casechanger.LowerCaseFormatter; import org.junit.Before; import org.junit.Test; @@ -27,12 +29,13 @@ public void serializeNewMetadataReturnsEmptyMap() throws Exception { @Test public void serializeSingleSaveAction() throws IOException { - FieldFormatterCleanups saveActions = new FieldFormatterCleanups(true, "title[LowerCaseChanger]"); + FieldFormatterCleanups saveActions = new FieldFormatterCleanups(true, + Collections.singletonList(new FieldFormatterCleanup("title", new LowerCaseFormatter()))); metaData.setSaveActions(saveActions); Map expectedSerialization = new TreeMap<>(); expectedSerialization.put("saveActions", - "enabled;" + Globals.NEWLINE + "title[LowerCaseChanger]" + Globals.NEWLINE + ";"); + "enabled;" + Globals.NEWLINE + "title[lower_case]" + Globals.NEWLINE + ";"); assertEquals(expectedSerialization, metaData.serialize()); } } \ No newline at end of file diff --git a/src/test/java/net/sf/jabref/exporter/BibDatabaseWriterTest.java b/src/test/java/net/sf/jabref/exporter/BibDatabaseWriterTest.java index ab9a05cc34a..dbcdc2ebe25 100644 --- a/src/test/java/net/sf/jabref/exporter/BibDatabaseWriterTest.java +++ b/src/test/java/net/sf/jabref/exporter/BibDatabaseWriterTest.java @@ -2,7 +2,9 @@ import com.google.common.base.Charsets; import net.sf.jabref.*; +import net.sf.jabref.logic.cleanup.FieldFormatterCleanup; import net.sf.jabref.logic.config.SaveOrderConfig; +import net.sf.jabref.logic.formatter.casechanger.LowerCaseFormatter; import net.sf.jabref.logic.labelpattern.AbstractLabelPattern; import net.sf.jabref.model.EntryTypes; import net.sf.jabref.groups.GroupTreeNode; @@ -324,13 +326,14 @@ public void reformatStringIfAskedToDoSo() throws IOException { @Test public void writeSaveActions() throws Exception { - FieldFormatterCleanups saveActions = new FieldFormatterCleanups(true, "title[LowerCaseChanger]"); + FieldFormatterCleanups saveActions = new FieldFormatterCleanups(true, + Collections.singletonList(new FieldFormatterCleanup("title", new LowerCaseFormatter()))); metaData.setSaveActions(saveActions); databaseWriter.writePartOfDatabase(stringWriter, bibtexContext, Collections.emptyList(), new SavePreferences()); assertEquals(Globals.NEWLINE + "@Comment{jabref-meta: saveActions:enabled;" + Globals.NEWLINE - + "title[LowerCaseChanger]" + Globals.NEWLINE + ";}" + Globals.NEWLINE, stringWriter.toString()); + + "title[lower_case]" + Globals.NEWLINE + ";}" + Globals.NEWLINE, stringWriter.toString()); } @Test diff --git a/src/test/java/net/sf/jabref/exporter/FieldFormatterCleanupsTest.java b/src/test/java/net/sf/jabref/exporter/FieldFormatterCleanupsTest.java index 4cc6ffcf299..05fca844af2 100644 --- a/src/test/java/net/sf/jabref/exporter/FieldFormatterCleanupsTest.java +++ b/src/test/java/net/sf/jabref/exporter/FieldFormatterCleanupsTest.java @@ -4,15 +4,19 @@ import net.sf.jabref.JabRefPreferences; import net.sf.jabref.logic.cleanup.FieldFormatterCleanup; import net.sf.jabref.logic.formatter.Formatter; +import net.sf.jabref.logic.formatter.IdentityFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.NormalizeDateFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter; +import net.sf.jabref.logic.formatter.casechanger.LowerCaseFormatter; import net.sf.jabref.model.entry.BibEntry; import net.sf.jabref.model.entry.BibtexEntryTypes; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import java.util.List; -import java.util.Optional; +import java.util.*; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; @@ -48,7 +52,10 @@ public void setUp() { @Test public void checkSimpleUseCase() { - FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "title[IdentityFormatter]"); + FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "title[identity]"); + + FieldFormatterCleanup identityInTitle = new FieldFormatterCleanup("title", new IdentityFormatter()); + assertEquals(Collections.singletonList(identityInTitle), actions.getConfiguredActions()); actions.applySaveActions(entry); @@ -60,6 +67,8 @@ public void invalidSaveActionSting() { FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "title"); + assertEquals(Collections.emptyList(), actions.getConfiguredActions()); + actions.applySaveActions(entry); assertEquals("Educational session 1", entry.getField("title")); @@ -68,7 +77,10 @@ public void invalidSaveActionSting() { @Test public void checkLowerCaseSaveAction() { - FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "title[LowerCaseChanger]"); + FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "title[lower_case]"); + + FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup("title", new LowerCaseFormatter()); + assertEquals(Collections.singletonList(lowerCaseTitle), actions.getConfiguredActions()); actions.applySaveActions(entry); @@ -77,9 +89,11 @@ public void checkLowerCaseSaveAction() { @Test public void checkTwoSaveActionsForOneField() { - FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "title[LowerCaseChanger,IdentityFormatter]"); + FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "title[lower_case,identity]"); - assertEquals(2, actions.getConfiguredActions().size()); + FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup("title", new LowerCaseFormatter()); + FieldFormatterCleanup identityInTitle = new FieldFormatterCleanup("title", new IdentityFormatter()); + assertEquals(Arrays.asList(lowerCaseTitle, identityInTitle), actions.getConfiguredActions()); actions.applySaveActions(entry); @@ -89,10 +103,12 @@ public void checkTwoSaveActionsForOneField() { @Test public void checkThreeSaveActionsForOneField() { - FieldFormatterCleanups actions = new FieldFormatterCleanups(true, - "title[LowerCaseChanger,IdentityFormatter,DateFormatter]"); + FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "title[lower_case,identity,normalize_date]"); - assertEquals(3, actions.getConfiguredActions().size()); + FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup("title", new LowerCaseFormatter()); + FieldFormatterCleanup identityInTitle = new FieldFormatterCleanup("title", new IdentityFormatter()); + FieldFormatterCleanup normalizeDatesInTitle = new FieldFormatterCleanup("title", new NormalizeDateFormatter()); + assertEquals(Arrays.asList(lowerCaseTitle, identityInTitle, normalizeDatesInTitle), actions.getConfiguredActions()); actions.applySaveActions(entry); @@ -102,20 +118,12 @@ public void checkThreeSaveActionsForOneField() { @Test public void checkMultipleSaveActions() { - FieldFormatterCleanups actions = new FieldFormatterCleanups(true, - "pages[PageNumbersFormatter]title[LowerCaseChanger]"); - + FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "pages[normalize_page_numbers]title[lower_case]"); List formatterCleanups = actions.getConfiguredActions(); - assertEquals(2, formatterCleanups.size()); - - for (FieldFormatterCleanup cleanup : formatterCleanups) { - if (cleanup.getField().equals("title")) { - assertEquals("LowerCaseChanger", cleanup.getFormatter().getKey()); - } else if (cleanup.getField().equals("pages")) { - assertEquals("PageNumbersFormatter", cleanup.getFormatter().getKey()); - } - } + FieldFormatterCleanup normalizePages = new FieldFormatterCleanup("pages", new NormalizePagesFormatter()); + FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup("title", new LowerCaseFormatter()); + assertEquals(Arrays.asList(normalizePages, lowerCaseTitle), formatterCleanups); actions.applySaveActions(entry); @@ -127,21 +135,13 @@ public void checkMultipleSaveActions() { public void checkMultipleSaveActionsWithMultipleFormatters() { FieldFormatterCleanups actions = new FieldFormatterCleanups(true, - "pages[PageNumbersFormatter,DateFormatter]title[LowerCaseChanger]"); + "pages[normalize_page_numbers,normalize_date]title[lower_case]"); List formatterCleanups = actions.getConfiguredActions(); - assertEquals(3, formatterCleanups.size()); - - for (FieldFormatterCleanup cleanup : formatterCleanups) { - if (cleanup.getField().equals("title")) { - assertEquals("LowerCaseChanger", cleanup.getFormatter().getKey()); - } else if (cleanup.getField().equals("pages")) { - if (!("PageNumbersFormatter".equals(cleanup.getFormatter().getKey()) - || "DateFormatter".equals(cleanup.getFormatter().getKey()))) { - fail("Wrong formatter for pages field: " + cleanup.getFormatter().getKey()); - } - } - } + FieldFormatterCleanup normalizePages = new FieldFormatterCleanup("pages", new NormalizePagesFormatter()); + FieldFormatterCleanup normalizeDatesInPages = new FieldFormatterCleanup("pages", new NormalizeDateFormatter()); + FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup("title", new LowerCaseFormatter()); + assertEquals(Arrays.asList(normalizePages, normalizeDatesInPages, lowerCaseTitle), formatterCleanups); actions.applySaveActions(entry); @@ -150,8 +150,8 @@ public void checkMultipleSaveActionsWithMultipleFormatters() { } @Test - public void eraseFormatterRemovesField() { - FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "mont[EraseFormatter]"); + public void clearFormatterRemovesField() { + FieldFormatterCleanups actions = new FieldFormatterCleanups(true, "mont[clear]"); actions.applySaveActions(entry); assertEquals(Optional.empty(), entry.getFieldOptional("mont")); diff --git a/src/test/java/net/sf/jabref/gui/dbproperties/SaveActionsListModelTest.java b/src/test/java/net/sf/jabref/gui/dbproperties/SaveActionsListModelTest.java index 7a96f5c5437..f0704a55ffc 100644 --- a/src/test/java/net/sf/jabref/gui/dbproperties/SaveActionsListModelTest.java +++ b/src/test/java/net/sf/jabref/gui/dbproperties/SaveActionsListModelTest.java @@ -2,7 +2,7 @@ import net.sf.jabref.exporter.FieldFormatterCleanups; import net.sf.jabref.logic.cleanup.FieldFormatterCleanup; -import net.sf.jabref.logic.formatter.bibtexfields.EraseFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.ClearFormatter; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -37,7 +37,7 @@ public void resetFiresItemsChanged() throws Exception { public void resetSetsFormattersToPassedList() throws Exception { SaveActionsListModel model = new SaveActionsListModel(Collections.emptyList()); FieldFormatterCleanups defaultFormatters = mock(FieldFormatterCleanups.class); - List formatters = Arrays.asList(new FieldFormatterCleanup("test", new EraseFormatter())); + List formatters = Arrays.asList(new FieldFormatterCleanup("test", new ClearFormatter())); when(defaultFormatters.getConfiguredActions()).thenReturn(formatters); model.reset(defaultFormatters); diff --git a/src/test/java/net/sf/jabref/importer/fileformat/BibtexParserTest.java b/src/test/java/net/sf/jabref/importer/fileformat/BibtexParserTest.java index d9d50cb8fda..12414549c10 100644 --- a/src/test/java/net/sf/jabref/importer/fileformat/BibtexParserTest.java +++ b/src/test/java/net/sf/jabref/importer/fileformat/BibtexParserTest.java @@ -12,7 +12,7 @@ import net.sf.jabref.importer.ParserResult; import net.sf.jabref.logic.cleanup.FieldFormatterCleanup; import net.sf.jabref.logic.config.SaveOrderConfig; -import net.sf.jabref.logic.formatter.casechanger.LowerCaseChanger; +import net.sf.jabref.logic.formatter.casechanger.LowerCaseFormatter; import net.sf.jabref.logic.labelpattern.AbstractLabelPattern; import net.sf.jabref.logic.labelpattern.DatabaseLabelPattern; import net.sf.jabref.model.database.BibDatabaseMode; @@ -1259,34 +1259,37 @@ public void parseTrimsWhitespaceInEpilogueAfterEntry() throws IOException { @Test public void parseRecognizesSaveActionsAfterEntry() throws IOException { - BibtexParser parser = new BibtexParser( - new StringReader("@InProceedings{6055279,\n" + " Title = {Educational session 1},\n" - + " Booktitle = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},\n" - + " Year = {2011},\n" + " Month = {Sept},\n" - + " Pages = {1-7},\n" - + " Abstract = {Start of the above-titled section of the conference proceedings record.},\n" - + " DOI = {10.1109/CICC.2011.6055279},\n" - + " ISSN = {0886-5930}\n" + "}\n" + "\n" - + "@comment{jabref-meta: saveActions:enabled;title[LowerCaseChanger]}")); + BibtexParser parser = new BibtexParser(new StringReader("@InProceedings{6055279,\n" + + " Title = {Educational session 1},\n" + + " Booktitle = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},\n" + + " Year = {2011},\n" + + " Month = {Sept},\n" + + " Pages = {1-7},\n" + + " Abstract = {Start of the above-titled section of the conference proceedings record.},\n" + + " DOI = {10.1109/CICC.2011.6055279},\n" + + " ISSN = {0886-5930}\n" + + "}\n" + + "\n" + + "@comment{jabref-meta: saveActions:enabled;title[lower_case]}")); ParserResult parserResult = parser.parse(); List saveActions = parserResult.getMetaData().getData(MetaData.SAVE_ACTIONS); assertEquals("enabled", saveActions.get(0)); - assertEquals("title[LowerCaseChanger]", saveActions.get(1)); + assertEquals("title[lower_case]", saveActions.get(1)); } @Test public void integrationTestSaveActions() throws IOException { BibtexParser parser = new BibtexParser( - new StringReader("@comment{jabref-meta: saveActions:enabled;title[LowerCaseChanger]}")); + new StringReader("@comment{jabref-meta: saveActions:enabled;title[lower_case]}")); ParserResult parserResult = parser.parse(); FieldFormatterCleanups saveActions = parserResult.getMetaData().getSaveActions(); assertTrue(saveActions.isEnabled()); - assertEquals(Collections.singletonList(new FieldFormatterCleanup("title", new LowerCaseChanger())), + assertEquals(Collections.singletonList(new FieldFormatterCleanup("title", new LowerCaseFormatter())), saveActions.getConfiguredActions()); } diff --git a/src/test/java/net/sf/jabref/logic/cleanup/CleanupWorkerTest.java b/src/test/java/net/sf/jabref/logic/cleanup/CleanupWorkerTest.java index 7176ddf9be5..619910bcb18 100644 --- a/src/test/java/net/sf/jabref/logic/cleanup/CleanupWorkerTest.java +++ b/src/test/java/net/sf/jabref/logic/cleanup/CleanupWorkerTest.java @@ -4,6 +4,8 @@ import net.sf.jabref.JabRefPreferences; import net.sf.jabref.exporter.FieldFormatterCleanups; import net.sf.jabref.logic.FieldChange; +import net.sf.jabref.logic.formatter.bibtexfields.*; +import net.sf.jabref.logic.formatter.casechanger.ProtectTermsFormatter; import net.sf.jabref.logic.journals.JournalAbbreviationLoader; import net.sf.jabref.logic.journals.JournalAbbreviationRepository; import net.sf.jabref.model.entry.BibEntry; @@ -140,7 +142,8 @@ public void cleanupDoiReturnsChanges() { @Test public void cleanupMonthChangesNumberToBibtex() { - CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, "month[MonthFormatter]")); + CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, + Collections.singletonList(new FieldFormatterCleanup("month", new NormalizeMonthFormatter())))); BibEntry entry = new BibEntry(); entry.setField("month", "01"); @@ -151,7 +154,8 @@ public void cleanupMonthChangesNumberToBibtex() { @Test public void cleanupPageNumbersConvertsSingleDashToDouble() { - CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, "pages[PageNumbersFormatter]")); + CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, + Collections.singletonList(new FieldFormatterCleanup("pages", new NormalizePagesFormatter())))); BibEntry entry = new BibEntry(); entry.setField("pages", "1-2"); @@ -162,7 +166,8 @@ public void cleanupPageNumbersConvertsSingleDashToDouble() { @Test public void cleanupDatesConvertsToCorrectFormat() { - CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, "date[DateFormatter]")); + CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, + Collections.singletonList(new FieldFormatterCleanup("date", new NormalizeDateFormatter())))); BibEntry entry = new BibEntry(); entry.setField("date", "01/1999"); @@ -217,19 +222,21 @@ public void cleanupRenamePdfRenamesRelativeFile() throws IOException { } @Test - public void cleanupHtmlStripsHtmlTag() { - CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, "title[HtmlConverter]")); + public void cleanupHtmlToLatexConvertsEpsilonToLatex() { + CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, + Collections.singletonList(new FieldFormatterCleanup("title", new HtmlToLatexFormatter())))); BibEntry entry = new BibEntry(); - entry.setField("title", "hallo"); + entry.setField("title", "Ε"); CleanupWorker worker = new CleanupWorker(preset); worker.cleanup(entry); - Assert.assertEquals("hallo", entry.getField("title")); + Assert.assertEquals("{$\\Epsilon$}", entry.getField("title")); } @Test public void cleanupUnitsConvertsOneAmpereToLatex() { - CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, "title[UnitFormatter]")); + CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, + Collections.singletonList(new FieldFormatterCleanup("title", new UnitsToLatexFormatter())))); BibEntry entry = new BibEntry(); entry.setField("title", "1 A"); @@ -240,7 +247,8 @@ public void cleanupUnitsConvertsOneAmpereToLatex() { @Test public void cleanupCasesAddsBracketAroundAluminiumGalliumArsenid() { - CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, "title[CaseKeeper]")); + CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, + Collections.singletonList(new FieldFormatterCleanup("title", new ProtectTermsFormatter())))); BibEntry entry = new BibEntry(); entry.setField("title", "AlGaAs"); @@ -251,7 +259,8 @@ public void cleanupCasesAddsBracketAroundAluminiumGalliumArsenid() { @Test public void cleanupLatexMergesTwoLatexMathEnvironments() { - CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, "title[LatexFormatter]")); + CleanupPreset preset = new CleanupPreset(new FieldFormatterCleanups(true, + Collections.singletonList(new FieldFormatterCleanup("title", new LatexCleanupFormatter())))); BibEntry entry = new BibEntry(); entry.setField("title", "$\\alpha$$\\beta$"); diff --git a/src/test/java/net/sf/jabref/logic/formatter/CaseChangersTest.java b/src/test/java/net/sf/jabref/logic/formatter/CaseChangersTest.java index 898575e210d..d9d03f55218 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/CaseChangersTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/CaseChangersTest.java @@ -5,58 +5,49 @@ public class CaseChangersTest { - @Test - public void testNumberOfModes() { - Assert.assertEquals("lower", CaseChangers.LOWER.getName()); // equals: FORMAT_MODE.ALL_LOWERS - Assert.assertEquals("UPPER", CaseChangers.UPPER.getName()); // equals: FORMAT_MODE.ALL_UPPERS - Assert.assertEquals("Upper first", CaseChangers.UPPER_FIRST.getName()); // equals: FORMAT_MODE.TITLE_LOWERS - Assert.assertEquals("Upper Each First", CaseChangers.UPPER_EACH_FIRST.getName()); // equals: FORMAT_MODE.EACH_FIRST_UPPERS - Assert.assertEquals("Title", CaseChangers.TITLE.getName()); // equals: FORMAT_MODE.TITLE_UPPERS - } - @Test public void testChangeCaseLower() { - Assert.assertEquals("", CaseChangers.LOWER.format("")); - Assert.assertEquals("lower", CaseChangers.LOWER.format("LOWER")); - Assert.assertEquals("lower {UPPER}", CaseChangers.LOWER.format("LOWER {UPPER}")); - Assert.assertEquals("lower {U}pper", CaseChangers.LOWER.format("LOWER {U}PPER")); + Assert.assertEquals("", CaseChangers.TO_LOWER_CASE.format("")); + Assert.assertEquals("lower", CaseChangers.TO_LOWER_CASE.format("LOWER")); + Assert.assertEquals("lower {UPPER}", CaseChangers.TO_LOWER_CASE.format("LOWER {UPPER}")); + Assert.assertEquals("lower {U}pper", CaseChangers.TO_LOWER_CASE.format("LOWER {U}PPER")); } @Test public void testChangeCaseUpper() { - Assert.assertEquals("", CaseChangers.UPPER.format("")); - Assert.assertEquals("LOWER", CaseChangers.UPPER.format("LOWER")); - Assert.assertEquals("UPPER", CaseChangers.UPPER.format("upper")); - Assert.assertEquals("UPPER", CaseChangers.UPPER.format("UPPER")); - Assert.assertEquals("UPPER {lower}", CaseChangers.UPPER.format("upper {lower}")); - Assert.assertEquals("UPPER {l}OWER", CaseChangers.UPPER.format("upper {l}ower")); + Assert.assertEquals("", CaseChangers.TO_UPPER_CASE.format("")); + Assert.assertEquals("LOWER", CaseChangers.TO_UPPER_CASE.format("LOWER")); + Assert.assertEquals("UPPER", CaseChangers.TO_UPPER_CASE.format("upper")); + Assert.assertEquals("UPPER", CaseChangers.TO_UPPER_CASE.format("UPPER")); + Assert.assertEquals("UPPER {lower}", CaseChangers.TO_UPPER_CASE.format("upper {lower}")); + Assert.assertEquals("UPPER {l}OWER", CaseChangers.TO_UPPER_CASE.format("upper {l}ower")); } @Test public void testChangeCaseUpperFirst() { - Assert.assertEquals("", CaseChangers.UPPER_FIRST.format("")); - Assert.assertEquals("Upper first", CaseChangers.UPPER_FIRST.format("upper First")); - Assert.assertEquals("Upper first", CaseChangers.UPPER_FIRST.format("uPPER FIRST")); - Assert.assertEquals("Upper {NOT} first", CaseChangers.UPPER_FIRST.format("upper {NOT} FIRST")); - Assert.assertEquals("Upper {N}ot first", CaseChangers.UPPER_FIRST.format("upper {N}OT FIRST")); + Assert.assertEquals("", CaseChangers.TO_SENTENCE_CASE.format("")); + Assert.assertEquals("Upper first", CaseChangers.TO_SENTENCE_CASE.format("upper First")); + Assert.assertEquals("Upper first", CaseChangers.TO_SENTENCE_CASE.format("uPPER FIRST")); + Assert.assertEquals("Upper {NOT} first", CaseChangers.TO_SENTENCE_CASE.format("upper {NOT} FIRST")); + Assert.assertEquals("Upper {N}ot first", CaseChangers.TO_SENTENCE_CASE.format("upper {N}OT FIRST")); } @Test public void testChangeCaseUpperEachFirst() { - Assert.assertEquals("", CaseChangers.UPPER_EACH_FIRST.format("")); - Assert.assertEquals("Upper Each First", CaseChangers.UPPER_EACH_FIRST.format("upper each First")); - Assert.assertEquals("Upper Each First {NOT} {this}", CaseChangers.UPPER_EACH_FIRST.format("upper each first {NOT} {this}")); - Assert.assertEquals("Upper Each First {N}ot {t}his", CaseChangers.UPPER_EACH_FIRST.format("upper each first {N}OT {t}his")); + Assert.assertEquals("", CaseChangers.CAPITALIZE.format("")); + Assert.assertEquals("Upper Each First", CaseChangers.CAPITALIZE.format("upper each First")); + Assert.assertEquals("Upper Each First {NOT} {this}", CaseChangers.CAPITALIZE.format("upper each first {NOT} {this}")); + Assert.assertEquals("Upper Each First {N}ot {t}his", CaseChangers.CAPITALIZE.format("upper each first {N}OT {t}his")); } @Test public void testChangeCaseTitle() { - Assert.assertEquals("", CaseChangers.TITLE.format("")); - Assert.assertEquals("Upper Each First", CaseChangers.TITLE.format("upper each first")); - Assert.assertEquals("An Upper Each First And", CaseChangers.TITLE.format("an upper each first and")); - Assert.assertEquals("An Upper Each of the and First And", CaseChangers.TITLE.format("an upper each of the and first and")); - Assert.assertEquals("An Upper Each of: The and First And", CaseChangers.TITLE.format("an upper each of: the and first and")); - Assert.assertEquals("An Upper First with and without {CURLY} {brackets}", CaseChangers.TITLE.format("AN UPPER FIRST WITH AND WITHOUT {CURLY} {brackets}")); - Assert.assertEquals("An Upper First with {A}nd without {C}urly {b}rackets", CaseChangers.TITLE.format("AN UPPER FIRST WITH {A}ND WITHOUT {C}URLY {b}rackets")); + Assert.assertEquals("", CaseChangers.TO_TITLE_CASE.format("")); + Assert.assertEquals("Upper Each First", CaseChangers.TO_TITLE_CASE.format("upper each first")); + Assert.assertEquals("An Upper Each First And", CaseChangers.TO_TITLE_CASE.format("an upper each first and")); + Assert.assertEquals("An Upper Each of the and First And", CaseChangers.TO_TITLE_CASE.format("an upper each of the and first and")); + Assert.assertEquals("An Upper Each of: The and First And", CaseChangers.TO_TITLE_CASE.format("an upper each of: the and first and")); + Assert.assertEquals("An Upper First with and without {CURLY} {brackets}", CaseChangers.TO_TITLE_CASE.format("AN UPPER FIRST WITH AND WITHOUT {CURLY} {brackets}")); + Assert.assertEquals("An Upper First with {A}nd without {C}urly {b}rackets", CaseChangers.TO_TITLE_CASE.format("AN UPPER FIRST WITH {A}ND WITHOUT {C}URLY {b}rackets")); } } diff --git a/src/test/java/net/sf/jabref/logic/formatter/FormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/FormatterTest.java index c692e875cd2..e4172012de5 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/FormatterTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/FormatterTest.java @@ -4,7 +4,8 @@ import net.sf.jabref.JabRefPreferences; import net.sf.jabref.logic.formatter.bibtexfields.*; import net.sf.jabref.logic.formatter.casechanger.*; -import net.sf.jabref.logic.formatter.minifier.AuthorsMinifier; +import net.sf.jabref.logic.formatter.minifier.MinifyNameListFormatter; +import net.sf.jabref.logic.layout.format.LatexToUnicodeFormatter; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -73,25 +74,26 @@ public void getDescriptionAlwaysNonEmpty() { @Parameterized.Parameters(name = "{index}: {0}") public static Collection instancesToTest() { return Arrays.asList( - new Object[]{new AuthorsFormatter()}, - new Object[]{new UpperEachFirstCaseChanger()}, - new Object[]{new UpperCaseChanger()}, - new Object[]{new MonthFormatter()}, - new Object[]{new LatexFormatter()}, + new Object[]{new NormalizeNamesFormatter()}, + new Object[]{new CapitalizeFormatter()}, + new Object[]{new UpperCaseFormatter()}, + new Object[]{new NormalizeMonthFormatter()}, + new Object[]{new LatexCleanupFormatter()}, new Object[]{new IdentityFormatter()}, - new Object[]{new UpperFirstCaseChanger()}, - new Object[]{new AuthorsMinifier()}, - new Object[]{new DateFormatter()}, - new Object[]{new TitleCaseChanger()}, - new Object[]{new CaseKeeper()}, - new Object[]{new PageNumbersFormatter()}, - new Object[]{new LowerCaseChanger()}, - new Object[]{new HTMLToLatexFormatter()}, - new Object[]{new SuperscriptFormatter()}, - new Object[]{new UnitFormatter()}, - new Object[]{new RemoveBracesFormatter()}, + new Object[]{new SentenceCaseFormatter()}, + new Object[]{new MinifyNameListFormatter()}, + new Object[]{new NormalizeDateFormatter()}, + new Object[]{new TitleCaseFormatter()}, + new Object[]{new ProtectTermsFormatter()}, + new Object[]{new NormalizePagesFormatter()}, + new Object[]{new LowerCaseFormatter()}, + new Object[]{new HtmlToLatexFormatter()}, + new Object[]{new LatexToUnicodeFormatter()}, new Object[]{new UnicodeToLatexFormatter()}, - new Object[]{new EraseFormatter()} + new Object[]{new OrdinalsToSuperscriptFormatter()}, + new Object[]{new UnitsToLatexFormatter()}, + new Object[]{new RemoveBracesFormatter()}, + new Object[]{new ClearFormatter()} ); } } \ No newline at end of file diff --git a/src/test/java/net/sf/jabref/logic/formatter/PageNumbersFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/NormalizePagesFormatterTest.java similarity index 78% rename from src/test/java/net/sf/jabref/logic/formatter/PageNumbersFormatterTest.java rename to src/test/java/net/sf/jabref/logic/formatter/NormalizePagesFormatterTest.java index 4ce36670e46..0c39fabe213 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/PageNumbersFormatterTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/NormalizePagesFormatterTest.java @@ -1,17 +1,17 @@ package net.sf.jabref.logic.formatter; -import net.sf.jabref.logic.formatter.bibtexfields.PageNumbersFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class PageNumbersFormatterTest { - private PageNumbersFormatter formatter; +public class NormalizePagesFormatterTest { + private NormalizePagesFormatter formatter; @Before public void setUp() { - formatter = new PageNumbersFormatter(); + formatter = new NormalizePagesFormatter(); } @After @@ -20,9 +20,8 @@ public void tearDown() { } @Test - public void returnsFormatterName() { - Assert.assertNotNull(formatter.getName()); - Assert.assertNotEquals("", formatter.getName()); + public void formatSinglePageResultsInNoChange() { + expectCorrect("1", "1"); } @Test diff --git a/src/test/java/net/sf/jabref/logic/formatter/SuperscriptFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/OrdinalsToSuperscriptFormatterTest.java similarity index 88% rename from src/test/java/net/sf/jabref/logic/formatter/SuperscriptFormatterTest.java rename to src/test/java/net/sf/jabref/logic/formatter/OrdinalsToSuperscriptFormatterTest.java index 049767c90c2..c588a29ab2e 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/SuperscriptFormatterTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/OrdinalsToSuperscriptFormatterTest.java @@ -1,18 +1,18 @@ package net.sf.jabref.logic.formatter; -import net.sf.jabref.logic.formatter.bibtexfields.SuperscriptFormatter; +import net.sf.jabref.logic.formatter.bibtexfields.OrdinalsToSuperscriptFormatter; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class SuperscriptFormatterTest { - private SuperscriptFormatter formatter; +public class OrdinalsToSuperscriptFormatterTest { + private OrdinalsToSuperscriptFormatter formatter; @Before public void setUp() { - formatter = new SuperscriptFormatter(); + formatter = new OrdinalsToSuperscriptFormatter(); } @After diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/EraseFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java similarity index 64% rename from src/test/java/net/sf/jabref/logic/formatter/bibtexfields/EraseFormatterTest.java rename to src/test/java/net/sf/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java index e293fa38dba..b8c3c4c2992 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/EraseFormatterTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/ClearFormatterTest.java @@ -4,15 +4,15 @@ import static org.junit.Assert.*; -public class EraseFormatterTest { +public class ClearFormatterTest { @Test public void formatReturnsEmptyForEmptyString() throws Exception { - assertEquals("", new EraseFormatter().format("")); + assertEquals("", new ClearFormatter().format("")); } @Test public void formatReturnsEmptyForSomeString() throws Exception { - assertEquals("", new EraseFormatter().format("test")); + assertEquals("", new ClearFormatter().format("test")); } } \ No newline at end of file diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/HTMLConverterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/HTMLConverterTest.java deleted file mode 100644 index 91055438ae8..00000000000 --- a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/HTMLConverterTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.sf.jabref.logic.formatter.bibtexfields; - -import static org.junit.Assert.*; - -import org.junit.Before; -import org.junit.Test; - -import net.sf.jabref.Globals; -import net.sf.jabref.JabRefPreferences; - - -public class HTMLConverterTest { - - private final HTMLToLatexFormatter conv = new HTMLToLatexFormatter(); - - @Before - public void setUp() throws Exception { - Globals.prefs = JabRefPreferences.getInstance(); - } - - @Test - public void testBasic() { - assertEquals("aaa", conv.format("aaa")); - } - - @Test - public void testHTMLEmpty() { - assertEquals("", conv.format("")); - } - - @Test - public void testHTML() { - assertEquals("{\\\"{a}}", conv.format("ä")); - assertEquals("{\\\"{a}}", conv.format("ä")); - assertEquals("{\\\"{a}}", conv.format("ä")); - assertEquals("{$\\Epsilon$}", conv.format("Ε")); - } - - @Test - public void testHTMLRemoveTags() { - assertEquals("aaa", conv.format("aaa")); - } - - @Test - public void testHTMLCombiningAccents() { - assertEquals("{\\\"{a}}", conv.format("ä")); - assertEquals("{\\\"{a}}", conv.format("ä")); - assertEquals("{\\\"{a}}b", conv.format("äb")); - assertEquals("{\\\"{a}}b", conv.format("äb")); - } -} diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java new file mode 100644 index 00000000000..9f2dcd8be0a --- /dev/null +++ b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java @@ -0,0 +1,62 @@ +package net.sf.jabref.logic.formatter.bibtexfields; + +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.*; + +public class HtmlToLatexFormatterTest { + + private HtmlToLatexFormatter htmlToLatexFormatter; + + @Before + public void setUp() throws Exception { + htmlToLatexFormatter = new HtmlToLatexFormatter(); + } + + @Test + public void formatWithoutHtmlCharactersReturnsSameString() { + assertEquals("abc", htmlToLatexFormatter.format("abc")); + } + + @Test + public void formatMultipleHtmlCharacters() { + assertEquals("{{\\aa}}{\\\"{a}}{\\\"{o}}", htmlToLatexFormatter.format("åäö")); + } + + @Test + public void formatCombinedAccent() { + assertEquals("{\\'{\\i}}", htmlToLatexFormatter.format("í")); + } + + @Test + public void testBasic() { + assertEquals("aaa", htmlToLatexFormatter.format("aaa")); + } + + @Test + public void testHTMLEmpty() { + assertEquals("", htmlToLatexFormatter.format("")); + } + + @Test + public void testHTML() { + assertEquals("{\\\"{a}}", htmlToLatexFormatter.format("ä")); + assertEquals("{\\\"{a}}", htmlToLatexFormatter.format("ä")); + assertEquals("{\\\"{a}}", htmlToLatexFormatter.format("ä")); + assertEquals("{$\\Epsilon$}", htmlToLatexFormatter.format("Ε")); + } + + @Test + public void testHTMLRemoveTags() { + assertEquals("aaa", htmlToLatexFormatter.format("aaa")); + } + + @Test + public void testHTMLCombiningAccents() { + assertEquals("{\\\"{a}}", htmlToLatexFormatter.format("ä")); + assertEquals("{\\\"{a}}", htmlToLatexFormatter.format("ä")); + assertEquals("{\\\"{a}}b", htmlToLatexFormatter.format("äb")); + assertEquals("{\\\"{a}}b", htmlToLatexFormatter.format("äb")); + } +} \ No newline at end of file diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/LatexFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java similarity index 83% rename from src/test/java/net/sf/jabref/logic/formatter/bibtexfields/LatexFormatterTest.java rename to src/test/java/net/sf/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java index 67ce6f39660..dface875955 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/LatexFormatterTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java @@ -4,11 +4,11 @@ import org.junit.Test; -public class LatexFormatterTest { +public class LatexCleanupFormatterTest { @Test public void test() { - LatexFormatter lf = new LatexFormatter(); + LatexCleanupFormatter lf = new LatexCleanupFormatter(); assertEquals("$\\alpha\\beta$", lf.format("$\\alpha$$\\beta$")); assertEquals("{VLSI DSP}", lf.format("{VLSI} {DSP}")); diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/DateFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java similarity index 59% rename from src/test/java/net/sf/jabref/logic/formatter/bibtexfields/DateFormatterTest.java rename to src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java index ee594ee7f74..cd0d1e33bc2 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/DateFormatterTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java @@ -3,143 +3,143 @@ import org.junit.Assert; import org.junit.Test; -public class DateFormatterTest { +public class NormalizeDateFormatterTest { @Test public void formatDateYYYYMM0D() { - String formatted = new DateFormatter().format("2015-11-08"); + String formatted = new NormalizeDateFormatter().format("2015-11-08"); Assert.assertEquals("2015-11-08", formatted); } @Test public void formatDateYYYYM0D() { - String formatted = new DateFormatter().format("2015-1-08"); + String formatted = new NormalizeDateFormatter().format("2015-1-08"); Assert.assertEquals("2015-01-08", formatted); } @Test public void formatDateYYYYMD() { - String formatted = new DateFormatter().format("2015-1-8"); + String formatted = new NormalizeDateFormatter().format("2015-1-8"); Assert.assertEquals("2015-01-08", formatted); } @Test public void formatDateYYYYMM() { - String formatted = new DateFormatter().format("2015-11"); + String formatted = new NormalizeDateFormatter().format("2015-11"); Assert.assertEquals("2015-11", formatted); } @Test public void formatDateYYYYM() { - String formatted = new DateFormatter().format("2015-1"); + String formatted = new NormalizeDateFormatter().format("2015-1"); Assert.assertEquals("2015-01", formatted); } @Test public void formatDateMMYY() { - String formatted = new DateFormatter().format("11/15"); + String formatted = new NormalizeDateFormatter().format("11/15"); Assert.assertEquals("2015-11", formatted); } @Test public void formatDateMYY() { - String formatted = new DateFormatter().format("1/15"); + String formatted = new NormalizeDateFormatter().format("1/15"); Assert.assertEquals("2015-01", formatted); } @Test public void formatDate0MYY() { - String formatted = new DateFormatter().format("01/15"); + String formatted = new NormalizeDateFormatter().format("01/15"); Assert.assertEquals("2015-01", formatted); } @Test public void formatDateMMYYYY() { - String formatted = new DateFormatter().format("11/2015"); + String formatted = new NormalizeDateFormatter().format("11/2015"); Assert.assertEquals("2015-11", formatted); } @Test public void formatDateMYYYY() { - String formatted = new DateFormatter().format("1/2015"); + String formatted = new NormalizeDateFormatter().format("1/2015"); Assert.assertEquals("2015-01", formatted); } @Test public void formatDate0MYYYY() { - String formatted = new DateFormatter().format("01/2015"); + String formatted = new NormalizeDateFormatter().format("01/2015"); Assert.assertEquals("2015-01", formatted); } @Test public void formatDateMMMDDCommaYYYY() { - String formatted = new DateFormatter().format("November 08, 2015"); + String formatted = new NormalizeDateFormatter().format("November 08, 2015"); Assert.assertEquals("2015-11-08", formatted); } @Test public void formatDateMMMDCommaYYYY() { - String formatted = new DateFormatter().format("November 8, 2015"); + String formatted = new NormalizeDateFormatter().format("November 8, 2015"); Assert.assertEquals("2015-11-08", formatted); } @Test public void formatDateMMMCommaYYYY() { - String formatted = new DateFormatter().format("November, 2015"); + String formatted = new NormalizeDateFormatter().format("November, 2015"); Assert.assertEquals("2015-11", formatted); } @Test public void formatDate0DdotMMdotYYYY() { - String formatted = new DateFormatter().format("08.11.2015"); + String formatted = new NormalizeDateFormatter().format("08.11.2015"); Assert.assertEquals("2015-11-08", formatted); } @Test public void formatDateDdotMMdotYYYY() { - String formatted = new DateFormatter().format("8.11.2015"); + String formatted = new NormalizeDateFormatter().format("8.11.2015"); Assert.assertEquals("2015-11-08", formatted); } @Test public void formatDateDDdotMMdotYYYY() { - String formatted = new DateFormatter().format("15.11.2015"); + String formatted = new NormalizeDateFormatter().format("15.11.2015"); Assert.assertEquals("2015-11-15", formatted); } @Test public void formatDate0Ddot0MdotYYYY() { - String formatted = new DateFormatter().format("08.01.2015"); + String formatted = new NormalizeDateFormatter().format("08.01.2015"); Assert.assertEquals("2015-01-08", formatted); } @Test public void formatDateDdot0MdotYYYY() { - String formatted = new DateFormatter().format("8.01.2015"); + String formatted = new NormalizeDateFormatter().format("8.01.2015"); Assert.assertEquals("2015-01-08", formatted); } @Test public void formatDateDDdot0MdotYYYY() { - String formatted = new DateFormatter().format("15.01.2015"); + String formatted = new NormalizeDateFormatter().format("15.01.2015"); Assert.assertEquals("2015-01-15", formatted); } @Test public void formatDate0DdotMdotYYYY() { - String formatted = new DateFormatter().format("08.1.2015"); + String formatted = new NormalizeDateFormatter().format("08.1.2015"); Assert.assertEquals("2015-01-08", formatted); } @Test public void formatDateDdotMdotYYYY() { - String formatted = new DateFormatter().format("8.1.2015"); + String formatted = new NormalizeDateFormatter().format("8.1.2015"); Assert.assertEquals("2015-01-08", formatted); } @Test public void formatDateDDdotMdotYYYY() { - String formatted = new DateFormatter().format("15.1.2015"); + String formatted = new NormalizeDateFormatter().format("15.1.2015"); Assert.assertEquals("2015-01-15", formatted); } } \ No newline at end of file diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/AuthorsFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java similarity index 93% rename from src/test/java/net/sf/jabref/logic/formatter/bibtexfields/AuthorsFormatterTest.java rename to src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java index c443e79749e..5fff9604b87 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/AuthorsFormatterTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java @@ -5,12 +5,12 @@ import org.junit.Before; import org.junit.Test; -public class AuthorsFormatterTest { - private AuthorsFormatter formatter; +public class NormalizeNamesFormatterTest { + private NormalizeNamesFormatter formatter; @Before public void setUp() { - formatter = new AuthorsFormatter(); + formatter = new NormalizeNamesFormatter(); } @After diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/PageNumbersFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/PageNumbersFormatterTest.java deleted file mode 100644 index f69765c09fd..00000000000 --- a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/PageNumbersFormatterTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.sf.jabref.logic.formatter.bibtexfields; - -import org.junit.Assert; -import org.junit.Test; - -public class PageNumbersFormatterTest { - - @Test - public void formatPageNumbers() { - String formatted = new PageNumbersFormatter().format("1-2"); - Assert.assertEquals("1--2", formatted); - formatted = new PageNumbersFormatter().format("1"); - Assert.assertEquals("1", formatted); - } -} \ No newline at end of file diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java new file mode 100644 index 00000000000..6c93b7d3b01 --- /dev/null +++ b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java @@ -0,0 +1,18 @@ +package net.sf.jabref.logic.formatter.bibtexfields; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class UnicodeToLatexFormatterTest { + + @Test + public void formatWithoutUnicodeCharactersReturnsSameString() { + assertEquals("abc", new UnicodeToLatexFormatter().format("abc")); + } + + @Test + public void formatMultipleUnicodeCharacters() { + assertEquals("{{\\aa}}{\\\"{a}}{\\\"{o}}", new UnicodeToLatexFormatter().format("\u00E5\u00E4\u00F6")); + } +} \ No newline at end of file diff --git a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/UnitFormatterTest.java b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java similarity index 71% rename from src/test/java/net/sf/jabref/logic/formatter/bibtexfields/UnitFormatterTest.java rename to src/test/java/net/sf/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java index 845a535248d..623f70b0cb1 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/UnitFormatterTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatterTest.java @@ -5,10 +5,10 @@ import org.junit.Test; -public class UnitFormatterTest { +public class UnitsToLatexFormatterTest { @Test public void test() { - UnitFormatter uf = new UnitFormatter(); + UnitsToLatexFormatter uf = new UnitsToLatexFormatter(); assertEquals("1~{A}", uf.format("1 A")); assertEquals("1\\mbox{-}{mA}", uf.format("1-mA")); diff --git a/src/test/java/net/sf/jabref/logic/formatter/casechanger/CaseKeeperTest.java b/src/test/java/net/sf/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java similarity index 78% rename from src/test/java/net/sf/jabref/logic/formatter/casechanger/CaseKeeperTest.java rename to src/test/java/net/sf/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java index 40cacf7af2e..85ab8581afe 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/casechanger/CaseKeeperTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java @@ -5,11 +5,11 @@ import org.junit.Test; -public class CaseKeeperTest { +public class ProtectTermsFormatterTest { @Test public void test() { - CaseKeeper ck = new CaseKeeper(); + ProtectTermsFormatter ck = new ProtectTermsFormatter(); assertEquals("{VLSI}", ck.format("VLSI")); assertEquals("{VLSI}", ck.format("{VLSI}")); diff --git a/src/test/java/net/sf/jabref/logic/formatter/minifier/AuthorsMinifierTest.java b/src/test/java/net/sf/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java similarity index 89% rename from src/test/java/net/sf/jabref/logic/formatter/minifier/AuthorsMinifierTest.java rename to src/test/java/net/sf/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java index 2897988a7ba..c049e7ba7d7 100644 --- a/src/test/java/net/sf/jabref/logic/formatter/minifier/AuthorsMinifierTest.java +++ b/src/test/java/net/sf/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java @@ -5,12 +5,12 @@ import org.junit.Before; import org.junit.Test; -public class AuthorsMinifierTest { - private AuthorsMinifier formatter; +public class MinifyNameListFormatterTest { + private MinifyNameListFormatter formatter; @Before public void setUp() { - formatter = new AuthorsMinifier(); + formatter = new MinifyNameListFormatter(); } @After diff --git a/src/test/java/net/sf/jabref/logic/layout/format/FormatCharsTest.java b/src/test/java/net/sf/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java similarity index 79% rename from src/test/java/net/sf/jabref/logic/layout/format/FormatCharsTest.java rename to src/test/java/net/sf/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java index aa36ef5964a..0cdcc3b9a6d 100644 --- a/src/test/java/net/sf/jabref/logic/layout/format/FormatCharsTest.java +++ b/src/test/java/net/sf/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java @@ -32,27 +32,27 @@ import net.sf.jabref.logic.layout.LayoutFormatter; -public class FormatCharsTest { +public class LatexToUnicodeFormatterTest { @Test public void testPlainFormat() { - assertEquals("aaa", new FormatChars().format("aaa")); + assertEquals("aaa", new LatexToUnicodeFormatter().format("aaa")); } @Test public void testFormatUmlaut() { - assertEquals("ä", new FormatChars().format("{\\\"{a}}")); - assertEquals("Ä", new FormatChars().format("{\\\"{A}}")); + assertEquals("ä", new LatexToUnicodeFormatter().format("{\\\"{a}}")); + assertEquals("Ä", new LatexToUnicodeFormatter().format("{\\\"{A}}")); } @Test public void testFormatStripLatexCommands() { - assertEquals("-", new FormatChars().format("\\mbox{-}")); + assertEquals("-", new LatexToUnicodeFormatter().format("\\mbox{-}")); } @Test public void testEquations() { - LayoutFormatter layout = new FormatChars(); + LayoutFormatter layout = new LatexToUnicodeFormatter(); assertEquals("$", layout.format("\\$")); assertEquals("σ", layout.format("$\\sigma$")); diff --git a/src/test/java/net/sf/jabref/logic/util/ConvertersTest.java b/src/test/java/net/sf/jabref/logic/util/ConvertersTest.java deleted file mode 100644 index 1bb2476350d..00000000000 --- a/src/test/java/net/sf/jabref/logic/util/ConvertersTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.sf.jabref.logic.util; - -import net.sf.jabref.logic.util.strings.Converters; -import net.sf.jabref.Globals; -import net.sf.jabref.JabRefPreferences; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -public class ConvertersTest { - - @Before - public void setUp() { - Globals.prefs = JabRefPreferences.getInstance(); - } - - @Test - public void testNumberOfModes() { - Assert.assertEquals("Unicode to LaTeX", Converters.UNICODE_TO_LATEX.getName()); - Assert.assertEquals("HTML to LaTeX", Converters.HTML_TO_LATEX.getName()); - } - - @Test - public void testUnicodeToLatexConversion() { - Assert.assertEquals("", Converters.UNICODE_TO_LATEX.convert("")); - Assert.assertEquals("abc", Converters.UNICODE_TO_LATEX.convert("abc")); - Assert.assertEquals("{{\\aa}}{\\\"{a}}{\\\"{o}}", Converters.UNICODE_TO_LATEX.convert("\u00E5\u00E4\u00F6")); - } - - @Test - public void testHTMLToLatexConversion() { - Assert.assertEquals("", Converters.HTML_TO_LATEX.convert("")); - Assert.assertEquals("abc", Converters.HTML_TO_LATEX.convert("abc")); - Assert.assertEquals("{{\\aa}}{\\\"{a}}{\\\"{o}}", Converters.HTML_TO_LATEX.convert("åäö")); - Assert.assertEquals("{\\'{\\i}}", Converters.HTML_TO_LATEX.convert("í")); - } - -}