[jabref] 109/459: [svn-upgrade] Integrating new upstream version, jabref (2.3)
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:39:55 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 b8009e653a7915e9f4e0a79078edf56cedb8a686
Author: gregor herrmann <gregoa at debian.org>
Date: Thu Nov 8 23:39:05 2007 +0000
[svn-upgrade] Integrating new upstream version, jabref (2.3)
---
build.number | 4 +-
build.xml | 18 +-
changelog_highlights.txt | 27 ++
lib/forms-1.0.4.jar | Bin 83278 -> 0 bytes
lib/forms-1.1.0.jar | Bin 0 -> 88620 bytes
src/images/absIcon.png | Bin 180 -> 0 bytes
src/images/add.png | Bin 455 -> 0 bytes
src/images/autumn.png | Bin 307468 -> 0 bytes
src/images/completeItem.png | Bin 458 -> 0 bytes
src/images/contents.png | Bin 1073 -> 0 bytes
src/images/document-save-as.png | Bin 1337 -> 0 bytes
src/images/document-save.png | Bin 1255 -> 0 bytes
src/images/doismall.png | Bin 738 -> 0 bytes
src/images/duplicate.png | Bin 359 -> 0 bytes
src/images/edit-copy.png | Bin 979 -> 0 bytes
src/images/edit-cut.png | Bin 985 -> 0 bytes
src/images/edit-delete.png | Bin 1339 -> 0 bytes
src/images/edit-find.png | Bin 1347 -> 0 bytes
src/images/edit-paste.png | Bin 956 -> 0 bytes
src/images/edit-redo.png | Bin 909 -> 0 bytes
src/images/edit-undo.png | Bin 957 -> 0 bytes
src/images/editor.png | Bin 1196 -> 0 bytes
src/images/emacs.png | Bin 267 -> 0 bytes
src/images/emblem-web-small.png | Bin 960 -> 0 bytes
src/images/emblem-web.png | Bin 1419 -> 0 bytes
src/images/fileclose.png | Bin 238 -> 0 bytes
src/images/fileclose2.png | Bin 250 -> 0 bytes
src/images/filenew.png | Bin 968 -> 0 bytes
src/images/fileopen.png | Bin 1123 -> 0 bytes
src/images/genIcon.png | Bin 180 -> 0 bytes
src/images/go-down.png | Bin 1216 -> 0 bytes
src/images/go-next.png | Bin 1203 -> 0 bytes
src/images/go-previous.png | Bin 1157 -> 0 bytes
src/images/go-up.png | Bin 1092 -> 0 bytes
src/images/groupIncluding.png | Bin 105 -> 0 bytes
src/images/groupRefining.png | Bin 160 -> 0 bytes
src/images/grouping_morten.png | Bin 875 -> 0 bytes
src/images/groupsHighlightAll.png | Bin 280 -> 0 bytes
src/images/groupsHighlightAny.png | Bin 276 -> 0 bytes
src/images/help-about.png | Bin 986 -> 0 bytes
src/images/help-browser.png | Bin 1541 -> 0 bytes
src/images/integrity.png | Bin 748 -> 0 bytes
src/images/lyx2.png | Bin 927 -> 0 bytes
src/images/mark.png | Bin 928 -> 0 bytes
src/images/messageFail.png | Bin 937 -> 0 bytes
src/images/messageInfo.png | Bin 978 -> 0 bytes
src/images/messageWarn.png | Bin 1014 -> 0 bytes
src/images/optIcon.png | Bin 200 -> 0 bytes
src/images/pdf-new.png | Bin 936 -> 0 bytes
src/images/pdf.png | Bin 349 -> 0 bytes
src/images/postscript.png | Bin 233 -> 0 bytes
src/images/preamble.png | Bin 266 -> 0 bytes
src/images/preferences.png | Bin 1381 -> 0 bytes
src/images/remove.png | Bin 288 -> 0 bytes
src/images/reqIcon.png | Bin 182 -> 0 bytes
src/images/search.png | Bin 1433 -> 0 bytes
src/images/splash-2.1.svg | 229 --------------
src/images/splash-2.1beta.png | Bin 179073 -> 0 bytes
src/images/splash-2.3.svg | 24 +-
src/images/splash.png | Bin 175224 -> 172232 bytes
src/images/splash.svg | 229 --------------
src/images/strings.png | Bin 233 -> 0 bytes
src/images/unmark.png | Bin 1025 -> 0 bytes
src/images/user-home.png | Bin 1290 -> 0 bytes
src/images/view-refresh.png | Bin 1591 -> 0 bytes
src/images/viewsource.gif | Bin 119 -> 0 bytes
src/images/winedt.png | Bin 1495 -> 0 bytes
src/images/wizard.png | Bin 238 -> 0 bytes
src/images/wrongItem.png | Bin 776 -> 0 bytes
src/images/wwwciteseer.png | Bin 526 -> 0 bytes
src/java/gnu/dtools/ritopt/Options.java | 18 +-
src/java/net/sf/jabref/EntryEditor.java | 4 +-
src/java/net/sf/jabref/EntryEditorTab.java | 4 +-
src/java/net/sf/jabref/ExternalTab.java | 45 +--
src/java/net/sf/jabref/FileTab.java | 144 +++++++++
src/java/net/sf/jabref/GUIGlobals.java | 2 +-
src/java/net/sf/jabref/GeneralTab.java | 169 +++-------
src/java/net/sf/jabref/JabRef.java | 2 -
src/java/net/sf/jabref/JabRefPreferences.java | 148 +++++++--
src/java/net/sf/jabref/PrefsDialog3.java | 15 +-
src/java/net/sf/jabref/Util.java | 96 +++---
src/java/net/sf/jabref/export/FileActions.java | 2 +-
.../sf/jabref/external/DownloadExternalFile.java | 17 +-
.../net/sf/jabref/external/DroppedFileHandler.java | 9 +-
.../net/sf/jabref/external/ExternalFilePanel.java | 12 +-
.../net/sf/jabref/external/ExternalFileType.java | 22 ++
.../sf/jabref/external/ExternalFileTypeEditor.java | 8 +-
.../external/ExternalFileTypeEntryEditor.java | 5 +-
.../jabref/external/FileLinksUpgradeWarning.java | 3 +-
.../sf/jabref/external/SynchronizeFileField.java | 57 +++-
src/java/net/sf/jabref/gui/ColorSetupPanel.java | 2 +-
src/java/net/sf/jabref/gui/FileListEditor.java | 2 +-
.../net/sf/jabref/gui/FileListEntryEditor.java | 31 +-
src/java/net/sf/jabref/gui/FileListTableModel.java | 41 ++-
.../net/sf/jabref/gui/ImportInspectionDialog.java | 4 +-
src/java/net/sf/jabref/imports/OAI2Fetcher.java | 4 +-
.../sf/jabref/journals/ManageJournalsAction.java | 9 +-
.../sf/jabref/labelPattern/LabelPatternUtil.java | 4 +-
src/resource/JabRef_de.properties | 35 +-
src/resource/JabRef_du.properties | 43 +--
src/resource/JabRef_en.properties | 52 +--
src/resource/JabRef_fr.properties | 48 +--
src/resource/JabRef_it.properties | 99 +++---
src/resource/JabRef_no.properties | 352 +++++++++++----------
src/resource/Menu_de.properties | 2 +
src/resource/Menu_du.properties | 2 +
src/resource/Menu_en.properties | 1 +
src/resource/Menu_es.properties | 3 +
src/resource/Menu_fr.properties | 1 +
src/resource/Menu_it.properties | 1 +
src/resource/Menu_no.properties | 19 +-
src/resource/build.properties | 6 +-
src/resource/build.properties.orig | 3 -
src/txt/README | 15 +-
src/txt/TODO | 41 ---
115 files changed, 987 insertions(+), 1146 deletions(-)
diff --git a/build.number b/build.number
index 41727ba..0cddc37 100644
--- a/build.number
+++ b/build.number
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
-#Sat Oct 06 17:22:01 CEST 2007
-build.number=197
+#Thu Nov 08 16:55:08 CET 2007
+build.number=320
diff --git a/build.xml b/build.xml
index 53dfdb9..4855062 100644
--- a/build.xml
+++ b/build.xml
@@ -22,8 +22,8 @@
Compiler: Ant
Authors: Joerg K. Wegner, wegnerj at informatik.uni-tuebingen.de
Morten O. Alver
- Version: $Revision: 2408 $
- $Date: 2007-10-02 22:32:13 +0200 (Tue, 02 Oct 2007) $
+ Version: $Revision: 2460 $
+ $Date: 2007-11-04 16:58:28 +0100 (Sun, 04 Nov 2007) $
$Author: mortenalver $
modified:
@@ -47,7 +47,7 @@
========================================================================================== -->
<!-- some version information -->
- <property name="jabref.version" value="2.3b3" />
+ <property name="jabref.version" value="2.3" />
<property name="jabref.placeholder.version" value="@version@" />
<!-- used by replace task -->
@@ -114,7 +114,7 @@
<pathelement location="${library.directory}/antlr.jar" />
<pathelement location="${library.directory}/antlr-3.0b5.jar" />
<pathelement location="${library.directory}/looks-2.0.4.jar" />
- <pathelement location="${library.directory}/forms-1.0.4.jar" />
+ <pathelement location="${library.directory}/forms-1.1.0.jar" />
<pathelement location="${library.directory}/spin.jar" />
<pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" />
<pathelement location="${library.directory}/microba.jar" />
@@ -156,11 +156,17 @@
<!-- Compiles project -->
<target name="compile">
<mkdir dir="${build.classes}" />
- <javac debug="on" deprecation="on" destdir="${build.classes}" source="1.5" target="1.5">
+ <javac debug="off" deprecation="on" destdir="${build.classes}" source="1.5" target="1.5">
<src path="${java.dir}" />
<exclude name="tests/**" />
+ <exclude name="**/JabRefMain.java" />
<classpath refid="classpath" />
</javac>
+ <javac debug="off" deprecation="on" destdir="${build.classes}" source="1.4" target="1.4">
+ <src path="${java.dir}" />
+ <include name="**/JabRefMain.java" />
+ </javac>
+
</target>
<!-- Compiles only the tests -->
@@ -359,7 +365,7 @@ version=${jabref.version}</echo>
<unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" />
<unjar src="${library.directory}/antlr-3.0b5.jar" dest="${build.tmp}" />
<unjar src="${library.directory}/looks-2.0.4.jar" dest="${build.tmp}" />
- <unjar src="${library.directory}/forms-1.0.4.jar" dest="${build.tmp}" />
+ <unjar src="${library.directory}/forms-1.1.0.jar" dest="${build.tmp}" />
<unjar src="${library.directory}/spin.jar" dest="${build.tmp}" />
<unjar src="${library.directory}/glazedlists-1.7.0_java15.jar" dest="${build.tmp}" />
<unjar src="${library.directory}/microba.jar" dest="${build.tmp}" />
diff --git a/changelog_highlights.txt b/changelog_highlights.txt
new file mode 100644
index 0000000..4baea2d
--- /dev/null
+++ b/changelog_highlights.txt
@@ -0,0 +1,27 @@
+These are the most important new features and bugfixes in version 2.3.
+
+Features:
+- Added % at start of signature text in BibTeX output. Parser now reads both old and new style.
+- Added MIS Quarterly export format.
+- Added support for COPAC file format.
+- Added autocompletion feature for author/editors and other fields.
+- Added feature to save all open databases.
+- Added support for pushing citations to Vim when Vim server is enabled.
+- Improved handling of external links. The 'file' field can now specify a list of external links, and arbitrary file types are supported. Old-style PDF and PS links can be moved automatically into the 'file' field.
+- Removed antialias setting for main table, because it interferes with proper rendering on LCDs when running under JRE 6. Removed non-optional antialias settings for entry editor for the same reason.
+- Changed external link handling so remote (http) links can be sent to the external application. Applications like Evince and Gimp can open remote links.
+- Replaced Simle HTML export filter with improved version by Mark Schenk.
+- Introduced ParamLayoutFormatter interface for layout formatters that can take an argument by the following syntax: \format[MyFormatter(argument)]{\field} Implementing classes contain a setArgument(String) method that receives the argument (if any) before the format() method is called.
+- Timestamp and owner fields are now set also when appending a bib file, and new options have been introduced to control whether imported/appended/pasted entries should have these fields overwritten if already set.
+- Added \encoding tag for begin/end layouts in export filters to print the name of the character encoding used for the export. The tag is not available in entry layouts.
+- Added "authorLast" and "editorLast" markers for using last author's last name in BibTeX keys.
+- Numeric fields (year, volume, number, pmid, citeseercitationcount) are now sorted as numbers when possible.
+
+
+
+Important bug fixes:
+- Fixed bug in HTMLChars: commands like {\aa} and {\o} were not processed properly, even though defined in Globals.HTMLCHARS.
+- Fixed bug that made it possible to accidentally close database without saving, when error occurs during the save operation.
+- Fixed bug in entry editor: source panel edits were not properly stored when clicking a different entry in the main table.
+- Fixed problem with wrong enable/disable behaviour of Clear search button when switching between tabs.
+
diff --git a/lib/forms-1.0.4.jar b/lib/forms-1.0.4.jar
deleted file mode 100755
index 9ecbef7..0000000
Binary files a/lib/forms-1.0.4.jar and /dev/null differ
diff --git a/lib/forms-1.1.0.jar b/lib/forms-1.1.0.jar
new file mode 100644
index 0000000..50c1eb8
Binary files /dev/null and b/lib/forms-1.1.0.jar differ
diff --git a/src/images/absIcon.png b/src/images/absIcon.png
deleted file mode 100644
index f249fda..0000000
Binary files a/src/images/absIcon.png and /dev/null differ
diff --git a/src/images/add.png b/src/images/add.png
deleted file mode 100644
index 6b636fe..0000000
Binary files a/src/images/add.png and /dev/null differ
diff --git a/src/images/autumn.png b/src/images/autumn.png
deleted file mode 100644
index 77b7590..0000000
Binary files a/src/images/autumn.png and /dev/null differ
diff --git a/src/images/completeItem.png b/src/images/completeItem.png
deleted file mode 100644
index 5eeadc7..0000000
Binary files a/src/images/completeItem.png and /dev/null differ
diff --git a/src/images/contents.png b/src/images/contents.png
deleted file mode 100644
index 6e44fa7..0000000
Binary files a/src/images/contents.png and /dev/null differ
diff --git a/src/images/document-save-as.png b/src/images/document-save-as.png
deleted file mode 100644
index 7a1591f..0000000
Binary files a/src/images/document-save-as.png and /dev/null differ
diff --git a/src/images/document-save.png b/src/images/document-save.png
deleted file mode 100644
index 0311e47..0000000
Binary files a/src/images/document-save.png and /dev/null differ
diff --git a/src/images/doismall.png b/src/images/doismall.png
deleted file mode 100644
index 3c9595b..0000000
Binary files a/src/images/doismall.png and /dev/null differ
diff --git a/src/images/duplicate.png b/src/images/duplicate.png
deleted file mode 100644
index 5599a18..0000000
Binary files a/src/images/duplicate.png and /dev/null differ
diff --git a/src/images/edit-copy.png b/src/images/edit-copy.png
deleted file mode 100644
index efec317..0000000
Binary files a/src/images/edit-copy.png and /dev/null differ
diff --git a/src/images/edit-cut.png b/src/images/edit-cut.png
deleted file mode 100644
index 7e750c9..0000000
Binary files a/src/images/edit-cut.png and /dev/null differ
diff --git a/src/images/edit-delete.png b/src/images/edit-delete.png
deleted file mode 100644
index 0ac3589..0000000
Binary files a/src/images/edit-delete.png and /dev/null differ
diff --git a/src/images/edit-find.png b/src/images/edit-find.png
deleted file mode 100644
index b98e348..0000000
Binary files a/src/images/edit-find.png and /dev/null differ
diff --git a/src/images/edit-paste.png b/src/images/edit-paste.png
deleted file mode 100644
index 577e9c2..0000000
Binary files a/src/images/edit-paste.png and /dev/null differ
diff --git a/src/images/edit-redo.png b/src/images/edit-redo.png
deleted file mode 100644
index 712a8ee..0000000
Binary files a/src/images/edit-redo.png and /dev/null differ
diff --git a/src/images/edit-undo.png b/src/images/edit-undo.png
deleted file mode 100644
index 4652df0..0000000
Binary files a/src/images/edit-undo.png and /dev/null differ
diff --git a/src/images/editor.png b/src/images/editor.png
deleted file mode 100644
index a653bfe..0000000
Binary files a/src/images/editor.png and /dev/null differ
diff --git a/src/images/emacs.png b/src/images/emacs.png
deleted file mode 100644
index 6b76f52..0000000
Binary files a/src/images/emacs.png and /dev/null differ
diff --git a/src/images/emblem-web-small.png b/src/images/emblem-web-small.png
deleted file mode 100644
index 3d81a37..0000000
Binary files a/src/images/emblem-web-small.png and /dev/null differ
diff --git a/src/images/emblem-web.png b/src/images/emblem-web.png
deleted file mode 100644
index 49f7290..0000000
Binary files a/src/images/emblem-web.png and /dev/null differ
diff --git a/src/images/fileclose.png b/src/images/fileclose.png
deleted file mode 100644
index 033326f..0000000
Binary files a/src/images/fileclose.png and /dev/null differ
diff --git a/src/images/fileclose2.png b/src/images/fileclose2.png
deleted file mode 100644
index c1e5f4d..0000000
Binary files a/src/images/fileclose2.png and /dev/null differ
diff --git a/src/images/filenew.png b/src/images/filenew.png
deleted file mode 100644
index 7274a21..0000000
Binary files a/src/images/filenew.png and /dev/null differ
diff --git a/src/images/fileopen.png b/src/images/fileopen.png
deleted file mode 100644
index 7c9f7a6..0000000
Binary files a/src/images/fileopen.png and /dev/null differ
diff --git a/src/images/genIcon.png b/src/images/genIcon.png
deleted file mode 100644
index 5bedaa2..0000000
Binary files a/src/images/genIcon.png and /dev/null differ
diff --git a/src/images/go-down.png b/src/images/go-down.png
deleted file mode 100644
index 970d43a..0000000
Binary files a/src/images/go-down.png and /dev/null differ
diff --git a/src/images/go-next.png b/src/images/go-next.png
deleted file mode 100644
index cfee8f4..0000000
Binary files a/src/images/go-next.png and /dev/null differ
diff --git a/src/images/go-previous.png b/src/images/go-previous.png
deleted file mode 100644
index 3311c05..0000000
Binary files a/src/images/go-previous.png and /dev/null differ
diff --git a/src/images/go-up.png b/src/images/go-up.png
deleted file mode 100644
index 4ee50ef..0000000
Binary files a/src/images/go-up.png and /dev/null differ
diff --git a/src/images/groupIncluding.png b/src/images/groupIncluding.png
deleted file mode 100644
index 6f2bd08..0000000
Binary files a/src/images/groupIncluding.png and /dev/null differ
diff --git a/src/images/groupRefining.png b/src/images/groupRefining.png
deleted file mode 100644
index 2ba0a26..0000000
Binary files a/src/images/groupRefining.png and /dev/null differ
diff --git a/src/images/grouping_morten.png b/src/images/grouping_morten.png
deleted file mode 100644
index 9b29f68..0000000
Binary files a/src/images/grouping_morten.png and /dev/null differ
diff --git a/src/images/groupsHighlightAll.png b/src/images/groupsHighlightAll.png
deleted file mode 100644
index c6e1a97..0000000
Binary files a/src/images/groupsHighlightAll.png and /dev/null differ
diff --git a/src/images/groupsHighlightAny.png b/src/images/groupsHighlightAny.png
deleted file mode 100644
index 1bc2e28..0000000
Binary files a/src/images/groupsHighlightAny.png and /dev/null differ
diff --git a/src/images/help-about.png b/src/images/help-about.png
deleted file mode 100644
index 90ce540..0000000
Binary files a/src/images/help-about.png and /dev/null differ
diff --git a/src/images/help-browser.png b/src/images/help-browser.png
deleted file mode 100644
index 6de563b..0000000
Binary files a/src/images/help-browser.png and /dev/null differ
diff --git a/src/images/integrity.png b/src/images/integrity.png
deleted file mode 100644
index 4343947..0000000
Binary files a/src/images/integrity.png and /dev/null differ
diff --git a/src/images/lyx2.png b/src/images/lyx2.png
deleted file mode 100644
index 84a742f..0000000
Binary files a/src/images/lyx2.png and /dev/null differ
diff --git a/src/images/mark.png b/src/images/mark.png
deleted file mode 100644
index 6f8ab3a..0000000
Binary files a/src/images/mark.png and /dev/null differ
diff --git a/src/images/messageFail.png b/src/images/messageFail.png
deleted file mode 100644
index 474f63f..0000000
Binary files a/src/images/messageFail.png and /dev/null differ
diff --git a/src/images/messageInfo.png b/src/images/messageInfo.png
deleted file mode 100644
index ecdc991..0000000
Binary files a/src/images/messageInfo.png and /dev/null differ
diff --git a/src/images/messageWarn.png b/src/images/messageWarn.png
deleted file mode 100755
index 55a6f01..0000000
Binary files a/src/images/messageWarn.png and /dev/null differ
diff --git a/src/images/optIcon.png b/src/images/optIcon.png
deleted file mode 100644
index 64562b3..0000000
Binary files a/src/images/optIcon.png and /dev/null differ
diff --git a/src/images/pdf-new.png b/src/images/pdf-new.png
deleted file mode 100644
index cda12b9..0000000
Binary files a/src/images/pdf-new.png and /dev/null differ
diff --git a/src/images/pdf.png b/src/images/pdf.png
deleted file mode 100644
index d5eab07..0000000
Binary files a/src/images/pdf.png and /dev/null differ
diff --git a/src/images/postscript.png b/src/images/postscript.png
deleted file mode 100644
index 5065c98..0000000
Binary files a/src/images/postscript.png and /dev/null differ
diff --git a/src/images/preamble.png b/src/images/preamble.png
deleted file mode 100644
index cf9d89d..0000000
Binary files a/src/images/preamble.png and /dev/null differ
diff --git a/src/images/preferences.png b/src/images/preferences.png
deleted file mode 100644
index 426460b..0000000
Binary files a/src/images/preferences.png and /dev/null differ
diff --git a/src/images/remove.png b/src/images/remove.png
deleted file mode 100644
index 0815d3f..0000000
Binary files a/src/images/remove.png and /dev/null differ
diff --git a/src/images/reqIcon.png b/src/images/reqIcon.png
deleted file mode 100644
index 5d2439c..0000000
Binary files a/src/images/reqIcon.png and /dev/null differ
diff --git a/src/images/search.png b/src/images/search.png
deleted file mode 100644
index a555de8..0000000
Binary files a/src/images/search.png and /dev/null differ
diff --git a/src/images/splash-2.1.svg b/src/images/splash-2.1.svg
deleted file mode 100644
index 1f931f6..0000000
--- a/src/images/splash-2.1.svg
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:export-ydpi="90.000000"
- inkscape:export-xdpi="90.000000"
- inkscape:export-filename="/home/alver/jabref-2.1b/src/images/splash-2.1beta.png"
- sodipodi:docname="splash-2.1.svg"
- sodipodi:docbase="/home/alver/jabref_newcvs/jabref/src/images"
- inkscape:version="0.44"
- sodipodi:version="0.32"
- id="svg2138"
- height="1052.3622047"
- width="744.09448819">
- <defs
- id="defs2140">
- <pattern
- patternTransform="translate(316.0000,1046.362)"
- id="pattern9054"
- xlink:href="#pattern9048"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient5361"
- inkscape:collect="always">
- <stop
- id="stop5363"
- offset="0"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- id="stop5365"
- offset="1"
- style="stop-color:#000000;stop-opacity:0;" />
- </linearGradient>
- <marker
- style="overflow:visible;"
- id="Arrow2Send"
- refX="0.0"
- refY="0.0"
- orient="auto"
- inkscape:stockid="Arrow2Send">
- <path
- transform="scale(0.3) rotate(180) translate(-5,0)"
- d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
- style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
- id="path3046"
- sodipodi:nodetypes="cccc" />
- </marker>
- <linearGradient
- gradientUnits="userSpaceOnUse"
- y2="300.91277"
- x2="491.20592"
- y1="300.91277"
- x1="445.01770"
- id="linearGradient5367"
- xlink:href="#linearGradient5361"
- inkscape:collect="always" />
- <pattern
- id="pattern9048"
- patternTransform="translate(231.0000,284.3622)"
- height="428.00000"
- width="572.00000"
- patternUnits="userSpaceOnUse">
- <image
- transform="translate(-231.0000,-284.3622)"
- style="opacity:1.0000000;stroke:#000000;stroke-width:5.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
- inkscape:export-ydpi="90.000000"
- inkscape:export-xdpi="90.000000"
- inkscape:export-filename="/home/alver/Desktop/bilder/jabref/splash4.png"
- y="284.36218"
- x="231.00000"
- xlink:href="behandlet.png"
- sodipodi:absref="/home/alver/Desktop/bilder/jabref/behandlet.png"
- width="572.00000"
- height="428.00000"
- id="image9050" />
- </pattern>
- </defs>
- <sodipodi:namedview
- inkscape:window-y="53"
- inkscape:window-x="15"
- inkscape:window-height="856"
- inkscape:window-width="853"
- inkscape:current-layer="layer1"
- inkscape:document-units="px"
- inkscape:cy="698.1925"
- inkscape:cx="364.52617"
- inkscape:zoom="1"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base" />
- <metadata
- id="metadata2143">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:groupmode="layer"
- inkscape:label="Layer 1">
- <rect
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref-2.1rc/src/images/splash-2.1.png"
- y="170.36218"
- x="77.500000"
- height="432.00000"
- width="576.00000"
- id="rect6833"
- style="opacity:1.0000000;fill:#6b6b75;fill-opacity:1.0000000;stroke:none;stroke-width:5.0000000;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000" />
- <image
- id="image1821"
- height="428"
- width="572"
- sodipodi:absref="/home/alver/jabref/src/images/splashBackground.png"
- xlink:href="/home/alver/jabref/src/images/splashBackground.png"
- x="79"
- y="172.36218"
- inkscape:export-filename="/home/alver/jabref-2.1rc/src/images/splash-2.1.png"
- inkscape:export-xdpi="75"
- inkscape:export-ydpi="75" />
- <flowRoot
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref-2.1rc/src/images/splash-2.1.png"
- style="opacity:1.0000000;fill:#635578;fill-opacity:1.0000000;stroke:#b5b5c7;stroke-width:0.48137558;stroke-linejoin:bevel;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
- transform="matrix(1.875133,0.000000,0.000000,2.542210,-129.6969,-372.8897)"
- id="flowRoot2189"
- xml:space="preserve">
- <flowRegion
- id="flowRegion2191">
- <rect
- style="fill:#635578;fill-opacity:1.0000000;stroke:#b5b5c7;stroke-opacity:1.0000000;stroke-width:0.48137557;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-linejoin:bevel"
- y="199.10532"
- x="128.49385"
- height="127.49445"
- width="283.51782"
- id="rect2193" />
- </flowRegion>
- <flowPara
- style="font-size:90.000000px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill:#635578;fill-opacity:1.0000000;stroke:#b5b5c7;stroke-width:0.48137558;stroke-linejoin:bevel;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;font-family:AR PL KaitiM GB"
- id="flowPara2201">JabRef</flowPara>
- </flowRoot> <flowRoot
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref-2.1b/src/images/splash-2.1beta.png"
- style="font-size:34.96500015px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:104.16220427%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#5cc757;stroke-width:0.64448702;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:0.64448701 0.64448701 ;stroke-dashoffset:0.45114091;stroke-opacity:1;font-family:FreeSans"
- transform="matrix(2.869197,-1.415830e-2,2.234317e-2,3.356271,-832.1435,-652.0185)"
- id="flowRoot2203"
- xml:space="preserve">
- <flowRegion
- style="stroke:url(#linearGradient5367);stroke-width:0.64448702;stroke-miterlimit:4;stroke-dasharray:0.64448701 0.64448701 ;stroke-dashoffset:0.45114091"
- id="flowRegion2205">
- <rect
- style="font-size:34.96500015px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:104.16220427%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#322b5b;stroke-width:0.64448702;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:0.64448701 0.64448701 ;stroke-dashoffset:0.45114091;stroke-opacity:1;font-family:FreeSans"
- y="286.45224"
- x="443.95346"
- height="119.83134"
- width="173.972"
- id="rect2207" />
- </flowRegion>
- <flowPara
- style="font-size:34.96500015px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:104.16220427%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#322b5b;stroke-width:0.64448702;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:0.64448701 0.64448701 ;stroke-dashoffset:0.45114091;stroke-opacity:1;font-family:FreeSans"
- id="flowPara2211">2.1</flowPara>
- </flowRoot> <flowRoot
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref-2.1rc/src/images/splash-2.1.png"
- transform="matrix(0.972246,0.000000,0.000000,1.325301,6.054966,-126.1181)"
- style="font-size:11.9999996;font-style:oblique;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#797580;fill-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;text-align:center;line-height:100%"
- id="flowRoot3076"
- xml:space="preserve"><flowRegion
- id="flowRegion3078">
- <rect
- style="fill:#797580;fill-opacity:1.0000000;font-family:Bitstream Vera Sans;font-weight:bold;font-style:oblique;font-stretch:normal;font-variant:normal;font-size:11.9999996;text-anchor:middle;text-align:center;writing-mode:lr;line-height:100%"
- y="514.56494"
- x="115.50008"
- height="78.684433"
- width="506.03476"
- id="rect3080" />
- </flowRegion><flowPara
- id="flowPara1339">This program is distributed under the terms of the General Public License.</flowPara><flowPara
- id="flowPara1341">Copyright (2003-2006) Morten O. Alver, Nizar Batada and all contributors.</flowPara></flowRoot> <text
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref-2.1rc/src/images/splash-2.1.png"
- transform="scale(0.853277,1.171952)"
- sodipodi:linespacing="100%"
- id="text1393"
- y="315.20035"
- x="163.38908"
- style="font-size:183.29680;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#413b62;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Nimbus Roman No9 L;text-anchor:start;writing-mode:lr-tb"
- xml:space="preserve"><tspan
- y="315.20035"
- x="163.38908"
- id="tspan1395"
- sodipodi:role="line">JabRef</tspan></text>
- <text
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref-2.1rc/src/images/splash-2.1.png"
- transform="scale(0.853347,1.171856)"
- sodipodi:linespacing="100%"
- id="text2179"
- y="397.84811"
- x="149.99753"
- style="font-size:44.00000436;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#805b41;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Nimbus Roman No9 L;text-anchor:start;writing-mode:lr;text-align:start;line-height:100%"
- xml:space="preserve"><tspan
- y="397.84811"
- x="149.99753"
- id="tspan2181"
- sodipodi:role="line">reference manager</tspan></text>
- </g>
-</svg>
diff --git a/src/images/splash-2.1beta.png b/src/images/splash-2.1beta.png
deleted file mode 100644
index 4304131..0000000
Binary files a/src/images/splash-2.1beta.png and /dev/null differ
diff --git a/src/images/splash-2.3.svg b/src/images/splash-2.3.svg
index 199d5db..d519da8 100644
--- a/src/images/splash-2.3.svg
+++ b/src/images/splash-2.3.svg
@@ -14,13 +14,12 @@
inkscape:export-filename="/home/alver/jabref_head/jabref/src/images/jabref_splash-2.2.png"
sodipodi:docname="splash-2.3.svg"
sodipodi:docbase="/home/alver/jabref/src/images"
- inkscape:version="0.45"
+ inkscape:version="0.45.1"
sodipodi:version="0.32"
id="svg2138"
height="1052.3622047"
width="744.09448819"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="TRUE">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs2140">
<linearGradient
@@ -273,22 +272,5 @@
x="462.20135"
y="426.2529"
style="font-size:119.00263214px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#727888;stroke-width:1.80000031;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;font-family:Bitstream Vera Sans">2.3</tspan></text>
- <flowRoot
- xml:space="preserve"
- id="flowRoot2272"
- style="font-size:64px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ef2421;fill-opacity:0.68208092;font-family:Bitstream Vera Sans"
- transform="matrix(0.9738368,-0.2272485,0.2272485,0.9738368,-57.970505,148.42613)"
- inkscape:transform-center-x="30.526535"
- inkscape:transform-center-y="-9.9731132"
- inkscape:export-filename="/home/alver/jabref/src/images/splash.png"
- inkscape:export-xdpi="75"
- inkscape:export-ydpi="75"><flowRegion
- id="flowRegion2274"><rect
- id="rect2276"
- width="244"
- height="120"
- x="446"
- y="418.36218"
- style="font-size:64px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ef2421;fill-opacity:0.68208092;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
- id="flowPara2278">beta</flowPara></flowRoot> </g>
+ </g>
</svg>
diff --git a/src/images/splash.png b/src/images/splash.png
index cb3c24b..705eafc 100644
Binary files a/src/images/splash.png and b/src/images/splash.png differ
diff --git a/src/images/splash.svg b/src/images/splash.svg
deleted file mode 100644
index 628543b..0000000
--- a/src/images/splash.svg
+++ /dev/null
@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:export-ydpi="90.000000"
- inkscape:export-xdpi="90.000000"
- inkscape:export-filename="/home/alver/Desktop/bilder/jabref/splash6.png"
- sodipodi:docname="splash.svg"
- sodipodi:docbase="/home/alver/jabref_beta/jabref/src/images"
- inkscape:version="0.42+0.43pre1"
- sodipodi:version="0.32"
- id="svg2138"
- height="1052.3622047"
- width="744.09448819">
- <defs
- id="defs2140">
- <pattern
- patternTransform="translate(316.0000,1046.362)"
- id="pattern9054"
- xlink:href="#pattern9048"
- inkscape:collect="always" />
- <linearGradient
- id="linearGradient5361"
- inkscape:collect="always">
- <stop
- id="stop5363"
- offset="0"
- style="stop-color:#000000;stop-opacity:1;" />
- <stop
- id="stop5365"
- offset="1"
- style="stop-color:#000000;stop-opacity:0;" />
- </linearGradient>
- <marker
- style="overflow:visible;"
- id="Arrow2Send"
- refX="0.0"
- refY="0.0"
- orient="auto"
- inkscape:stockid="Arrow2Send">
- <path
- transform="scale(0.3) rotate(180) translate(-5,0)"
- d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
- style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
- id="path3046"
- sodipodi:nodetypes="cccc" />
- </marker>
- <linearGradient
- gradientUnits="userSpaceOnUse"
- y2="300.91277"
- x2="491.20592"
- y1="300.91277"
- x1="445.01770"
- id="linearGradient5367"
- xlink:href="#linearGradient5361"
- inkscape:collect="always" />
- <pattern
- id="pattern9048"
- patternTransform="translate(231.0000,284.3622)"
- height="428.00000"
- width="572.00000"
- patternUnits="userSpaceOnUse">
- <image
- transform="translate(-231.0000,-284.3622)"
- style="opacity:1.0000000;stroke:#000000;stroke-width:5.0000000;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000"
- inkscape:export-ydpi="90.000000"
- inkscape:export-xdpi="90.000000"
- inkscape:export-filename="/home/alver/Desktop/bilder/jabref/splash4.png"
- y="284.36218"
- x="231.00000"
- xlink:href="behandlet.png"
- sodipodi:absref="/home/alver/Desktop/bilder/jabref/behandlet.png"
- width="572.00000"
- height="428.00000"
- id="image9050" />
- </pattern>
- </defs>
- <sodipodi:namedview
- inkscape:window-y="80"
- inkscape:window-x="8"
- inkscape:window-height="856"
- inkscape:window-width="750"
- inkscape:current-layer="layer1"
- inkscape:document-units="px"
- inkscape:cy="698.1925"
- inkscape:cx="364.52617"
- inkscape:zoom="1"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base" />
- <metadata
- id="metadata2143">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:groupmode="layer"
- inkscape:label="Layer 1">
- <rect
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref_beta/jabref/jabref-2.0-splash.png"
- y="170.36218"
- x="77.500000"
- height="432.00000"
- width="576.00000"
- id="rect6833"
- style="opacity:1.0000000;fill:#6b6b75;fill-opacity:1.0000000;stroke:none;stroke-width:5.0000000;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000" />
- <image
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref_beta/jabref/jabref-2.0-splash.png"
- y="172.36218"
- x="79.000000"
- id="image1390"
- height="428.00000"
- width="572.00000"
- sodipodi:absref="/home/alver/oldhome/bilder/bilder/jabref/behandlet.png"
- xlink:href="/home/alver/oldhome/bilder/bilder/jabref/behandlet.png" />
- <flowRoot
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref_beta/jabref/jabref-2.0-splash.png"
- style="opacity:1.0000000;fill:#635578;fill-opacity:1.0000000;stroke:#b5b5c7;stroke-width:0.48137558;stroke-linejoin:bevel;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
- transform="matrix(1.875133,0.000000,0.000000,2.542210,-129.6969,-372.8897)"
- id="flowRoot2189"
- xml:space="preserve">
- <flowRegion
- id="flowRegion2191">
- <rect
- style="fill:#635578;fill-opacity:1.0000000;stroke:#b5b5c7;stroke-opacity:1.0000000;stroke-width:0.48137557;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-linejoin:bevel"
- y="199.10532"
- x="128.49385"
- height="127.49445"
- width="283.51782"
- id="rect2193" />
- </flowRegion>
- <flowPara
- style="font-size:90.000000px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill:#635578;fill-opacity:1.0000000;stroke:#b5b5c7;stroke-width:0.48137558;stroke-linejoin:bevel;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;font-family:AR PL KaitiM GB"
- id="flowPara2201">JabRef</flowPara>
- </flowRoot> <flowRoot
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref_beta/jabref/jabref-2.0-splash.png"
- style="font-size:34.96500015px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:104.16220427%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#5cc757;stroke-width:0.64448702;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:0.64448701 0.64448701 ;stroke-dashoffset:0.45114091;stroke-opacity:1;font-family:FreeSans"
- transform="matrix(2.869197,-1.415830e-2,2.234317e-2,3.356271,-832.1435,-652.0185)"
- id="flowRoot2203"
- xml:space="preserve">
- <flowRegion
- style="stroke:url(#linearGradient5367);stroke-width:0.64448702;stroke-miterlimit:4;stroke-dasharray:0.64448701 0.64448701 ;stroke-dashoffset:0.45114091"
- id="flowRegion2205">
- <rect
- style="font-size:34.96500015px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:104.16220427%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#322b5b;stroke-width:0.64448702;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:0.64448701 0.64448701 ;stroke-dashoffset:0.45114091;stroke-opacity:1;font-family:FreeSans"
- y="286.45224"
- x="443.95346"
- height="119.83134"
- width="173.972"
- id="rect2207" />
- </flowRegion>
- <flowPara
- style="font-size:34.96500015px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:104.16220427%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#322b5b;stroke-width:0.64448702;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:0.64448701 0.64448701 ;stroke-dashoffset:0.45114091;stroke-opacity:1;font-family:FreeSans"
- id="flowPara2211">2.0</flowPara>
- </flowRoot> <flowRoot
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref_beta/jabref/jabref-2.0-splash.png"
- transform="matrix(0.972246,0.000000,0.000000,1.325301,6.054966,-126.1181)"
- style="font-size:11.9999996;font-style:oblique;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#797580;fill-opacity:1.0000000;font-family:Bitstream Vera Sans;text-anchor:middle;writing-mode:lr;text-align:center;line-height:100%"
- id="flowRoot3076"
- xml:space="preserve"><flowRegion
- id="flowRegion3078">
- <rect
- style="fill:#797580;fill-opacity:1.0000000;font-family:Bitstream Vera Sans;font-weight:bold;font-style:oblique;font-stretch:normal;font-variant:normal;font-size:11.9999996;text-anchor:middle;text-align:center;writing-mode:lr;line-height:100%"
- y="514.56494"
- x="115.50008"
- height="78.684433"
- width="506.03476"
- id="rect3080" />
- </flowRegion><flowPara
- id="flowPara1339">This program is distributed under the terms of the General Public License.</flowPara><flowPara
- id="flowPara1341">Copyright (2003-2006) Morten O. Alver, Nizar Batada and all contributors.</flowPara></flowRoot> <text
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref_beta/jabref/jabref-2.0-splash.png"
- transform="scale(0.853277,1.171952)"
- sodipodi:linespacing="100%"
- id="text1393"
- y="315.20035"
- x="163.38908"
- style="font-size:183.29680;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#413b62;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Nimbus Roman No9 L;text-anchor:start;writing-mode:lr-tb"
- xml:space="preserve"><tspan
- y="315.20035"
- x="163.38908"
- id="tspan1395"
- sodipodi:role="line">JabRef</tspan></text>
- <text
- inkscape:export-ydpi="75.000000"
- inkscape:export-xdpi="75.000000"
- inkscape:export-filename="/home/alver/jabref_beta/jabref/jabref-2.0-splash.png"
- transform="scale(0.853347,1.171856)"
- sodipodi:linespacing="100%"
- id="text2179"
- y="397.84811"
- x="149.99753"
- style="font-size:45.702374;font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#805b41;fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;font-family:Times New Roman;text-anchor:start;writing-mode:lr-tb"
- xml:space="preserve"><tspan
- y="397.84811"
- x="149.99753"
- id="tspan2181"
- sodipodi:role="line">reference manager</tspan></text>
- </g>
-</svg>
diff --git a/src/images/strings.png b/src/images/strings.png
deleted file mode 100644
index 649899f..0000000
Binary files a/src/images/strings.png and /dev/null differ
diff --git a/src/images/unmark.png b/src/images/unmark.png
deleted file mode 100644
index 92ac338..0000000
Binary files a/src/images/unmark.png and /dev/null differ
diff --git a/src/images/user-home.png b/src/images/user-home.png
deleted file mode 100644
index a3c4765..0000000
Binary files a/src/images/user-home.png and /dev/null differ
diff --git a/src/images/view-refresh.png b/src/images/view-refresh.png
deleted file mode 100644
index 952b5f7..0000000
Binary files a/src/images/view-refresh.png and /dev/null differ
diff --git a/src/images/viewsource.gif b/src/images/viewsource.gif
deleted file mode 100644
index 3ef9a2e..0000000
Binary files a/src/images/viewsource.gif and /dev/null differ
diff --git a/src/images/winedt.png b/src/images/winedt.png
deleted file mode 100644
index cded1a7..0000000
Binary files a/src/images/winedt.png and /dev/null differ
diff --git a/src/images/wizard.png b/src/images/wizard.png
deleted file mode 100644
index b5d81d3..0000000
Binary files a/src/images/wizard.png and /dev/null differ
diff --git a/src/images/wrongItem.png b/src/images/wrongItem.png
deleted file mode 100644
index 8b2f1eb..0000000
Binary files a/src/images/wrongItem.png and /dev/null differ
diff --git a/src/images/wwwciteseer.png b/src/images/wwwciteseer.png
deleted file mode 100644
index 1885445..0000000
Binary files a/src/images/wwwciteseer.png and /dev/null differ
diff --git a/src/java/gnu/dtools/ritopt/Options.java b/src/java/gnu/dtools/ritopt/Options.java
index 8ec5113..88ade80 100644
--- a/src/java/gnu/dtools/ritopt/Options.java
+++ b/src/java/gnu/dtools/ritopt/Options.java
@@ -4,7 +4,7 @@ package gnu.dtools.ritopt;
* Options.java
*
* Version:
- * $Id: Options.java 1234 2005-07-30 14:49:05Z mortenalver $
+ * $Id: Options.java 2451 2007-10-30 17:28:42Z mortenalver $
*/
@@ -273,7 +273,7 @@ public class Options implements OptionRegistrar, OptionModuleRegistrar,
/**
* Returns the program name displayed in the usage.
*
- * @param The program name.
+ * @returns The program name.
*/
public String getUsageProgram() {
@@ -283,7 +283,7 @@ public class Options implements OptionRegistrar, OptionModuleRegistrar,
/**
* Returns the version of the program.
*
- * @param The version.
+ * @returns The version.
*/
public String getVersion() {
@@ -383,14 +383,6 @@ public class Options implements OptionRegistrar, OptionModuleRegistrar,
defaultOptionFilename = fn;
}
- /**
- * Sets the debugging flag.
- *
- * @param flag The value to set the debugging flag.
-
- public void setDebugFlag( boolean flag ) {
- debugFlag = flag;
- }
/**
* Displays the program's help which includes a description of each
@@ -587,7 +579,7 @@ public class Options implements OptionRegistrar, OptionModuleRegistrar,
* Splits a string representing command line arguments into several
* strings.
*
- * @param split The string to split.
+ * @param str The string to split.
*
* @return The splitted string.
*/
@@ -694,7 +686,7 @@ public class Options implements OptionRegistrar, OptionModuleRegistrar,
/**
* Processes an array of strings representing command line arguments.
*
- * @param The arguments to process.
+ * @param args arguments to process.
*
* @return The leftover arguments.
*/
diff --git a/src/java/net/sf/jabref/EntryEditor.java b/src/java/net/sf/jabref/EntryEditor.java
index bf866be..27227a1 100644
--- a/src/java/net/sf/jabref/EntryEditor.java
+++ b/src/java/net/sf/jabref/EntryEditor.java
@@ -797,7 +797,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
Object[] options = { Globals.lang("Edit"),
Globals.lang("Revert to original source") };
- int answer = JOptionPane.showOptionDialog(frame, Globals.lang("Error: ") + ex.getMessage(),
+ int answer = JOptionPane.showOptionDialog(frame, Globals.lang("Error") + ": " + ex.getMessage(),
Globals.lang("Problem with parsing entry"), JOptionPane.YES_NO_OPTION,
JOptionPane.ERROR_MESSAGE, null, options, options[0]);
@@ -1132,7 +1132,7 @@ public class EntryEditor extends JPanel implements VetoableChangeListener {
});
} catch (IllegalArgumentException ex) {
- JOptionPane.showMessageDialog(frame, Globals.lang("Error: ") + ex.getMessage(), Globals
+ JOptionPane.showMessageDialog(frame, Globals.lang("Error") + ": " + ex.getMessage(), Globals
.lang("Error setting field"), JOptionPane.ERROR_MESSAGE);
fe.setBackground(GUIGlobals.invalidFieldBackground);
}
diff --git a/src/java/net/sf/jabref/EntryEditorTab.java b/src/java/net/sf/jabref/EntryEditorTab.java
index 6b8a8f4..c87b923 100644
--- a/src/java/net/sf/jabref/EntryEditorTab.java
+++ b/src/java/net/sf/jabref/EntryEditorTab.java
@@ -55,7 +55,7 @@ import net.sf.jabref.gui.FileListEditor;
* A single tab displayed in the EntryEditor holding several FieldEditors.
*
* @author $Author: mortenalver $
- * @version $Revision: 2114 $ ($Date: 2007-06-13 22:47:58 +0200 (Wed, 13 Jun 2007) $)
+ * @version $Revision: 2421 $ ($Date: 2007-10-09 10:27:21 +0200 (Tue, 09 Oct 2007) $)
*
*/
public class EntryEditorTab {
@@ -133,7 +133,7 @@ public class EntryEditorTab {
String rowSpec = sb.toString();
DefaultFormBuilder builder = new DefaultFormBuilder
- (panel, new FormLayout(colSpec, rowSpec));
+ (new FormLayout(colSpec, rowSpec), panel);
for (int i = 0; i < fields.length; i++) {
// Create the text area:
diff --git a/src/java/net/sf/jabref/ExternalTab.java b/src/java/net/sf/jabref/ExternalTab.java
index 68d7d32..10c97ca 100644
--- a/src/java/net/sf/jabref/ExternalTab.java
+++ b/src/java/net/sf/jabref/ExternalTab.java
@@ -6,12 +6,7 @@ import java.awt.event.ItemListener;
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
+import javax.swing.*;
import com.jgoodies.forms.builder.DefaultFormBuilder;
import com.jgoodies.forms.layout.FormLayout;
@@ -30,8 +25,10 @@ public class ExternalTab extends JPanel implements PrefsTab {
ItemListener regExpListener;
JCheckBox useRegExpComboBox;
+ JRadioButton matchExactKeyOnly = new JRadioButton(Globals.lang("Autolink only files that match the BibTeX key")),
+ matchStartsWithKey = new JRadioButton(Globals.lang("Autolink files with names starting with the BibTeX key"));
- public ExternalTab(JabRefFrame frame, PrefsDialog3 prefsDiag, JabRefPreferences prefs,
+ public ExternalTab(JabRefFrame frame, PrefsDialog3 prefsDiag, JabRefPreferences prefs,
HelpDialog helpDialog) {
_prefs = prefs;
_frame = frame;
@@ -52,8 +49,7 @@ public class ExternalTab extends JPanel implements PrefsTab {
editFileTypes = new JButton(Globals.lang("Manage external file types"));
regExpTextField = new JTextField(30);
-
- useRegExpComboBox = new JCheckBox(Globals.lang("Use Regular Expression Search"));
+ useRegExpComboBox = new JCheckBox(Globals.lang("Use Regular Expression Search"));
regExpListener = new ItemListener() {
public void itemStateChanged(ItemEvent e) {
regExpTextField.setEditable(useRegExpComboBox.isSelected());
@@ -72,13 +68,14 @@ public class ExternalTab extends JPanel implements PrefsTab {
editFileTypes.addActionListener(ExternalFileTypeEditor.getAction(prefsDiag));
+ ButtonGroup bg = new ButtonGroup();
+ bg.add(matchExactKeyOnly);
+ bg.add(matchStartsWithKey);
+
BrowseAction browse;
FormLayout layout = new FormLayout(
- "1dlu, 8dlu, left:pref, 4dlu, fill:200dlu, 4dlu, fill:pref",// 4dlu,
- // left:pref,
- // 4dlu",
- "");
+ "1dlu, 8dlu, left:pref, 4dlu, fill:170dlu, 4dlu, fill:pref","");
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
@@ -111,11 +108,15 @@ public class ExternalTab extends JPanel implements PrefsTab {
builder.nextLine();
builder.append(new JPanel());
- builder.append(useRegExpComboBox);
- builder.append(regExpTextField);
- HelpAction helpAction = new HelpAction(helpDialog, GUIGlobals.regularExpressionSearchHelp,
+ builder.append(matchStartsWithKey, 3);
+ builder.nextLine();
+ builder.append(new JPanel());
+ builder.append(matchExactKeyOnly, 3);
+ //builder.append(useRegExpComboBox);
+ //builder.append(regExpTextField);
+ /*HelpAction helpAction = new HelpAction(helpDialog, GUIGlobals.regularExpressionSearchHelp,
Globals.lang("Help on Regular Expression Search"), GUIGlobals.getIconUrl("helpSmall"));
- builder.append(helpAction.getIconButton());
+ builder.append(helpAction.getIconButton());*/
builder.nextLine();
builder.appendSeparator(Globals.lang("External programs"));
@@ -227,7 +228,12 @@ public class ExternalTab extends JPanel implements PrefsTab {
regExpTextField.setText(_prefs.get(JabRefPreferences.REG_EXP_SEARCH_EXPRESSION_KEY));
useRegExpComboBox.setSelected(_prefs.getBoolean(JabRefPreferences.USE_REG_EXP_SEARCH_KEY));
regExpListener.itemStateChanged(null);
- }
+
+ if (_prefs.getBoolean("autolinkExactKeyOnly"))
+ matchExactKeyOnly.setSelected(true);
+ else
+ matchStartsWithKey.setSelected(true);
+ }
public void storeSettings() {
@@ -249,7 +255,8 @@ public class ExternalTab extends JPanel implements PrefsTab {
_prefs.put("vimServer", vimServer.getText());
_prefs.put("latexEditorPath", led.getText());
_prefs.put("citeCommand", citeCommand.getText());
- }
+ _prefs.putBoolean("autolinkExactKeyOnly", matchExactKeyOnly.isSelected());
+ }
public boolean readyToClose() {
return true;
diff --git a/src/java/net/sf/jabref/FileTab.java b/src/java/net/sf/jabref/FileTab.java
new file mode 100644
index 0000000..f661e84
--- /dev/null
+++ b/src/java/net/sf/jabref/FileTab.java
@@ -0,0 +1,144 @@
+package net.sf.jabref;
+
+import com.jgoodies.forms.builder.DefaultFormBuilder;
+import com.jgoodies.forms.layout.CellConstraints;
+import com.jgoodies.forms.layout.FormLayout;
+
+import javax.swing.*;
+import java.text.SimpleDateFormat;
+import java.awt.*;
+
+/**
+ * Preferences tab for file options. These options were moved out from GeneralTab to
+ * resolve the space issue.
+ */
+public class FileTab extends JPanel implements PrefsTab {
+
+ JabRefPreferences _prefs;
+ JabRefFrame _frame;
+
+ private JCheckBox backup, openLast, autoDoubleBraces;
+ private JRadioButton
+ saveOriginalOrder, saveAuthorOrder, saveTableOrder,
+ resolveStringsStandard, resolveStringsAll;
+ private JTextField bracesAroundCapitalsFields, nonWrappableFields,
+ doNotResolveStringsFor;
+
+ public FileTab(JabRefFrame frame, JabRefPreferences prefs) {
+ _prefs = prefs;
+ _frame = frame;
+
+ openLast = new JCheckBox(Globals.lang("Open last edited databases at startup"));
+ backup = new JCheckBox(Globals.lang("Backup old file when saving"));
+ saveAuthorOrder = new JRadioButton(Globals.lang("Save ordered by author/editor/year"));
+ saveOriginalOrder = new JRadioButton(Globals.lang("Save entries in their original order"));
+ saveTableOrder = new JRadioButton(Globals.lang("Save in default table sort order"));
+ ButtonGroup bg = new ButtonGroup();
+ bg.add(saveAuthorOrder);
+ bg.add(saveOriginalOrder);
+ bg.add(saveTableOrder);
+ resolveStringsAll = new JRadioButton(Globals.lang("Resolve strings for all fields except")+":");
+ resolveStringsStandard = new JRadioButton(Globals.lang("Resolve strings for standard BibTeX fields only"));
+ bg = new ButtonGroup();
+ bg.add(resolveStringsAll);
+ bg.add(resolveStringsStandard);
+
+ bracesAroundCapitalsFields = new JTextField(25);
+ nonWrappableFields = new JTextField(25);
+ doNotResolveStringsFor = new JTextField(30);
+ autoDoubleBraces = new JCheckBox(
+ //+ Globals.lang("Store fields with double braces, and remove extra braces when loading.<BR>"
+ //+ "Double braces signal that BibTeX should preserve character case.") + "</HTML>");
+ Globals.lang("Remove double braces around BibTeX fields when loading."));
+
+ FormLayout layout = new FormLayout("left:pref, 4dlu, fill:pref", "");
+ DefaultFormBuilder builder = new DefaultFormBuilder(layout);
+
+ builder.appendSeparator(Globals.lang("General"));
+ builder.nextLine();
+ builder.append(openLast, 3);
+ builder.nextLine();
+ builder.append(backup, 3);
+ builder.nextLine();
+ builder.append(autoDoubleBraces, 3);
+ builder.nextLine();
+
+ JLabel label = new JLabel(Globals.lang("Store the following fields with braces around capital letters")+":");
+ builder.append(label);
+ builder.append(bracesAroundCapitalsFields);
+ builder.nextLine();
+ label = new JLabel(Globals.lang("Do not wrap the following fields when saving")+":");
+ builder.append(label);
+ builder.append(nonWrappableFields);
+ builder.nextLine();
+ builder.append(resolveStringsStandard, 3);
+ builder.nextLine();
+ builder.append(resolveStringsAll);
+ builder.append(doNotResolveStringsFor);
+ builder.nextLine();
+ builder.appendSeparator(Globals.lang("Sort order"));
+ builder.append(saveAuthorOrder, 3);
+ builder.nextLine();
+ builder.append(saveTableOrder, 3);
+ builder.nextLine();
+ builder.append(saveOriginalOrder, 3);
+ builder.nextLine();
+
+ JPanel pan = builder.getPanel();
+ pan.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+ setLayout(new BorderLayout());
+ add(pan, BorderLayout.CENTER);
+ }
+
+ public void setValues() {
+ openLast.setSelected(_prefs.getBoolean("openLastEdited"));
+ backup.setSelected(_prefs.getBoolean("backup"));
+ if (_prefs.getBoolean("saveInStandardOrder"))
+ saveAuthorOrder.setSelected(true);
+ else if (_prefs.getBoolean("saveInOriginalOrder"))
+ saveOriginalOrder.setSelected(true);
+ else
+ saveTableOrder.setSelected(true);
+ //preserveFormatting.setSelected(_prefs.getBoolean("preserveFieldFormatting"));
+ autoDoubleBraces.setSelected(_prefs.getBoolean("autoDoubleBraces"));
+ resolveStringsAll.setSelected(_prefs.getBoolean("resolveStringsAllFields"));
+ resolveStringsStandard.setSelected(!resolveStringsAll.isSelected());
+ doNotResolveStringsFor.setText(_prefs.get("doNotResolveStringsFor"));
+ bracesAroundCapitalsFields.setText(_prefs.get("putBracesAroundCapitals"));
+ nonWrappableFields.setText(_prefs.get("nonWrappableFields"));
+
+
+ }
+
+ public void storeSettings() {
+ _prefs.putBoolean("backup", backup.isSelected());
+ _prefs.putBoolean("openLastEdited", openLast.isSelected());
+ _prefs.putBoolean("saveInStandardOrder", saveAuthorOrder.isSelected());
+ _prefs.putBoolean("saveInOriginalOrder", saveOriginalOrder.isSelected());
+ _prefs.putBoolean("autoDoubleBraces", autoDoubleBraces.isSelected());
+ _prefs.putBoolean("resolveStringsAllFields", resolveStringsAll.isSelected());
+ _prefs.put("doNotResolveStringsFor", doNotResolveStringsFor.getText().trim());
+ doNotResolveStringsFor.setText(_prefs.get("doNotResolveStringsFor"));
+ boolean updateSpecialFields = false;
+ if (!bracesAroundCapitalsFields.getText().trim().equals(_prefs.get("putBracesAroundCapitals"))) {
+ _prefs.put("putBracesAroundCapitals", bracesAroundCapitalsFields.getText());
+ updateSpecialFields = true;
+ }
+ if (!nonWrappableFields.getText().trim().equals(_prefs.get("nonWrappableFields"))) {
+ _prefs.put("nonWrappableFields", nonWrappableFields.getText());
+ updateSpecialFields = true;
+ }
+ // If either of the two last entries were changed, run the update for special field handling:
+ if (updateSpecialFields)
+ _prefs.updateSpecialFieldHandling();
+
+ }
+
+ public boolean readyToClose() {
+ return true;
+ }
+
+ public String getTabName() {
+ return Globals.lang("File");
+ }
+}
diff --git a/src/java/net/sf/jabref/GUIGlobals.java b/src/java/net/sf/jabref/GUIGlobals.java
index e0c8110..c5ab999 100644
--- a/src/java/net/sf/jabref/GUIGlobals.java
+++ b/src/java/net/sf/jabref/GUIGlobals.java
@@ -235,7 +235,7 @@ public class GUIGlobals {
LANGUAGES.put("Italiano", "it");
LANGUAGES.put("Nederlands", "du");
LANGUAGES.put("Norsk", "no");
- LANGUAGES.put("Español", "es");
+ //LANGUAGES.put("Español", "es");
}
/**
diff --git a/src/java/net/sf/jabref/GeneralTab.java b/src/java/net/sf/jabref/GeneralTab.java
index 8dcb06a..6adc82e 100644
--- a/src/java/net/sf/jabref/GeneralTab.java
+++ b/src/java/net/sf/jabref/GeneralTab.java
@@ -12,16 +12,13 @@ import com.jgoodies.forms.builder.*;
public class GeneralTab extends JPanel implements PrefsTab {
- private JCheckBox backup, openLast,
+ private JCheckBox
defSort, ctrlClick, useOwner, overwriteOwner,
- keyDuplicateWarningDialog, keyEmptyWarningDialog, autoDoubleBraces,
+ keyDuplicateWarningDialog, keyEmptyWarningDialog,
confirmDelete, allowEditing, /*preserveFormatting, */useImportInspector,
useImportInspectorForSingle, inspectionWarnDupli, useTimeStamp, overwriteTimeStamp;
- private JRadioButton
- saveOriginalOrder, saveAuthorOrder, saveTableOrder,
- resolveStringsStandard, resolveStringsAll;
- private JTextField defOwnerField, timeStampFormat, timeStampField,
- bracesAroundCapitalsFields, nonWrappableFields, doNotResolveStringsFor;
+
+ private JTextField defOwnerField, timeStampFormat, timeStampField;
JabRefPreferences _prefs;
JabRefFrame _frame;
private JComboBox language = new JComboBox(GUIGlobals.LANGUAGES.keySet().toArray()),
@@ -33,9 +30,9 @@ public class GeneralTab extends JPanel implements PrefsTab {
_frame = frame;
setLayout(new BorderLayout());
- openLast = new JCheckBox(Globals.lang("Open last edited databases at startup"));
+
allowEditing = new JCheckBox(Globals.lang("Allow editing in table cells"));
- backup = new JCheckBox(Globals.lang("Backup old file when saving"));
+
defSort = new JCheckBox(Globals.lang("Sort Automatically"));
ctrlClick = new JCheckBox(Globals.lang("Open right-click menu with Ctrl+left button"));
useOwner = new JCheckBox(Globals.lang("Mark new entries with owner name") + ":");
@@ -50,23 +47,7 @@ public class GeneralTab extends JPanel implements PrefsTab {
keyDuplicateWarningDialog = new JCheckBox(Globals.lang("Show warning dialog when a duplicate BibTeX key is entered"));
keyEmptyWarningDialog = new JCheckBox(Globals.lang("Show warning dialog when an empty BibTeX key is entered")); // JZTODO lyrics
confirmDelete = new JCheckBox(Globals.lang("Show confirmation dialog when deleting entries"));
- saveAuthorOrder = new JRadioButton(Globals.lang("Save ordered by author/editor/year"));
- saveOriginalOrder = new JRadioButton(Globals.lang("Save entries in their original order"));
- saveTableOrder = new JRadioButton(Globals.lang("Save in default table sort order"));
- ButtonGroup bg = new ButtonGroup();
- bg.add(saveAuthorOrder);
- bg.add(saveOriginalOrder);
- bg.add(saveTableOrder);
- resolveStringsAll = new JRadioButton(Globals.lang("Resolve strings for all fields except")+":");
- resolveStringsStandard = new JRadioButton(Globals.lang("Resolve strings for standard BibTeX fields only"));
- bg = new ButtonGroup();
- bg.add(resolveStringsAll);
- bg.add(resolveStringsStandard);
- doNotResolveStringsFor = new JTextField(30);
- autoDoubleBraces = new JCheckBox(
- //+ Globals.lang("Store fields with double braces, and remove extra braces when loading.<BR>"
- //+ "Double braces signal that BibTeX should preserve character case.") + "</HTML>");
- Globals.lang("Remove double braces around BibTeX fields when loading."));
+
useImportInspector = new JCheckBox(Globals.lang("Display imported entries in an inspection window before they are added."));
useImportInspectorForSingle = new JCheckBox(Globals.lang("Use inspection window also when a single entry is imported."));
JPanel general = new JPanel();
@@ -82,8 +63,7 @@ public class GeneralTab extends JPanel implements PrefsTab {
Insets marg = new Insets(0,12,3,0);
useImportInspectorForSingle.setMargin(marg);
inspectionWarnDupli.setMargin(marg);
- bracesAroundCapitalsFields = new JTextField(25);
- nonWrappableFields = new JTextField(25);
+
// We need a listener on useImportInspector to enable and disable the
// import inspector related choices;
useImportInspector.addChangeListener(new ChangeListener() {
@@ -95,80 +75,61 @@ public class GeneralTab extends JPanel implements PrefsTab {
);
FormLayout layout = new FormLayout
- ("8dlu, left:pref, 8dlu, fill:pref, 4dlu, fill:pref", // 4dlu, left:pref, 4dlu",
- "pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, "
- +"pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, "
- +"pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, pref, 6dlu, "
- +"pref, 6dlu, pref, 6dlu, pref, 6dlu, pref");
+ ("8dlu, 1dlu, left:170dlu, 4dlu, fill:pref, 4dlu, fill:pref, 4dlu, left:pref, 4dlu, left:pref, 4dlu, left:pref", "");
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
- CellConstraints cc = new CellConstraints();
- builder.addSeparator(Globals.lang("File"), cc.xyw(1,1, 5));
- builder.add(openLast, cc.xy(2,3));
- builder.add(backup, cc.xy(2,5));
- builder.add(autoDoubleBraces, cc.xy(2, 7));
- builder.add(saveAuthorOrder, cc.xy(4, 3));
- builder.add(saveTableOrder, cc.xy(4, 5));
- builder.add(saveOriginalOrder, cc.xy(4, 7));
- JLabel label = new JLabel(Globals.lang("Store the following fields with braces around capital letters")+":");
- DefaultFormBuilder builder3 = new DefaultFormBuilder
- (new FormLayout("left:pref, 4dlu, fill:pref",""));
- builder3.append(label);
- builder3.append(bracesAroundCapitalsFields);
- label = new JLabel(Globals.lang("Do not wrap the following fields when saving")+":");
- builder3.append(label);
- builder3.append(nonWrappableFields);
- builder.add(builder3.getPanel(), cc.xyw(2, 9, 3));
- builder.add(resolveStringsStandard, cc.xyw(2, 11, 5));
- DefaultFormBuilder builder4 = new DefaultFormBuilder
- (new FormLayout("left:pref, 4dlu, fill:pref",""));
- builder4.append(resolveStringsAll);
- builder4.append(doNotResolveStringsFor);
- builder.add(builder4.getPanel(), cc.xyw(2, 13, 1));
- //builder.add(resolveStringsAll, cc.xy(2, 13));
- //builder.add(doNotResolveStringsFor, cc.xyw(4, 13, 3));
- builder.addSeparator(Globals.lang("Miscellaneous"), cc.xyw(1, 15, 5));
- builder.add(useImportInspector, cc.xy(2, 17));
- builder.add(useImportInspectorForSingle, cc.xy(2, 19));
- builder.add(inspectionWarnDupli, cc.xy(2, 21));
- builder.add(ctrlClick, cc.xy(2, 23));
- builder.add(confirmDelete, cc.xy(2, 25));
- builder.add(keyDuplicateWarningDialog, cc.xy(2, 27));
- builder.add(keyEmptyWarningDialog, cc.xy(2, 29));
+ builder.appendSeparator(Globals.lang("General"));
+ builder.nextLine();
+ builder.append(useImportInspector, 13);
+ builder.nextLine();
+ builder.append(new JPanel());
+ builder.append(useImportInspectorForSingle, 11);
+ builder.nextLine();
+ builder.append(new JPanel());
+ builder.append(inspectionWarnDupli, 11);
+ builder.nextLine();
+ builder.append(ctrlClick, 13);
+ builder.nextLine();
+ builder.append(confirmDelete, 13);
+ builder.nextLine();
+ builder.append(keyDuplicateWarningDialog, 13);
+ builder.nextLine();
+ builder.append(keyEmptyWarningDialog, 13);
+ builder.nextLine();
// Create a new panel with its own FormLayout for the last items:
FormLayout layout2 = new FormLayout
("left:pref, 8dlu, fill:50dlu, 4dlu, left:pref, 4dlu, left:pref, 4dlu, fill:50dlu, 4dlu, fill:pref", "");
DefaultFormBuilder builder2 = new DefaultFormBuilder(layout2);
- builder2.append(useOwner);
- builder2.append(defOwnerField);
- builder2.append(overwriteOwner);
+ builder.append(useOwner, 3);
+ builder.append(defOwnerField);
+ builder.append(overwriteOwner);
+ builder.append(new JPanel(), 3);
JButton hlp = new JButton(ownerHelp);
hlp.setText(null);
hlp.setPreferredSize(new Dimension(24, 24));
- builder2.append(hlp);
- //builder2.nextLine();
-
- builder2.nextLine();
- builder2.append(useTimeStamp);
- builder2.append(timeStampFormat);
- builder2.append(overwriteTimeStamp);
- builder2.append(Globals.lang("Field name")+":");
- builder2.append(timeStampField);
+ builder.append(hlp);
+ builder.nextLine();
+
+ builder.append(useTimeStamp, 3);
+ builder.append(timeStampFormat);
+ builder.append(overwriteTimeStamp);
+ builder.append(Globals.lang("Field name")+":");
+ builder.append(timeStampField);
hlp = new JButton(timeStampHelp);
hlp.setText(null);
hlp.setPreferredSize(new Dimension(24, 24));
- builder2.append(hlp);
- builder2.nextLine();
+ builder.append(hlp);
+ builder.nextLine();
JLabel lab;
lab = new JLabel(Globals.lang("Language") + ":");
- builder2.append(lab);
- builder2.append(language);
- builder2.nextLine();
+ builder.append(lab, 3);
+ builder.append(language);
+ builder.nextLine();
lab = new JLabel(Globals.lang("Default encoding") + ":");
- builder2.append(lab);
- builder2.append(encodings);
+ builder.append(lab, 3);
+ builder.append(encodings);
- builder.add(builder2.getPanel(), cc.xyw(2, 31, 3));
+ //builder.add(builder2.getPanel(), cc.xyw(2, 15, 3));
JPanel pan = builder.getPanel();
@@ -178,9 +139,7 @@ public class GeneralTab extends JPanel implements PrefsTab {
}
public void setValues() {
- openLast.setSelected(_prefs.getBoolean("openLastEdited"));
allowEditing.setSelected(_prefs.getBoolean("allowTableEditing"));
- backup.setSelected(_prefs.getBoolean("backup"));
defSort.setSelected(_prefs.getBoolean("defaultAutoSort"));
ctrlClick.setSelected(_prefs.getBoolean("ctrlClick"));
useOwner.setSelected(_prefs.getBoolean("useOwner"));
@@ -190,17 +149,6 @@ public class GeneralTab extends JPanel implements PrefsTab {
keyDuplicateWarningDialog.setSelected(_prefs.getBoolean("dialogWarningForDuplicateKey"));
keyEmptyWarningDialog.setSelected(_prefs.getBoolean("dialogWarningForEmptyKey"));
confirmDelete.setSelected(_prefs.getBoolean("confirmDelete"));
- if (_prefs.getBoolean("saveInStandardOrder"))
- saveAuthorOrder.setSelected(true);
- else if (_prefs.getBoolean("saveInOriginalOrder"))
- saveOriginalOrder.setSelected(true);
- else
- saveTableOrder.setSelected(true);
- //preserveFormatting.setSelected(_prefs.getBoolean("preserveFieldFormatting"));
- autoDoubleBraces.setSelected(_prefs.getBoolean("autoDoubleBraces"));
- resolveStringsAll.setSelected(_prefs.getBoolean("resolveStringsAllFields"));
- resolveStringsStandard.setSelected(!resolveStringsAll.isSelected());
- doNotResolveStringsFor.setText(_prefs.get("doNotResolveStringsFor"));
defOwnerField.setText(_prefs.get("defaultOwner"));
timeStampFormat.setText(_prefs.get("timeStampFormat"));
timeStampField.setText(_prefs.get("timeStampField"));
@@ -209,8 +157,6 @@ public class GeneralTab extends JPanel implements PrefsTab {
inspectionWarnDupli.setSelected(_prefs.getBoolean("warnAboutDuplicatesInInspection"));
useImportInspectorForSingle.setEnabled(useImportInspector.isSelected());
inspectionWarnDupli.setEnabled(useImportInspector.isSelected());
- bracesAroundCapitalsFields.setText(_prefs.get("putBracesAroundCapitals"));
- nonWrappableFields.setText(_prefs.get("nonWrappableFields"));
String enc = _prefs.get("defaultEncoding");
outer: for (int i = 0; i < Globals.ENCODINGS.length; i++) {
@@ -233,8 +179,6 @@ public class GeneralTab extends JPanel implements PrefsTab {
}
public void storeSettings() {
- _prefs.putBoolean("backup", backup.isSelected());
- _prefs.putBoolean("openLastEdited", openLast.isSelected());
_prefs.putBoolean("useOwner", useOwner.isSelected());
_prefs.putBoolean("overwriteOwner", overwriteOwner.isSelected());
_prefs.putBoolean("useTimeStamp", useTimeStamp.isSelected());
@@ -242,15 +186,9 @@ public class GeneralTab extends JPanel implements PrefsTab {
_prefs.putBoolean("dialogWarningForDuplicateKey", keyDuplicateWarningDialog.isSelected());
_prefs.putBoolean("dialogWarningForEmptyKey", keyEmptyWarningDialog.isSelected());
_prefs.putBoolean("confirmDelete", confirmDelete.isSelected());
- _prefs.putBoolean("saveInStandardOrder", saveAuthorOrder.isSelected());
- _prefs.putBoolean("saveInOriginalOrder", saveOriginalOrder.isSelected());
_prefs.putBoolean("allowTableEditing", allowEditing.isSelected());
_prefs.putBoolean("ctrlClick", ctrlClick.isSelected());
//_prefs.putBoolean("preserveFieldFormatting", preserveFormatting.isSelected());
- _prefs.putBoolean("autoDoubleBraces", autoDoubleBraces.isSelected());
- _prefs.putBoolean("resolveStringsAllFields", resolveStringsAll.isSelected());
- _prefs.put("doNotResolveStringsFor", doNotResolveStringsFor.getText().trim());
- doNotResolveStringsFor.setText(_prefs.get("doNotResolveStringsFor"));
_prefs.putBoolean("useImportInspectionDialog", useImportInspector.isSelected());
_prefs.putBoolean("useImportInspectionDialogForSingle", useImportInspectorForSingle.isSelected());
_prefs.putBoolean("warnAboutDuplicatesInInspection", inspectionWarnDupli.isSelected());
@@ -261,19 +199,6 @@ public class GeneralTab extends JPanel implements PrefsTab {
_prefs.put("timeStampFormat", timeStampFormat.getText().trim());
_prefs.put("timeStampField", timeStampField.getText().trim());
_prefs.put("defaultEncoding", (String) encodings.getSelectedItem());
- boolean updateSpecialFields = false;
- if (!bracesAroundCapitalsFields.getText().trim().equals(_prefs.get("putBracesAroundCapitals"))) {
- _prefs.put("putBracesAroundCapitals", bracesAroundCapitalsFields.getText());
- updateSpecialFields = true;
- }
- if (!nonWrappableFields.getText().trim().equals(_prefs.get("nonWrappableFields"))) {
- _prefs.put("nonWrappableFields", nonWrappableFields.getText());
- updateSpecialFields = true;
- }
- // If either of the two last entries were changed, run the update for special field handling:
- if (updateSpecialFields)
- _prefs.updateSpecialFieldHandling();
-
if (!GUIGlobals.LANGUAGES.get(language.getSelectedItem()).equals(_prefs.get("language"))) {
_prefs.put("language", GUIGlobals.LANGUAGES.get(language.getSelectedItem()).toString());
diff --git a/src/java/net/sf/jabref/JabRef.java b/src/java/net/sf/jabref/JabRef.java
index edfbd36..e1c90c2 100644
--- a/src/java/net/sf/jabref/JabRef.java
+++ b/src/java/net/sf/jabref/JabRef.java
@@ -81,8 +81,6 @@ public class JabRef {
ths = this;
- System.setProperty("swing.aatext", "true");
-
// The following two lines signal that the system proxy settings should be used:
System.setProperty("java.net.useSystemProxies", "true");
System.getProperties().put( "proxySet", "true" );
diff --git a/src/java/net/sf/jabref/JabRefPreferences.java b/src/java/net/sf/jabref/JabRefPreferences.java
index 6e041f1..c173af1 100644
--- a/src/java/net/sf/jabref/JabRefPreferences.java
+++ b/src/java/net/sf/jabref/JabRefPreferences.java
@@ -52,6 +52,10 @@ public class JabRefPreferences {
CUSTOM_TAB_NAME = "customTabName_",
CUSTOM_TAB_FIELDS = "customTabFields_";
+ // This String is used in the encoded list in prefs of external file type
+ // modifications, in order to indicate a removed default file type:
+ public static final String FILE_TYPE_REMOVED_FLAG = "REMOVED";
+
public String WRAPPED_USERNAME;
Preferences prefs;
@@ -327,6 +331,7 @@ public class JabRefPreferences {
defaults.put("showFileLinksUpgradeWarning", Boolean.TRUE);
+ defaults.put("autolinkExactKeyOnly", Boolean.TRUE);
//defaults.put("lastAutodetectedImport", "");
//defaults.put("autoRemoveExactDuplicates", Boolean.FALSE);
@@ -762,8 +767,10 @@ public class JabRefPreferences {
defKeyBinds.put("New from plain text", "ctrl shift N");
defKeyBinds.put("Import Fields from CiteSeer", "ctrl shift C");
defKeyBinds.put("Fetch citations from CiteSeer", "F7");
+ defKeyBinds.put("Synchronize files", "ctrl F4");
defKeyBinds.put("Synchronize PDF", "shift F4");
- defKeyBinds.put("Synchronize PS", "ctrl F4");
+ defKeyBinds.put("Synchronize PS", "ctrl shift F4");
+
defKeyBinds.put("Abbreviate", "ctrl alt A");
defKeyBinds.put("Unabbreviate", "ctrl alt shift A");
defKeyBinds.put("Search IEEEXplore", "F8");
@@ -846,42 +853,27 @@ public class JabRefPreferences {
}
- /**
- * Set up the list of external file types, either from default values, or from values
- * recorded in Preferences.
- */
- public void updateExternalFileTypes() {
- if (prefs.get("externalFileTypes", null) == null) {
- externalFileTypes.clear();
- List<ExternalFileType> list = getDefaultExternalFileTypes();
- externalFileTypes.addAll(list);
- }
- else {
- String[][] vals = Util.decodeStringDoubleArray(prefs.get("externalFileTypes", ""));
- for (int i = 0; i < vals.length; i++) {
- ExternalFileType type = new ExternalFileType(vals[i]);
- externalFileTypes.add(type);
- }
- }
- }
public List<ExternalFileType> getDefaultExternalFileTypes() {
List<ExternalFileType> list = new ArrayList<ExternalFileType>();
- list.add(new ExternalFileType("PDF", "pdf", get("pdfviewer"), "pdfSmall"));
- list.add(new ExternalFileType("PostScript", "ps", get("psviewer"), "psSmall"));
- list.add(new ExternalFileType("Word file", "doc", "oowriter", "openoffice"));
+ list.add(new ExternalFileType("PDF", "pdf", "evince", "pdfSmall"));
+ list.add(new ExternalFileType("PostScript", "ps", "evince", "psSmall"));
+ list.add(new ExternalFileType("Word", "doc", "oowriter", "openoffice"));
list.add(new ExternalFileType("OpenDocument text", "odt", "oowriter", "openoffice"));
- list.add(new ExternalFileType("Excel file", "xls", "oocalc", "openoffice"));
+ list.add(new ExternalFileType("Excel", "xls", "oocalc", "openoffice"));
list.add(new ExternalFileType("OpenDocument spreadsheet", "ods", "oocalc", "openoffice"));
- list.add(new ExternalFileType("PowerPoint file", "ppt", "ooimpress", "openoffice"));
+ list.add(new ExternalFileType("PowerPoint", "ppt", "ooimpress", "openoffice"));
list.add(new ExternalFileType("OpenDocument presentation", "odp", "ooimpress", "openoffice"));
list.add(new ExternalFileType("Rich Text Format", "rtf", "oowriter", "openoffice"));
list.add(new ExternalFileType("PNG image", "png", "gimp", "picture"));
list.add(new ExternalFileType("GIF image", "gif", "gimp", "picture"));
list.add(new ExternalFileType("JPG image", "jpg", "gimp", "picture"));
-
- list.add(new ExternalFileType("Text file", "txt", "emacs", "emacs"));
+ list.add(new ExternalFileType("Djvu", "djvu", "evince", "psSmall"));
+ list.add(new ExternalFileType("Text", "txt", "emacs", "emacs"));
+ list.add(new ExternalFileType("LaTeX", "tex", "emacs", "emacs"));
+ list.add(new ExternalFileType("CHM", "chm", "gnochm", "www"));
+ list.add(new ExternalFileType("TIFF image", "tiff", "gimp", "picture"));
ExternalFileType tp = new ExternalFileType("URL", "html", "firefox", "www");
list.add(tp);
@@ -938,22 +930,118 @@ public class JabRefPreferences {
* just new entries.
*/
public void setExternalFileTypes(List<ExternalFileType> types) {
+
+ // First find a list of the default types:
+ List<ExternalFileType> defTypes = getDefaultExternalFileTypes();
+ // Make a list of types that are unchanged:
+ List<ExternalFileType> unchanged = new ArrayList<ExternalFileType>();
+
externalFileTypes.clear();
for (Iterator<ExternalFileType> iterator = types.iterator(); iterator.hasNext();) {
- externalFileTypes.add(iterator.next());
+ ExternalFileType type = iterator.next();
+ externalFileTypes.add(type);
+
+ // See if we can find a type with matching name in the default type list:
+ ExternalFileType found = null;
+ for (ExternalFileType defType : defTypes) {
+ if (defType.getName().equals(type.getName())) {
+ found = defType;
+ break;
+ }
+ }
+ if (found != null) {
+ // Found it! Check if it is an exact match, or if it has been customized:
+ if (found.equals(type))
+ unchanged.add(type);
+ else {
+ // It was modified. Remove its entry from the defaults list, since
+ // the type hasn't been removed:
+ defTypes.remove(found);
+ }
+ }
}
- String[][] array = new String[externalFileTypes.size()][];
+
+ // Go through unchanged types. Remove them from the ones that should be stored,
+ // and from the list of defaults, since we don't need to mention these in prefs:
+ for (ExternalFileType type : unchanged) {
+ defTypes.remove(type);
+ types.remove(type);
+ }
+
+ // Now set up the array to write to prefs, containing all new types, all modified
+ // types, and a flag denoting each default type that has been removed:
+ String[][] array = new String[types.size()+defTypes.size()][];
int i=0;
- for (Iterator iterator = externalFileTypes.iterator(); iterator.hasNext();) {
- ExternalFileType type = (ExternalFileType) iterator.next();
+ for (ExternalFileType type : types) {
array[i] = type.getStringArrayRepresentation();
i++;
}
+ for (ExternalFileType type : defTypes) {
+ array[i] = new String[] {type.getName(), FILE_TYPE_REMOVED_FLAG};
+ i++;
+ }
//System.out.println("Encoded: '"+Util.encodeStringArray(array)+"'");
put("externalFileTypes", Util.encodeStringArray(array));
}
+ /**
+ * Set up the list of external file types, either from default values, or from values
+ * recorded in Preferences.
+ */
+ public void updateExternalFileTypes() {
+ // First get a list of the default file types as a starting point:
+ List<ExternalFileType> types = getDefaultExternalFileTypes();
+ // If no changes have been stored, simply use the defaults:
+ if (prefs.get("externalFileTypes", null) == null) {
+ externalFileTypes.clear();
+ externalFileTypes.addAll(types);
+ return;
+ }
+ // Read the prefs information for file types:
+ String[][] vals = Util.decodeStringDoubleArray(prefs.get("externalFileTypes", ""));
+ for (int i = 0; i < vals.length; i++) {
+ if ((vals[i].length == 2) && (vals[i][1].equals(FILE_TYPE_REMOVED_FLAG))) {
+ // This entry indicates that a default entry type should be removed:
+ ExternalFileType toRemove = null;
+ for (ExternalFileType type : types) {
+ if (type.getName().equals(vals[i][0])) {
+ toRemove = type;
+ break;
+ }
+ }
+ // If we found it, remove it from the type list:
+ if (toRemove != null)
+ types.remove(toRemove);
+ }
+ else {
+ // A new or modified entry type. Construct it from the string array:
+ ExternalFileType type = new ExternalFileType(vals[i]);
+ // Check if there is a default type with the same name. If so, this is a
+ // modification of that type, so remove the default one:
+ ExternalFileType toRemove = null;
+ for (ExternalFileType defType : types) {
+ if (type.getName().equals(defType.getName())) {
+ toRemove = defType;
+ break;
+ }
+ }
+ // If we found it, remove it from the type list:
+ if (toRemove != null) {
+ types.remove(toRemove);
+ }
+
+ // Then add the new one:
+ types.add(type);
+ }
+ }
+
+ // Finally, build the list of types based on the modified defaults list:
+ for (ExternalFileType type : types) {
+ externalFileTypes.add(type);
+ }
+ }
+
/**
* Removes all information about custom entry types with tags of
diff --git a/src/java/net/sf/jabref/PrefsDialog3.java b/src/java/net/sf/jabref/PrefsDialog3.java
index e646eb4..671de67 100644
--- a/src/java/net/sf/jabref/PrefsDialog3.java
+++ b/src/java/net/sf/jabref/PrefsDialog3.java
@@ -81,6 +81,7 @@ public class PrefsDialog3 extends JDialog {
// ----------------------------------------------------------------
ArrayList tabs = new ArrayList();
tabs.add(new GeneralTab(frame, prefs));
+ tabs.add(new FileTab(frame, prefs));
tabs.add(new EntryEditorPrefsTab(frame, prefs));
tabs.add(new GroupsPrefsTab(prefs));
tabs.add(new AppearancePrefsTab(prefs));
@@ -96,11 +97,13 @@ public class PrefsDialog3 extends JDialog {
Iterator it = tabs.iterator();
String[] names = new String[tabs.size()];
int i = 0;
- while (it.hasNext()) {
+ //ArrayList<Component> comps = new ArrayList<Component>();
+ while (it.hasNext()) {
PrefsTab tab = (PrefsTab) it.next();
names[i++] = tab.getTabName();
main.add((Component) tab, tab.getTabName());
- }
+ //comps.add((Component)tab); // for debug only
+ }
upper.setBorder(BorderFactory.createEtchedBorder());
@@ -208,7 +211,13 @@ public class PrefsDialog3 extends JDialog {
setValues();
pack(); // setSize(440, 500);
- }
+
+ /** Look through component sizes to find which tab is to blame
+ * when the dialog grows too large:
+ for (Component co : comps) {
+ System.out.println(co.getPreferredSize());
+ }*/
+ }
class OkAction extends AbstractAction {
public OkAction() {
diff --git a/src/java/net/sf/jabref/Util.java b/src/java/net/sf/jabref/Util.java
index 93a8fab..efead94 100644
--- a/src/java/net/sf/jabref/Util.java
+++ b/src/java/net/sf/jabref/Util.java
@@ -694,7 +694,7 @@ public class Util {
file = tmp;
}
- // Check if we have arrived at a file type, and either an http link or an existing file:
+ // Check if we have arrived at a file type, and either an http link or an existing file:
if ((httpLink || file.exists()) && (fileType != null)) {
// Open the file:
try {
@@ -709,7 +709,7 @@ public class Util {
} else
openFileOnWindows(filePath, true);
} else {
- String[] cmdArray = new String[] { fileType.getOpenWith(), filePath };
+ String[] cmdArray = new String[] { fileType.getOpenWith(), filePath };
Runtime.getRuntime().exec(cmdArray);
}
} catch (IOException e) {
@@ -805,7 +805,7 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
throw new RuntimeException("Could not find the file list entry "+link+" in "+entry.toString());
}
- FileListEntryEditor editor = new FileListEntryEditor(frame, flEntry, false, metaData);
+ FileListEntryEditor editor = new FileListEntryEditor(frame, flEntry, false, true, metaData);
editor.setVisible(true);
if (editor.okPressed()) {
// Store the changes and add an undo edit:
@@ -890,18 +890,39 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
for (BibtexEntry entry : entries){
result.put(entry, new ArrayList<File>());
}
-
- // Now look for keys
+
+ boolean exactOnly = Globals.prefs.getBoolean("autolinkExactKeyOnly");
+ // Now look for keys
nextFile:
for (File file : filesWithExtension){
String name = file.getName();
- for (BibtexEntry entry : entries){
- if (name.contains(entry.getCiteKey())){
- result.get(entry).add(file);
- continue nextFile;
- }
- }
+ int dot = name.lastIndexOf('.');
+ // First, look for exact matches:
+ for (BibtexEntry entry : entries){
+ String citeKey = entry.getCiteKey();
+ if ((citeKey != null) && (citeKey.length() > 0)) {
+ if (dot > 0) {
+ if (name.substring(0, dot).equals(citeKey)) {
+ result.get(entry).add(file);
+ continue nextFile;
+ }
+ }
+ }
+ }
+ // If we get here, we didn't find any exact matches. If non-exact
+ // matches are allowed, try to find one:
+ if (!exactOnly) {
+ for (BibtexEntry entry : entries){
+ String citeKey = entry.getCiteKey();
+ if ((citeKey != null) && (citeKey.length() > 0)) {
+ if (name.startsWith(citeKey)){
+ result.get(entry).add(file);
+ continue nextFile;
+ }
+ }
+ }
+ }
}
return result;
@@ -1007,17 +1028,17 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
/**
* Searches the given directory and file name pattern for a file for the
* bibtexentry.
- *
+ *
* Used to fix:
- *
+ *
* http://sourceforge.net/tracker/index.php?func=detail&aid=1503410&group_id=92314&atid=600309
- *
+ *
* Requirements:
* - Be able to find the associated PDF in a set of given directories.
* - Be able to return a relative path or absolute path.
* - Be fast.
* - Allow for flexible naming schemes in the PDFs.
- *
+ *
* Syntax scheme for file:
* <ul>
* <li>* Any subDir</li>
@@ -1025,7 +1046,7 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
* <li>[key] Key from bibtex file and database</li>
* <li>.* Anything else is taken to be a Regular expression.</li>
* </ul>
- *
+ *
* @param entry
* non-null
* @param database
@@ -1037,10 +1058,10 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
* the file attribute for this.
* @param file
* non-null
- *
+ *
* @param relative
* whether to return relative file paths or absolute ones
- *
+ *
* @return Will return the first file found to match the given criteria or
* null if none was found.
*/
@@ -1058,7 +1079,7 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
/**
* Removes optional square brackets from the string s
- *
+ *
* @param s
* @return
*/
@@ -1093,10 +1114,10 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
if (i < c.length){
if (c[i] == '"'){
// Parameter is in format "xxx"
-
+
// Skip "
i++;
-
+
int startParam = i;
i++;
boolean escaped = false;
@@ -1110,23 +1131,23 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
i++;
}
-
+
String param = calls.substring(startParam, i);
result.add(new String[] { method, param });
} else {
// Parameter is in format xxx
-
+
int startParam = i;
-
+
while (i < c.length && c[i] != ')') {
i++;
}
-
+
String param = calls.substring(startParam, i);
-
+
result.add(new String[] { method, param });
-
-
+
+
}
} else {
// Incorrecly terminated open brace
@@ -1147,7 +1168,7 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
* Accepts a string like [author:toLowerCase("escapedstring"),toUpperCase],
* whereas the first string signifies the bibtex-field to get while the
* others are the names of layouters that will be applied.
- *
+ *
* @param fieldAndFormat
* @param entry
* @param database
@@ -1196,7 +1217,7 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
/**
* Convenience function for absolute search.
- *
+ *
* Uses findFile(BibtexEntry, BibtexDatabase, (String)null, String, false).
*/
public static String findFile(BibtexEntry entry, BibtexDatabase database, String file) {
@@ -1206,7 +1227,7 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
/**
* Internal Version of findFile, which also accepts a current directory to
* base the search on.
- *
+ *
*/
public static String findFile(BibtexEntry entry, BibtexDatabase database, String directory,
String file, boolean relative) {
@@ -1221,16 +1242,16 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
return null;
String found = findFile(entry, database, root, file);
-
+
if (directory == null || !relative) {
return found;
}
-
+
if (found != null) {
try {
/**
* [ 1601651 ] PDF subdirectory - missing first character
- *
+ *
* http://sourceforge.net/tracker/index.php?func=detail&aid=1601651&group_id=92314&atid=600306
*/
// Changed by M. Alver 2007.01.04:
@@ -1387,9 +1408,9 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
/**
* Takes a string that contains bracketed expression and expands each of
* these using getFieldAndFormat.
- *
+ *
* Unknown Bracket expressions are silently dropped.
- *
+ *
* @param bracketString
* @param entry
* @param database
@@ -2639,8 +2660,9 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
newList.add(thisEntry);
// Convert to String[][]:
- String[][] res = new String[newList.size()][newList.get(0).size()];
+ String[][] res = new String[newList.size()][];
for (int i = 0; i < res.length; i++) {
+ res[i] = new String[newList.get(i).size()];
for (int j = 0; j < res[i].length; j++) {
res[i][j] = newList.get(i).get(j);
}
diff --git a/src/java/net/sf/jabref/export/FileActions.java b/src/java/net/sf/jabref/export/FileActions.java
index cf6c574..809031d 100644
--- a/src/java/net/sf/jabref/export/FileActions.java
+++ b/src/java/net/sf/jabref/export/FileActions.java
@@ -241,7 +241,7 @@ public class FileActions
e.printStackTrace();
throw new SaveException(ex.getMessage()+"\n"+
Globals.lang("Warning: could not complete file repair; your file may "
- +"have been corrupted. Error message: ")+e.getMessage());
+ +"have been corrupted. Error message")+": "+e.getMessage());
}
throw new SaveException(ex.getMessage(), be);
}
diff --git a/src/java/net/sf/jabref/external/DownloadExternalFile.java b/src/java/net/sf/jabref/external/DownloadExternalFile.java
index 4f0673f..e1cad48 100644
--- a/src/java/net/sf/jabref/external/DownloadExternalFile.java
+++ b/src/java/net/sf/jabref/external/DownloadExternalFile.java
@@ -66,8 +66,8 @@ public class DownloadExternalFile {
try {
udl.download();
} catch (IOException e2) {
- JOptionPane.showMessageDialog(frame, Globals.lang("Invalid URL: "
- + e2.getMessage()), Globals.lang("Download file"),
+ JOptionPane.showMessageDialog(frame, Globals.lang("Invalid URL")+": "
+ + e2.getMessage(), Globals.lang("Download file"),
JOptionPane.ERROR_MESSAGE);
Globals.logger("Error while downloading " + url.toString());
return;
@@ -99,7 +99,7 @@ public class DownloadExternalFile {
File file = new File(new File(suggestDir), suggestedName);
FileListEntry entry = new FileListEntry("", bibtexKey != null ? file.getPath() : "",
Globals.prefs.getExternalFileTypeByExt(suffix));
- editor = new FileListEntryEditor(frame, entry, true, metaData);
+ editor = new FileListEntryEditor(frame, entry, true, false, metaData);
editor.getProgressBar().setIndeterminate(true);
editor.setOkEnabled(false);
editor.setExternalConfirm(new ConfirmCloseFileListEntryEditor() {
@@ -223,6 +223,17 @@ public class DownloadExternalFile {
* @return The suffix, excluding the dot (e.g. ".pdf")
*/
public String getSuffix(String link) {
+ try {
+ // Try to strip the query string, if any, to get the correct suffix:
+ URL url = new URL(link);
+ if ((url.getQuery() != null) && (url.getQuery().length() < link.length()-1)) {
+ link = link.substring(0, link.length()-url.getQuery().length()-1);
+ System.out.println(link);
+ }
+ } catch (MalformedURLException e) {
+ // Don't report this error, since this getting the suffix is a non-critical
+ // operation, and this error will be triggered and reported elsewhere.
+ }
int index = link.lastIndexOf('.');
if ((index <= 0) || (index == link.length() - 1)) // No occurence, or at the end
return null;
diff --git a/src/java/net/sf/jabref/external/DroppedFileHandler.java b/src/java/net/sf/jabref/external/DroppedFileHandler.java
index e470337..dff80f5 100644
--- a/src/java/net/sf/jabref/external/DroppedFileHandler.java
+++ b/src/java/net/sf/jabref/external/DroppedFileHandler.java
@@ -63,8 +63,8 @@ public class DroppedFileHandler {
grp.add(moveRadioButton);
copyRadioButton.setSelected(true);
- DefaultFormBuilder builder = new DefaultFormBuilder(optionsPanel, new FormLayout(
- "left:pref", ""));
+ DefaultFormBuilder builder = new DefaultFormBuilder(new FormLayout("left:pref", ""),
+ optionsPanel);
builder.append(linkInPlace);
builder.append(destDirLabel);
builder.append(copyRadioButton);
@@ -203,10 +203,7 @@ public class DroppedFileHandler {
boolean isSingle = xmpEntriesInFile.size() == 1;
BibtexEntry single = (isSingle ? (BibtexEntry) xmpEntriesInFile.get(0) : null);
- /*reply = showLinkMoveCopyRenameDialog(Globals.lang("Link to PDF %0", fileName), fileType,
- isSingle, (isSingle ? single.getCiteKey() : Globals.lang("Cannot rename for several entries.")),
- false, !isSingle);*/
-
+
boolean success = true;
String destFilename;
diff --git a/src/java/net/sf/jabref/external/ExternalFilePanel.java b/src/java/net/sf/jabref/external/ExternalFilePanel.java
index 0c7848a..686de4d 100644
--- a/src/java/net/sf/jabref/external/ExternalFilePanel.java
+++ b/src/java/net/sf/jabref/external/ExternalFilePanel.java
@@ -42,8 +42,8 @@ import net.sf.jabref.util.XMPUtil;
*
* Current Version:
*
- * @author $Author: coezbek $
- * @version $Revision: 2110 $ ($Date: 2007-06-13 03:39:51 +0200 (Wed, 13 Jun 2007) $)
+ * @author $Author: mortenalver $
+ * @version $Revision: 2454 $ ($Date: 2007-10-31 21:00:41 +0000 (Wed, 31 Oct 2007) $)
*
*/
public class ExternalFilePanel extends JPanel {
@@ -191,9 +191,9 @@ public class ExternalFilePanel extends JPanel {
JOptionPane.showMessageDialog(editor.getParent(), Globals.lang(
"Error writing XMP to file: %0", e.getLocalizedMessage()), Globals
.lang("Writing XMP"), JOptionPane.ERROR_MESSAGE);
- Globals.logger(Globals.lang("Error while writing XMP %0", finalFile
+ Globals.logger(Globals.lang("Error writing XMP to file: %0", finalFile
.getAbsolutePath()));
- output(Globals.lang("Error writing XMP to '%0'...", finalFile.getName()));
+ output(Globals.lang("Error writing XMP to file: %0", finalFile.getName()));
} catch (TransformerException e) {
JOptionPane.showMessageDialog(editor.getParent(), Globals.lang(
@@ -331,8 +331,8 @@ public class ExternalFilePanel extends JPanel {
try {
udl.download();
} catch (IOException e2) {
- JOptionPane.showMessageDialog(parent, Globals.lang("Invalid URL: "
- + e2.getMessage()), Globals.lang("Download file"),
+ JOptionPane.showMessageDialog(parent, Globals.lang("Invalid URL")+": "
+ + e2.getMessage(), Globals.lang("Download file"),
JOptionPane.ERROR_MESSAGE);
Globals.logger("Error while downloading " + url.toString());
return;
diff --git a/src/java/net/sf/jabref/external/ExternalFileType.java b/src/java/net/sf/jabref/external/ExternalFileType.java
index 8abfa27..73d9a4a 100644
--- a/src/java/net/sf/jabref/external/ExternalFileType.java
+++ b/src/java/net/sf/jabref/external/ExternalFileType.java
@@ -150,4 +150,26 @@ public class ExternalFileType implements Comparable {
public ExternalFileType copy() {
return new ExternalFileType(name, extension, openWith, iconName);
}
+
+
+ public int hashCode() {
+ return name.hashCode();
+ }
+
+ /**
+ * We define two file type objects as equal if their name, extension, openWith and
+ * iconName are equal.
+ *
+ * @param object The file type to compare with.
+ * @return true if the file types are equal.
+ */
+ public boolean equals(Object object) {
+ ExternalFileType other = (ExternalFileType)object;
+ if (other == null)
+ return false;
+ return (name == null ? other.name == null : name.equals(other.name))
+ && (extension == null ? other.extension == null : extension.equals(other.extension))
+ && (openWith== null ? other.openWith == null : openWith.equals(other.openWith))
+ && (iconName== null ? other.iconName == null : iconName.equals(other.iconName));
+ }
}
diff --git a/src/java/net/sf/jabref/external/ExternalFileTypeEditor.java b/src/java/net/sf/jabref/external/ExternalFileTypeEditor.java
index b92dc0d..79a4ccb 100644
--- a/src/java/net/sf/jabref/external/ExternalFileTypeEditor.java
+++ b/src/java/net/sf/jabref/external/ExternalFileTypeEditor.java
@@ -313,11 +313,11 @@ public class ExternalFileTypeEditor extends JDialog {
}
public static class EditExternalFileTypesAction extends MnemonicAwareAction {
- private JFrame frame = null;
+ private JabRefFrame frame = null;
private JDialog dialog = null;
ExternalFileTypeEditor editor = null;
- public EditExternalFileTypesAction(JFrame frame) {
+ public EditExternalFileTypesAction(JabRefFrame frame) {
super();
putValue(NAME, "Manage external file types");
this.frame = frame;
@@ -338,6 +338,10 @@ public class ExternalFileTypeEditor extends JDialog {
}
editor.setValues();
editor.setVisible(true);
+ if (frame != null) {
+ if (frame.basePanel() != null)
+ frame.basePanel().mainTable.repaint();
+ }
}
}
diff --git a/src/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java b/src/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java
index ed30023..2217fcd 100644
--- a/src/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java
+++ b/src/java/net/sf/jabref/external/ExternalFileTypeEntryEditor.java
@@ -105,9 +105,10 @@ public class ExternalFileTypeEntryEditor {
ok.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
- diag.dispose();
- storeSettings(ExternalFileTypeEntryEditor.this.entry);
okPressed = true;
+ storeSettings(ExternalFileTypeEntryEditor.this.entry);
+ diag.dispose();
+
}
});
cancel.addActionListener(new ActionListener() {
diff --git a/src/java/net/sf/jabref/external/FileLinksUpgradeWarning.java b/src/java/net/sf/jabref/external/FileLinksUpgradeWarning.java
index 5724dde..4a5b409 100644
--- a/src/java/net/sf/jabref/external/FileLinksUpgradeWarning.java
+++ b/src/java/net/sf/jabref/external/FileLinksUpgradeWarning.java
@@ -86,8 +86,7 @@ public class FileLinksUpgradeWarning implements PostOpenAction {
sb.append("</html>");
JPanel message = new JPanel();
- DefaultFormBuilder b = new DefaultFormBuilder(message,
- new FormLayout("left:pref", ""));
+ DefaultFormBuilder b = new DefaultFormBuilder(new FormLayout("left:pref", ""), message);
b.append(new JLabel(sb.toString()));
b.nextLine();
if (offerChangeSettings) {
diff --git a/src/java/net/sf/jabref/external/SynchronizeFileField.java b/src/java/net/sf/jabref/external/SynchronizeFileField.java
index 4a9b5b1..957d744 100644
--- a/src/java/net/sf/jabref/external/SynchronizeFileField.java
+++ b/src/java/net/sf/jabref/external/SynchronizeFileField.java
@@ -6,10 +6,7 @@ import net.sf.jabref.undo.NamedCompound;
import net.sf.jabref.undo.UndoableFieldChange;
import javax.swing.*;
-import java.util.Collection;
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.HashSet;
+import java.util.*;
import java.io.File;
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
@@ -32,7 +29,7 @@ public class SynchronizeFileField extends AbstractWorker {
private SynchronizeFileField.OptionsDialog optDiag = null;
Object[] brokenLinkOptions =
- {Globals.lang("Ignore"), Globals.lang("Assign new file"), Globals.lang("Clear field"),
+ {Globals.lang("Ignore"), Globals.lang("Assign new file"), Globals.lang("Remove link"),
Globals.lang("Quit synchronization")};
private boolean goOn = true, autoSet = true, overWriteAllowed = true, checkExisting = true;
@@ -144,7 +141,7 @@ public class SynchronizeFileField extends AbstractWorker {
// Check if a extension is set:
if ((old != null) && !old.equals("")) {
FileListTableModel tableModel = new FileListTableModel();
- tableModel.setContent((String)old);
+ tableModel.setContentDontGuessTypes((String)old);
for (int j=0; j<tableModel.getRowCount(); j++) {
FileListEntry flEntry = tableModel.getEntry(j);
// See if the link looks like an URL:
@@ -152,7 +149,10 @@ public class SynchronizeFileField extends AbstractWorker {
if (httpLink)
continue; // Don't check the remote file.
// TODO: should there be an option to check remote links?
-
+
+ // A variable to keep track of whether this link gets deleted:
+ boolean deleted = false;
+
// Get an absolute path representation:
File file = Util.expandFilename(flEntry.getLink(), new String[]{dir, "."});
if ((file == null) || !file.exists()) {
@@ -166,12 +166,13 @@ public class SynchronizeFileField extends AbstractWorker {
case 1:
// Assign new file.
FileListEntryEditor flEditor = new FileListEntryEditor
- (panel.frame(), flEntry, false, panel.metaData());
+ (panel.frame(), flEntry, false, true, panel.metaData());
flEditor.setVisible(true);
break;
case 2:
// Clear field
tableModel.removeEntry(j);
+ deleted = true; // Make sure we don't investigate this link further.
j--; // Step back in the iteration, because we removed an entry.
break;
case 3:
@@ -181,7 +182,47 @@ public class SynchronizeFileField extends AbstractWorker {
brokenLinks++;
}
+ // Unless we deleted this link, see if its file type is recognized:
+ if (!deleted && (flEntry.getType() instanceof UnknownExternalFileType)) {
+ String[] options = new String[]
+ {Globals.lang("Define '%0'", flEntry.getType().getName()),
+ Globals.lang("Change file type"), Globals.lang("Cancel")};
+ String defOption = options[0];
+ int answer = JOptionPane.showOptionDialog(panel.frame(), Globals.lang("One or more file links are of the type '%0', which is undefined. What do you want to do?",
+ flEntry.getType().getName()),
+ Globals.lang("Undefined file type"), JOptionPane.YES_NO_CANCEL_OPTION,
+ JOptionPane.QUESTION_MESSAGE, null, options, defOption);
+ if (answer == JOptionPane.CANCEL_OPTION) {
+ // User doesn't want to handle this unknown link type.
+ }
+ else if (answer == JOptionPane.YES_OPTION) {
+ // User wants to define the new file type. Show the dialog:
+ ExternalFileType newType = new ExternalFileType(flEntry.getType().getName(), "", "", "new");
+ ExternalFileTypeEntryEditor editor = new ExternalFileTypeEntryEditor(panel.frame(), newType);
+ editor.setVisible(true);
+ if (editor.okPressed()) {
+ // Get the old list of types, add this one, and update the list in prefs:
+ java.util.List<ExternalFileType> fileTypes = new ArrayList<ExternalFileType>();
+ ExternalFileType[] oldTypes = Globals.prefs.getExternalFileTypeSelection();
+ for (int k = 0; k < oldTypes.length; k++) {
+ fileTypes.add(oldTypes[k]);
+ }
+ fileTypes.add(newType);
+ Collections.sort(fileTypes);
+ Globals.prefs.setExternalFileTypes(fileTypes);
+ panel.mainTable.repaint();
+ }
+ }
+ else {
+ // User wants to change the type of this link.
+ // First get a model of all file links for this entry:
+ FileListEntryEditor editor = new FileListEntryEditor
+ (panel.frame(), flEntry, false, true, panel.metaData());
+ editor.setVisible(true);
+ }
+ }
}
+
if (!tableModel.getStringRepresentation().equals(old)) {
// The table has been modified. Store the change:
String toSet = tableModel.getStringRepresentation();
diff --git a/src/java/net/sf/jabref/gui/ColorSetupPanel.java b/src/java/net/sf/jabref/gui/ColorSetupPanel.java
index 521ee69..69cf899 100644
--- a/src/java/net/sf/jabref/gui/ColorSetupPanel.java
+++ b/src/java/net/sf/jabref/gui/ColorSetupPanel.java
@@ -27,7 +27,7 @@ public class ColorSetupPanel extends JPanel {
public ColorSetupPanel() {
FormLayout layout = new FormLayout
- ("30dlu, 4dlu, fill:pref, 4dlu, fill:pref, 8dlu, 30dlu, 4dlu, fill:pref, 4dlu, fill:pref", "");
+ ("30dlu, 4dlu, fill:pref, 4dlu, fill:pref", "");
DefaultFormBuilder builder = new DefaultFormBuilder(layout);
buttons.add(new ColorButton("tableText", Globals.lang("Table text color")));
diff --git a/src/java/net/sf/jabref/gui/FileListEditor.java b/src/java/net/sf/jabref/gui/FileListEditor.java
index aead340..b1fdc0f 100644
--- a/src/java/net/sf/jabref/gui/FileListEditor.java
+++ b/src/java/net/sf/jabref/gui/FileListEditor.java
@@ -267,7 +267,7 @@ public class FileListEditor extends JTable implements FieldEditor,
private boolean editListEntry(FileListEntry entry) {
if (editor == null) {
- editor = new FileListEntryEditor(frame, entry, false, metaData);
+ editor = new FileListEntryEditor(frame, entry, false, true, metaData);
}
else
editor.setEntry(entry);
diff --git a/src/java/net/sf/jabref/gui/FileListEntryEditor.java b/src/java/net/sf/jabref/gui/FileListEntryEditor.java
index bbd94dc..e2aa34b 100644
--- a/src/java/net/sf/jabref/gui/FileListEntryEditor.java
+++ b/src/java/net/sf/jabref/gui/FileListEntryEditor.java
@@ -12,6 +12,7 @@ import net.sf.jabref.*;
import net.sf.jabref.external.ExternalFileType;
import net.sf.jabref.external.ConfirmCloseFileListEntryEditor;
import net.sf.jabref.external.ExternalFileMenuItem;
+import net.sf.jabref.external.UnknownExternalFileType;
import java.awt.*;
import java.awt.event.*;
@@ -45,10 +46,10 @@ public class FileListEntryEditor {
private JabRefFrame frame;
private FileListEntry entry;
private MetaData metaData;
- private boolean okPressed = false;
+ private boolean okPressed = false, okDisabledExternally = false;
public FileListEntryEditor(JabRefFrame frame, FileListEntry entry, boolean showProgressBar,
- MetaData metaData) {
+ boolean showOpenButton, MetaData metaData) {
this.frame = frame;
this.entry = entry;
this.metaData = metaData;
@@ -74,35 +75,38 @@ public class FileListEntryEditor {
types = new JComboBox();
types.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent itemEvent) {
- ok.setEnabled(types.getSelectedItem() != null);
+ if (!okDisabledExternally)
+ ok.setEnabled(types.getSelectedItem() != null);
}
});
DefaultFormBuilder builder = new DefaultFormBuilder(new FormLayout
- ("left:pref, 4dlu, fill:150dlu, 4dlu, fill:pref", ""));
+ ("left:pref, 4dlu, fill:150dlu, 4dlu, fill:pref, 4dlu, fill:pref", ""));
builder.append(Globals.lang("Link"));
builder.append(link);
BrowseListener browse = new BrowseListener(frame, link);
JButton browseBut = new JButton(Globals.lang("Browse"));
browseBut.addActionListener(browse);
builder.append(browseBut);
+ if (showOpenButton)
+ builder.append(open);
builder.nextLine();
builder.append(Globals.lang("Description"));
- builder.append(description);
+ builder.append(description, 3);
builder.getPanel().setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
builder.nextLine();
builder.append(Globals.lang("File type"));
- builder.append(types);
+ builder.append(types, 3);
if (showProgressBar) {
builder.nextLine();
builder.append(downloadLabel);
- builder.append(prog);
+ builder.append(prog, 3);
}
ButtonBarBuilder bb = new ButtonBarBuilder();
bb.addGlue();
- bb.addGridded(open);
- bb.addRelatedGap();
+ //bb.addGridded(open);
+ //bb.addRelatedGap();
bb.addGridded(ok);
bb.addGridded(cancel);
bb.addGlue();
@@ -174,7 +178,7 @@ public class FileListEntryEditor {
ExternalFileType type = (ExternalFileType)types.getSelectedItem();
if (type != null)
try {
- Util.openExternalFileAnyFormat(metaData, link.getText(), entry.getType());
+ Util.openExternalFileAnyFormat(metaData, link.getText(), type);
} catch (IOException e) {
e.printStackTrace();
}
@@ -185,6 +189,7 @@ public class FileListEntryEditor {
}
public void setOkEnabled(boolean enabled) {
+ okDisabledExternally = !enabled;
ok.setEnabled(enabled);
}
@@ -210,12 +215,12 @@ public class FileListEntryEditor {
public void setValues(FileListEntry entry) {
description.setText(entry.getDescription());
link.setText(entry.getLink());
- if (link.getText().length() > 0)
- checkExtension();
+ //if (link.getText().length() > 0)
+ // checkExtension();
types.setModel(new DefaultComboBoxModel(Globals.prefs.getExternalFileTypeSelection()));
types.setSelectedIndex(-1);
// See what is a reasonable selection for the type combobox:
- if (entry.getType() != null)
+ if ((entry.getType() != null) && !(entry.getType() instanceof UnknownExternalFileType))
types.setSelectedItem(entry.getType());
// If the entry has a link but not a file type, try to deduce the file type:
else if ((entry.getLink() != null) && (entry.getLink().length() > 0)) {
diff --git a/src/java/net/sf/jabref/gui/FileListTableModel.java b/src/java/net/sf/jabref/gui/FileListTableModel.java
index 8e58789..5f9434a 100644
--- a/src/java/net/sf/jabref/gui/FileListTableModel.java
+++ b/src/java/net/sf/jabref/gui/FileListTableModel.java
@@ -1,6 +1,8 @@
package net.sf.jabref.gui;
import net.sf.jabref.Globals;
+import net.sf.jabref.external.ExternalFileType;
+import net.sf.jabref.external.UnknownExternalFileType;
import javax.swing.table.AbstractTableModel;
import javax.swing.event.TableModelEvent;
@@ -88,10 +90,14 @@ public class FileListTableModel extends AbstractTableModel {
* @param value The string representation
*/
public void setContent(String value) {
- setContent(value, false);
+ setContent(value, false, true);
}
- private FileListEntry setContent(String value, boolean firstOnly) {
+ public void setContentDontGuessTypes(String value) {
+ setContent(value, false, false);
+ }
+
+ private FileListEntry setContent(String value, boolean firstOnly, boolean deduceUnknownTypes) {
if (value == null)
value = "";
ArrayList newList = new ArrayList();
@@ -125,9 +131,9 @@ public class FileListTableModel extends AbstractTableModel {
thisEntry.add(sb.toString());
sb = new StringBuilder();
if (firstOnly)
- return decodeEntry(thisEntry);
+ return decodeEntry(thisEntry, deduceUnknownTypes);
else {
- newList.add(decodeEntry(thisEntry));
+ newList.add(decodeEntry(thisEntry, deduceUnknownTypes));
thisEntry.clear();
}
}
@@ -138,9 +144,9 @@ public class FileListTableModel extends AbstractTableModel {
thisEntry.add(sb.toString());
if (thisEntry.size() > 0) {
if (firstOnly)
- return decodeEntry(thisEntry);
+ return decodeEntry(thisEntry, deduceUnknownTypes);
else
- newList.add(decodeEntry(thisEntry));
+ newList.add(decodeEntry(thisEntry, deduceUnknownTypes));
}
synchronized (list) {
@@ -164,16 +170,31 @@ public class FileListTableModel extends AbstractTableModel {
*/
public static JLabel getFirstLabel(String content) {
FileListTableModel tm = new FileListTableModel();
- FileListEntry entry = tm.setContent(content, true);
+ FileListEntry entry = tm.setContent(content, true, true);
return entry != null ? entry.getType().getIconLabel() : null;
}
- private FileListEntry decodeEntry(ArrayList contents) {
+ private FileListEntry decodeEntry(ArrayList contents, boolean deduceUnknownType) {
+ ExternalFileType type = Globals.prefs.getExternalFileTypeByName
+ (getElementIfAvailable(contents, 2));
+ if (deduceUnknownType && (type instanceof UnknownExternalFileType)) {
+ // No file type was recognized. Try to find a usable file type based
+ // on the extension:
+ ExternalFileType typeGuess = null;
+ String link = getElementIfAvailable(contents, 1);
+ int index = link.lastIndexOf('.');
+ if ((index >= 0) && (index < link.length()-1)) {
+ String extension = link.substring(index+1);
+ typeGuess = Globals.prefs.getExternalFileTypeByExt(extension);
+ }
+ if (typeGuess != null)
+ type = typeGuess;
+
+ }
return new FileListEntry(getElementIfAvailable(contents, 0),
getElementIfAvailable(contents, 1),
- Globals.prefs.getExternalFileTypeByName
- (getElementIfAvailable(contents, 2)));
+ type);
}
private String getElementIfAvailable(ArrayList contents, int index) {
diff --git a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
index b24e9d7..6857afa 100644
--- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
+++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
@@ -40,7 +40,7 @@ import ca.odell.glazedlists.swing.EventSelectionModel;
*
* @author alver
* @author $Author: mortenalver $
- * @version $Revision: 2279 $ ($Date: 2007-08-21 19:30:22 +0200 (Tue, 21 Aug 2007) $)
+ * @version $Revision: 2458 $ ($Date: 2007-11-04 15:47:55 +0100 (Sun, 04 Nov 2007) $)
*
*/
public class ImportInspectionDialog extends JDialog {
@@ -1100,7 +1100,7 @@ public class ImportInspectionDialog extends JDialog {
return;
entry = (BibtexEntry) selectionModel.getSelected().get(0);
FileListEntry flEntry = new FileListEntry("", "", null);
- FileListEntryEditor editor = new FileListEntryEditor(frame, flEntry, false, metaData);
+ FileListEntryEditor editor = new FileListEntryEditor(frame, flEntry, false, true, metaData);
editor.setVisible(true);
if (editor.okPressed()) {
FileListTableModel model = new FileListTableModel();
diff --git a/src/java/net/sf/jabref/imports/OAI2Fetcher.java b/src/java/net/sf/jabref/imports/OAI2Fetcher.java
index 4f58aae..3e07a39 100644
--- a/src/java/net/sf/jabref/imports/OAI2Fetcher.java
+++ b/src/java/net/sf/jabref/imports/OAI2Fetcher.java
@@ -35,7 +35,7 @@ import org.xml.sax.helpers.DefaultHandler;
* @author Ulrich Stärk
* @author Christian Kopf
*
- * @version $Revision: 1970 $ ($Date: 2007-03-10 20:22:06 +0100 (Sat, 10 Mar 2007) $)
+ * @version $Revision: 2456 $ ($Date: 2007-11-01 21:35:20 +0100 (Thu, 01 Nov 2007) $)
*
*/
public class OAI2Fetcher implements EntryFetcher, Runnable {
@@ -314,7 +314,7 @@ public class OAI2Fetcher implements EntryFetcher, Runnable {
dialog.entryListComplete();
frame.output("");
} catch (Exception e) {
- frame.output(Globals.lang("Error while fetching from OIA2: ") + e.getMessage());
+ frame.output(Globals.lang("Error while fetching from OIA2")+ ": " + e.getMessage());
e.printStackTrace();
}
}
diff --git a/src/java/net/sf/jabref/journals/ManageJournalsAction.java b/src/java/net/sf/jabref/journals/ManageJournalsAction.java
index 24ac97e..35d4252 100644
--- a/src/java/net/sf/jabref/journals/ManageJournalsAction.java
+++ b/src/java/net/sf/jabref/journals/ManageJournalsAction.java
@@ -1,10 +1,10 @@
package net.sf.jabref.journals;
-import net.sf.jabref.JabRefFrame;
import net.sf.jabref.Globals;
+import net.sf.jabref.JabRefFrame;
+import net.sf.jabref.MnemonicAwareAction;
import net.sf.jabref.Util;
-import javax.swing.*;
import java.awt.event.ActionEvent;
/**
@@ -14,12 +14,13 @@ import java.awt.event.ActionEvent;
* Time: 10:45:02 PM
* To browseOld this template use File | Settings | File Templates.
*/
-public class ManageJournalsAction extends AbstractAction {
+public class ManageJournalsAction extends MnemonicAwareAction {
JabRefFrame frame;
public ManageJournalsAction(JabRefFrame frame) {
- super(Globals.lang("Manage journal abbreviations"));
+ super();
+ putValue(NAME, Globals.menuTitle("Manage journal abbreviations"));
this.frame = frame;
}
public void actionPerformed(ActionEvent actionEvent) {
diff --git a/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java b/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java
index d9176d4..275c0c2 100644
--- a/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java
+++ b/src/java/net/sf/jabref/labelPattern/LabelPatternUtil.java
@@ -321,8 +321,8 @@ public class LabelPatternUtil {
// Abbreviate - that is,
//System.out.println(_sbvalue.toString());
StringBuffer abbr = new StringBuffer();
- String[] words = _sbvalue.toString().replaceAll("[\\{\\}]","")
- .split("[ \r\n]");//split("\\b");
+ String[] words = _sbvalue.toString().replaceAll("[\\{\\}']","")
+ .split("[ \r\n\"]");//split("\\b");
for (int word=0; word<words.length; word++)
if (words[word].length() > 0)
abbr.append(words[word].charAt(0));
diff --git a/src/resource/JabRef_de.properties b/src/resource/JabRef_de.properties
index 4b1706e..a9f1833 100644
--- a/src/resource/JabRef_de.properties
+++ b/src/resource/JabRef_de.properties
@@ -1812,43 +1812,39 @@ Pushed_citations_to_Vim=Literaturangaben_in_Vim_eingef\u00fcgt
Waiting_for_ArXiv...=Warte_auf_ArXiv...
Processing_=Bearbeite_
-Error_while_fetching_from_OIA2:_=Fehler_beim_Abrufen_von_OIA2:_
+Error_while_fetching_from_OIA2=Fehler_beim_Abrufen_von_OIA2
No_entries_found_for_the_search_string_'%0'=F\u00fcr_den_Suchausdruck_'%0'_wurden_keine_Eintr\u00e4ge_gefunden
-The_chosen_encoding_'%0'_could_not_encode_the_following_characters:_=Die_gew\u00e4hlte_Kodierung_'%0'_konnte_folgende_Buchstaben_nicht_darstellen:_
+The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=Die_gew\u00e4hlte_Kodierung_'%0'_konnte_folgende_Buchstaben_nicht_darstellen:_
Operation_not_supported=Vorgang_nicht_unterst\u00fctzt
Drag_and_Drop_Error='Drag_&_Drop'-Fehler
File_download=Datei-Download
-Error_while_downloading_file:=Fehler_beim_Herunterladen_der_Datei:
+Error_while_downloading_file\:=Fehler_beim_Herunterladen_der_Datei:
Only_one_item_is_supported=Nur_ein_Element_wird_unterst\u00fctzt
Do_not_write_the_following_fields_to_XMP_Metadata\:=Folgende_Felder_nicht_in_die_XMP-Metadaten_schreiben:
<HTML>Could_not_find_file_'%0'<BR>linked_from_entry_'%1'</HTML>=<HTML>Die_Datei_'%0',_die_vom_Eintrag<BR>'%1'_verlinkt_wird,_wurde_nicht_gefunden</HTML>
Drop_%0=%0_streichen
Link_to_file_%0=Link_zur_Datei_%0
The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?=Die_PDF-Datei_enth\u00e4lt_mindestens_einen_BibTeX-Datensatz.\nWollen_Sie_diese(n)_als_neue_Eintr\u00e4ge_in_die_aktuelle_Datei_importieren?
-XMP_metadata_found_in_PDF:_%0=XMP-Metadaten_gefunden_im_PDF:_%0
+XMP_metadata_found_in_PDF\:_%0=XMP-Metadaten_gefunden_im_PDF:_%0
Link_to_PDF_%0=Link_zum_PDF_%0
Writing_XMP_to_'%0'...=Schreibe_XMP_in_'%0'...
Wrote_XMP_to_'%0'.=XMP_in_'%0'_geschrieben.
-Error_writing_XMP_to_file:_%0=Fehler_beim_Schreiben_von_XMP_in_die_Datei_%0
-Error_while_writing_XMP_%0=Fehler_beim_Schreiben_von_XMP_%0
-Error_writing_XMP_to_'%0'...=Fehler_beim_Schreiben_von_XMP_in_'%0'...
+Error_writing_XMP_to_file\:_%0=Fehler_beim_Schreiben_von_XMP_in_die_Datei_%0
Error_converting_Bibtex_to_XMP:_%0=Fehler_beim_Konvertieren_von_BibTeX_nach_XMP:_%0
Error_while_converting_BibtexEntry_to_XMP_%0=Fehler_beim_Konvertieren_des_BibTeX-Eintrags_nach_XMP_%0
Error_converting_XMP_to_'%0'...=Fehler_beim_Konvertieren_von_XMP_nach_'%0'...
-Could_not_find_directory_for_%0-files:_%1=Verzeichnis_f\u00fcr_%0-Dateien_wurde_nicht_gefunden:_%1
-Invalid_URL:_=Ung\u00fcltige_URL:_
+Could_not_find_directory_for_%0-files\:_%1=Verzeichnis_f\u00fcr_%0-Dateien_wurde_nicht_gefunden:_%1
This_operation_requires_at_least_one_entry.=Dieser_Vorgang_ben\u00f6tigt_mindestens_einen_Eintrag.
Write_XMP-metadata=Schreibe_XMP-Metadaten
Write_XMP-metadata_for_all_PDFs_in_current_database?=XMP-Metadaten_f\u00fcr_alle_PDFs_der_aktuellen_Datei_schreiben?
No_XMP_metadata_found_in_=Keine_XMP-Metadaten_gefunden_in_
-Drog_PDF=
Please_refer_to_the_JabRef_help_manual_on_using_the_CiteSeer_tools=Bitte_schauen_Sie_in_der_JabRef-Hilfe_nach,_wie_Sie_die_CiteSeer-Tools_nutzen_k\u00f6nnen
Search_IEEExplore=IEEExplore-Suche
An_Exception_ocurred_while_accessing_'%0'=Fehler_beim_Zugriff_auf_'%0'
An_SAXException_ocurred_while_parsing_'%0':=Beim_Parsen_von_'%0'_ist_eine_SAX-Exception_aufgetreten:
-An_Error_occurred_while_fetching_from_OAI2_source_(%0):=Fehler_beim_Abrufen_der_OAI2-Quelle_(%0):
+An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:=Fehler_beim_Abrufen_der_OAI2-Quelle_(%0):
Abbreviated_%0_journal_names.=%0_Zeitschriftentitel_abgek\u00fcrzt.
Unabbreviated_%0_journal_names.=Bei_%0_Zeitschriftentiteln_wurde_die_Abk\u00fcrzung_aufgehoben.
@@ -1879,7 +1875,6 @@ Application=Anwendung
Icon=Icon
Path_to_%0_not_defined=Pfad_zu_%0_nicht_definiert
-Error:_=Fehler:_
Path_to_Vim=Pfad_zu_Vim
Vim_Server_Name=Vim_Server-Name
MS_Office_2007=MS_Office_2007
@@ -1897,7 +1892,6 @@ File_'%0'_is_already_open.=Datei_'%0'_ist_bereits_ge\u00f6ffnet.
File_has_been_updated_externally._What_do_you_want_to_do?=Die_Datei_wurde_extern_aktualisiert._Was_wollen_Sie_tun?
Entry_has_no_citekey=Der_Eintrag_hat_keinen_citekey
-Cannot_rename_for_several_entries.=Mehrere_Eintr\u00e4ge_k\u00f6nnen_nicht_umbenannt_werden.
Rename_to_match_citekey=Dem_citekey_entsprechend_umbenennen
Change_file_type=Dateityp_\u00e4ndern
@@ -1926,7 +1920,7 @@ Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Externe_PDF/PS-Links_aktual
Broken_link=Ung\u00fcltiger_Link
Change_table_column_and_General_fields_settings_to_use_the_new_feature=Tabellenspalte_und_Einstellungen_der_Allgemeinen_Felder_\u00e4ndern,_um_die_neue_Funktion_zu_nutzen
Upgrade_old_external_file_links_to_use_the_new_feature=Alte_Links_zu_externen_Dateien_aktualisieren,_um_die_neue_Funktion_zu_nutzen
-Set_main_external_file_directory=Hauptverzeichnis_f\u00fcr_externe_Dateien_setzen
+Set_main_external_file_directory=Standard-Ordner_f\u00fcr_externe_Dateien_bestimmen
Do_not_show_these_options_in_the_future=Diese_Optionen_in_Zukunft_nicht_anzeigen
File_directory=Dateiverzeichnis
Autosetting_links=Links_werden_automatisch_gesetzt
@@ -1958,7 +1952,7 @@ Replace_comma_by_and_where_appropriate=Komma_an_passenden_Stellen_durch_'and'_er
The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=Die_aktuelle_Version_hat_eine_neue_Methode,_Links_zu_externen_Dateien_zu_behandeln.<br>Um_sie_zu_nutzen,_m\u00fcssen_Ihre_Links_in_das_neue_Format_\u00fcbertragen_werden<br>und_JabRef_muss_konfiguriert_werden,_um_die_neuen_Links_anzuzeigen.
This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=JabRef_sucht_nach_jeder_%0-Dateiendung_und_\u00fcberpr\u00fcft,_ob_die_Datei_existiert.<br>Falls_nicht,_erhalten_Sie_Optionen,_um_das_Problem_zu_l\u00f6sen.
You_have_changed_the_look_and_feel_setting._You_must_restart_JabRef_for_this_to_come_into_effect.=Sie_haben_die_Einstellungen_des_Erscheinungsbildes_('look_and_feel')_ge\u00e4ndert._Sie_m\u00fcssen_JabRef_neu_starten,_damit_die_\u00c4nderungen_in_Kraft_treten.
-Warning:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message:_=Achtung:_Dateiwiederherstellung_konnte_nicht_durchgef\u00fchrt_werden;_die_Datei_k\u00f6nnte_besch\u00e4digt_sein._Fehlermeldung:_
+Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message=Achtung:_Dateiwiederherstellung_konnte_nicht_durchgef\u00fchrt_werden;_die_Datei_k\u00f6nnte_besch\u00e4digt_sein._Fehlermeldung
Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Die_Datei_konnte_nicht_gespeichert_werden._Die_Zeichenkodierung_'%0'_wird_nicht_unterst\u00fctzt.
Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=\u00d6ffnen_des_Links_nicht_m\u00f6glich._Die_Anwendung_'%0',_die_dem_Dateityp_'%1'_zugeordnet_ist,_konnte_nicht_aufgerufen_werden.
Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Verbindung_zum_Vim-Server_fehlgeschlagen._Vergewissern_Sie_sich,<br>dass_Vim_mit_korrektem_Servernamen_l\u00e4uft.
@@ -1986,3 +1980,14 @@ Error_writing_to_%0_file(s).=Fehler_beim_Schreiben_in_%0_Datei(en).
Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=Schreiben_der_XMP-Metadaten_in_%0_Datei(en)_beendet.
You_have_entered_an_invalid_search_'%0'.=Sie_haben_eine_ung\u00fcltige_Suche_'%0'_eingegeben.
+One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Mindestens_ein_Dateilink_ist_vom_Typ_'%0',_der_nicht_definiert_ist._Was_wollen_Sie_tun?
+
+Remove_link=Link_l\u00F6schen
+
+
+Autolink_files_with_names_starting_with_the_BibTeX_key=Dateien,_deren_Namen_mit_dem_BibTeX-Key_beginnen,_automatisch_verlinken
+Autolink_only_files_that_match_the_BibTeX_key=Nur_Dateien_verlinken,_deren_Namen_dem_BibTeX-Key_entsprechen
+Error_converting_Bibtex_to_XMP\:_%0=Fehler_beim_Konvertieren_von_BibTeX_nach_XMP:_%0
+
+
+Sort_order=Sortierung
diff --git a/src/resource/JabRef_du.properties b/src/resource/JabRef_du.properties
index 94925d6..7d32569 100644
--- a/src/resource/JabRef_du.properties
+++ b/src/resource/JabRef_du.properties
@@ -1808,43 +1808,39 @@ Pushed_citations_to_Vim=
Waiting_for_ArXiv...=
Processing_=
-Error_while_fetching_from_OIA2:_=
+Error_while_fetching_from_OIA2=
No_entries_found_for_the_search_string_'%0'=
-The_chosen_encoding_'%0'_could_not_encode_the_following_characters:_=
+The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=
Operation_not_supported=
Drag_and_Drop_Error=
File_download=
-Error_while_downloading_file:=
+Error_while_downloading_file\:=
Only_one_item_is_supported=
Do_not_write_the_following_fields_to_XMP_Metadata\:=
<HTML>Could_not_find_file_'%0'<BR>linked_from_entry_'%1'</HTML>=
Drop_%0=
Link_to_file_%0=
The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?=
-XMP_metadata_found_in_PDF:_%0=
+XMP_metadata_found_in_PDF\:_%0=
Link_to_PDF_%0=
Writing_XMP_to_'%0'...=
Wrote_XMP_to_'%0'.=
-Error_writing_XMP_to_file:_%0=
-Error_while_writing_XMP_%0=
-Error_writing_XMP_to_'%0'...=
+Error_writing_XMP_to_file\:_%0=
Error_converting_Bibtex_to_XMP:_%0=
Error_while_converting_BibtexEntry_to_XMP_%0=
Error_converting_XMP_to_'%0'...=
-Could_not_find_directory_for_%0-files:_%1=
-Invalid_URL:_=
+Could_not_find_directory_for_%0-files\:_%1=
This_operation_requires_at_least_one_entry.=
Write_XMP-metadata=
Write_XMP-metadata_for_all_PDFs_in_current_database?=
No_XMP_metadata_found_in_=
-Drog_PDF=
Please_refer_to_the_JabRef_help_manual_on_using_the_CiteSeer_tools=
Search_IEEExplore=
An_Exception_ocurred_while_accessing_'%0'=
An_SAXException_ocurred_while_parsing_'%0':=
-An_Error_occurred_while_fetching_from_OAI2_source_(%0):=
+An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:=
Abbreviated_%0_journal_names.=
Unabbreviated_%0_journal_names.=
@@ -1876,7 +1872,6 @@ Icon=
Path_to_%0_not_defined=
-Error:_=
Path_to_Vim=
Vim_Server_Name=
MS_Office_2007=
@@ -1894,7 +1889,6 @@ File_'%0'_is_already_open.=
File_has_been_updated_externally._What_do_you_want_to_do?=
Entry_has_no_citekey=
-Cannot_rename_for_several_entries.=
Rename_to_match_citekey=
Change_file_type=
@@ -1904,18 +1898,18 @@ Unable_to_open_file.=
Undefined_file_type=
Error\:_=
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=
-Upgrade_external_links=
-Upgraded_links.=
Do_you_want_JabRef_to_do_the_following_operations?=
Upgrade_file=
+This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=
+Upgrade_external_links=
+Upgraded_links.=
+This_entry_has_no_BibTeX_key._Generate_key_now?=
+Target_file_cannot_be_a_directory.=
Finished_autosetting_external_links.=
No_files_found.=
-Target_file_cannot_be_a_directory.=
-This_entry_has_no_BibTeX_key._Generate_key_now?=
External_file_links=
Main_%0_directory=
@@ -1937,7 +1931,6 @@ Could_not_open_link=
The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=
Native_file_dialog=
-Error:_=
Beta_version=
Do_not_write_the_following_fields_to_XMP_Metadata:=
MIS_Quarterly=MIS_Quarterly
@@ -1956,7 +1949,7 @@ Replace_comma_by_and_where_appropriate=
The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=
This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=
You_have_changed_the_look_and_feel_setting._You_must_restart_JabRef_for_this_to_come_into_effect.=
-Warning:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message:_=
+Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message=
Could_not_save_file._Character_encoding_'%0'_is_not_supported.=
Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=
Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=
@@ -1983,3 +1976,13 @@ Error_writing_to_%0_file(s).=
Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=
You_have_entered_an_invalid_search_'%0'.=
+One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=
+
+Remove_link=
+
+
+Autolink_files_with_names_starting_with_the_BibTeX_key=
+Autolink_only_files_that_match_the_BibTeX_key=
+Error_converting_Bibtex_to_XMP\:_%0=
+
+Sort_order=
diff --git a/src/resource/JabRef_en.properties b/src/resource/JabRef_en.properties
index 426fd46..cf1e1ba 100644
--- a/src/resource/JabRef_en.properties
+++ b/src/resource/JabRef_en.properties
@@ -1788,44 +1788,40 @@ Pushed_citations_to_Vim=Pushed_citations_to_Vim
Waiting_for_ArXiv...=Waiting_for_ArXiv...
Processing_=Processing_
-Error_while_fetching_from_OIA2:_=Error_while_fetching_from_OIA2:_
+Error_while_fetching_from_OIA2=Error_while_fetching_from_OIA2
No_entries_found_for_the_search_string_'%0'=No_entries_found_for_the_search_string_'%0'
-The_chosen_encoding_'%0'_could_not_encode_the_following_characters:_=The_chosen_encoding_'%0'_could_not_encode_the_following_characters:_
+The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=The_chosen_encoding_'%0'_could_not_encode_the_following_characters:_
Operation_not_supported=Operation_not_supported
Drag_and_Drop_Error=Drag_and_Drop_Error
File_download=File_download
-Error_while_downloading_file:=Error_while_downloading_file:
+Error_while_downloading_file\:=Error_while_downloading_file:
Only_one_item_is_supported=Only_one_item_is_supported
Do_not_write_the_following_fields_to_XMP_Metadata\:=Do_not_write_the_following_fields_to_XMP_Metadata:
<HTML>Could_not_find_file_'%0'<BR>linked_from_entry_'%1'</HTML>=<HTML>Could_not_find_file_'%0'<BR>linked_from_entry_'%1'</HTML>
Drop_%0=Drop_%0
Link_to_file_%0=Link_to_file_%0
The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?=The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?
-XMP_metadata_found_in_PDF:_%0=XMP_metadata_found_in_PDF:_%0
+XMP_metadata_found_in_PDF\:_%0=XMP_metadata_found_in_PDF:_%0
Link_to_PDF_%0=Link_to_PDF_%0
Writing_XMP_to_'%0'...=Writing_XMP_to_'%0'...
Wrote_XMP_to_'%0'.=Wrote_XMP_to_'%0'.
-Error_writing_XMP_to_file:_%0=Error_writing_XMP_to_file:_%0
-Error_while_writing_XMP_%0=Error_while_writing_XMP_%0
-Error_writing_XMP_to_'%0'...=Error_writing_XMP_to_'%0'...
+Error_writing_XMP_to_file\:_%0=Error_writing_XMP_to_file:_%0
Error_converting_Bibtex_to_XMP:_%0=Error_converting_Bibtex_to_XMP:_%0
Error_while_converting_BibtexEntry_to_XMP_%0=Error_while_converting_BibtexEntry_to_XMP_%0
Error_converting_XMP_to_'%0'...=Error_converting_XMP_to_'%0'...
-Could_not_find_directory_for_%0-files:_%1=Could_not_find_directory_for_%0-files:_%1
-Invalid_URL:_=Invalid_URL:_
+Could_not_find_directory_for_%0-files\:_%1=Could_not_find_directory_for_%0-files:_%1
This_operation_requires_at_least_one_entry.=This_operation_requires_at_least_one_entry.
Write_XMP-metadata=Write_XMP-metadata
Write_XMP-metadata_for_all_PDFs_in_current_database?=Write_XMP-metadata_for_all_PDFs_in_current_database?
No_XMP_metadata_found_in_=No_XMP_metadata_found_in_
-Drog_PDF=Drog_PDF
Please_refer_to_the_JabRef_help_manual_on_using_the_CiteSeer_tools=Please_refer_to_the_JabRef_help_manual_on_using_the_CiteSeer_tools
Search_IEEExplore=Search_IEEExplore
An_Exception_ocurred_while_accessing_'%0'=An_Exception_ocurred_while_accessing_'%0'
An_SAXException_ocurred_while_parsing_'%0':=An_SAXException_ocurred_while_parsing_'%0':
-An_Error_occurred_while_fetching_from_OAI2_source_(%0):=An_Error_occurred_while_fetching_from_OAI2_source_(%0):
+An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:=An_Error_occurred_while_fetching_from_OAI2_source_(%0):
Abbreviated_%0_journal_names.=Abbreviated_%0_journal_names.
Unabbreviated_%0_journal_names.=Unabbreviated_%0_journal_names.
@@ -1856,8 +1852,6 @@ Application=Application
Icon=Icon
Path_to_%0_not_defined=Path_to_%0_not_defined
-
-Error\:_=Error:_
Path_to_Vim=Path_to_Vim
Vim_Server_Name=Vim_Server_Name
MS_Office_2007=MS_Office_2007
@@ -1874,23 +1868,23 @@ File_'%0'_is_already_open.=File_'%0'_is_already_open.
File_has_been_updated_externally._What_do_you_want_to_do?=File_has_been_updated_externally._What_do_you_want_to_do?
Entry_has_no_citekey=Entry_has_no_citekey
-Cannot_rename_for_several_entries.=Cannot_rename_for_several_entries.
Rename_to_match_citekey=Rename_to_match_citekey
+Change_file_type=Change_file_type
+Define_'%0'=Define_'%0'
+
+This_external_link_is_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=This_external_link_is_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?
Unable_to_open_file.=Unable_to_open_file.
-Define_'%0'=Define_'%0'
-Change_file_type=Change_file_type
Undefined_file_type=Undefined_file_type
+Error\:_=
-This_external_link_is_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=This_external_link_is_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?
+Do_you_want_JabRef_to_do_the_following_operations?=Do_you_want_JabRef_to_do_the_following_operations?
+Upgrade_file=Upgrade_file
This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?
Upgrade_external_links=Upgrade_external_links
Upgraded_links.=Upgraded_links.
-Do_you_want_JabRef_to_do_the_following_operations?=Do_you_want_JabRef_to_do_the_following_operations?
-Upgrade_file=Upgrade_file
-
This_entry_has_no_BibTeX_key._Generate_key_now?=This_entry_has_no_BibTeX_key._Generate_key_now?
Target_file_cannot_be_a_directory.=Target_file_cannot_be_a_directory.
@@ -1916,7 +1910,6 @@ Could_not_open_link=Could_not_open_link
The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.
Native_file_dialog=Native_file_dialog
-Error:_=Error:_
Beta_version=Beta_version
Do_not_write_the_following_fields_to_XMP_Metadata:=Do_not_write_the_following_fields_to_XMP_Metadata:
MIS_Quarterly=MIS_Quarterly
@@ -1937,7 +1930,7 @@ Replace_comma_by_and_where_appropriate=Replace_comma_by_and_where_appropriate
The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.
This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.
You_have_changed_the_look_and_feel_setting._You_must_restart_JabRef_for_this_to_come_into_effect.=You_have_changed_the_look_and_feel_setting._You_must_restart_JabRef_for_this_to_come_into_effect.
-Warning:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message:_=Warning:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message:_
+Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message=Warning:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message
Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Could_not_save_file._Character_encoding_'%0'_is_not_supported.
Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.
Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.
@@ -1957,11 +1950,20 @@ Copy_file_to_file_directory.=Copy_file_to_file_directory.
Move_file_to_file_directory=Move_file_to_file_directory
New_file_link_(INSERT)=New_file_link_(INSERT)
Remove_file_link_(DELETE)=Remove_file_link_(DELETE)
+No_PDF_linked=No_PDF_linked
+PDF_does_not_exist=PDF_does_not_exist
Wrote_XMP-metadata=Wrote_XMP-metadata
-PDF_does_not_exist=PDF_does_not_exist
-No_PDF_linked=No_PDF_linked
-Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=Finished_writing_XMP-metadata._Wrote_to_%0_file(s).
Error_writing_to_%0_file(s).=Error_writing_to_%0_file(s).
+Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=Finished_writing_XMP-metadata._Wrote_to_%0_file(s).
You_have_entered_an_invalid_search_'%0'.=You_have_entered_an_invalid_search_'%0'.
+One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?
+
+Remove_link=Remove_link
+Autolink_files_with_names_starting_with_the_BibTeX_key=Autolink_files_with_names_starting_with_the_BibTeX_key
+
+Autolink_only_files_that_match_the_BibTeX_key=Autolink_only_files_that_match_the_BibTeX_key
+Error_converting_Bibtex_to_XMP\:_%0=Error_converting_Bibtex_to_XMP:_%0
+
+Sort_order=Sort_order
diff --git a/src/resource/JabRef_fr.properties b/src/resource/JabRef_fr.properties
index 0451cf9..b63de62 100644
--- a/src/resource/JabRef_fr.properties
+++ b/src/resource/JabRef_fr.properties
@@ -928,46 +928,42 @@ Pushed_citations_to_Vim=Envoyer_les_citations_dans_Vim
Waiting_for_ArXiv...=Attente_de_ArXiv...
Processing_=Traitement_de_
-Error_while_fetching_from_OIA2:_=Erreur_lors_d'une_recherche_sur_OIA2_:_
+Error_while_fetching_from_OIA2=Erreur_lors_d'une_recherche_sur_OIA2
No_entries_found_for_the_search_string_'%0'=Pas_d'entr\u00E9e_pour_la_cha\u00EEne_de_recherche_'%0'
-The_chosen_encoding_'%0'_could_not_encode_the_following_characters:_=L'encodage_'%0'_choisi_ne_peut_pas_encoder_les_caract\u00e8res_suivants_:_
+The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=L'encodage_'%0'_choisi_ne_peut_pas_encoder_les_caract\u00e8res_suivants_:_
Operation_not_supported=Op\u00e9ration_non_support\u00e9e
Drag_and_Drop_Error=Erreur_de_Glisser-D\u00e9poser
File_download=T\u00e9l\u00e9chargement_de_fichier
-Error_while_downloading_file:=Erreur_lors_du_t\u00e9l\u00e9chargement_du_fichier_:
+Error_while_downloading_file\:=Erreur_lors_du_t\u00e9l\u00e9chargement_du_fichier_:
Only_one_item_is_supported=Un_seul_objet_est_support\u00e9
Do_not_write_the_following_fields_to_XMP_Metadata\:=Ne_pas_\u00e9crire_les_champs_suivants_dans_les_m\u00e9tadonn\u00e9es_XMP_:
<HTML>Could_not_find_file_'%0'<BR>linked_from_entry_'%1'</HTML>=<HTML>Le_fichier_'%0'_n'a_pas_pu_\u00EAtre_trouv\u00e9_<BR>\u00e0_partir_du_lien_de_l'entr\u00e9e_'%1'</HTML>
Drop_%0=D\u00e9poser_%0
Link_to_file_%0=Lien_vers_le_fichier_%0
The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?=Le_PDF_contient_un_ou_plusieurs_enregistrements_BibTeX.\nVoulez-vous_les_importer_comme_de_nouvelles_entr\u00e9es_dans_la_base_de_donn\u00e9es_actuelle_?
-XMP_metadata_found_in_PDF:_%0=M\u00e9tadonn\u00e9es_XMP_trouv\u00e9es_dans_le_PDF:_%0
+XMP_metadata_found_in_PDF\:_%0=M\u00e9tadonn\u00e9es_XMP_trouv\u00e9es_dans_le_PDF:_%0
Link_to_PDF_%0=Lien_vers_PDF_%0
Writing_XMP_to_'%0'...=Ecriture_des_XMP_dans_'%0'...
Wrote_XMP_to_'%0'.=XMP_\u00e9crites_dans_'%0'.
-Error_writing_XMP_to_file:_%0=Erreur_lors_de_l'\u00e9criture_des_XMP_dans_le_fichier_%0
-Error_while_writing_XMP_%0=Erreur_lors_de_l'\u00e9criture_des_XMP_%0
-Error_writing_XMP_to_'%0'...=Erreur_lors_de_l'\u00e9criture_des_XMP_dans_'%0'...
+Error_writing_XMP_to_file\:_%0=Erreur_lors_de_l'\u00e9criture_des_XMP_dans_le_fichier_%0
Error_converting_Bibtex_to_XMP:_%0=Erreur_lors_de_la_conversion_de_BibTeX_en_XMP_:_%0
Error_while_converting_BibtexEntry_to_XMP_%0=Erreur_lors_de_la_conversion_de_l'entr\u00e9e_BibTeX_en_XMP_%0
Error_converting_XMP_to_'%0'...=Erreur_lors_de_la_conversion_d'XMP_en_'%0'
-Could_not_find_directory_for_%0-files:_%1=Le_r\u00e9pertoire_n'a_pas_pu_\u00EAtre_trouv\u00e9_pour_les_fichiers_%0_:_%1
-Invalid_URL:_=URL_invalide_:_
+Could_not_find_directory_for_%0-files\:_%1=Le_r\u00e9pertoire_n'a_pas_pu_\u00EAtre_trouv\u00e9_pour_les_fichiers_%0_:_%1
This_operation_requires_at_least_one_entry.=Cette_op\u00e9ration_n\u00e9cessite_au_moins_une_entr\u00e9e.
Write_XMP-metadata=Ecrire_les_m\u00e9tadonn\u00e9es_XMP
Write_XMP-metadata_for_all_PDFs_in_current_database?=Ecrire_les_m\u00e9tadonn\u00e9es_XMP_pour_tous_les_PDFs_dans_la_base_courante_?
No_XMP_metadata_found_in_=Pas_de_m\u00e9tadonn\u00e9es_XMP_trouv\u00e9es_dans_
-Drog_PDF=xxx
Please_refer_to_the_JabRef_help_manual_on_using_the_CiteSeer_tools=S'il_vous_pla\u00eet,_consultez_le_manuel_d'aide_de_JabRef_sur_l'utilisation_des_outils_CiteSeer
Search_IEEExplore=Recherche_IEEExplore
An_Exception_ocurred_while_accessing_'%0'=Une_Exception_est_survenue_lors_de_l'acc\u00e8s_\u00e0_'%0'
An_SAXException_ocurred_while_parsing_'%0':=Une_Exception_SAX_est_survenue_pendant_le_traitement_de_'%0'_:
-An_Error_occurred_while_fetching_from_OAI2_source_(%0):=Une_erreur_est_survenue_lors_de_la_recherche_\u00e0_partir_de_la_source_OAI2_(%0)_:
+An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:=Une_erreur_est_survenue_lors_de_la_recherche_\u00e0_partir_de_la_source_OAI2_(%0)_:
Abbreviated_%0_journal_names.=%0_noms_de_journaux_abr\u00e9g\u00e9s.
Unabbreviated_%0_journal_names.=%0_noms_de_journaux_d\u00e9velopp\u00e9s.
@@ -999,7 +995,6 @@ Icon=Ic\u00f4ne
Path_to_%0_not_defined=Chemin_vers_%0_non_d\u00E9fini
-Error\:_=Erreur_:_
Path_to_Vim=Chemin_de_Vim_
Vim_Server_Name=Nom_du_serveur_Vim_
MS_Office_2007=MS_Office_2007
@@ -1017,28 +1012,29 @@ File_'%0'_is_already_open.=Le_fichier_'%0'_est_d\u00E9j\u00E0_ouvert.
File_has_been_updated_externally._What_do_you_want_to_do?=Le_fichier_a_\u00E9t\u00E9_mis_\u00E0_jour_externalement._Que_voulez-vous_faire_?
Entry_has_no_citekey=L'entr\u00E9e_n'a_pas_de_clef_BibTeX
-Cannot_rename_for_several_entries.=Renommage_impossible_pour_plusieurs_entr\u00E9es
Rename_to_match_citekey=Renommer_pour_correspondre_\u00E0_la_clef_BibTeX
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Ceci_d\u00E09placera_tous_les_liens_externes_des_champs_'pdf'_et_'ps'_dans_le_champ_'%0'._Continuer_?
-
-Upgrade_external_links=Mettre_\u00E0_jour_les_liens_externes
-Upgraded_links.=Liens_mis_\u00E0_jour.
-
Change_file_type=Changer_le_type_de_fichier
Define_'%0'=D\u00E9finir_'%0'
This_external_link_is_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Ce_lien_externe_est_du_type_'%0',_qui_est_ind\u00E9fini._Que_voulez-vous_faire_?
Unable_to_open_file.=Impossible_d'ouvrir_le_fichier
Undefined_file_type=Type_de_fichier_ind\u00E9fini
+Error\:_=Erreur_:_
+
Do_you_want_JabRef_to_do_the_following_operations?=Voulez-vous_que_JabRef_fasse_les_op\u00E9rations_suivantes_?
Upgrade_file=Mettre_\u00E0_jour_le_fichier
+This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Ceci_d\u00E09placera_tous_les_liens_externes_des_champs_'pdf'_et_'ps'_dans_le_champ_'%0'._Continuer_?
+
+Upgrade_external_links=Mettre_\u00E0_jour_les_liens_externes
+Upgraded_links.=Liens_mis_\u00E0_jour.
+This_entry_has_no_BibTeX_key._Generate_key_now?=Cette_entr\u00E9e_n'a_pas_de_clef_BibTeX._En_g\u00E9n\u00E9rer_une_maintenant_?
+Target_file_cannot_be_a_directory.=Le_fichier_cible_ne_peut_pas_\u00EAtre_un_r\u00E9pertoire.
+
Finished_autosetting_external_links.=La_d\u00E9finition_automatique_des_liens_externes_est_termin\u00E9e.
No_files_found.=Fichiers_non_trouv\u00E9s.
-Target_file_cannot_be_a_directory.=Le_fichier_cible_ne_peut_pas_\u00EAtre_un_r\u00E9pertoire.
-This_entry_has_no_BibTeX_key._Generate_key_now?=Cette_entr\u00E9e_n'a_pas_de_clef_BibTeX._En_g\u00E9n\u00E9rer_une_maintenant_?
External_file_links=Liens_vers_les_fichiers_externes
Main_%0_directory=R\u00E9pertoire_principal_%0
@@ -1060,7 +1056,6 @@ Could_not_open_link=Le_lien_n'a_pas_pu_\u00EAtre_ouvert
The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=L'application_'%0'_associ\u00E9e_avec_le_type_de_fichier_'%1'_n'a_pas_pu_\u00EAtre_lanc\u00E9e.
Native_file_dialog=Dialogue_de_fichier_natif
-Error:_=Erreur_:_
Beta_version=Version_Beta
Do_not_write_the_following_fields_to_XMP_Metadata:=Ne_pas_\u00E9crire_les_champs_suivants_dans_les_m\u00E9tadonn\u00E9es_XMP_:
MIS_Quarterly=MIS_Quarterly
@@ -1080,7 +1075,7 @@ Replace_comma_by_and_where_appropriate=Remplacer_les_virgules_quand_appropri\u00
The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=La_version_actuelle_a_une_nouvelle_fa\u00E7on_de_g\u00E9rer_les_liens_vers_des_fichiers_externes.<br>Pour_en_profiter,_vos_liens_doivent_\u00EAtre_convertis_en_un_autre_format<br>et_JabRef_doit_\u00EAtre_configur\u00E9_pour_afficher_les_nouveaux_liens.
This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=JabRef_va_consid\u00E9rer_chaque_extension_de_%0_et_v\u00E9rifier_si_le_fichier_existe.<BR>Dans_la_n\u00E9gative,_un_choix_d'options_vous_sera_propos\u00E9_pour_r\u00E9soudre_le_probl\u00E8me.
You_have_changed_the_look_and_feel_setting._You_must_restart_JabRef_for_this_to_come_into_effect.=Vous_avez_chang\u00E9_les_param\u00e8tres_d'apparence._Vous_devez_red\u00E9marrer_JabRef_pour_que_ce_changement_prenne_effet.
-Warning:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message:_=Avertissement_:_La_r\u00E9paration_du_fichier_n'a_pas_pu_\u00EAtre_termin\u00E9e_;_votre_fichier_peut_avoir_\u00E9t\u00E9_corrompu._Message_d'erreur_:_
+Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message=Avertissement_:_La_r\u00E9paration_du_fichier_n'a_pas_pu_\u00EAtre_termin\u00E9e_;_votre_fichier_peut_avoir_\u00E9t\u00E9_corrompu._Message_d'erreur
Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Le_fichier_n'a_pas_pu_\u00EAtre_sauvegard\u00E9._L'encodage_de_caract\u00E8res_'%0'_n'est_pas_support\u00E9.
Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Impossible_d'ouvrir_un_lien._L'application_'%0'_associ\u00E9e_avec_le_type_de_fichier_'%1'_n'a_pu_\u00EAtre_appel\u00E9e.
Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=La_connexion_au_serveur_Vim_a_\u00e9chou\u00e9._Assurez-vous_que_Vim_tourne<BR>avec_le_bon_nom_de_serveur.
@@ -1108,3 +1103,12 @@ Error_writing_to_%0_file(s).=Erreur_lors_de_l'\u00E9criture_de_%0_fichier(s).
Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=Ecriture_des_m\u00E9ta-donn\u00E9es_XMP_termin\u00E9e._Ecriture_de_%0_fichier(s).
You_have_entered_an_invalid_search_'%0'.=Vous_avez_entr\u00E9_une_recherche_invalide_'%0'.
+One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Un_ou_plusieurs_liens_de_fichier_sont_du_type_'%0',_qui_est_ind\u00e9fini._Que_voulez-vous_faire_?
+
+Remove_link=Supprimer_le_lien
+
+Autolink_files_with_names_starting_with_the_BibTeX_key=Lier_automatiquement_les_fichiers_commen\u00E7ant_par_la_clef_BibTeX
+Autolink_only_files_that_match_the_BibTeX_key=Lier_automatiquement_uniquement_les_fichiers_correspondant_�_la_clef_BibTeX
+Error_converting_Bibtex_to_XMP\:_%0=Erreur_lors_de_la_conversion_BibTeX_vers_XMP\:_%0
+
+Sort_order=Ordre_de_tri
diff --git a/src/resource/JabRef_it.properties b/src/resource/JabRef_it.properties
index 6290bde..b103c6c 100644
--- a/src/resource/JabRef_it.properties
+++ b/src/resource/JabRef_it.properties
@@ -166,7 +166,6 @@ Copied_cell_contents=Contenuto_delle_celle_copiato
Copied_key=Chiave_BibTeX_copiata
Copied_keys=Chiavi_BibTeX_copiate
Copy=Copia
-Copy_to_clipboard=Copia_negli_appunti
Copy_BibTeX_key=Copia_chiave_BibTeX
Could_not_call_executable=Non_\u00e8_possibile_effetuare_la_chiamata_dell'eseguibile
Could_not_connect_to_a_running_gnuserv_process._Make_sure_that_Emacs_or_XEmacs_is_running,<BR>and_that_the_server_has_been_started_(by_running_the_command_'gnuserv-start').=Impossibile_la_connessione_a_un_processo_gnuserv_in_esecuzione._Accertarsi_che_Emacs_o_XEmacs_siano_in_esecuzione,<BR>e_che_il_server_sia_stato_avviato_(con_il_comando_'gnuserv-start').
@@ -975,15 +974,15 @@ Pushed_citations_to_Vim=Citazioni_inviate_a_Vim
Waiting_for_ArXiv...=In_attesa_di_ArXiv...
Processing_=Elaborazione_di_
-Error_while_fetching_from_OIA2:_=Errore_durante_una_ricerca_da_OIA2:_
+Error_while_fetching_from_OIA2=Errore_durante_una_ricerca_da_OIA2
No_entries_found_for_the_search_string_'%0'=Nessuna_voce_trovata_in_base_alla_stringa_di_ricerca_'%0'
-The_chosen_encoding_'%0'_could_not_encode_the_following_characters:_=La_codifica_scelta_'%0'_non_pu\u00f2_codificare_i_caratteri_seguenti:_
+The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=La_codifica_scelta_'%0'_non_pu\u00f2_codificare_i_caratteri_seguenti:_
Operation_not_supported=Operazione_non_supportata
Drag_and_Drop_Error=Errore_di_'Drag_&_Drop'
File_download=Download_di_file
-Error_while_downloading_file:=Errore_nel_corso_del_download_del_file:
+Error_while_downloading_file\:=Errore_nel_corso_del_download_del_file:
Only_one_item_is_supported=Un_solo_elemento_\u00e8_supportato
Do_not_write_the_following_fields_to_XMP_Metadata\:=Non_scrivere_i_dati_dei_campi_seguenti_nei_metadati_XMP:
<HTML>Could_not_find_file_'%0'<BR>linked_from_entry_'%1'</HTML>=<HTML>Non_\u00e8_stato_trovato_il_file_'%0'_<BR>collegato_alla_voce_'%1'</HTML>
@@ -991,29 +990,24 @@ Do_not_write_the_following_fields_to_XMP_Metadata\:=Non_scrivere_i_dati_dei_camp
Drop_%0=Rilascia_%0
Link_to_file_%0=Collegamento_al_file_%0
The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?=Il_file_PDF_contiene_uno_o_pi\u00f9_record_BibTeX.\nVuoi_importarli_come_nuove_voci_nel_database_corrente?
-XMP_metadata_found_in_PDF:_%0=Metadati_XMP_trovati_nel_file_PDF:_%0
+XMP_metadata_found_in_PDF\:_%0=Metadati_XMP_trovati_nel_file_PDF:_%0
Link_to_PDF_%0=Collegamento_al_file_PDF_%0
Writing_XMP_to_'%0'...=Scrittura_dei_metadati_XMP_in_'%0'...
Wrote_XMP_to_'%0'.=Scritti_i_metadati_XMP_in_'%0'.
-Error_writing_XMP_to_file:_%0=Errore_durante_la_scrittura_dei_metadati_XMP_nel_file:_%0_
-Error_while_writing_XMP_%0=Errore_durante_la_scrittura_dei_metadati_XMP_%0_
-Error_writing_XMP_to_'%0'...=Errore_durante_la_scrittura_dei_metadati_XMP_in_%0_
+Error_writing_XMP_to_file\:_%0=Errore_durante_la_scrittura_dei_metadati_XMP_nel_file:_%0_
Error_converting_Bibtex_to_XMP:_%0=Errore_durante_la_conversione_della_voce_BibTeX_in_XMP:_%0
Error_while_converting_BibtexEntry_to_XMP_%0=Errore_durante_la_conversione_della_voce_BibTeX_in_XMP_%0
Error_converting_XMP_to_'%0'...=Errore_durante_la_conversione_dei_metadati_XMP_in_'%0'...
-Could_not_find_directory_for_%0-files:_%1=Impossibile_trovare_la_cartella_per_i_file_%0:_%1
-Invalid_URL:_=URL_non_valido:_
+Could_not_find_directory_for_%0-files\:_%1=Impossibile_trovare_la_cartella_per_i_file_%0:_%1
This_operation_requires_at_least_one_entry.=Questa_operazione_richiede_almeno_una_voce.
Write_XMP-metadata=Scrivi_i_metadati_XMP
Write_XMP-metadata_for_all_PDFs_in_current_database?=Scrivere_i_metadati_XMP_per_tutti_i_file_PDF_del_database_corrente?
No_XMP_metadata_found_in_=Non_sono_stati_trovati_metadati_XMP_in_
-# ???? below: Drog ???
-Drog_PDF=
Please_refer_to_the_JabRef_help_manual_on_using_the_CiteSeer_tools=Consulta_l'aiuto_in_linea_sull'utilizzo_degli_strumenti_CiteSeer
Search_IEEExplore=Ricerca_in_IEEExplore
An_Exception_ocurred_while_accessing_'%0'=Eccezione_durante_l'accesso_a_'%0'
An_SAXException_ocurred_while_parsing_'%0':=Eccezione_SAX_durante_l'elaborazione_di_'%0':
-An_Error_occurred_while_fetching_from_OAI2_source_(%0):=Errore_durante_il_recupero_dalla_fonte_OAI2_(%0):
+An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:=Errore_durante_il_recupero_dalla_fonte_OAI2_(%0):
Abbreviated_%0_journal_names.=%0_nomi_di_riviste_abbreviati.
Unabbreviated_%0_journal_names.=%0_nomi_di_riviste_per_esteso.
@@ -1048,7 +1042,6 @@ Icon=Icona
Path_to_%0_not_defined=Percorso_per_%0_non_definito
-Error:_=Errore:_
Path_to_Vim=Percorso_per_Vim
Vim_Server_Name=Nome_del_server_Vim
MS_Office_2007=MS_Office_2007
@@ -1066,7 +1059,6 @@ File_'%0'_is_already_open.=Il_file_'%0'__\u00e8_gi\u00e0_aperto.
File_has_been_updated_externally._What_do_you_want_to_do?=Il_file_\u00e8_stato_aggiornato_da_un'applicazione_esterna._Cosa_vuoi_fare?
Entry_has_no_citekey=La_voce_non_ha_chiave_BibTeX
-Cannot_rename_for_several_entries.=Impossibile_rinominare_pi\u00f9_di_una_voce
Rename_to_match_citekey=Rinomina_concordemente_alla_chiave_BibTeX
Change_file_type=Cambia_il_tipo_di_file
@@ -1076,17 +1068,17 @@ Unable_to_open_file.=Impossibile_aprire_il_file
Undefined_file_type=Tipo_di_file_non_definito
Error\:_=Errore:_
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Questa_azione_sposter\u00e0_tutti_i_collegamenti_dai_campi_'pdf'_e_'ps'_al_campo_'%0'._Procedere?
-Upgrade_external_links=Aggiorna_i_collegamenti_esterni
-Upgraded_links.=Collegamenti_aggiornati.
Do_you_want_JabRef_to_do_the_following_operations?=Vuoi_che_JabRef_esegua_le_operazioni_seguenti?
Upgrade_file=Aggiornamento_del_file
+This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Questa_azione_sposter\u00e0_tutti_i_collegamenti_dai_campi_'pdf'_e_'ps'_al_campo_'%0'._Procedere?
+Upgrade_external_links=Aggiorna_i_collegamenti_esterni
+Upgraded_links.=Collegamenti_aggiornati.
+This_entry_has_no_BibTeX_key._Generate_key_now?=Questa_voce_\u00e8_priva_di_una_chiave_BibTeX._Generarla_ora?
+Target_file_cannot_be_a_directory.=L'oggetto_deve_essere_un_file,_non_una_cartella.
Finished_autosetting_external_links.=Impostazione_automatica_dei_collegamenti_esterni_terminata.
No_files_found.=Nessun_file_trovato.
-Target_file_cannot_be_a_directory.=L'oggetto_deve_essere_un_file,_non_una_cartella.
-This_entry_has_no_BibTeX_key._Generate_key_now?=Questa_voce_\u00e8_priva_di_una_chiave_BibTeX._Generarla_ora?
External_file_links=Collegamenti_a_file_esterni
Main_%0_directory=Cartella_%0_principale
@@ -1109,14 +1101,13 @@ Could_not_open_link=Impossibile_aprire_il_collegamento
The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Impossibile_avviare_l'applicazione_'%0'_associata_con_il_tipo_di_file'%1'.
Native_file_dialog=Dialogo_File_nativo
-# key below duplicate, also with colon "escaped" by a backslash
-Error:_=
Beta_version=Versione_Beta
# key below already already present with colon "escaped" by a backslash
Do_not_write_the_following_fields_to_XMP_Metadata:=Non_scrivere_i_dati_dei_campi_seguenti_nei_metadati_XMP:
MIS_Quarterly=MIS_Quarterly
Use_default_viewer=Usa_il_visualizzatore_predefinito
Select_icon=Seleziona_l'icona
+Copy_to_clipboard=Copia_negli_appunti
Paste_from_clipboard=Incolla_dagli_appunti
lower=minuscolo
@@ -1125,35 +1116,45 @@ Upper_Each_First=Prime_Lettere_In_Maiuscolo
Upper_first=Prima_lettera_in_maiuscolo
Replace_comma_by_and_where_appropriate=Sostituisci_le_virgole_con_'and'_dove_appropriato
-%0_export_successful=
+%0_export_successful=%0_esportazioni_riuscite
+
+The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=La_versione_attuale_dispone_di_una_nuova_modalit\u00e0_di_gestione_dei_collegamenti_ai_file_esterni.<BR>Per_poterla_sfruttare,_i_collegamenti_devono_essere_convertiti_nel_nuovo_formato<BR>e_JabRef_deve_essere_configurato_per_mostrare_i_nuovi_collegamenti.
+This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Per_ciascuna_delle_%0_estensioni,_JabRef_verificher\u00e0_l'esistenza_del_file.<BR>In_caso_negativo_proporr\u00e0_delle_opzioni_per_la_risoluzione_del_problema.
+You_have_changed_the_look_and_feel_setting._You_must_restart_JabRef_for_this_to_come_into_effect.=Le_impostazioni_dell'aspetto_dell'applicazione_sono_stati_cambiati._\u00c8_necessario_riavviare_JabRef_affich\u00e9_i_cambiamenti_abbiano_effetto.
+Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message=Attenzione:_non_\u00e8_stato_possibile_completare_la_riparazione_del_file;_il_file_potrebbe_essere_corrotto._Messaggio_di_errore
+Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Impossibile_salvare_il_file._La_codifica_dei_caratteri_'%0'_non_\u00e8_supportata.
+Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Impossibile_aprire_il_collegamento._L'applicazione_'%0'_associata_con_il_tipo_di_file_'%1'_non_pu\u00f2_essere_aperta.
+Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Impossibile_stabilire_la_connessione_al_server_Vim.<BR>Assicurarsi_che_Vim_sia_in_esecuzione_con_il_nome_di_server_corretto.
+All_entries_of_this_type_will_be_declared_typeless._Continue?=Tutte_le_voci_di_questo_tipo_saranno_definite_'senza_tipo'._Continuare?
+Field_names_are_not_allowed_to_contain_white_space_or_the_following_characters=I_nomi_dei_campi_non_possono_contenere_spazi_o_i_caratteri_seguenti
+%0_entries_found._To_reduce_server_load,_abstracts_will_only_be_downloaded_for_searches_returning_%1_hits_or_less.=%0_voci_trovate._Per_ridurre_il_carico_sul_server,_i_riassunti_saranno_scaricati_solo_per_ricerche_che_forniscano_meno_di_%1_risultati.
+A_string_with_that_label_already_exists=Una_stringa_con_questa_etichetta_esiste_gi\u00e0
+Overwrite=Sovrascrivi
+
+File_directory_is_not_set_or_does_not_exist!=La_cartella_non_\u00e8_impostata_o_non_esiste!
+File_directory_is_'%0':=La_cartella_dei_file_\u00e8_'%0':
+Copy_files_to_file_directory.=Copia_i_file_nella_cartella.
+Move_files_to_file_directory.=Sposta_i_file_nella_cartella.
+Copy_file_to_file_directory.=Copia_il_file_nella_cartella.
+Move_file_to_file_directory=Sposta_il_file_nella_cartella.
+New_file_link_(INSERT)=Nuovo_collegamento_a_file_(INSERT)
+Remove_file_link_(DELETE)=Rimuovi_collegamento_a_file_(DELETE)
+
+No_PDF_linked=Nessun_file_PDF_collegato
+PDF_does_not_exist=Il_file_PDF_non_esiste
+Wrote_XMP-metadata=Metadati_XMP_scritti
+
+Error_writing_to_%0_file(s).=Errore_di_scrittura_di_%0_file.
+Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=Scrittura_dei_metadati_XMP_terminata._Scrittura_eseguita_su_%0_file.
-The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=
-This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=
-You_have_changed_the_look_and_feel_setting._You_must_restart_JabRef_for_this_to_come_into_effect.=
-Warning:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message:_=
-Could_not_save_file._Character_encoding_'%0'_is_not_supported.=
-Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=
-Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=
-All_entries_of_this_type_will_be_declared_typeless._Continue?=
-Field_names_are_not_allowed_to_contain_white_space_or_the_following_characters=
-%0_entries_found._To_reduce_server_load,_abstracts_will_only_be_downloaded_for_searches_returning_%1_hits_or_less.=
-A_string_with_that_label_already_exists=
-Overwrite=
+You_have_entered_an_invalid_search_'%0'.=\u00c8_stata_inserita_una_ricerca_non_valida_'%0'.
+One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Uno_o_pi\u00f9_collegamenti_a_file_sono_del_tipo_'%0',_non_definito._Come_procedere?
-File_directory_is_not_set_or_does_not_exist!=
-File_directory_is_'%0':=
-Copy_files_to_file_directory.=
-Move_files_to_file_directory.=
-Copy_file_to_file_directory.=
-Move_file_to_file_directory=
-New_file_link_(INSERT)=
-Remove_file_link_(DELETE)=
+Remove_link=Rimuovere_il_collegamento
-No_PDF_linked=
-PDF_does_not_exist=
-Wrote_XMP-metadata=
-Error_writing_to_%0_file(s).=
-Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=
+Autolink_files_with_names_starting_with_the_BibTeX_key=Collegare_automaticamente_i_file_con_nome_che_inizia_con_la_chiave_BibTeX
+Autolink_only_files_that_match_the_BibTeX_key=Collegare_automaticamente_solo_i_file_con_nome_corrispondente_alla_chiave_BibTeX
+Error_converting_Bibtex_to_XMP\:_%0=Errore_durante_la_conversione_della_voce_BibTeX_in_XMP:_%0
-You_have_entered_an_invalid_search_'%0'.=
+Sort_order=Ordinamento
diff --git a/src/resource/JabRef_no.properties b/src/resource/JabRef_no.properties
index 383528d..e2f3177 100644
--- a/src/resource/JabRef_no.properties
+++ b/src/resource/JabRef_no.properties
@@ -27,7 +27,7 @@ Accept=Aksepter
Accept_change=Aksepter_endring
Action=Aksjon
Add=Legg_til
-Add_a_(compiled)_custom_ImportFormat_class_from_a_class_path._\nThe_path_need_not_be_on_the_classpath_of_JabRef.=
+Add_a_(compiled)_custom_ImportFormat_class_from_a_class_path._\nThe_path_need_not_be_on_the_classpath_of_JabRef.=Legg_til_en_(kompilert)_egendefinert_ImportFormat-klasse_fra_en_classpath._\nStien_trenger_ikke_\u00e5_v\u00e6re_p\u00e5_JabRefs_classpath.
Add_a_(compiled)_custom_ImportFormat_class_from_a_Zip-archive.\nThe_Zip-archive_need_not_be_on_the_classpath_of_JabRef.=Legg_til_en_kompilert_ImportFormat-klasse_fra_en_ZIP-fil._ZIP-filen_trenger_ikke_\u00e5_v\u00e6re_i_din_classpath.
add_entries_to_group=legg_til_enheter_i_gruppe
@@ -55,7 +55,7 @@ any_field_that_matches_the_regular_expression_<b>%0</b>=ethvert_felt_som_matcher
Appearance=Utseende
Append=Legg_til
Append_database=Append_database
-append_the_selected_text_to_bibtex_key=
+append_the_selected_text_to_bibtex_key=legg_til_den_valgte_teksten_til_BibTeX-n\u00f8kkelen
Apply=Utf\u00F8r
Arguments_passed_on_to_running_JabRef_instance._Shutting_down.=Argumentene_sendt_til_allerede_aktiv_JabRef-instans._Avslutter.
Assign_entry_selection_exclusively_to_this_group=Legg_valgte_enheter_eksklusivt_til_denne_gruppen
@@ -88,8 +88,8 @@ Background_color_for_marked_entries=Bakgrunnsfarge_for_merkede_enheter
Background_color_for_optional_fields=Bakgrunnsfarge_for_valgfrie_felter
Background_color_for_required_fields=Bakgrunnsfarge_for_n\u00F8dvendige_felter
Backup_old_file_when_saving=Lag_sikkerhetskopi_ved_lagring
-Bibkey_to_filename_conversion=
-BibTeX_key=
+Bibkey_to_filename_conversion=Konvertering_av_BibTeX-n\u00f8kkel_til_filnavn
+BibTeX_key=BibTeX-n\u00f8kkel
BibTeX_key_is_unique.=BibTeX-n\u00F8kkelen_er_unik
BibTeX_key_not_set._Enter_a_name_for_the_downloaded_file=BibTeX-n\u00F8kkel_er_ikke_satt._Angi_et_navn_for_den_nedlastede_filen
BibTeX_source=BibTeX-kilde
@@ -177,10 +177,10 @@ Could_not_find_image_file=Kunne_ikke_finne_bilde
Could_not_find_layout_file=Fant_ikke_layoutfil
Could_not_import_entry_types=Kunne_ikke_importere_enhetstyper
Could_not_import_preferences=Kunne_ikke_importere_innstillinger
-Could_not_instantiate_%0_%1=
+Could_not_instantiate_%0_%1=Kunne_ikke_instansiere_%0_%1
Could_not_instantiate_%0_%1._Have_you_chosen_the_correct_package_path?=Kunne_ikke_instansiere_%0_%1._Har_du_valgt_riktig_katalog?
-Could_not_parse_number_of_hits=
+Could_not_parse_number_of_hits=Kunne_ikke_lese_ut_antall_treff
Could_not_resolve_import_format=Kunne_ikke_bestemme_importformat
Could_not_run_the_'gnuclient'_program._Make_sure_you_have_the_gnuserv/gnuclient_programs_installed.=Kunne_ikke_kalle_'gnuclient'-programmet._Kontroller_at_du_har_installert_gnuserv/gnuclient-programmene.
Could_not_save_file=Kunne_ikke_lagre
@@ -206,7 +206,7 @@ Cut_pr=Klippet_ut
Database_encoding=Tegnkoding_for_database
Database_has_changed._Do_you_want_to_save_before_closing?=Databasen_er_endret._Vil_du_lagre_f\u00F8r_du_lukker_den?
Database_properties=Databaseegenskaper
-Date_format=
+Date_format=Datoformat
Default=Tilbakestill
Default_encoding=Standard_koding
Default_grouping_field=Standardfelt_for_gruppering
@@ -234,7 +234,7 @@ Disable_entry_editor_when_multiple_entries_are_selected=Sperr_enhetsskjema_n\u00
Disable_this_confirmation_dialog=Deaktiver_denne_kontrolldialogen
Disable_this_warning_dialog=Deaktiver_denne_advarselen
Display_all_entries_belonging_to_one_or_more_of_the_selected_groups.=Vis_alle_enheter_inneholdt_i_minst_en_av_de_valgte_gruppene.
-Display_all_error_messages=
+Display_all_error_messages=Vis_alle_feilmeldinger
Display_help_on_command_line_options=Vis_kommandolinjehjelp
Display_imported_entries_in_an_inspection_window_before_they_are_added.=Vis_importerte_enheter_i_et_inspeksjonsvindu_f\u00F8r_de_legges_til.
Display_only_entries_belonging_to_all_selected_groups.=Vis_kun_enheter_inneholdt_i_alle_valgte_grupper.
@@ -339,7 +339,7 @@ field=felt
# Integrity check is a process that checks for indications of wrongly filled out bibtex fields. "Scan" is the button that starts the check.
Field_content=Innhold_i_felt
Field_name=Feltnavn
-Field_sizes=
+Field_sizes=Feltst\u00f8rrelser
Field_to_filter=Felt_som_skal_filtreres
Field_to_group_by=Grupperingsfelt
@@ -491,7 +491,7 @@ Left=Venstre
License=
Limit_to_fields=Begrens_til_f\u00F8lgende_felter
Limit_to_selected_entries=Begrens_til_valgte_enheter
-Listen_for_remote_operation_on_port=
+Listen_for_remote_operation_on_port=Lytt_etter_fjernoperasjoner_p\u00c3\u00a5_port
Load_session=Gjenopprett_tilstand
Loading_session...=Gjenoppretter_tilstand...
Look_and_feel=Utseende
@@ -502,11 +502,11 @@ Main_PDF_directory=Hovedkatalog_for_PDF-filer
Main_PS_directory=Hovedkatalog_for_PS-filer
Manage=Sett_opp
Manage_custom_exports=Sett_opp_eksterne_eksportfiltre
-Manage_custom_imports=
+Manage_custom_imports=Sett_opp_eksterne_importfiltre
Manage_journal_abbreviations=Sett_opp_journalforkortelser
Mark_entries=Merk_enheter
Mark_entry=Merk_enhet
-Mark_new_entries_with_addition_date=
+Mark_new_entries_with_addition_date=Merk_nye_enheter_med_dato
Mark_new_entries_with_owner_name=Merk_nye_enheter_med_navn_p\u00E5_eier
Marked_selected=Merket_valgte_enheter
Medline_entries_fetched=Medline-enheter_hentet
@@ -710,12 +710,12 @@ Right=H\u00f8yre
Save=Lagre
Save_before_closing=Lagre_f\u00F8r_databasen_lukkes
Save_database=Lagre_database
-Save_entries_in_their_original_order=
+Save_entries_in_their_original_order=Lagre_enheter_i_opprinnelig_rekkef\u00f8lge
Save_failed=Lagring_mislyktes
Save_failed_during_backup_creation=Lagring_mislyktes_ved_opprettelse_av_sikkerhetskopi
Save_failed_while_committing_changes=Lagring_mislyktes_ved_sluttf\u00f8ring_av_endringer
-Save_in_default_table_sort_order=
-Save_ordered_by_author/editor/year=
+Save_in_default_table_sort_order=Lagre_i_standardsortering_for_tabell
+Save_ordered_by_author/editor/year=Lagre_sortert_etter_author/editor/year
Saved_database=Lagret_database
Saved_selected_to=Lagret_valgte_i
Saved_session=Lagret_tilstand
@@ -788,8 +788,8 @@ Show_warning_dialog_when_a_duplicate_BibTeX_key_is_entered=Vis_advarsel_n\u00E5r
Show_warning_dialog_when_an_empty_BibTeX_key_is_entered=Vis_dialogboks_med_advarsel_n\u00E5r_en_tom_BibTeX-n\u00F8kkel_skrives_inn
Simple_HTML=Enkel_HTML
Size=St\u00f8rrelse
-Skip=
-Skipped_-_No_PDF_linked=
+Skip=Hopp_over
+Skipped_-_No_PDF_linked=Hoppet_over_-_ingen_PDF-fil_linket
Skipped_-_PDF_does_not_exist=Hoppet_over_-_PDF-filen_finnes_ikke
Skipped_entry.=Hoppet_over_enhet.
@@ -857,8 +857,8 @@ This_group_contains_entries_whose_<b>%0</b>_field_contains_the_keyword_<b>%1</b>
This_group_contains_entries_whose_<b>%0</b>_field_contains_the_regular_expression_<b>%1</b>=Denne_gruppen_inneholder_enheter_hvis_<b>%0</b>-felt_stemmer_med_regul\u00e6ruttrykket_<b>%1</b>
This_is_a_simple_copy_and_paste_dialog_for_import_some_fields_from_normal_text.=Dette_er_et_enkelt_klipp-og-lim-vindu._F\u00F8rst_last_inn_eller_kopier_tekst_til_inndatafeltet._Deretter_kan_du_merke_tekst_og_tildele_den_til_et_BibTeX-felt.
This_makes_JabRef_look_up_each_%0_link_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=Dette_f\u00E5r_JabRef_til_\u00E5_unders\u00F8ke_hver_av_%0-linkene,_og_sjekke_om_filen_eksisterer._Hvis_ikke_vil_du_bli_gitt_valg<BR>for_\u00E5_l\u00F8se_problemet.
-This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=
-This_operation_requires_one_or_more_entries_to_be_selected.=
+This_operation_requires_all_selected_entries_to_have_BibTex_keys_defined.=Denne_operasjonen_krever_at_alle_valgte_enheter_har_definerte_BibTeX-n\u00F8kler.
+This_operation_requires_one_or_more_entries_to_be_selected.=Denne_operasjonen_krever_at_en_eller_flere_enheter_er_valgt.
To_set_up,_go_to_<B>Tools_->_Manage_journal_abbreviations</B>=For_\u00e5_sette_opp,_g\u00e5_til_<B>Verkt\u00f8y_->_Sett_opp_journalforkortelser</b>
Toggle_abbreviation=Forkort/ekspander
Try_different_encoding=Pr\u00f8v_en_annen_tegnkoding
@@ -866,7 +866,7 @@ Type=Type
Type_set_to_'other'=Type_satt_til_'other'
unable_to_access_LyX-pipe=ingen_tilgang_til_LyX-pipe
Unable_to_create_graphical_interface=Kunne_ikke_opprette_grafisk_grensesnitt
-Unable_to_parse_clipboard_text_as_Bibtex_entries.=Kunne_ikke_lese_tekst_p\ufffd_utklippstavlen_som_BibTeX-enheter.
+Unable_to_parse_clipboard_text_as_Bibtex_entries.=Kunne_ikke_lese_tekst_p\u00E5_utklippstavlen_som_BibTeX-enheter.
Unable_to_parse_the_following_URL=Kunne_ikke_tolke_f\u00F8lgende_URL
Unable_to_read_default_icon_theme.=Kunne_ikke_lese_standard_ikonsettfil.
Unable_to_read_icon_theme_file=Kunne_ikke_lese_ikonsettfil
@@ -906,20 +906,20 @@ View=Vis
Warn_about_unresolved_duplicates_when_closing_inspection_window=Advar_om_duplikater_som_ikke_er_blitt_h\u00e5ndtert_n\u00e5r_inspeksjonsvinduet_lukkes
Warn_before_overwriting_existing_keys=Gi_advarsel_f\u00f8r_eksisterende_n\u00f8kler_skrives_over
Warning=Advarsel
-Warning_there_is_a_duplicate_key=
+Warning_there_is_a_duplicate_key=Advarsel:_det_finnes_en_lik_BibTeX-n\u00F8kkel
Warnings=Advarsler
web_link=link
-What_do_you_want_to_do?=
+What_do_you_want_to_do?=Hva_vil_du_gj\u00F8re?
When_adding/removing_keywords,_separate_them_by=N\u00e5r_n\u00f8kkelord_legges_til_eller_fjernes_skill_dem_med
with=med
Word=Ord
-Write_BibtexEntry_as_XMP-metadata_to_PDF.=
+Write_BibtexEntry_as_XMP-metadata_to_PDF.=Skriv_BibTeX-enheten_som_XMP-metadata_til_PDF.
Write_XMP=Skriv_XMP
Writing_XMP=Skriver_XMP
-Writing_XMP_metadata...=
-Writing_XMP_metadata_for_selected_entries...=
+Writing_XMP_metadata...=Skriver_XMP-metadata...
+Writing_XMP_metadata_for_selected_entries...=Skriver_XMP-metadata_for_de_valgte_enhetene...
Wrong_file_format=Feil_filformat
XMP-annotated_PDF=XMP-annotert_PDF
@@ -928,75 +928,73 @@ XMP_metadata=XMP-metadata
You_have_changed_the_language_setting._You_must_restart_JabRef_for_this_to_come_into_effect.=Du_har_valgt_et_nytt_spr\u00E5k._Du_m\u00E5_starte_JabRef_p\u00E5_nytt_for_at_dette_skal_tre_i_kraft.
You_have_cleared_this_field._Original_value=Du_har_slettet_dette_feltet._Original_verdi
You_must_choose_a_file_name_to_store_journal_abbreviations=Du_m\u00e5_velge_et_filnavn_for_\u00e5_lagre_journalforkortelser
-You_must_enter_an_integer_value_in_the_text_field_for=Du_m\ufffd_skrive_et_heltall_i_tekstfeltet_for
+You_must_enter_an_integer_value_in_the_text_field_for=Du_m\u00E5_skrive_et_heltall_i_tekstfeltet_for
You_must_fill_in_a_name_for_the_entry_type.=Du_m\u00E5_velge_et_navn_for_enhetstypen.
You_must_restart_JabRef_for_the_new_key_bindings_to_work_properly.=Du_m\u00E5_starte_JabRef_p\u00E5_nytt_for_at_de_nye_hurtigtastene_skal_fungere.
You_must_select_at_least_one_row_to_perform_this_operation.=Du_m\u00E5_velge_minst_\u00E9n_rad_f\u00F8r_du_kan_bruke_denne_operasjonen.
You_must_set_both_BibTeX_key_and_%0_directory=Du_m\u00E5_sette_b\u00E5de_BibTeX-n\u00F8kkel_og_%0-katalog
Your_new_key_bindings_have_been_stored.=Dine_nye_hurtigtaster_har_blitt_lagret.
-Save_all_open_databases=
+Save_all_open_databases=Lagre_alle_\u00E5pne_databaser
-Automatically_remove_exact_duplicates=
-Enable_word/name_autocompletion=
-Editor_options=
-Use_autocompletion_for_the_following_fields=
-Saving_all_databases...=
-Save_all_finished.=
-Saved_%0_databases.=
-No_databases_saved.=
-Connection_to_IEEEXplore_failed=
+Automatically_remove_exact_duplicates=Fjern_eksakte_duplikater_automatisk
+Enable_word/name_autocompletion=Aktiver_autokomplettering_av_navn/ord
+Editor_options=Alternativer_for_redigering
+Use_autocompletion_for_the_following_fields=Bruk_autokomplettering_for_f\u00F8lgende_felter
+Saving_all_databases...=Lagrer_alle_databaser...
+Save_all_finished.=Fullf\u00F8rte_lagring_av_alle_databaser
+Saved_%0_databases.=Lagret_%0_databaser.
+No_databases_saved.=Ingen_databaser_lagret.
+Connection_to_IEEEXplore_failed=Oppkobling_til_IEEExplore_mislyktes
-Link=
-File_type=
-Edit_file_link=
+Link=Link
+File_type=Filtype
+Edit_file_link=Rediger_link
+Path_to_LatexEditor_(LEd.exe)=Sti_til_LatexEditor_(LEd.exe)
+Move_external_links_to_'file'_field=Flytt_eksterne_linker_til_'file'-feltet
+Push_selection_to_Vim=Send_valgte_enheter_til_Vim
+Pushed_citations_to_Vim=Sendte_enheter_til_Vim
+Waiting_for_ArXiv...=Venter_p\u00E5_ArXiv
+Processing_=Arbeider_
+Error_while_fetching_from_OIA2=Feil_ved_nedlasting_fra_OIA2
+No_entries_found_for_the_search_string_'%0'=Fant_ingen_enheter_for_s\u00F8keteksten_'%0'
-Path_to_LatexEditor_(LEd.exe)=
-Move_external_links_to_'file'_field=
-Push_selection_to_Vim=
-Pushed_citations_to_Vim=
+The_chosen_encoding_'%0'_could_not_encode_the_following_characters\:_=Den_valgte_tegnkodingen_'%0'_kunne_ikke_kode_de_f\u00F8lgende_tegnene:_
+Operation_not_supported=Operasjonen_er_ikke_st\u00F8ttet
-Waiting_for_ArXiv...=
-Processing_=
-Error_while_fetching_from_OIA2:_=
+Drag_and_Drop_Error=Feil_ved_trekk-og-slipp
-No_entries_found_for_the_search_string_'%0'=
+File_download=Filnedlasting
+Error_while_downloading_file\:=Feil_ved_nedlasting_av_fil
+Only_one_item_is_supported=Bare_ett_element_av_gangen_er_st\u00F8ttet
+Do_not_write_the_following_fields_to_XMP_Metadata\:=Ikke_skriv_de_f\u00F8lgende_feltene_til_XMP-metadata
+<HTML>Could_not_find_file_'%0'<BR>linked_from_entry_'%1'</HTML>=<HTML>Kunne_ikke_finne_filen_'%0'<BR>linket_fra_enheten_'%1'</HTML>
+Drop_%0=Slipp_%0
-The_chosen_encoding_'%0'_could_not_encode_the_following_characters:_=
-Operation_not_supported=
-Drag_and_Drop_Error=
-File_download=
-Error_while_downloading_file:=
-Only_one_item_is_supported=
-Do_not_write_the_following_fields_to_XMP_Metadata\:=
-<HTML>Could_not_find_file_'%0'<BR>linked_from_entry_'%1'</HTML>=
-Drop_%0=
-Link_to_file_%0=
-The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?=
-XMP_metadata_found_in_PDF:_%0=
-Link_to_PDF_%0=
-Writing_XMP_to_'%0'...=
-Wrote_XMP_to_'%0'.=
-Error_writing_XMP_to_file:_%0=
-Error_while_writing_XMP_%0=
-Error_writing_XMP_to_'%0'...=
+Link_to_file_%0=Link_til_filen_%0
+The_PDF_contains_one_or_several_bibtex-records.\nDo_you_want_to_import_these_as_new_entries_into_the_current_database?=PDF-filen_inneholder_en_eller_flere_BibTeX-enheter.\nVil_du_importere_disse_som_nye_enheter_i_den_\u00E5pne_databasen?
+XMP_metadata_found_in_PDF\:_%0=XMP-metadata_funnet_i_PDF:_%0
+Link_to_PDF_%0=Link_til_PDF_%0
+Writing_XMP_to_'%0'...=Skriver_XMP_til_'%0'
+Wrote_XMP_to_'%0'.=Skrev_XMP_til_'%0'
+Error_writing_XMP_to_file\:_%0=Feil_ved_skriving_av_XMP_til_filen_'%0'
Error_converting_Bibtex_to_XMP:_%0=
-Error_while_converting_BibtexEntry_to_XMP_%0=
-Error_converting_XMP_to_'%0'...=
-Could_not_find_directory_for_%0-files:_%1=
-Invalid_URL:_=
-This_operation_requires_at_least_one_entry.=
-Write_XMP-metadata=
-Write_XMP-metadata_for_all_PDFs_in_current_database?=
-No_XMP_metadata_found_in_=
-Drog_PDF=
-Please_refer_to_the_JabRef_help_manual_on_using_the_CiteSeer_tools=
-Search_IEEExplore=
-An_Exception_ocurred_while_accessing_'%0'=
-An_SAXException_ocurred_while_parsing_'%0':=
-An_Error_occurred_while_fetching_from_OAI2_source_(%0):=
-Abbreviated_%0_journal_names.=
-Unabbreviated_%0_journal_names.=
+Error_while_converting_BibtexEntry_to_XMP_%0=Feil_ved_konvertering_av_BibTeX-enheten_til_XMP_%0
+Error_converting_XMP_to_'%0'...=Feil_ved_tilpassing_av_XMP_for_'%0'...
+
+Could_not_find_directory_for_%0-files\:_%1=Kunne_ikke_finne_katalog_for_%0-filer:_%1
+This_operation_requires_at_least_one_entry.=Denne_operasjonen_krever_minst_en_enhet.
+Write_XMP-metadata=Skriv_XMP-metadata
+Write_XMP-metadata_for_all_PDFs_in_current_database?=Skriv_XMP-metadata_for_alle_PDFer_i_denne_databasen?
+No_XMP_metadata_found_in_=Ingen_XMP-metadata_funnet_i_
+Please_refer_to_the_JabRef_help_manual_on_using_the_CiteSeer_tools=Se_i_JabRef-manualen_for_informasjon_om_bruk_av_CiteSeer-verkt\u00F8yene
+
+Search_IEEExplore=S\u00F8k_IEEExplore
+An_Exception_ocurred_while_accessing_'%0'=En_feil_oppsto_ved_lesing_av_'%0'
+An_SAXException_ocurred_while_parsing_'%0':=En_SAXException_forekom_ved_lesing_av_'%0':
+An_Error_occurred_while_fetching_from_OAI2_source_(%0)\:=En_feil_oppsto_ved_nedlasting_fra_OIA2-kilde_(%0):
+Abbreviated_%0_journal_names.=Fortkortet_%0_journalnavn.
+Unabbreviated_%0_journal_names.=Ekspanderte_%0_journalnavn.
Help_contents=Oversikt_over_hjelpefiler
Edit_entry=Rediger_enhet
@@ -1014,122 +1012,128 @@ Will_write_XMP-metadata_to_the_PDFs_linked_from_selected_entries.=
Abbreviate_journal_names_of_the_selected_entries_(ISO_abbreviation)=Forkort_journalnavn_for_de_valgte_enhetene_(ISO-forkortelse)
Abbreviate_journal_names_of_the_selected_entries_(MEDLINE_abbreviation)=Forkort_journalnavn_for_de_valgte_enhetene_(MEDLINE-forkortelse)
Unabbreviate_journal_names_of_the_selected_entries=Ekspander_journalnavn_for_de_valgte_enhetene
-Do_not_show_splash_window_at_startup=
+Do_not_show_splash_window_at_startup=Ikke_vis_JabRef-informasjonsvindu_ved_oppstart
+Resolve_strings_for_all_fields_except=Sl\u00E5_opp_strenger_for_alle_felter_unntatt
+Resolve_strings_for_standard_BibTeX_fields_only=Sl\u00E5_opp_strenger_kun_for_standard_BibTeX-felter
-Resolve_strings_for_all_fields_except=
-Resolve_strings_for_standard_BibTeX_fields_only=
-Leave_files_in_their_current_directory.=
-Leave_file_in_its_current_directory.=
-Extension=
-Application=
-Icon=
+Leave_files_in_their_current_directory.=La_filene_ligge_i_katalogen_de_ligger_i_n\u00E5.
+Leave_file_in_its_current_directory.=La_filen_ligge_i_katalogen_den_ligger_i_n\u00E5.
+Extension=Etternavn
+Application=Applikasjon
+Icon=Ikon
Path_to_%0_not_defined=Sti_til_%0_ikke_definert
-Error:_=
-Path_to_Vim=
-Vim_Server_Name=
-MS_Office_2007=
-Manage_external_file_types=
-All_custom_file_types_will_be_lost._Proceed?=
-Reset_file_type_definitons=
-Edit_file_type=
-Could_not_run_the_'vim'_program.=
+Path_to_Vim=Sti_til_Vim
+Vim_Server_Name=Navn_p\u00E5_Vim-server
+MS_Office_2007=MS_Office_2007
+Manage_external_file_types=Sett_opp_eksterne_filtyper
+All_custom_file_types_will_be_lost._Proceed?=Alle_egendefinerte_filtyper_vil_bli_slettet._Fortsette?
+Reset_file_type_definitons=Gjenopprett_opprinnelige_filtyper
+Edit_file_type=Rediger_filtype
+Could_not_run_the_'vim'_program.=Kunne_ikke_kj\u00F8re_'vim'-programmet
-Show_file_column=
-This_database_was_written_using_an_older_version_of_JabRef.=
+Show_file_column=Vis_'file'-kolonne
+This_database_was_written_using_an_older_version_of_JabRef.=Denne_databasen_ble_lagret_fra_en_eldre_versjon_av_JabRef.
-File_'%0'_is_already_open.=
+File_'%0'_is_already_open.=Filen_'%0'_er_allerede_\u00E5pen.
-File_has_been_updated_externally._What_do_you_want_to_do?=
+File_has_been_updated_externally._What_do_you_want_to_do?=Filen_har_blitt_endret_eksternt._Hva_vil_du_gj\u00F8re?
-Entry_has_no_citekey=
-Cannot_rename_for_several_entries.=
-Rename_to_match_citekey=
+Entry_has_no_citekey=Enheten_har_ingen_BibTeX-n\u00F8kkel
-Change_file_type=
-Define_'%0'=
-This_external_link_is_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=
-Unable_to_open_file.=
-Undefined_file_type=
+Rename_to_match_citekey=Endre_navn_for_\u00E5_samsvare_med_BibTeX-n\u00F8kkel
+Change_file_type=Endre_filtype
+Define_'%0'=Definer_'%0'
+This_external_link_is_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=Denne_eksterne_linken_er_av_typen_'%0'_som_er_udefinert._Hva_vil_du_gj\u00F8re?
+Unable_to_open_file.=Kan_ikke_\u00E5pne_fil.
+Undefined_file_type=Udefinert_filtype
Error\:_=
-This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=
-Upgrade_external_links=
-Upgraded_links.=
-Do_you_want_JabRef_to_do_the_following_operations?=
-Upgrade_file=
+Do_you_want_JabRef_to_do_the_following_operations?=Vil_du_at_JabRef_skal_gj\u00F8re_de_f\u00F8lgende_operasjonene?
+Upgrade_file=Oppgrader_fil
+This_will_move_all_external_links_from_the_'pdf'_and_'ps'_fields_into_the_'%0'_field._Proceed?=Denne_operasjonen_vil_flytte_alle_eskterne_linker_fra_'pdf'-_og_'ps'-feltene_til_'%0'-feltet._Fortsette?
+Upgrade_external_links=Oppgrader_eksterne_linker
+Upgraded_links.=Oppgraderte_linker.
+This_entry_has_no_BibTeX_key._Generate_key_now?=Denne_enheten_har_ingen_BibTeX-n\u00F8kkel._Generer_n\u00F8kkel_n\u00E5?
+Target_file_cannot_be_a_directory.=M\u00E5lfilen_kan_ikke_v\u00e6re_en_katalog.
+Finished_autosetting_external_links.=Fullf\u00F8rte_automatisk_setting_av_eksterne_linker.
+No_files_found.=Ingen_filer_funnet.
-Finished_autosetting_external_links.=
-No_files_found.=
-Target_file_cannot_be_a_directory.=
-This_entry_has_no_BibTeX_key._Generate_key_now?=
+External_file_links=Eksterne_linker
+Main_%0_directory=Hovedkatalog_for_%0-filer
+Synchronize_file_links=Synkroniser_eksterne_linker
+Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=Oppgrader_eksterne_PDF-_og_PS-linker_til_\u00E5_bruke_'%0'-feltet.
+Broken_link=Ugyldig_link
+Change_table_column_and_General_fields_settings_to_use_the_new_feature=Endre_oppsett_for_tabellkollonner_og_generelle_felter_for_\u00E5_ta_i_bruk_den_nye_funksjonen
+Upgrade_old_external_file_links_to_use_the_new_feature=Oppgrader_gamle_eksterne_linker_for_\u00E5_bruke_den_nye_funksjonen
+Set_main_external_file_directory=Sett_hovedkatalog_for_eksterne_linker
+Do_not_show_these_options_in_the_future=Ikke_vis_disse_valgene_igjen
+File_directory=Filkatalog
+Autosetting_links=Setter_linker_automatisk
+Autoset_external_links=Sett_linker_automatisk
+Link_local_file=Link_til_lokal_fil
-External_file_links=
-Main_%0_directory=
-Synchronize_file_links=
-Upgrade_external_PDF/PS_links_to_use_the_'%0'_field.=
-Broken_link=
-Change_table_column_and_General_fields_settings_to_use_the_new_feature=
-Upgrade_old_external_file_links_to_use_the_new_feature=
-Set_main_external_file_directory=
-Do_not_show_these_options_in_the_future=
-File_directory=
-Autosetting_links=
-Autoset_external_links=
-Link_local_file=
+Searching_for_files=S\u00F8ker_etter_filer
-Searching_for_files=
+Could_not_open_link=Kunne_ikke_\u00E5pne_link
+The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Applikasjonen_'%0'_assosiert_med_filtypen_'%1'_kunne_ikke_startes.
-Could_not_open_link=
-The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=
-
-Native_file_dialog=
-Error:_=
-Beta_version=
+Native_file_dialog=System-fildialog
+Beta_version=Betaversjon
Do_not_write_the_following_fields_to_XMP_Metadata:=
MIS_Quarterly=MIS_Quarterly
-Use_default_viewer=
-Select_icon=
+Use_default_viewer=Bruk_standardprogram_for_filtypen
+Select_icon=Velg_ikon
-Copy_to_clipboard=
-Paste_from_clipboard=
-lower=
-UPPER=
-Upper_Each_First=
-Upper_first=
-Replace_comma_by_and_where_appropriate=
-%0_export_successful=
+Copy_to_clipboard=Kopier_til_utklippstavle
+Paste_from_clipboard=Lim_inn_fra_utklippstavle
+lower=sm\u00E5_bokstaver
+UPPER=STORE_BOKSTAVER
+Upper_Each_First=Stor_Forbokstav
+Upper_first=Stor_forbokstav_f\u00F8rst
+Replace_comma_by_and_where_appropriate=Bytt_ut_komma_med_'and'_der_det_passer
+%0_export_successful=%0-eksport_lyktes
+The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=Denne_versjonen_tilbyr_en_ny_m\u00E5te_\u00E5_h\u00E5ndtere_linker_til_eksterne_filer.<br>For_\u00E5_dra_nytte_av_dette_m\u00E5_linkene_dine_endres_til_det_nye_formatet,_og<br>JabRef_m\u00E5_konfigureres_for_\u00E5_vise_de_nye_linkene.
-The_current_version_features_a_new_way_of_handling_links_to_external_files.<br>To_take_advantage_of_this,_your_links_must_be_changed_into_the_new_format,_and<br>JabRef_must_be_configured_to_show_the_new_links.=
This_makes_JabRef_look_up_each_%0_extension_and_check_if_the_file_exists._If_not,_you_will_be_given_options<BR>to_resolve_the_problem.=
-You_have_changed_the_look_and_feel_setting._You_must_restart_JabRef_for_this_to_come_into_effect.=
-Warning:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message:_=
-Could_not_save_file._Character_encoding_'%0'_is_not_supported.=
-Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=
-Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=
-All_entries_of_this_type_will_be_declared_typeless._Continue?=
-Field_names_are_not_allowed_to_contain_white_space_or_the_following_characters=
-%0_entries_found._To_reduce_server_load,_abstracts_will_only_be_downloaded_for_searches_returning_%1_hits_or_less.=
-A_string_with_that_label_already_exists=
-Overwrite=
+You_have_changed_the_look_and_feel_setting._You_must_restart_JabRef_for_this_to_come_into_effect.=Du_har_endret_instillingen_for_utseende._Du_m\u00E5_starte_JabRef_p\u00E5_nytt_for_at_dette_skal_tre_i_kraft.
+Warning\:_could_not_complete_file_repair;_your_file_may_have_been_corrupted._Error_message=Advarsel:_kunne_ikke_fullf\u00F8re_reparasjon_av_filen;_filen_kan_v\u00e6re_\u00F8delagt._Feilmelding
+Could_not_save_file._Character_encoding_'%0'_is_not_supported.=Kunne_ikke_lagre_fil._Tegnkodingen_'%0'_er_ikke_st\u00F8ttet.
+Unable_to_open_link._The_application_'%0'_associated_with_the_file_type_'%1'_could_not_be_called.=Kan_ikke_\u00E5pne_link._Applikasjonen_'%0'_assosiert_med_filtypen_'%1'_kunne_ikke_kalles.
+Could_not_connect_to_Vim_server._Make_sure_that_Vim_is_running<BR>with_correct_server_name.=Kunne_ikke_koble_til_Vim-server._Sjekk_at_Vim_kj\u00F8rer<BR>med_riktig_servernavn.
+All_entries_of_this_type_will_be_declared_typeless._Continue?=Alle_enhetene_av_denne_typen_vil_bli_klassifisert_som_typel\u00F8se._Fortsette?
+Field_names_are_not_allowed_to_contain_white_space_or_the_following_characters=Feltnavn_kan_ikke_inneholde_opperom_eller_de_f\u00F8lgende_tegnene
+%0_entries_found._To_reduce_server_load,_abstracts_will_only_be_downloaded_for_searches_returning_%1_hits_or_less.=%0_enheter_funnet._For_\u00E5_redusere_belastningen_p\u00E5_serveren_vil_sammendrag_bare_bli_lastet_ned_for_s\u00F8k_som_returnerer_%1_eller_f\u00e6rre_treff.
+
+A_string_with_that_label_already_exists=Det_finnes_allerede_en_streng_med_det_navnet
+Overwrite=Skriv_over
+
+File_directory_is_not_set_or_does_not_exist!=Filkatalogen_er_ikke_satt_eller_eksisterer_ikke!
+File_directory_is_'%0':=Filkatalogen_er_'%0':
+Copy_files_to_file_directory.=Kopier_filer_til_filkatalog.
+Move_files_to_file_directory.=Flytt_filer_til_filkatalog.
+Copy_file_to_file_directory.=Kopier_fil_til_filkatalog.
+Move_file_to_file_directory=Flytt_fil_til_filkatalog.
+New_file_link_(INSERT)=Ny_link_(INSERT)
+Remove_file_link_(DELETE)=Slett_link_(DELETE)
+
+No_PDF_linked=Ingen_PDF_linket
+PDF_does_not_exist=PDF-filen_finnes_ikke
+Wrote_XMP-metadata=Skrev_XMP-metadata
+
+Error_writing_to_%0_file(s).=Feil_ved_skriving_til_%0_fil(er).
+Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=Fullf\u00F8rte_skriving_av_XMP-metadata._Skrev_til_%0_fil(er).
-File_directory_is_not_set_or_does_not_exist!=
-File_directory_is_'%0':=
-Copy_files_to_file_directory.=
-Move_files_to_file_directory.=
-Copy_file_to_file_directory.=
-Move_file_to_file_directory=
-New_file_link_(INSERT)=
-Remove_file_link_(DELETE)=
+You_have_entered_an_invalid_search_'%0'.=Ugyldig_s\u00F8keuttrykk_'%0'.
+One_or_more_file_links_are_of_the_type_'%0',_which_is_undefined._What_do_you_want_to_do?=En_eller_flere_linker_er_av_typen_'%0'_som_er_udefinert._Hva_vil_du_gj\u00F8re?
+Remove_link=Slett_link
-No_PDF_linked=
-PDF_does_not_exist=
-Wrote_XMP-metadata=
+Autolink_files_with_names_starting_with_the_BibTeX_key=Autolink_filer_med_navn_som_starter_med_BibTeX-n\u00F8kkelen
+Autolink_only_files_that_match_the_BibTeX_key=Autolink_bare_filer_med_navn_som_samsvarer_med_BibTeX-n\u00F8kkelen
-Error_writing_to_%0_file(s).=
-Finished_writing_XMP-metadata._Wrote_to_%0_file(s).=
+Error_converting_Bibtex_to_XMP\:_%0=Feil_ved_konvertering_av_BibTeX_til_XMP:_%0
-You_have_entered_an_invalid_search_'%0'.=
+Sort_order=Sortering
diff --git a/src/resource/Menu_de.properties b/src/resource/Menu_de.properties
index 30c6370..a72f6fa 100644
--- a/src/resource/Menu_de.properties
+++ b/src/resource/Menu_de.properties
@@ -95,6 +95,8 @@ Manage_custom_exports=&Verwalte_externe_Exportfilter
Manage_custom_imports=Verwalte_externe_&Importfilter
+Manage_journal_abbreviations=&Abk\u00fcrzungen_der_Zeitschriften_verwalten
+
Mark_entries=Eintr\u00E4ge_&markieren
# File menu
diff --git a/src/resource/Menu_du.properties b/src/resource/Menu_du.properties
index e16302d..cdb7611 100644
--- a/src/resource/Menu_du.properties
+++ b/src/resource/Menu_du.properties
@@ -95,6 +95,8 @@ Manage_custom_exports=Beheer_externe_exportfilters
Manage_custom_imports=Beheer_externe_importfilters
+Manage_journal_abbreviations=Beheer_tijdschrift_afkortingen
+
Mark_entries=Markeer_entries
# File menu
diff --git a/src/resource/Menu_en.properties b/src/resource/Menu_en.properties
index 84d1c63..8253edc 100644
--- a/src/resource/Menu_en.properties
+++ b/src/resource/Menu_en.properties
@@ -51,6 +51,7 @@ Load_session=Loa&d_session
Manage_content_selectors=Manage_&content_selectors
Manage_custom_exports=&Manage_custom_exports
Manage_custom_imports=Manage_custom_&imports
+Manage_journal_abbreviations=Manage_&journal_abbreviations
Mark_entries=&Mark_entries
# File menu
New_database=&New_database
diff --git a/src/resource/Menu_es.properties b/src/resource/Menu_es.properties
index 581a29e..5ff035c 100644
--- a/src/resource/Menu_es.properties
+++ b/src/resource/Menu_es.properties
@@ -51,6 +51,7 @@ Load_session=Ca&rgar_sesión
Manage_content_selectors=Administrar_selectores_de_&contenido
Manage_custom_exports=Administrar_&exportaciones_personalizadas
Manage_custom_imports=Administrar_&importaciones_personalizadas
+
Mark_entries=&Marcar_registros
# File menu
New_database=&Nueva_base_de_datos
@@ -121,3 +122,5 @@ Upgrade_external_links=Actualizar_vínculos_externos
Manage_external_file_types=Administrar_tipos_de_archivo_externos
Open_file=Abrir_archivo
+
+Manage_journal_abbreviations=
\ No newline at end of file
diff --git a/src/resource/Menu_fr.properties b/src/resource/Menu_fr.properties
index d77e5fc..57ce93b 100644
--- a/src/resource/Menu_fr.properties
+++ b/src/resource/Menu_fr.properties
@@ -47,6 +47,7 @@ Load_session=&Charger_session
Manage_content_selectors=&G\u00E9rer_les_s\u00E9lecteurs_de_contenu
Manage_custom_exports=&G\u00E9rer_les_exportations_personnalis\u00E9es
Manage_custom_imports=G\u00E9rer_les_&importations_personnalis\u00E9es
+Manage_journal_abbreviations=G\u00e9rer_les_abr\u00e9viations_de_journaux
Mark_entries=Etiqueter_des_&entr\u00E9es
New_database=&Nouvelle_base
New_entry=N&ouvelle_entr\u00E9e
diff --git a/src/resource/Menu_it.properties b/src/resource/Menu_it.properties
index 1512043..aa488ed 100644
--- a/src/resource/Menu_it.properties
+++ b/src/resource/Menu_it.properties
@@ -51,6 +51,7 @@ Load_session=&Carica_sessione
Manage_content_selectors=&Gestione_dei_selettori_di_contenuti
Manage_custom_exports=&Gestione_delle_esportazioni_personalizzate
Manage_custom_imports=Gestione_delle_&importazioni_personalizzate
+Manage_journal_abbreviations=Gestione_delle_&abbreviazioni_delle_riviste
Mark_entries=E&videnzia
# File menu
New_database=&Nuovo_database
diff --git a/src/resource/Menu_no.properties b/src/resource/Menu_no.properties
index db843df..7ac43b8 100644
--- a/src/resource/Menu_no.properties
+++ b/src/resource/Menu_no.properties
@@ -30,7 +30,6 @@ Fetch_Medline=Hent_&Medline
# Menu names
File=&Fil
-Find_And_Fix=
Find_and_remove_exact_duplicates=&Finn_og_fjern_eksakte_duplikater
Find_duplicates=S\u00F8k_etter_&duplikater
Help=&Hjelp
@@ -49,7 +48,7 @@ JabRef_help=JabRef-&hjelp
Load_session=&Gjenopprett_tilstand
Manage_content_selectors=Sett_opp_&ordvelgere
Manage_custom_exports=&Sett_opp_eksterne_eksportfiltre
-Manage_custom_imports=Sett_opp_eksterne_importfiltre
+Manage_custom_imports=Sett_opp_eksterne_&importfiltre
Mark_entries=&Merk_enheter
# File menu
New_database=&Ny_database
@@ -82,7 +81,7 @@ Search_IEEEXplore=Hent_IEEEXplore
Select_all=&Velg_alle
Set_up_general_fields=Sett_opp_&generelle_felter
Show_error_console=Vis_feilkonsoll
-Sort_tabs=
+Sort_tabs=Sorter_tabs
Switch_preview_layout=&Skift_layout_p\u00E5_forh\u00E5ndsvisning
Synchronize_PDF_links=Synkroniser_PDF-lenker
Synchronize_PS_links=Synkroniser_PS-lenker
@@ -104,16 +103,18 @@ Import_into_current_database=Importer_til_den_aktive_databasen
Scan_database...=&Unders\u00F8k_database
-Push_entries_to_external_application_(%0)=
-Write_XMP-metadata_to_PDFs=
+Push_entries_to_external_application_(%0)=Send_enheter_til_ekstern_applikasjon_(%0)
+Write_XMP-metadata_to_PDFs=Skriv_XMP-metadata_til_PDF-filer
Set/clear_fields=Sett/fjern_felter
Export_selected_entries=Eksporter_valgte_enheter
Fetch_ArXiv.org=Hent_ArXiv.org
Sessions=Tilstander
-Save_all=
+Save_all=Lagre_alle
-Upgrade_external_links=
-Manage_external_file_types=
+Upgrade_external_links=&Oppgrader_eksterne_linker
+Manage_external_file_types=Sett_opp_eksterne_&filtyper
-Open_file=
+Open_file=\u00C5pne_fil
+
+Manage_journal_abbreviations=Sett_opp_&journalforkortelser
\ No newline at end of file
diff --git a/src/resource/build.properties b/src/resource/build.properties
index 197bc59..c5262ed 100644
--- a/src/resource/build.properties
+++ b/src/resource/build.properties
@@ -1,3 +1,3 @@
-builddate=October 6 2007
-build=196
-version=2.3b3
\ No newline at end of file
+builddate=November 8 2007
+build=319
+version=2.3
\ No newline at end of file
diff --git a/src/resource/build.properties.orig b/src/resource/build.properties.orig
deleted file mode 100644
index c2c91e1..0000000
--- a/src/resource/build.properties.orig
+++ /dev/null
@@ -1,3 +0,0 @@
-builddate=October 6 2007
-build=195
-version=2.3b3
\ No newline at end of file
diff --git a/src/txt/README b/src/txt/README
index 66a1b1b..f395f52 100644
--- a/src/txt/README
+++ b/src/txt/README
@@ -1,6 +1,6 @@
-JabRef 2.3b3
-------------
+JabRef 2.3
+----------
Introduction:
@@ -80,6 +80,17 @@ appear in your chosen languages.
Change log:
+2.3
+ - Added handling of unknown file types when synchronizing the file field.
+ - Changed the way customized external file types are stored. Types are now stored in a
+ way analogous to a diff from the default types. This allows default types added in later
+ versions to appear immediately, even if the user has customized the list.
+ - Moved file preferences from General tab to new File tab.
+ - Reduced horizontal size of preferences dialog.
+ - Fixed handling of quotes when using the "abbr" modifier for key generator (Debian bug
+ #448917).
+ - Download file procedure now strips query string in order to find correct file extension
+ (Debian bug #448027).
2.3b3
- Export formats that output the character encoding now use common names for encodings
instead of Java-specific names.
diff --git a/src/txt/TODO b/src/txt/TODO
deleted file mode 100644
index 10a1837..0000000
--- a/src/txt/TODO
+++ /dev/null
@@ -1,41 +0,0 @@
-
-Chris:
-------
- * Think about synchronizing XMP.
- * Document data schema used (BibteXmp)
- * Add build.xml target to export standalone XMPUtil for the CLI.
- * Plugin-Architecture for LayoutFormatters.
- * Allow search relativ to bibtex-file
-
-Morten:
-* [POSTPONE] Strange bug: when editing a field in entry editor, then clicking an entry of different type
- in the table, current entry is stored, but the selection drops back to the first entry.
-* [MADE WORKAROUND] Native FileDialog does not work for selecting a directory.
- - workaround is to autodisable native file dialog for dir selection.
-
-* [DONE?] Usability of FileListEditor. Paste functionality.
-* [OK? Extension fields only] MODS exports "file" in raw form.
-
-* [POSTPONE] Look into "DOS short path" bug report.
-* [POSTPONE] Problem setting today with Microba calendar.
-* [POSTPONE] Icon selection for external file types: - select arbitrary images from disk?
-* Improve Help information for external file links
-* [POSTPONE] Add "Copy all externally linked files for this set of entries"-feature.
- Basic functionality in AccessLinksForEntries.
-* [POSTPONE] Fix Save/Export file dialog stuff
-* [POSTPONE] Look up Vista problem with opening file chooser:
- Exception in thread "AWT-EventQueue-0" java.lang.ArrayIndexOutOfBoundsException:
- 3184
- at sun.awt.shell.Win32ShellFolder2.getFileChooserIcon(Unknown Source)
- at sun.awt.shell.Win32ShellFolderManager2.get(Unknown Source)
- at sun.awt.shell.ShellFolder.get(Unknown Source)
- at com.sun.java.swing.plaf.windows.WindowsLookAndFeel$LazyWindowsIcon.createVal
- ue(Unknown Source)
- at javax.swing.UIDefaults.getFromHashtable(Unknown Source)
- at javax.swing.UIDefaults.get(Unknown Source)
- at javax.swing.MultiUIDefaults.get(Unknown Source)
- at javax.swing.UIDefaults.getIcon(Unknown Source)
- at javax.swing.UIManager.getIcon(Unknown Source)
- at javax.swing.plaf.basic.BasicFileChooserUI.installIcons(Unknown Source)
-
-
--
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