[jabref] 394/459: Merge tag 'upstream/2.10_beta1+ds' into experimental

gregor herrmann gregoa at debian.org
Thu Sep 15 20:41:25 UTC 2016


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository jabref.

commit 849c0a447c7ff046bf5f736221c4296e2ea9a7e6
Merge: 8b42890 f6a735e
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Mar 29 17:26:09 2013 +0100

    Merge tag 'upstream/2.10_beta1+ds' into experimental
    
    Upstream version 2.10~beta1+ds

 .travis.yml                                        |    1 +
 build.gradle                                       |   88 --
 build.xml                                          |   36 +-
 gradle/wrapper/gradle-wrapper.jar                  |  Bin 39860 -> 0 bytes
 gradle/wrapper/gradle-wrapper.properties           |    6 -
 osx/JavaApplicationStub                            |  Bin 61376 -> 0 bytes
 osx/OSXAdapter.class                               |  Bin 1815 -> 0 bytes
 src/help/About.html                                |    5 +-
 src/help/BibtexHelp.html                           |   18 +-
 src/help/Contents.html                             |    3 +-
 src/help/LabelPatterns.html                        |   43 +-
 src/help/RevisionHistory.html                      |   62 +-
 src/help/StringsHelp.html                          |   56 +
 src/help/da/About.html                             |    5 +-
 src/help/de/About.html                             |    6 +-
 src/help/fr/About.html                             |    4 +-
 src/help/fr/BibtexHelp.html                        |   20 +-
 src/help/fr/CiteSeerHelp.html                      |    4 +-
 src/help/fr/Contents.html                          |    3 +-
 src/help/fr/IEEEXploreHelp.html                    |    3 +-
 src/help/fr/LabelPatterns.html                     |   76 +-
 src/help/fr/StringsHelp.html                       |   66 +
 src/help/in/About.html                             |    5 +-
 src/help/ja/ACMPortalHelp.html                     |    8 +-
 src/help/ja/About.html                             |   12 +-
 src/help/ja/BaseFrameHelp.html                     |   10 +-
 src/help/ja/BibtexHelp.html                        |   14 +-
 src/help/ja/CiteSeerHelp.html                      |   29 +-
 src/help/ja/CommandLine.html                       |  143 +-
 src/help/ja/Contents.html                          |   27 +-
 src/help/ja/CustomEntriesHelp.html                 |  109 +-
 src/help/ja/CustomExports.html                     |  650 +++-----
 src/help/ja/CustomImports.html                     |  119 +-
 src/help/ja/DOItoBibTeXHelp.html                   |   17 +
 src/help/ja/DiVAtoBibTeXHelp.html                  |   17 +
 src/help/ja/EndNoteFilters.html                    |   12 +-
 src/help/ja/EntryEditorHelp.html                   |   50 +-
 src/help/ja/ExternalFiles.html                     |    4 +-
 src/help/ja/FileLinks.html                         |   10 +-
 src/help/ja/GeneralFields.html                     |   18 +-
 src/help/ja/GoogleScholarHelp.html                 |   18 +
 src/help/ja/GroupsHelp.html                        |  157 +-
 src/help/ja/HelpHelp.html                          |    2 +-
 src/help/ja/IEEEXploreHelp.html                    |   12 +-
 src/help/ja/ISBNtoBibTeXHelp.html                  |   17 +
 src/help/ja/ImportInspectionDialog.html            |   17 +-
 src/help/ja/JSTOR.html                             |    4 +-
 src/help/ja/JabRefHelp.html                        |    6 +-
 src/help/ja/JournalAbbreviations.html              |    8 +-
 src/help/ja/LabelPatterns.html                     |   14 +-
 src/help/ja/MarkingHelp.html                       |    2 +-
 src/help/ja/MedlineHelp.html                       |   55 +-
 src/help/ja/OpenOfficeHelp.html                    |   73 -
 src/help/ja/OpenOfficeIntegration.html             |  370 +++++
 src/help/ja/Plugin.html                            |    8 +-
 src/help/ja/PreviewHelp.html                       |    2 +-
 src/help/ja/RevisionHistory.html                   |    2 +-
 src/help/ja/SQLExport.html                         |   33 +-
 src/help/ja/ScienceDirect.html                     |    2 +
 src/help/ja/SearchHelp.html                        |    4 +-
 src/help/ja/SpecialFieldsHelp.html                 |   46 +
 src/help/ja/Spires.html                            |    4 +-
 src/help/ja/StringsHelp.html                       |   49 +
 src/help/ja/XMPHelp.html                           |  114 +-
 src/help/ja/jabref_help.css                        |  144 +-
 src/images/crystal_16/Icons.properties             |    1 +
 src/images/crystal_16/mergeentries.png             |  Bin 0 -> 694 bytes
 src/images/splash-dev.svg                          |   64 +-
 src/images/splash.png                              |  Bin 172991 -> 222436 bytes
 src/java/net/sf/jabref/AdvancedTab.java            |   13 +-
 src/java/net/sf/jabref/AppearancePrefsTab.java     |   29 +-
 src/java/net/sf/jabref/AutoLinkFilesAction.java    |   50 +
 src/java/net/sf/jabref/BasePanel.java              |  111 +-
 src/java/net/sf/jabref/BibtexEntry.java            |  125 +-
 src/java/net/sf/jabref/BibtexEntryType.java        |   31 +-
 src/java/net/sf/jabref/BibtexString.java           |   77 +
 .../net/sf/jabref/CompressedEntryEditorTab.java    |   14 +-
 src/java/net/sf/jabref/DatabaseSearch.java         |    3 +-
 src/java/net/sf/jabref/EntryEditor.java            |  155 +-
 src/java/net/sf/jabref/EntryEditorPrefsTab.java    |   92 +-
 src/java/net/sf/jabref/EntryEditorTab.java         |    4 +
 src/java/net/sf/jabref/ExternalTab.java            |    4 +-
 src/java/net/sf/jabref/FieldComparator.java        |   11 +-
 src/java/net/sf/jabref/FileTab.java                |   52 +-
 .../net/sf/jabref/FindUnlinkedFilesDialog.java     |    8 +-
 src/java/net/sf/jabref/FontSelectorDialog.java     |    2 +-
 src/java/net/sf/jabref/GUIGlobals.java             |   15 +-
 src/java/net/sf/jabref/GeneralTab.java             |   16 +-
 src/java/net/sf/jabref/Globals.java                |   22 +-
 .../net/sf/jabref/JTextAreaWithHighlighting.java   |   32 +-
 src/java/net/sf/jabref/JabRef.java                 |   23 +-
 src/java/net/sf/jabref/JabRefFrame.java            |  143 +-
 src/java/net/sf/jabref/JabRefPreferences.java      |   74 +-
 src/java/net/sf/jabref/KeyBindingsDialog.java      |  153 +-
 src/java/net/sf/jabref/NetworkTab.java             |  146 ++
 src/java/net/sf/jabref/PrefsDialog3.java           |   13 +-
 src/java/net/sf/jabref/PreviewPanel.java           |    4 +-
 src/java/net/sf/jabref/PreviewPrefsTab.java        |    4 +-
 src/java/net/sf/jabref/RightClickMenu.java         |  156 +-
 src/java/net/sf/jabref/SearchManager2.java         |   25 +-
 src/java/net/sf/jabref/SendAsEMailAction.java      |   36 +-
 src/java/net/sf/jabref/SimpleUrlDragDrop.java      |    6 +-
 src/java/net/sf/jabref/TableColumnsTab.java        |   30 +-
 src/java/net/sf/jabref/UrlDragDrop.java            |   30 +-
 src/java/net/sf/jabref/Util.java                   |  286 +++-
 src/java/net/sf/jabref/XmpPrefsTab.java            |    4 +-
 .../net/sf/jabref/collab/FileUpdateMonitor.java    |   10 +
 src/java/net/sf/jabref/export/ExportFormats.java   |    2 +
 .../sf/jabref/export/ExportToClipboardAction.java  |    2 +-
 src/java/net/sf/jabref/export/FileActions.java     |  185 ++-
 .../net/sf/jabref/export/LatexFieldFormatter.java  |   23 +-
 src/java/net/sf/jabref/export/OpenFolder.java      |   67 +
 .../net/sf/jabref/export/SaveDatabaseAction.java   |    6 +-
 .../export/layout/format/Iso690FormatDate.java     |   57 +
 .../export/layout/format/Iso690NamesAuthors.java   |  116 ++
 .../sf/jabref/export/layout/format/RTFChars.java   |   67 +-
 .../sf/jabref/external/DownloadExternalFile.java   |    4 +-
 .../net/sf/jabref/external/DroppedFileHandler.java |   14 +-
 .../net/sf/jabref/external/ExternalFilePanel.java  |   14 +-
 src/java/net/sf/jabref/external/PushToLyx.java     |    4 +-
 .../sf/jabref/external/SynchronizeFileField.java   |   22 +-
 .../net/sf/jabref/external/WriteXMPAction.java     |   16 +-
 src/java/net/sf/jabref/groups/AutoGroupDialog.java |    3 +-
 src/java/net/sf/jabref/groups/ExplicitGroup.java   |   12 +-
 src/java/net/sf/jabref/groups/GroupDialog.java     |   36 +-
 src/java/net/sf/jabref/groups/GroupSelector.java   |   19 +
 .../sf/jabref/groups/GroupTreeCellRenderer.java    |   23 +-
 src/java/net/sf/jabref/groups/GroupsTree.java      |    5 +-
 src/java/net/sf/jabref/groups/KeywordGroup.java    |    7 +-
 src/java/net/sf/jabref/gui/CleanUpAction.java      |  108 +-
 .../sf/jabref/gui/EntryCustomizationDialog2.java   |    2 +-
 src/java/net/sf/jabref/gui/FieldWeightDialog.java  |    2 +-
 src/java/net/sf/jabref/gui/FileDialogs.java        |    4 +-
 src/java/net/sf/jabref/gui/FileListEditor.java     |  263 +---
 .../net/sf/jabref/gui/FileListEntryEditor.java     |    8 +-
 .../net/sf/jabref/gui/GroupAddRemoveDialog.java    |  102 ++
 .../net/sf/jabref/gui/ImportInspectionDialog.java  |   34 +-
 src/java/net/sf/jabref/gui/MainTable.java          |   17 +
 src/java/net/sf/jabref/gui/MainTableFormat.java    |   20 +-
 src/java/net/sf/jabref/gui/MergeEntriesDialog.java |  433 ++++++
 .../net/sf/jabref/gui/WaitForSaveOperation.java    |    2 +-
 .../net/sf/jabref/imports/ACMPortalFetcher.java    |    8 +
 src/java/net/sf/jabref/imports/BibtexImporter.java |   69 +
 src/java/net/sf/jabref/imports/BibtexParser.java   |    6 +-
 src/java/net/sf/jabref/imports/CaseKeeperList.java |  363 ++++-
 .../net/sf/jabref/imports/DOItoBibTeXFetcher.java  |  137 +-
 .../net/sf/jabref/imports/DiVAtoBibTeXFetcher.java |   18 +-
 src/java/net/sf/jabref/imports/GeneralFetcher.java |    4 +-
 src/java/net/sf/jabref/imports/HTMLConverter.java  |   49 +-
 .../net/sf/jabref/imports/IEEEXploreFetcher.java   |   13 +-
 .../jabref/imports/ImportCustomizationDialog.java  |    2 +-
 src/java/net/sf/jabref/imports/ImportFormat.java   |    2 +
 .../net/sf/jabref/imports/ImportFormatReader.java  |    1 +
 src/java/net/sf/jabref/imports/ImportMenuItem.java |    4 -
 src/java/net/sf/jabref/imports/JSTORFetcher2.java  |    8 +-
 src/java/net/sf/jabref/imports/MedlineFetcher.java |    4 +-
 src/java/net/sf/jabref/imports/MedlineHandler.java |    7 +-
 src/java/net/sf/jabref/imports/UnitFormatter.java  |  142 ++
 .../imports/fetcher/ISBNtoBibTeXFetcher.java       |   10 +-
 .../sf/jabref/labelPattern/LabelPatternUtil.java   |  388 ++++-
 src/java/net/sf/jabref/oo/OpenOfficePanel.java     |   27 +-
 src/java/net/sf/jabref/plugin/PluginCore.java      |   10 +-
 src/java/net/sf/jabref/sql/DBConnectDialog.java    |    2 +-
 .../net/sf/jabref/undo/UndoableFieldChange.java    |   12 +-
 src/java/net/sf/jabref/undo/UndoableKeyChange.java |    7 +
 src/java/net/sf/jabref/util/XMPUtil.java           |   11 +
 .../jabref/wizard/auximport/gui/FromAuxDialog.java |   89 +-
 .../commons/gui/shortcut/EmacsKeyBindings.java     |  831 ++++++++++
 .../xnap/commons/gui/shortcut/package-info.java    |    5 +
 src/java/spl/PdfImporter.java                      |   14 +-
 .../tests/net/sf/jabref/FileBasedTestCase.java     |   13 +-
 src/java/tests/net/sf/jabref/UtilFindFileTest.java |    4 +-
 src/java/tests/net/sf/jabref/UtilTest.java         |  210 +--
 .../net/sf/jabref/bst/BibtexNameFormatterTest.java |   14 +-
 src/java/tests/net/sf/jabref/bst/TestVM.java       |    2 +-
 .../net/sf/jabref/export/layout/HTMLCharsTest.java |   10 +-
 .../net/sf/jabref/export/layout/LayoutTest.java    |    2 +-
 .../net/sf/jabref/export/layout/RTFCharsTest.java  |   44 +-
 .../net/sf/jabref/imports/CopacImporterTest.java   |   10 +-
 .../net/sf/jabref/imports/OAI2ImportTest.java      |   16 +-
 .../jabref/labelPattern/LabelPatternUtilTest.java  |    4 +
 src/osx/osxadapter/OSXAdapter.java                 |  305 ++--
 src/resource/IntegrityMessage_es.properties        |   12 +
 src/resource/IntegrityMessage_ru.properties        |   11 +
 src/resource/JabRef_da.properties                  |  135 +-
 src/resource/JabRef_de.properties                  |  166 +-
 src/resource/JabRef_en.properties                  |  169 +--
 src/resource/JabRef_es.properties                  | 1592 ++++++++++++++++++++
 src/resource/JabRef_fr.properties                  |  143 +-
 src/resource/JabRef_in.properties                  |  134 +-
 src/resource/JabRef_it.properties                  |  137 +-
 src/resource/JabRef_ja.properties                  |  347 ++---
 src/resource/JabRef_nl.properties                  |  165 +-
 src/resource/JabRef_no.properties                  |  190 +--
 src/resource/JabRef_pt_BR.properties               |  133 +-
 .../{JabRef_en.properties => JabRef_ru.properties} |  456 +++---
 src/resource/JabRef_tr.properties                  |  138 +-
 src/resource/JabRef_vi.properties                  |  167 +-
 src/resource/JabRef_zh.properties                  |  168 +--
 src/resource/Menu_de.properties                    |    4 +-
 src/resource/Menu_es.properties                    |   98 +-
 src/resource/Menu_fr.properties                    |    6 +-
 src/resource/Menu_ja.properties                    |   38 +-
 src/resource/Menu_ru.properties                    |  151 ++
 src/resource/Menu_tr.properties                    |    6 +-
 .../layout/iso690rtf/iso690RTF.article.layout      |   11 +
 .../layout/iso690rtf/iso690RTF.begin.layout        |    3 +
 .../layout/iso690rtf/iso690RTF.book.layout         |   13 +
 .../layout/iso690rtf/iso690RTF.edocs.layout        |   19 +
 .../layout/iso690rtf/iso690RTF.edocsarticle.layout |   16 +
 .../iso690rtf/iso690RTF.edocscontribution.layout   |   20 +
 .../layout/iso690rtf/iso690RTF.edocsnews.layout    |   12 +
 .../iso690rtf/iso690RTF.edocsperiodical.layout     |   16 +
 .../layout/iso690rtf/iso690RTF.email.layout        |    7 +
 .../layout/iso690rtf/iso690RTF.emaillist.layout    |   12 +
 src/resource/layout/iso690rtf/iso690RTF.end.layout |    1 +
 .../layout/iso690rtf/iso690RTF.graphics.layout     |    8 +
 .../layout/iso690rtf/iso690RTF.inbook.layout       |   11 +
 .../layout/iso690rtf/iso690RTF.inedocs.layout      |   20 +
 .../iso690rtf/iso690RTF.inproceedings.layout       |   12 +
 src/resource/layout/iso690rtf/iso690RTF.layout     |   20 +
 .../layout/iso690rtf/iso690RTF.legislation.layout  |    8 +
 .../iso690rtf/iso690RTF.mastersthesis.layout       |   10 +
 .../layout/iso690rtf/iso690RTF.patent.layout       |   11 +
 .../layout/iso690rtf/iso690RTF.periodical.layout   |   13 +
 .../layout/iso690rtf/iso690RTF.proceeding.layout   |   13 +
 .../layout/iso690rtf/iso690RTF.radiotv.layout      |    6 +
 .../layout/iso690rtf/iso690RTF.recording.layout    |    8 +
 .../layout/iso690rtf/iso690RTF.standard.layout     |    9 +
 .../layout/iso690rtf/iso690RTF.techreport.layout   |   10 +
 .../layout/iso690rtf/iso690RTF.unpublished.layout  |    9 +
 .../layout/iso690txt/iso690.article.layout         |    1 +
 src/resource/layout/iso690txt/iso690.book.layout   |    1 +
 src/resource/layout/iso690txt/iso690.edocs.layout  |    1 +
 .../layout/iso690txt/iso690.edocsarticle.layout    |    1 +
 .../iso690txt/iso690.edocscontribution.layout      |    1 +
 .../layout/iso690txt/iso690.edocsnews.layout       |    1 +
 .../layout/iso690txt/iso690.edocsperiodical.layout |    1 +
 src/resource/layout/iso690txt/iso690.email.layout  |    1 +
 .../layout/iso690txt/iso690.emaillist.layout       |    1 +
 .../layout/iso690txt/iso690.graphics.layout        |    1 +
 src/resource/layout/iso690txt/iso690.inbook.layout |    1 +
 .../layout/iso690txt/iso690.inedocs.layout         |    1 +
 .../layout/iso690txt/iso690.inproceedings.layout   |    1 +
 src/resource/layout/iso690txt/iso690.layout        |    1 +
 .../layout/iso690txt/iso690.legislation.layout     |    1 +
 .../layout/iso690txt/iso690.mastersthesis.layout   |    1 +
 src/resource/layout/iso690txt/iso690.patent.layout |    2 +
 .../layout/iso690txt/iso690.periodical.layout      |    1 +
 .../layout/iso690txt/iso690.proceeding.layout      |    1 +
 .../layout/iso690txt/iso690.radiotv.layout         |    1 +
 .../layout/iso690txt/iso690.recording.layout       |    1 +
 .../layout/iso690txt/iso690.standard.layout        |    1 +
 .../layout/iso690txt/iso690.techreport.layout      |    1 +
 .../layout/iso690txt/iso690.unpublished.layout     |    1 +
 src/txt/CHANGELOG                                  |   95 +-
 src/txt/README                                     |    5 +-
 src/windows/nsis/installer_languages/spanish.nsh   |   33 +
 src/windows/nsis/setup.nsi                         |    2 +
 syncLang.py                                        |   45 +-
 260 files changed, 10153 insertions(+), 4488 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git



More information about the pkg-java-commits mailing list