[jabref] 341/459: Merge tag 'upstream/2.9_beta2+ds' into experimental
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:40:58 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 640222947ab60781166efd72da99f3b65f14669e
Merge: 3b56af4 f8d100f
Author: gregor herrmann <gregoa at debian.org>
Date: Mon Nov 19 16:44:53 2012 +0100
Merge tag 'upstream/2.9_beta2+ds' into experimental
Upstream version 2.9~beta2+ds
Conflicts:
build.number
src/resource/build.properties
-> removed
.classpath | 42 +
.gitignore | 1 +
.idea/.name | 1 +
.idea/ant.xml | 15 +
.idea/compiler.xml | 21 +
.idea/copyright/profiles_settings.xml | 5 +
.idea/encodings.xml | 5 +
.idea/libraries/jersey.xml | 13 +
.idea/libraries/lib.xml | 19 +
.idea/libraries/oo.xml | 12 +
.idea/libraries/plugin.xml | 14 +
.idea/libraries/sciplore.xml | 10 +
.idea/misc.xml | 30 +
.idea/modules.xml | 9 +
.idea/scopes/scope_settings.xml | 5 +
.idea/uiDesigner.xml | 125 ++
.idea/vcs.xml | 8 +
.idea/workspace.xml | 779 +++++++++
.project | 17 +
JabRef - MrDlib.userlibraries | 25 -
build.gradle | 15 -
build.xml | 133 +-
buildlib/jarbundler-2.2.0.jar | Bin 0 -> 18509 bytes
jabref.ebuild | 79 +
osx/JavaApplicationStub | Bin 0 -> 61376 bytes
osx/OSXAdapter.class | Bin 0 -> 1815 bytes
src/Jabref.iml | 19 +
src/help/ACMPortalHelp.html | 8 +-
src/help/About.html | 12 +-
src/help/Contents.html | 5 +-
src/help/DOItoBibTeXHelp.html | 20 +
src/help/DiVAtoBibTeXHelp.html | 22 +
src/help/GoogleScholarHelp.html | 23 +
src/help/IEEEXploreHelp.html | 2 +-
src/help/ISBNtoBibTeXHelp.html | 2 +-
src/help/RevisionHistory.html | 31 +
src/help/da/About.html | 9 +-
src/help/de/About.html | 7 +-
src/help/fr/About.html | 3 +-
src/help/fr/Contents.html | 4 +
src/help/fr/DOItoBibTeXHelp.html | 24 +
src/help/fr/GoogleScholarHelp.html | 26 +
src/help/fr/ISBNtoBibTeXHelp.html | 23 +
src/help/fr/RevisionHistory.html | 57 +
src/help/fr/SpecialFieldsHelp.html | 50 +
src/help/in/About.html | 7 +-
src/help/ja/About.html | 7 +-
src/help/jgoodies.html | 2 +-
src/images/JabRef-Logo.icns | Bin 35556 -> 194699 bytes
src/images/JabRef-icon-mac.svg | 59 +
src/images/reference_list.xcf | Bin 0 -> 553160 bytes
src/java/net/sf/jabref/AdvancedTab.java | 36 +-
src/java/net/sf/jabref/BasePanel.java | 20 +-
src/java/net/sf/jabref/BibLatexEntryTypes.java | 36 +
src/java/net/sf/jabref/BibtexEntryType.java | 48 +
src/java/net/sf/jabref/ContentSelectorDialog2.java | 4 +-
src/java/net/sf/jabref/EntryTypeDialog.java | 31 +-
src/java/net/sf/jabref/ExternalTab.java | 45 +-
.../net/sf/jabref/FindUnlinkedFilesDialog.java | 71 +-
src/java/net/sf/jabref/GUIGlobals.java | 10 +-
src/java/net/sf/jabref/GeneralTab.java | 4 +-
src/java/net/sf/jabref/Globals.java | 47 +-
src/java/net/sf/jabref/JabRef.java | 207 +--
src/java/net/sf/jabref/JabRefFrame.java | 26 +-
src/java/net/sf/jabref/JabRefMain.java | 10 +-
src/java/net/sf/jabref/JabRefPreferences.java | 3 +
src/java/net/sf/jabref/PrefsDialog3.java | 4 +-
src/java/net/sf/jabref/SearchManager2.java | 6 +-
src/java/net/sf/jabref/SidePaneComponent.java | 1 +
src/java/net/sf/jabref/SidePaneHeader.java | 119 --
src/java/net/sf/jabref/TableColumnsTab.java | 4 +-
src/java/net/sf/jabref/Util.java | 64 +-
src/java/net/sf/jabref/bst/.gitignore | 1 +
src/java/net/sf/jabref/bst/{bst.g => Bst.g} | 34 +-
src/java/net/sf/jabref/bst/BstLexer.java | 1713 ++++++++------------
src/java/net/sf/jabref/bst/BstParser.java | 1396 +++++++++-------
.../net/sf/jabref/export/CustomExportDialog.java | 4 +-
.../net/sf/jabref/export/CustomExportList.java | 4 +-
.../jabref/export/ExportCustomizationDialog.java | 4 +-
src/java/net/sf/jabref/export/FileActions.java | 2 +-
.../net/sf/jabref/export/LatexFieldFormatter.java | 5 +-
.../external/AutoSetExternalFileForEntries.java | 7 +-
.../net/sf/jabref/external/DroppedFileHandler.java | 3 +-
.../net/sf/jabref/external/ExternalFilePanel.java | 20 +-
.../sf/jabref/external/ExternalFileTypeEditor.java | 4 +-
.../external/ExternalFileTypeEntryEditor.java | 4 +-
src/java/net/sf/jabref/external/IconSelection.java | 4 +-
.../jabref/external/PushToApplicationButton.java | 4 +-
src/java/net/sf/jabref/external/PushToVim.java | 4 +-
.../sf/jabref/external/SynchronizeFileField.java | 7 +-
.../sf/jabref/external/UpgradeExternalLinks.java | 48 -
.../net/sf/jabref/external/WriteXMPAction.java | 4 +-
.../net/sf/jabref/groups/AddToGroupAction.java | 4 +-
src/java/net/sf/jabref/groups/AutoGroupDialog.java | 12 +-
.../jabref/groups/EntryTableTransferHandler.java | 5 +-
src/java/net/sf/jabref/groups/ExplicitGroup.java | 6 +-
src/java/net/sf/jabref/groups/GroupDialog.java | 4 +-
src/java/net/sf/jabref/groups/GroupSelector.java | 6 +-
src/java/net/sf/jabref/groups/KeywordGroup.java | 16 +-
src/java/net/sf/jabref/groups/SearchGroup.java | 12 +-
.../jabref/groups/UnsupportedVersionException.java | 3 +-
src/java/net/sf/jabref/groups/VersionHandling.java | 4 +-
src/java/net/sf/jabref/gui/AttachFileDialog.java | 6 +-
.../net/sf/jabref/gui/BibtexKeyPatternDialog.java | 4 +-
src/java/net/sf/jabref/gui/CleanUpAction.java | 155 +-
.../sf/jabref/gui/DatabasePropertiesDialog.java | 4 +-
src/java/net/sf/jabref/gui/DragDropPopupPane.java | 2 +-
.../sf/jabref/gui/EntryCustomizationDialog2.java | 4 +-
.../net/sf/jabref/gui/FetcherPreviewDialog.java | 271 ++++
src/java/net/sf/jabref/gui/FieldWeightDialog.java | 4 +-
.../net/sf/jabref/gui/FileListEntryEditor.java | 4 +-
.../net/sf/jabref/gui/GenFieldsCustomizer.java | 4 +-
.../net/sf/jabref/gui/ImportInspectionDialog.java | 6 +-
.../net/sf/jabref/gui/WaitForSaveOperation.java | 4 +-
.../net/sf/jabref/imports/ACMPortalFetcher.java | 331 ++--
src/java/net/sf/jabref/imports/ADSFetcher.java | 176 ++
src/java/net/sf/jabref/imports/BibtexParser.java | 6 +-
src/java/net/sf/jabref/imports/CaseKeeper.java | 61 +
src/java/net/sf/jabref/imports/CaseKeeperList.java | 395 +++++
.../net/sf/jabref/imports/DOItoBibTeXFetcher.java | 140 ++
.../net/sf/jabref/imports/DiVAtoBibTeXFetcher.java | 143 ++
.../imports/EntryFromFileCreatorManager.java | 49 +-
src/java/net/sf/jabref/imports/GeneralFetcher.java | 106 +-
.../sf/jabref/imports/GoogleScholarFetcher.java | 260 ++-
src/java/net/sf/jabref/imports/HTMLConverter.java | 614 ++++++-
.../net/sf/jabref/imports/IEEEXploreFetcher.java | 131 +-
.../jabref/imports/ImportCustomizationDialog.java | 4 +-
src/java/net/sf/jabref/imports/OAI2Fetcher.java | 20 +-
.../net/sf/jabref/imports/OpenDatabaseAction.java | 4 +-
.../net/sf/jabref/imports/PdfContentImporter.java | 38 +-
.../net/sf/jabref/imports/PreviewEntryFetcher.java | 31 +
src/java/net/sf/jabref/imports/ZipFileChooser.java | 2 +-
.../sf/jabref/journals/ManageJournalsPanel.java | 6 +-
.../labelPattern/ResolveDuplicateLabelDialog.java | 4 +-
src/java/net/sf/jabref/net/CookieHandlerImpl.java | 9 +-
src/java/net/sf/jabref/net/URLDownload.java | 1 -
src/java/net/sf/jabref/oo/AdvancedCiteDialog.java | 4 +-
src/java/net/sf/jabref/oo/CitationManager.java | 6 +-
src/java/net/sf/jabref/oo/OpenOfficePanel.java | 6 +-
src/java/net/sf/jabref/oo/StyleSelectDialog.java | 6 +-
.../net/sf/jabref/plugin/ManagePluginsDialog.java | 4 +-
src/java/net/sf/jabref/remote/RemoteListener.java | 5 +-
src/java/net/sf/jabref/specialfields/Quality.java | 2 +-
.../SpecialFieldDatabaseChangeListener.java | 2 +-
src/java/net/sf/jabref/sql/DBConnectDialog.java | 4 +-
.../net/sf/jabref/sql/DBImportExportDialog.java | 4 +-
src/java/net/sf/jabref/sql/SQLUtil.java | 2 +-
.../sf/jabref/sql/exporter/PostgreSQLExporter.java | 2 +-
.../net/sf/jabref/undo/CountingUndoManager.java | 13 -
.../net/sf/jabref/undo/UndoableInsertEntry.java | 50 +-
src/java/net/sf/jabref/util/ErrorConsole.java | 96 +-
src/java/net/sf/jabref/util/FileNameCleaner.java | 45 +
.../net/sf/jabref/util/ManageKeywordsAction.java | 4 +-
.../net/sf/jabref/util/MassSetFieldAction.java | 4 +-
.../jabref/wizard/auximport/gui/FromAuxDialog.java | 4 +-
.../sf/jabref/wizard/text/gui/TextInputDialog.java | 4 +-
src/java/spl/gui/ImportDialog.java | 4 +-
src/java/spl/gui/MetaDataListDialog.java | 6 +-
src/plugins/net.sf.jabref.core/plugin.xml | 37 +-
src/resource/JabRef_da.properties | 152 +-
src/resource/JabRef_de.properties | 155 +-
src/resource/JabRef_en.properties | 108 +-
src/resource/JabRef_fr.properties | 110 +-
src/resource/JabRef_in.properties | 108 +-
src/resource/JabRef_it.properties | 258 ++-
src/resource/JabRef_ja.properties | 112 +-
src/resource/JabRef_nl.properties | 109 +-
src/resource/JabRef_no.properties | 116 +-
src/resource/JabRef_pt_BR.properties | 109 +-
src/resource/JabRef_tr.properties | 112 +-
src/resource/JabRef_vi.properties | 109 +-
src/resource/JabRef_zh.properties | 108 +-
src/resource/Menu_it.properties | 2 +-
src/txt/CHANGELOG | 31 +
src/txt/README | 4 +-
src/windows/nsis/setup.nsi | 105 +-
176 files changed, 7883 insertions(+), 3183 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