[jabref] 124/459: [svn-upgrade] Integrating new upstream version, jabref (2.3.1)

gregor herrmann gregoa at debian.org
Thu Sep 15 20:39:58 UTC 2016


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

gregoa pushed a commit to branch master
in repository jabref.

commit ef93f30ad0eb00e20dfee9f62d7ee22bb0ab784a
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Nov 30 13:12:30 2007 +0000

    [svn-upgrade] Integrating new upstream version, jabref (2.3.1)
---
 MEDLINE_FIX.patch                                |  53 +++
 build.number                                     |   4 +-
 build.xml                                        |  36 +-
 hs_err_pid7783.log                               | 413 +++++++++++++++++++++++
 src/help/About.html                              |   2 +-
 src/help/BaseFrameHelp.html                      |   6 +-
 src/help/BibtexHelp.html                         | 164 ++++-----
 src/help/CiteSeerHelp.html                       |   6 +-
 src/help/CommandLine.html                        |   2 +-
 src/help/ContentSelectorHelp.html                |   2 +-
 src/help/Contents.html                           |  58 ++--
 src/help/CustomEntriesHelp.html                  |   2 +-
 src/help/CustomExports.html                      |  20 +-
 src/help/CustomImports.html                      |  14 +-
 src/help/EndNoteFilters.html                     |   2 +-
 src/help/EntryEditorHelp.html                    |   2 +-
 src/help/ExternalFiles.html                      |   2 +-
 src/help/FileLinks.html                          |   2 +-
 src/help/GeneralFields.html                      |   6 +-
 src/help/GroupsHelp.html                         |   2 +-
 src/help/HelpHelp.html                           |   2 +-
 src/help/IEEEXploreHelp.html                     |   2 +-
 src/help/ImportInspectionDialog.html             |   2 +-
 src/help/JabRefHelp.html                         |   2 +-
 src/help/JournalAbbreviations.html               |   2 +-
 src/help/LabelPatterns.html                      |  62 ++--
 src/help/MarkingHelp.html                        |   2 +-
 src/help/MedlineHelp.html                        |   2 +-
 src/help/OpenOfficeHelp.html                     |   2 +-
 src/help/OwnerHelp.html                          |   2 +-
 src/help/PreviewHelp.html                        |   2 +-
 src/help/RemoteHelp.html                         |   2 +-
 src/help/SearchHelp.html                         |   2 +-
 src/help/ShortAuxImport.html                     |   2 +-
 src/help/ShortIntegrityCheck.html                |   4 +-
 src/help/ShortPlainImport.html                   |   4 +-
 src/help/StringEditorHelp.html                   |   2 +-
 src/help/TimeStampHelp.html                      |   2 +-
 src/help/XMPHelp.html                            |  14 +-
 src/help/de/About.html                           |   2 +-
 src/help/de/BaseFrameHelp.html                   |   2 +-
 src/help/de/BibtexHelp.html                      | 126 +++----
 src/help/de/CiteSeerHelp.html                    |   8 +-
 src/help/de/CommandLine.html                     |   2 +-
 src/help/de/ContentSelectorHelp.html             |   2 +-
 src/help/de/Contents.html                        |  60 ++--
 src/help/de/CustomEntriesHelp.html               |   2 +-
 src/help/de/CustomExports.html                   |  20 +-
 src/help/de/CustomImports.html                   |   2 +-
 src/help/de/EndNoteFilters.html                  |   2 +-
 src/help/de/EntryEditorHelp.html                 |   2 +-
 src/help/de/ExternalFiles.html                   |   2 +-
 src/help/de/FileLinks.html                       |   2 +-
 src/help/de/GeneralFields.html                   |   4 +-
 src/help/de/GroupsHelp.html                      |   2 +-
 src/help/de/HelpHelp.html                        |   2 +-
 src/help/de/IEEEXploreHelp.html                  |   2 +-
 src/help/de/ImportInspectionDialog.html          |   2 +-
 src/help/de/JabRefHelp.html                      |   2 +-
 src/help/de/JournalAbbreviations.html            |   2 +-
 src/help/de/LabelPatterns.html                   |  58 ++--
 src/help/de/MarkingHelp.html                     |   2 +-
 src/help/de/MedlineHelp.html                     |   4 +-
 src/help/de/OpenOfficeHelp.html                  |   2 +-
 src/help/de/OwnerHelp.html                       |   2 +-
 src/help/de/PreviewHelp.html                     |   2 +-
 src/help/de/RemoteHelp.html                      |   2 +-
 src/help/de/SearchHelp.html                      |   2 +-
 src/help/de/ShortAuxImport.html                  |   2 +-
 src/help/de/ShortIntegrityCheck.html             |   2 +-
 src/help/de/ShortPlainImport.html                |   2 +-
 src/help/de/StringEditorHelp.html                |   2 +-
 src/help/de/TimeStampHelp.html                   |   2 +-
 src/help/de/XMPHelp.html                         |  14 +-
 src/help/fr/About.html                           |   2 +-
 src/help/fr/BaseFrameHelp.html                   |   6 +-
 src/help/fr/BibtexHelp.html                      | 162 ++++-----
 src/help/fr/CiteSeerHelp.html                    |   6 +-
 src/help/fr/CommandLine.html                     |   2 +-
 src/help/fr/ContentSelectorHelp.html             |   2 +-
 src/help/fr/Contents.html                        |  56 +--
 src/help/fr/CustomEntriesHelp.html               |   2 +-
 src/help/fr/CustomExports.html                   |  20 +-
 src/help/fr/CustomImports.html                   |   2 +-
 src/help/fr/EndNoteFilters.html                  |   2 +-
 src/help/fr/EntryEditorHelp.html                 |   2 +-
 src/help/fr/ExternalFiles.html                   |   2 +-
 src/help/fr/FileLinks.html                       |   2 +-
 src/help/fr/GeneralFields.html                   |   4 +-
 src/help/fr/GroupsHelp.html                      |   2 +-
 src/help/fr/HelpHelp.html                        |   2 +-
 src/help/fr/IEEEXploreHelp.html                  |   2 +-
 src/help/fr/ImportInspectionDialog.html          |   2 +-
 src/help/fr/JabRefHelp.html                      |   2 +-
 src/help/fr/JournalAbbreviations.html            |   2 +-
 src/help/fr/LabelPatterns.html                   |  60 ++--
 src/help/fr/MarkingHelp.html                     |   2 +-
 src/help/fr/MedlineHelp.html                     |   6 +-
 src/help/fr/OpenOfficeHelp.html                  |   2 +-
 src/help/fr/OwnerHelp.html                       |   2 +-
 src/help/fr/PreviewHelp.html                     |   2 +-
 src/help/fr/RemoteHelp.html                      |   2 +-
 src/help/fr/SearchHelp.html                      |   2 +-
 src/help/fr/ShortAuxImport.html                  |   2 +-
 src/help/fr/ShortIntegrityCheck.html             |   2 +-
 src/help/fr/ShortPlainImport.html                |   2 +-
 src/help/fr/StringEditorHelp.html                |   2 +-
 src/help/fr/TimeStampHelp.html                   |   2 +-
 src/help/fr/XMPHelp.html                         |  14 +-
 src/java/net/sf/jabref/JabRef.java               |   3 +-
 src/java/net/sf/jabref/JabRefFrame.java          |  28 +-
 src/java/net/sf/jabref/JabRefPreferences.java    |   4 +-
 src/java/net/sf/jabref/Util.java                 |  11 +-
 src/resource/build.properties                    |   6 +-
 src/txt/README                                   |   9 +-
 src/windows/nsis/installer_languages/english.nsh |   6 +-
 src/windows/nsis/installer_languages/french.nsh  |  10 +-
 src/windows/nsis/installer_languages/german.nsh  |   6 +-
 src/windows/nsis/installer_languages/italian.nsh |  10 +-
 src/windows/nsis/launcher.nsi                    |   1 +
 src/windows/nsis/setup.nsi                       | 144 +++++---
 121 files changed, 1214 insertions(+), 670 deletions(-)

diff --git a/MEDLINE_FIX.patch b/MEDLINE_FIX.patch
new file mode 100644
index 0000000..4cbbbe4
--- /dev/null
+++ b/MEDLINE_FIX.patch
@@ -0,0 +1,53 @@
+Index: JabRefFrame.java
+===================================================================
+--- JabRefFrame.java	(revision 2498)
++++ JabRefFrame.java	(working copy)
+@@ -1513,7 +1513,7 @@
+ 
+   /**
+    * This method causes all open BasePanels to set up their tables
+-   * anew. When called from PrefsDialog2, this updates to the new
++   * anew. When called from PrefsDialog3, this updates to the new
+    * settings.
+    */
+   public void setupAllTables() {
+@@ -1947,21 +1947,28 @@
+    * @param openInNew Should the entries be imported into a new database?
+    * @param callBack The callback for the ImportInspectionDialog to use.
+    */
+-  public void addImportedEntries(final BasePanel panel, final List<BibtexEntry> entries, String filename, boolean openInNew,
+-                                 ImportInspectionDialog.CallBack callBack) {
++  public void addImportedEntries(final BasePanel panel, final List<BibtexEntry> entries, String filename,
++                                 final boolean openInNew,
++                                 final ImportInspectionDialog.CallBack callBack) {
+       // Use the import inspection dialog if it is enabled in preferences, and (there are more than
+       // one entry or the inspection dialog is also enabled for single entries):
+       if (Globals.prefs.getBoolean("useImportInspectionDialog") &&
+               (Globals.prefs.getBoolean("useImportInspectionDialogForSingle") || (entries.size() > 1))) {
+-                ImportInspectionDialog diag = new ImportInspectionDialog(ths, panel,
+-                        BibtexFields.DEFAULT_INSPECTION_FIELDS,
+-                        Globals.lang("Import"), openInNew);
+-                diag.addEntries(entries);
+-                diag.addCallBack(callBack);
+-                diag.entryListComplete();
+-                Util.placeDialog(diag, ths);
+-                diag.setVisible(true);
+-        diag.toFront();
++
++          SwingUtilities.invokeLater(new Runnable() {
++              public void run() {
++                  ImportInspectionDialog diag = new ImportInspectionDialog(ths, panel,
++                          BibtexFields.DEFAULT_INSPECTION_FIELDS,
++                          Globals.lang("Import"), openInNew);
++                  diag.addEntries(entries);
++                  diag.addCallBack(callBack);
++                  diag.entryListComplete();
++                  Util.placeDialog(diag, ths);
++                  diag.setVisible(true);
++                  diag.toFront();
++              }
++          });
++
+         } else {
+             ths.addBibEntries(entries, filename, openInNew);
+           if ((panel != null) && (entries.size() == 1)) {
diff --git a/build.number b/build.number
index 0cddc37..c2d87c6 100644
--- a/build.number
+++ b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Thu Nov 08 16:55:08 CET 2007
-build.number=320
+#Thu Nov 29 09:31:57 GMT 2007
+build.number=336
diff --git a/build.xml b/build.xml
index 4855062..90b4947 100644
--- a/build.xml
+++ b/build.xml
@@ -47,7 +47,7 @@
      ========================================================================================== -->
 
 	<!-- some version information -->
-	<property name="jabref.version" value="2.3" />
+	<property name="jabref.version" value="2.3.1" />
 	<property name="jabref.placeholder.version" value="@version@" />
 	<!-- used by replace task -->
 
@@ -89,6 +89,7 @@
 	<property name="library.directory" value="lib" />
 
 <!--    <property name="nsis.executable" value="makensis.exe"/> -->
+	<property name="nsis.executable.linux" value="makensis"/>
 
 	<!-- Load user dependent properties -->
 	<!-- For instance to redefine the NSIS-compiler write 
@@ -429,6 +430,39 @@ version=${jabref.version}</echo>
 		
 	</target>
 
+	<target name="win.installer.linux" description="Copy files in place to be used by the installer" depends="jars">
+
+		<!-- Gather everything that will go into the installer in dist -->
+		<mkdir dir="${win.installer.dir}/dist" />
+
+		<copy file="${build.lib}/${build.jar}" todir="${win.installer.dir}/dist" />
+
+		<available property="win.installer.jar.available" file="${win.installer.dir}/dist/${build.jar}" />
+
+		<fail unless="win.installer.jar.available" message="Did not find jar: ${build.jar}" />
+
+		<copy todir="${win.installer.dir}/dist">
+			<fileset dir="${txt.dir}">
+				<include name="gpl.txt" />
+				<include name="lesser.txt" />
+				<include name="README" />
+			</fileset>
+		</copy>
+
+		<!-- "Create Exe-Wrapper" -->
+		<exec dir="." executable="${nsis.executable.linux}" failonerror="true">
+		  <arg line="'-DJARFILE=${build.jar}' '-DVERSION=${jabref.version}' '-DAPPICON=../../../${images.dir}/JabRef.ico' ${win.installer.dir}/launcher.nsi" />
+		</exec>
+
+		<!-- Finally create Windows-Installer -->
+		<exec dir="." executable="${nsis.executable.linux}" failonerror="true">
+			<arg line="'-DVERSION=${jabref.version}' ${win.installer.dir}/setup.nsi" />
+		</exec>
+
+		<delete dir="${win.installer.dir}/dist" />
+
+	</target>
+
 	<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
         What's about the software design ?!;-)
     ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
diff --git a/hs_err_pid7783.log b/hs_err_pid7783.log
new file mode 100644
index 0000000..ebdeae5
--- /dev/null
+++ b/hs_err_pid7783.log
@@ -0,0 +1,413 @@
+#
+# An unexpected error has been detected by Java Runtime Environment:
+#
+#  SIGSEGV (0xb) at pc=0x0634fa37, pid=7783, tid=3084979088
+#
+# Java VM: Java HotSpot(TM) Client VM (1.6.0_03-b05 mixed mode, sharing)
+# Problematic frame:
+# V  [libjvm.so+0x34fa37]
+#
+# If you would like to submit a bug report, please visit:
+#   http://java.sun.com/webapps/bugreport/crash.jsp
+#
+
+---------------  T H R E A D  ---------------
+
+Current thread (0x08058800):  JavaThread "main" [_thread_in_vm, id=7784]
+
+siginfo:si_signo=11, si_errno=0, si_code=1, si_addr=0x0101646e
+
+Registers:
+EAX=0x0101646e, EBX=0xb7e0f0f0, ECX=0x00000028, EDX=0x00000000
+ESP=0xb7e0f0b0, EBP=0xb7e0f0b8, ESI=0x080588dc, EDI=0xb7e0f170
+EIP=0x0634fa37, CR2=0x0101646e, EFLAGS=0x00010202
+
+Top of Stack: (sp=0xb7e0f0b0)
+0xb7e0f0b0:   b7e0f0f0 b7e0f0f0 b7e0f0d8 0634fdf0
+0xb7e0f0c0:   b7e0f0f0 00000028 00000000 00000042
+0xb7e0f0d0:   00000000 b7e0f0f0 b7e0f118 061c9d99
+0xb7e0f0e0:   b7e0f0f0 08059100 00000005 94be5768
+0xb7e0f0f0:   064204a8 08059100 00000000 00000000
+0xb7e0f100:   00000063 00000000 00000000 080590fc
+0xb7e0f110:   94c61628 01016464 b7e0f1c8 06200039
+0xb7e0f120:   b7e0f170 08059100 b5d509d4 b5d509d4 
+
+Instructions: (pc=0x0634fa37)
+0x0634fa27:   08 0f be 4d 0c 8b 43 04 8b 53 08 8b 00 83 c0 0a
+0x0634fa37:   0f be 04 02 39 c8 74 1d 51 68 cc 9e 40 06 6a 2c 
+
+Stack: [0xb7dc0000,0xb7e11000),  sp=0xb7e0f0b0,  free space=316k
+Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
+V  [libjvm.so+0x34fa37]
+V  [libjvm.so+0x34fdf0]
+V  [libjvm.so+0x1c9d99]
+V  [libjvm.so+0x200039]
+j  java.awt.datatransfer.SystemFlavorMap$1.run()Ljava/lang/Object;+63
+v  ~StubRoutines::call_stub
+V  [libjvm.so+0x20bc6d]
+V  [libjvm.so+0x30a828]
+V  [libjvm.so+0x20bb00]
+V  [libjvm.so+0x2619bb]
+C  [libjava.so+0xa96d]  Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2+0x3d
+j  java.security.AccessController.doPrivileged(Ljava/security/PrivilegedAction;)Ljava/lang/Object;+0
+j  java.awt.datatransfer.SystemFlavorMap.<init>()V+67
+j  java.awt.datatransfer.SystemFlavorMap.getDefaultFlavorMap()Ljava/awt/datatransfer/FlavorMap;+40
+j  java.awt.dnd.DropTarget.<init>(Ljava/awt/Component;ILjava/awt/dnd/DropTargetListener;ZLjava/awt/datatransfer/FlavorMap;)V+23
+j  java.awt.dnd.DropTarget.<init>(Ljava/awt/Component;ILjava/awt/dnd/DropTargetListener;Z)V+7
+j  java.awt.dnd.DropTarget.<init>(Ljava/awt/Component;ILjava/awt/dnd/DropTargetListener;)V+5
+j  javax.swing.TransferHandler$SwingDropTarget.<init>(Ljava/awt/Component;)V+5
+j  javax.swing.SwingUtilities.installSwingDropTargetAsNecessary(Ljava/awt/Component;Ljavax/swing/TransferHandler;)V+46
+j  javax.swing.JComponent.setTransferHandler(Ljavax/swing/TransferHandler;)V+21
+j  javax.swing.plaf.basic.BasicTextUI.installDefaults2()V+157
+j  javax.swing.plaf.basic.BasicTextUI.installUI(Ljavax/swing/JComponent;)V+20
+j  javax.swing.plaf.basic.BasicEditorPaneUI.installUI(Ljavax/swing/JComponent;)V+2
+j  javax.swing.plaf.basic.BasicTextPaneUI.installUI(Ljavax/swing/JComponent;)V+2
+j  javax.swing.JComponent.setUI(Ljavax/swing/plaf/ComponentUI;)V+135
+j  javax.swing.text.JTextComponent.setUI(Ljavax/swing/plaf/TextUI;)V+2
+j  javax.swing.text.JTextComponent.updateUI()V+8
+j  javax.swing.text.JTextComponent.<init>()V+62
+j  javax.swing.JEditorPane.<init>()V+1
+j  javax.swing.JTextPane.<init>()V+1
+j  net.sf.jabref.HelpContent.<init>(Lnet/sf/jabref/JabRefPreferences;)V+1
+j  net.sf.jabref.HelpDialog.<init>(Lnet/sf/jabref/JabRefFrame;)V+61
+j  net.sf.jabref.JabRefFrame.<init>()V+190
+j  net.sf.jabref.JabRef.openWindow(Ljava/util/Vector;)V+745
+j  net.sf.jabref.JabRef.<init>([Ljava/lang/String;)V+191
+j  net.sf.jabref.JabRef.main([Ljava/lang/String;)V+5
+v  ~StubRoutines::call_stub
+V  [libjvm.so+0x20bc6d]
+V  [libjvm.so+0x30a828]
+V  [libjvm.so+0x20bb00]
+V  [libjvm.so+0x33156f]
+V  [libjvm.so+0x333f6c]
+V  [libjvm.so+0x277c28]
+C  [libjava.so+0x15224]  Java_sun_reflect_NativeMethodAccessorImpl_invoke0+0x34
+j  sun.reflect.NativeMethodAccessorImpl.invoke0(Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+0
+j  sun.reflect.NativeMethodAccessorImpl.invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+87
+j  sun.reflect.DelegatingMethodAccessorImpl.invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+6
+j  java.lang.reflect.Method.invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+161
+j  net.sf.jabref.JabRefMain.main([Ljava/lang/String;)V+157
+v  ~StubRoutines::call_stub
+V  [libjvm.so+0x20bc6d]
+V  [libjvm.so+0x30a828]
+V  [libjvm.so+0x20bb00]
+V  [libjvm.so+0x234f26]
+V  [libjvm.so+0x2265cb]
+C  [java+0x1b98]  JavaMain+0x2c8
+C  [libpthread.so.0+0x546b]
+
+Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
+j  java.awt.datatransfer.SystemFlavorMap$1.run()Ljava/lang/Object;+63
+v  ~StubRoutines::call_stub
+j  java.security.AccessController.doPrivileged(Ljava/security/PrivilegedAction;)Ljava/lang/Object;+0
+j  java.awt.datatransfer.SystemFlavorMap.<init>()V+67
+j  java.awt.datatransfer.SystemFlavorMap.getDefaultFlavorMap()Ljava/awt/datatransfer/FlavorMap;+40
+j  java.awt.dnd.DropTarget.<init>(Ljava/awt/Component;ILjava/awt/dnd/DropTargetListener;ZLjava/awt/datatransfer/FlavorMap;)V+23
+j  java.awt.dnd.DropTarget.<init>(Ljava/awt/Component;ILjava/awt/dnd/DropTargetListener;Z)V+7
+j  java.awt.dnd.DropTarget.<init>(Ljava/awt/Component;ILjava/awt/dnd/DropTargetListener;)V+5
+j  javax.swing.TransferHandler$SwingDropTarget.<init>(Ljava/awt/Component;)V+5
+j  javax.swing.SwingUtilities.installSwingDropTargetAsNecessary(Ljava/awt/Component;Ljavax/swing/TransferHandler;)V+46
+j  javax.swing.JComponent.setTransferHandler(Ljavax/swing/TransferHandler;)V+21
+j  javax.swing.plaf.basic.BasicTextUI.installDefaults2()V+157
+j  javax.swing.plaf.basic.BasicTextUI.installUI(Ljavax/swing/JComponent;)V+20
+j  javax.swing.plaf.basic.BasicEditorPaneUI.installUI(Ljavax/swing/JComponent;)V+2
+j  javax.swing.plaf.basic.BasicTextPaneUI.installUI(Ljavax/swing/JComponent;)V+2
+j  javax.swing.JComponent.setUI(Ljavax/swing/plaf/ComponentUI;)V+135
+j  javax.swing.text.JTextComponent.setUI(Ljavax/swing/plaf/TextUI;)V+2
+j  javax.swing.text.JTextComponent.updateUI()V+8
+j  javax.swing.text.JTextComponent.<init>()V+62
+j  javax.swing.JEditorPane.<init>()V+1
+j  javax.swing.JTextPane.<init>()V+1
+j  net.sf.jabref.HelpContent.<init>(Lnet/sf/jabref/JabRefPreferences;)V+1
+j  net.sf.jabref.HelpDialog.<init>(Lnet/sf/jabref/JabRefFrame;)V+61
+j  net.sf.jabref.JabRefFrame.<init>()V+190
+j  net.sf.jabref.JabRef.openWindow(Ljava/util/Vector;)V+745
+j  net.sf.jabref.JabRef.<init>([Ljava/lang/String;)V+191
+j  net.sf.jabref.JabRef.main([Ljava/lang/String;)V+5
+v  ~StubRoutines::call_stub
+j  sun.reflect.NativeMethodAccessorImpl.invoke0(Ljava/lang/reflect/Method;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+0
+j  sun.reflect.NativeMethodAccessorImpl.invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+87
+j  sun.reflect.DelegatingMethodAccessorImpl.invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+6
+j  java.lang.reflect.Method.invoke(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;+161
+j  net.sf.jabref.JabRefMain.main([Ljava/lang/String;)V+157
+v  ~StubRoutines::call_stub
+
+---------------  P R O C E S S  ---------------
+
+Java Threads: ( => current thread )
+  0x08374c00 JavaThread "Image Fetcher 2" daemon [_thread_blocked, id=7800]
+  0x0836c800 JavaThread "Image Fetcher 1" daemon [_thread_blocked, id=7799]
+  0x08367400 JavaThread "AWT-EventQueue-0" [_thread_blocked, id=7798]
+  0x08364000 JavaThread "AWT-Shutdown" [_thread_blocked, id=7797]
+  0x08343000 JavaThread "Image Fetcher 0" daemon [_thread_blocked, id=7796]
+  0x0832b000 JavaThread "AWT-XAWT" daemon [_thread_in_native, id=7795]
+  0x082eb000 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=7794]
+  0x082db000 JavaThread "Thread-2" [_thread_blocked, id=7793]
+  0x082a5c00 JavaThread "Timer-0" daemon [_thread_blocked, id=7792]
+  0x0808d800 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=7790]
+  0x0808c000 JavaThread "CompilerThread0" daemon [_thread_blocked, id=7789]
+  0x0808ac00 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=7788]
+  0x08081c00 JavaThread "Finalizer" daemon [_thread_blocked, id=7787]
+  0x08080800 JavaThread "Reference Handler" daemon [_thread_blocked, id=7786]
+=>0x08058800 JavaThread "main" [_thread_in_vm, id=7784]
+
+Other Threads:
+  0x0807f400 VMThread [id=7785]
+  0x0808f400 WatcherThread [id=7791]
+
+VM state:not at safepoint (normal execution)
+
+VM Mutex/Monitor currently owned by a thread: None
+
+Heap
+ def new generation   total 960K, used 536K [0x8c0a0000, 0x8c1a0000, 0x8c580000)
+  eden space 896K,  56% used [0x8c0a0000, 0x8c11d9a8, 0x8c180000)
+  from space 64K,  53% used [0x8c180000, 0x8c1889c8, 0x8c190000)
+  to   space 64K,   0% used [0x8c190000, 0x8c190000, 0x8c1a0000)
+ tenured generation   total 4096K, used 2630K [0x8c580000, 0x8c980000, 0x900a0000)
+   the space 4096K,  64% used [0x8c580000, 0x8c811848, 0x8c811a00, 0x8c980000)
+ compacting perm gen  total 12288K, used 2751K [0x900a0000, 0x90ca0000, 0x940a0000)
+   the space 12288K,  22% used [0x900a0000, 0x9034fe18, 0x90350000, 0x90ca0000)
+    ro space 8192K,  73% used [0x940a0000, 0x94682560, 0x94682600, 0x948a0000)
+    rw space 12288K,  58% used [0x948a0000, 0x94f97448, 0x94f97600, 0x954a0000)
+
+Dynamic libraries:
+06000000-06417000 r-xp 00000000 08:03 4524503    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/client/libjvm.so
+06417000-06430000 rwxp 00417000 08:03 4524503    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/client/libjvm.so
+06430000-0684f000 rwxp 06430000 00:00 0 
+08048000-08052000 r-xp 00000000 08:03 4524480    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/bin/java
+08052000-08053000 rwxp 00009000 08:03 4524480    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/bin/java
+08053000-083de000 rwxp 08053000 00:00 0          [heap]
+8c0a0000-8c1a0000 rwxp 8c0a0000 00:00 0 
+8c1a0000-8c580000 rwxp 8c1a0000 00:00 0 
+8c580000-8c980000 rwxp 8c580000 00:00 0 
+8c980000-900a0000 rwxp 8c980000 00:00 0 
+900a0000-90ca0000 rwxp 900a0000 00:00 0 
+90ca0000-940a0000 rwxp 90ca0000 00:00 0 
+940a0000-94683000 r-xs 00001000 08:03 576285     /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/client/classes.jsa
+94683000-948a0000 rwxp 94683000 00:00 0 
+948a0000-94f98000 rwxp 005e4000 08:03 576285     /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/client/classes.jsa
+94f98000-954a0000 rwxp 94f98000 00:00 0 
+954a0000-95579000 rwxp 00cdc000 08:03 576285     /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/client/classes.jsa
+95579000-958a0000 rwxp 95579000 00:00 0 
+958a0000-958a4000 r-xs 00db5000 08:03 576285     /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/client/classes.jsa
+958a4000-95ca0000 rwxp 958a4000 00:00 0 
+b4f13000-b4f16000 ---p b4f13000 00:00 0 
+b4f16000-b4f64000 rwxp b4f16000 00:00 0 
+b4f64000-b4f67000 ---p b4f64000 00:00 0 
+b4f67000-b4fb5000 rwxp b4f67000 00:00 0 
+b4fb5000-b505e000 rwxs 00000000 00:09 10649610   /SYSV00000000 (deleted)
+b505e000-b5061000 ---p b505e000 00:00 0 
+b5061000-b50af000 rwxp b5061000 00:00 0 
+b50af000-b50b2000 ---p b50af000 00:00 0 
+b50b2000-b5100000 rwxp b50b2000 00:00 0 
+b5100000-b5102000 r-xs 00000000 08:03 4458195    /var/cache/fontconfig/603b2eb47209ddb3c5269b217a306167-x86.cache-2
+b5102000-b5108000 r-xs 00000000 08:03 4458194    /var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86.cache-2
+b5108000-b510b000 r-xs 00000000 08:03 4458192    /var/cache/fontconfig/e383d7ea5fbe662a33d9b44caf393297-x86.cache-2
+b510b000-b510c000 r-xs 00000000 08:03 4458191    /var/cache/fontconfig/fd9505950c048a77dc4b710eb6a628ed-x86.cache-2
+b510c000-b510e000 r-xs 00000000 08:03 4458190    /var/cache/fontconfig/ddc79d3ea06a7c6ffa86ede85f3bb5df-x86.cache-2
+b510e000-b510f000 r-xs 00000000 08:03 4458189    /var/cache/fontconfig/e7071f4a29fa870f4323321c154eba04-x86.cache-2
+b510f000-b5110000 r-xs 00000000 08:03 4458188    /var/cache/fontconfig/a2ab74764b07279e7c36ddb1d302cf26-x86.cache-2
+b5110000-b5114000 r-xs 00000000 08:03 4458177    /var/cache/fontconfig/921a30a17f0be15c70ac14043cb7a739-x86.cache-2
+b5114000-b5115000 r-xs 00000000 08:03 4458160    /var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86.cache-2
+b5115000-b5116000 r-xs 00000000 08:03 4458158    /var/cache/fontconfig/4c73fe0c47614734b17d736dbde7580a-x86.cache-2
+b5116000-b5118000 r-xs 00000000 08:03 4458157    /var/cache/fontconfig/646addb8444faa74ee138aa00ab0b6a0-x86.cache-2
+b5118000-b511b000 r-xs 00000000 08:03 4458156    /var/cache/fontconfig/a755afe4a08bf5b97852ceb7400b47bc-x86.cache-2
+b511b000-b511d000 r-xs 00000000 08:03 4458155    /var/cache/fontconfig/20bd79ad97094406f7d1b9654bfbd926-x86.cache-2
+b511d000-b511e000 r-xs 00000000 08:03 4458153    /var/cache/fontconfig/75a2cd575a62c63e802c11411fb87c37-x86.cache-2
+b511e000-b5120000 r-xs 00000000 08:03 4458152    /var/cache/fontconfig/9c0624108b9a2ae8552f664125be8356-x86.cache-2
+b5120000-b5126000 r-xs 00000000 08:03 4458151    /var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86.cache-2
+b5126000-b5128000 r-xs 00000000 08:03 4458150    /var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86.cache-2
+b5128000-b512a000 r-xs 00000000 08:03 4458149    /var/cache/fontconfig/da1bd5ca8443ffe22927a23ce431d198-x86.cache-2
+b512a000-b5132000 r-xs 00000000 08:03 4458122    /var/cache/fontconfig/e3de0de479f42330eadf588a55fb5bf4-x86.cache-2
+b5132000-b5138000 r-xs 00000000 08:03 4458027    /var/cache/fontconfig/0f34bcd4b6ee430af32735b75db7f02b-x86.cache-2
+b5138000-b5139000 r-xs 00000000 08:03 4456462    /var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86.cache-2
+b5139000-b5150000 r-xs 00000000 08:03 4456461    /var/cache/fontconfig/365b55f210c0a22e9a19e35191240f32-x86.cache-2
+b5150000-b5152000 r-xs 00000000 08:03 4456460    /var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86.cache-2
+b5152000-b5158000 r-xs 00000000 08:03 4456459    /var/cache/fontconfig/d52a8644073d54c13679302ca1180695-x86.cache-2
+b5158000-b515b000 r-xs 00000000 08:03 4456458    /var/cache/fontconfig/6386b86020ecc1ef9690bb720a13964f-x86.cache-2
+b515b000-b515f000 r-xs 00000000 08:03 4456457    /var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86.cache-2
+b515f000-b5166000 r-xs 00000000 08:03 4458203    /var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86.cache-2
+b5166000-b5167000 r-xs 00000000 08:03 4458218    /var/cache/fontconfig/e9e44584608a73233979f764b5f9dd81-x86.cache-2
+b5167000-b5168000 r-xs 00000000 08:03 4458183    /var/cache/fontconfig/b5a4f3f568a71026ccdc6a3a51afa9b4-x86.cache-2
+b5168000-b5169000 r-xs 00000000 08:03 4458215    /var/cache/fontconfig/bf1f9632594a1fa28e2cf4d7888deffe-x86.cache-2
+b5169000-b516b000 r-xs 00000000 08:03 4458214    /var/cache/fontconfig/b8613a33de00eecd32d5a94c3c617829-x86.cache-2
+b516b000-b516e000 r-xs 00000000 08:03 4458228    /var/cache/fontconfig/b21a91cee725896328b8cee8091cf747-x86.cache-2
+b516e000-b5177000 r-xs 00000000 08:03 4458212    /var/cache/fontconfig/fd9416c4b92f07c6f59a3a8cf496e9dc-x86.cache-2
+b5177000-b517a000 r-xs 00000000 08:03 4458227    /var/cache/fontconfig/059138ec877db160474b4d5de1248d14-x86.cache-2
+b517a000-b517b000 r-xs 00000000 08:03 4458210    /var/cache/fontconfig/f5a93ac943883aa0fd9a7bfe0f6ec3c1-x86.cache-2
+b517b000-b517d000 r-xs 00000000 08:03 4458219    /var/cache/fontconfig/118d8d5311348bbdf5fe3b106d7c13d4-x86.cache-2
+b517d000-b517e000 r-xs 00000000 08:03 4458208    /var/cache/fontconfig/a1131b7be650f9abae4907495aa5815d-x86.cache-2
+b517e000-b5183000 r-xs 00000000 08:03 4458207    /var/cache/fontconfig/8ab5f685cd6d8ba67c37c908faf08172-x86.cache-2
+b5183000-b5187000 r-xs 00000000 08:03 4458222    /var/cache/fontconfig/0f32d3adc6a232110812e17374eaa446-x86.cache-2
+b5187000-b5189000 r-xs 00000000 08:03 4458205    /var/cache/fontconfig/7b4a97c10f6c0166998ddfa1cf7392fb-x86.cache-2
+b5189000-b518c000 r-xs 00000000 08:03 4458187    /var/cache/fontconfig/61c830dfac3fd78a12654da5e9ba3f56-x86.cache-2
+b518c000-b518d000 r-xs 00000000 08:03 4458230    /var/cache/fontconfig/e0f9e95429e756d56293ed4d63866094-x86.cache-2
+b518d000-b518e000 r-xs 00000000 08:03 4458204    /var/cache/fontconfig/892f88ea27b235637f494d515247eddd-x86.cache-2
+b518e000-b5190000 r-xs 00000000 08:03 4458229    /var/cache/fontconfig/4123634e9c08547d899d0aaff05ebe69-x86.cache-2
+b5190000-b5196000 r-xs 00000000 08:03 4458237    /var/cache/fontconfig/142ecfc435bad6f1fbc2648c1119d5eb-x86.cache-2
+b5196000-b519c000 r-xs 00000000 08:03 4458226    /var/cache/fontconfig/102e5142c2e9e50c5e8ece26694a2dad-x86.cache-2
+b519c000-b519d000 r-xs 00000000 08:03 4458202    /var/cache/fontconfig/92a571655fb1c0ec1c4d6f496220600a-x86.cache-2
+b519d000-b51a5000 r-xs 00000000 08:03 4458199    /var/cache/fontconfig/a960c40fc9306f090224a04585f8a963-x86.cache-2
+b51a9000-b51ac000 ---p b51a9000 00:00 0 
+b51ac000-b51fa000 rwxp b51ac000 00:00 0 
+b51fa000-b51fd000 ---p b51fa000 00:00 0 
+b51fd000-b524b000 rwxp b51fd000 00:00 0 
+b524b000-b524f000 r-xp 00000000 08:03 4475528    /usr/lib/libXfixes.so.3.1.0
+b524f000-b5250000 rwxp 00003000 08:03 4475528    /usr/lib/libXfixes.so.3.1.0
+b5250000-b5257000 r-xp 00000000 08:03 4474918    /usr/lib/libXrender.so.1.3.0
+b5257000-b5258000 rwxp 00006000 08:03 4474918    /usr/lib/libXrender.so.1.3.0
+b5258000-b5260000 r-xp 00000000 08:03 4473311    /usr/lib/libXcursor.so.1.0.2
+b5260000-b5261000 rwxp 00007000 08:03 4473311    /usr/lib/libXcursor.so.1.0.2
+b5275000-b5278000 ---p b5275000 00:00 0 
+b5278000-b52c6000 rwxp b5278000 00:00 0 
+b52c6000-b5344000 r-xp 00000000 08:03 4524535    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libfontmanager.so
+b5344000-b534e000 rwxp 0007e000 08:03 4524535    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libfontmanager.so
+b534e000-b5353000 rwxp b534e000 00:00 0 
+b5353000-b5357000 r-xp 00000000 08:03 4473410    /usr/lib/libXdmcp.so.6.0.0
+b5357000-b5358000 rwxp 00003000 08:03 4473410    /usr/lib/libXdmcp.so.6.0.0
+b5358000-b535a000 r-xp 00000000 08:03 4473358    /usr/lib/libXau.so.6.0.0
+b535a000-b535b000 rwxp 00001000 08:03 4473358    /usr/lib/libXau.so.6.0.0
+b535b000-b5362000 r-xp 00000000 08:03 4473747    /usr/lib/libXi.so.6.0.0
+b5362000-b5363000 rwxp 00006000 08:03 4473747    /usr/lib/libXi.so.6.0.0
+b5363000-b5367000 r-xp 00000000 08:03 4473927    /usr/lib/libXtst.so.6.1.0
+b5367000-b5368000 rwxp 00004000 08:03 4473927    /usr/lib/libXtst.so.6.1.0
+b5368000-b5455000 r-xp 00000000 08:03 4474866    /usr/lib/libX11.so.6.2.0
+b5455000-b5459000 rwxp 000ed000 08:03 4474866    /usr/lib/libX11.so.6.2.0
+b5459000-b5466000 r-xp 00000000 08:03 4475531    /usr/lib/libXext.so.6.4.0
+b5466000-b5467000 rwxp 0000d000 08:03 4475531    /usr/lib/libXext.so.6.4.0
+b546a000-b546f000 r-xs 00000000 08:03 4458200    /var/cache/fontconfig/9404ff413c67fc2a1526fd14eb4163a8-x86.cache-2
+b546f000-b5473000 r-xs 00000000 08:03 4458217    /var/cache/fontconfig/b3fedf7c409f006ca1a6fceffceb77cf-x86.cache-2
+b5473000-b5478000 r-xs 00000000 08:03 4458198    /var/cache/fontconfig/6330322105e0c4105d7c7a6ea2974107-x86.cache-2
+b5478000-b547b000 r-xs 00000000 08:03 4458236    /var/cache/fontconfig/b67b32625a2bb51b023d3814a918f351-x86.cache-2
+b547b000-b54b9000 r-xp 00000000 08:03 4524530    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/xawt/libmawt.so
+b54b9000-b54bb000 rwxp 0003e000 08:03 4524530    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/xawt/libmawt.so
+b54bb000-b54bc000 rwxp b54bb000 00:00 0 
+b54bc000-b5582000 r-xp 00000000 08:03 4524526    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libmlib_image.so
+b5582000-b5583000 rwxp 000c5000 08:03 4524526    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libmlib_image.so
+b5583000-b55fe000 r-xp 00000000 08:03 4524527    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libawt.so
+b55fe000-b5605000 rwxp 0007b000 08:03 4524527    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libawt.so
+b5605000-b5629000 rwxp b5605000 00:00 0 
+b5629000-b562c000 ---p b5629000 00:00 0 
+b562c000-b567a000 rwxp b562c000 00:00 0 
+b567a000-b5688000 r-xs 00656000 08:03 4528453    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/charsets.jar
+b5688000-b568b000 ---p b5688000 00:00 0 
+b568b000-b5709000 rwxp b568b000 00:00 0 
+b5709000-b5885000 r-xs 02c8f000 08:03 4525058    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/rt.jar
+b5885000-b58d1000 r-xs 004f5000 08:03 3180064    /home/alver/Desktop/jabref-2.3.1/2.3.1/jabref-2.3.1/build/lib/JabRef-2.3.1.jar
+b58d1000-b591d000 r-xs 004f5000 08:03 3180064    /home/alver/Desktop/jabref-2.3.1/2.3.1/jabref-2.3.1/build/lib/JabRef-2.3.1.jar
+b591d000-b591e000 ---p b591d000 00:00 0 
+b591e000-b599e000 rwxp b591e000 00:00 0 
+b599e000-b59a1000 ---p b599e000 00:00 0 
+b59a1000-b59ef000 rwxp b59a1000 00:00 0 
+b59ef000-b59f2000 ---p b59ef000 00:00 0 
+b59f2000-b5a70000 rwxp b59f2000 00:00 0 
+b5a70000-b5a73000 ---p b5a70000 00:00 0 
+b5a73000-b5ac1000 rwxp b5a73000 00:00 0 
+b5ac1000-b5ac8000 r-xs 00000000 08:03 4492823    /usr/lib/gconv/gconv-modules.cache
+b5ac8000-b5b07000 r-xp 00000000 08:03 4528462    /usr/lib/locale/en_GB.utf8/LC_CTYPE
+b5b07000-b5b0a000 ---p b5b07000 00:00 0 
+b5b0a000-b5b58000 rwxp b5b0a000 00:00 0 
+b5b58000-b5b5b000 ---p b5b58000 00:00 0 
+b5b5b000-b5ba9000 rwxp b5b5b000 00:00 0 
+b5ba9000-b5baa000 ---p b5ba9000 00:00 0 
+b5baa000-b5c3d000 rwxp b5baa000 00:00 0 
+b5c3d000-b5c57000 rwxp b5c3d000 00:00 0 
+b5c57000-b5c5a000 rwxp b5c57000 00:00 0 
+b5c5a000-b5c75000 rwxp b5c5a000 00:00 0 
+b5c75000-b5c76000 rwxp b5c75000 00:00 0 
+b5c76000-b5c77000 rwxp b5c76000 00:00 0 
+b5c77000-b5c7a000 rwxp b5c77000 00:00 0 
+b5c7a000-b5c95000 rwxp b5c7a000 00:00 0 
+b5c95000-b5c9b000 rwxp b5c95000 00:00 0 
+b5c9b000-b5cb5000 rwxp b5c9b000 00:00 0 
+b5cb5000-b5cc5000 rwxp b5cb5000 00:00 0 
+b5cc5000-b5d40000 rwxp b5cc5000 00:00 0 
+b5d40000-b5e60000 rwxp b5d40000 00:00 0 
+b5e60000-b7d40000 rwxp b5e60000 00:00 0 
+b7d40000-b7d4f000 r-xp 00000000 08:03 4524512    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libzip.so
+b7d4f000-b7d51000 rwxp 0000e000 08:03 4524512    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libzip.so
+b7d51000-b7d74000 r-xp 00000000 08:03 4524509    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libjava.so
+b7d74000-b7d76000 rwxp 00023000 08:03 4524509    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libjava.so
+b7d76000-b7d7f000 r-xp 00000000 08:03 5130028    /lib/tls/i686/cmov/libnss_files-2.6.1.so
+b7d7f000-b7d81000 rwxp 00008000 08:03 5130028    /lib/tls/i686/cmov/libnss_files-2.6.1.so
+b7d81000-b7d89000 r-xp 00000000 08:03 5130030    /lib/tls/i686/cmov/libnss_nis-2.6.1.so
+b7d89000-b7d8b000 rwxp 00007000 08:03 5130030    /lib/tls/i686/cmov/libnss_nis-2.6.1.so
+b7d8b000-b7d9f000 r-xp 00000000 08:03 5130025    /lib/tls/i686/cmov/libnsl-2.6.1.so
+b7d9f000-b7da1000 rwxp 00013000 08:03 5130025    /lib/tls/i686/cmov/libnsl-2.6.1.so
+b7da1000-b7da3000 rwxp b7da1000 00:00 0 
+b7da3000-b7dae000 r-xp 00000000 08:03 4524508    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libverify.so
+b7dae000-b7daf000 rwxp 0000b000 08:03 4524508    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/libverify.so
+b7daf000-b7db7000 rwxs 00000000 08:03 2654259    /tmp/hsperfdata_alver/7783
+b7db7000-b7dbe000 r-xp 00000000 08:03 5130035    /lib/tls/i686/cmov/librt-2.6.1.so
+b7dbe000-b7dc0000 rwxp 00006000 08:03 5130035    /lib/tls/i686/cmov/librt-2.6.1.so
+b7dc0000-b7dc3000 ---p b7dc0000 00:00 0 
+b7dc3000-b7e11000 rwxp b7dc3000 00:00 0 
+b7e11000-b7e34000 r-xp 00000000 08:03 5130023    /lib/tls/i686/cmov/libm-2.6.1.so
+b7e34000-b7e36000 rwxp 00023000 08:03 5130023    /lib/tls/i686/cmov/libm-2.6.1.so
+b7e36000-b7e37000 rwxp b7e36000 00:00 0 
+b7e37000-b7f7b000 r-xp 00000000 08:03 5130019    /lib/tls/i686/cmov/libc-2.6.1.so
+b7f7b000-b7f7c000 r-xp 00143000 08:03 5130019    /lib/tls/i686/cmov/libc-2.6.1.so
+b7f7c000-b7f7e000 rwxp 00144000 08:03 5130019    /lib/tls/i686/cmov/libc-2.6.1.so
+b7f7e000-b7f81000 rwxp b7f7e000 00:00 0 
+b7f81000-b7f83000 r-xp 00000000 08:03 5130022    /lib/tls/i686/cmov/libdl-2.6.1.so
+b7f83000-b7f85000 rwxp 00001000 08:03 5130022    /lib/tls/i686/cmov/libdl-2.6.1.so
+b7f85000-b7f8c000 r-xp 00000000 08:03 4524511    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/jli/libjli.so
+b7f8c000-b7f8e000 rwxp 00006000 08:03 4524511    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/jli/libjli.so
+b7f8e000-b7f8f000 rwxp b7f8e000 00:00 0 
+b7f8f000-b7fa3000 r-xp 00000000 08:03 5130033    /lib/tls/i686/cmov/libpthread-2.6.1.so
+b7fa3000-b7fa5000 rwxp 00013000 08:03 5130033    /lib/tls/i686/cmov/libpthread-2.6.1.so
+b7fa5000-b7fa7000 rwxp b7fa5000 00:00 0 
+b7fa9000-b7fb0000 r-xp 00000000 08:03 5130026    /lib/tls/i686/cmov/libnss_compat-2.6.1.so
+b7fb0000-b7fb2000 rwxp 00006000 08:03 5130026    /lib/tls/i686/cmov/libnss_compat-2.6.1.so
+b7fb2000-b7fb8000 r-xp 00000000 08:03 4524497    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/native_threads/libhpi.so
+b7fb8000-b7fb9000 rwxp 00006000 08:03 4524497    /usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/native_threads/libhpi.so
+b7fb9000-b7fba000 rwxp b7fb9000 00:00 0 
+b7fba000-b7fbb000 r-xp b7fba000 00:00 0 
+b7fbb000-b7fbd000 rwxp b7fbb000 00:00 0 
+b7fbd000-b7fd7000 r-xp 00000000 08:03 5095975    /lib/ld-2.6.1.so
+b7fd7000-b7fd9000 rwxp 00019000 08:03 5095975    /lib/ld-2.6.1.so
+bfab1000-bfae8000 rwxp bfab1000 00:00 0          [stack]
+ffffe000-fffff000 r-xp 00000000 00:00 0          [vdso]
+
+VM Arguments:
+java_command: build/lib/JabRef-2.3.1.jar
+Launcher Type: SUN_STANDARD
+
+Environment Variables:
+PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/games
+USERNAME=alver
+LD_LIBRARY_PATH=/usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386/client:/usr/lib/jvm/java-6-sun-1.6.0.03/jre/lib/i386:/usr/lib/jvm/java-6-sun-1.6.0.03/jre/../lib/i386
+SHELL=/bin/bash
+DISPLAY=:0.0
+
+Signal Handlers:
+SIGSEGV: [libjvm.so+0x3b29c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGBUS: [libjvm.so+0x3b29c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGFPE: [libjvm.so+0x309ec0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGPIPE: [libjvm.so+0x309ec0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGILL: [libjvm.so+0x309ec0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000
+SIGUSR2: [libjvm.so+0x30bef0], sa_mask[0]=0x00000000, sa_flags=0x10000004
+SIGHUP: [libjvm.so+0x30b910], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGINT: [libjvm.so+0x30b910], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGQUIT: [libjvm.so+0x30b910], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGTERM: [libjvm.so+0x30b910], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
+SIGUSR2: [libjvm.so+0x30bef0], sa_mask[0]=0x00000000, sa_flags=0x10000004
+
+
+---------------  S Y S T E M  ---------------
+
+OS:lenny/sid
+
+uname:Linux 2.6.22-14-generic #1 SMP Sun Oct 14 23:05:12 GMT 2007 i686
+libc:glibc 2.6.1 NPTL 2.6.1 
+rlimit: STACK 8192k, CORE 0k, NPROC 8190, NOFILE 1024, AS infinity
+load average:1.57 1.42 1.32
+
+CPU:total 1 (1 cores per cpu, 1 threads per core) family 6 model 13 stepping 8, cmov, cx8, fxsr, mmx, sse, sse2
+
+Memory: 4k page, physical 1035536k(114348k free), swap 1815304k(1780512k free)
+
+vm_info: Java HotSpot(TM) Client VM (1.6.0_03-b05) for linux-x86, built on Sep 24 2007 22:45:46 by "java_re" with gcc 3.2.1-7a (J2SE release)
+
diff --git a/src/help/About.html b/src/help/About.html
index 9b9001d..89fcb3b 100755
--- a/src/help/About.html
+++ b/src/help/About.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <center>
         <h1>JabRef version @version@</h1>
diff --git a/src/help/BaseFrameHelp.html b/src/help/BaseFrameHelp.html
index 951ab80..bc3a37a 100755
--- a/src/help/BaseFrameHelp.html
+++ b/src/help/BaseFrameHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>The JabRef main window</h1>
 
@@ -108,8 +108,8 @@
     <p>In JabRef you write the contents of all fields the same way as you
     would in a text editor, with one exception: to reference a
     string, enclose the name of the string in a set of #
-    characters, e.g.:<br />
-      '#jan# 1997',<br />
+    characters, e.g.:<br>
+      '#jan# 1997',<br>
     which will be interpreted as the string named 'jan' followed by
     ' 1997'.</p>
 
diff --git a/src/help/BibtexHelp.html b/src/help/BibtexHelp.html
index 992c991..b25bf18 100755
--- a/src/help/BibtexHelp.html
+++ b/src/help/BibtexHelp.html
@@ -3,7 +3,7 @@
 <body style="color: rgb(39, 88, 86);">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>About <em>bibtex</em></h1>
 
@@ -32,83 +32,83 @@
         A unique string used to refer to the entry in LaTeX
         documents. Note that when referencing an entry from LaTeX,
         the key must match case-sensitively with the reference
-        string.<br />
-        <br /></li>
+        string.<br>
+        <br></li>
 
-        <li><strong>address<br /></strong> Usually the address of
+        <li><strong>address<br></strong> Usually the address of
         the <tt>publisher</tt> or other type of institution. For
         major publishing houses, van Leunen recommends
         omitting the information entirely. For small publishers, on
         the other hand, you can help the reader by giving the
         complete address.</li>
 
-        <li><strong>annote<br /></strong> An annotation. It is not
+        <li><strong>annote<br></strong> An annotation. It is not
         used by the standard bibliography styles, but may be used
         by others that produce an annotated bibliography.</li>
 
-        <li><strong>author<br /></strong> This field should contain
+        <li><strong>author<br></strong> This field should contain
         the complete author list for your entry. The names are
         separated by the word <em>and</em>, even if there are more
         than two authors. Each name can be written in two
-        equivalent forms:<br />
-         Donald E. Knuth <em>or</em> Knuth, Donald E.<br />
-         Eddie van Halen <em>or</em> van Halen, Eddie<br />
+        equivalent forms:<br>
+         Donald E. Knuth <em>or</em> Knuth, Donald E.<br>
+         Eddie van Halen <em>or</em> van Halen, Eddie<br>
          The second form should be used for authors with more than
         two names, to differentiate between middle names and last
-        names.<br />
-        <br /></li>
+        names.<br>
+        <br></li>
 
-        <li><strong>booktitle<br /></strong> Title of a book, part
+        <li><strong>booktitle<br></strong> Title of a book, part
         of which is being cited. For book entries, use the
         <tt>title</tt> field instead.</li>
 
-        <li><strong>chapter<br /></strong> A chapter (or section or
+        <li><strong>chapter<br></strong> A chapter (or section or
         whatever) number.</li>
 
-        <li><strong>crossref<br /></strong> The database key of the
+        <li><strong>crossref<br></strong> The database key of the
         entry being cross referenced.</li>
 
-        <li><strong>edition<br /></strong> The edition of a
+        <li><strong>edition<br></strong> The edition of a
         book--for example, ``Second''. This should be an ordinal,
         and should have the first letter capitalized, as shown
         here; the standard styles convert to lower case when
         necessary.</li>
 
-        <li><strong>editor<br /></strong> This field is analogue to
+        <li><strong>editor<br></strong> This field is analogue to
         the <em>author</em> field. If there is also an
         <tt>author</tt> field, then the <tt>editor</tt> field gives
         the editor of the book or collection in which the reference
         appears.</li>
 
-        <li><strong>howpublished<br /></strong> How something
+        <li><strong>howpublished<br></strong> How something
         strange has been published. The first word should be
         capitalized.</li>
 
-        <li><strong>institution<br /></strong> The sponsoring
+        <li><strong>institution<br></strong> The sponsoring
         institution of a technical report.</li>
 
-        <li><strong>journal<br /></strong> A journal name. The name
+        <li><strong>journal<br></strong> A journal name. The name
         of a journal can be abbreviated using a "string". To define
         such string, use the <a href="StringEditorHelp.html">string
         editor</a>.</li>
 
-        <li><strong>key<br /></strong> Used for alphabetizing,
+        <li><strong>key<br></strong> Used for alphabetizing,
         cross referencing, and creating a label when the ``author''
         information is missing. This field should not be confused
         with the key that appears in the <code>\cite</code> command
         and at the beginning of the database entry.</li>
 
-        <li><strong>month<br /></strong> The month in which the
+        <li><strong>month<br></strong> The month in which the
         work was published or, for an unpublished work, in which it
         was written. You should use the standard three-letter
         abbreviation (jan, feb, mar, apr, may, jun, jul, aug, sep,
         oct, nov, dec).</li>
 
-        <li><strong>note<br /></strong> Any additional information
+        <li><strong>note<br></strong> Any additional information
         that can help the reader. The first word should be
         capitalized.</li>
 
-        <li><strong>number</strong><br />
+        <li><strong>number</strong><br>
         The number of a journal, magazine, technical report, or of
         a work in a series. An issue of a journal or magazine is
         usually identified by its volume and number; the
@@ -116,10 +116,10 @@
         it a number; and sometimes books are given numbers in a
         named series.</li>
 
-        <li><strong>organization<br /></strong> The organization
+        <li><strong>organization<br></strong> The organization
         that sponsors a conference or that publishes a manual.</li>
 
-        <li><strong>pages<br /></strong> One or more page numbers
+        <li><strong>pages<br></strong> One or more page numbers
         or range of numbers, such as <tt>42-111</tt> or
         <tt>7,41,73-97</tt> or <tt>43+</tt> (the `<tt>+</tt>' in
         this last example indicates pages following that don't form
@@ -129,38 +129,38 @@
         dash used in TeX to denote number ranges (as in
         <tt>7-33</tt>).</li>
 
-        <li><strong>publisher<br /></strong> The publisher's
+        <li><strong>publisher<br></strong> The publisher's
         name.</li>
 
-        <li><strong>school<br /></strong> The name of the school
+        <li><strong>school<br></strong> The name of the school
         where a thesis was written.</li>
 
-        <li><strong>series<br /></strong> The name of a series or
+        <li><strong>series<br></strong> The name of a series or
         set of books. When citing an entire book, the
         <tt>title</tt> field gives its title and an optional
         <tt>series</tt> field gives the name of a series or
         multi-volume set in which the book is published.</li>
 
-        <li><strong>title<br /></strong> The work's title. The
+        <li><strong>title<br></strong> The work's title. The
         capitalization may depend on the bibliography style and on
         the language used. For words that have to be capitalized
         (such as a proper noun), enclose the word (or its first
         letter) in braces.</li>
 
-        <li><strong>type<br /></strong> The type of a technical
+        <li><strong>type<br></strong> The type of a technical
         report--for example, ``Research Note''.</li>
 
-        <li><strong>volume<br /></strong> The volume of a journal
+        <li><strong>volume<br></strong> The volume of a journal
         or multivolume book.</li>
 
-        <li><strong>year<br /></strong> The year of publication or,
+        <li><strong>year<br></strong> The year of publication or,
         for an unpublished work, the year it was written. Generally
         it should consist of four numerals, such as <tt>1984</tt>,
         although the standard styles can handle any <tt>year</tt>
         whose last four nonpunctuation characters are numerals,
         such as `(about 1984)'. This field is required for most
         entry types.</li>
-    </ul><br />
+    </ul><br>
 
 
     <h2>Other fields</h2>
@@ -172,91 +172,91 @@
     <ul>
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        affiliation*</span><br /></strong> The authors
-        affiliation.<br />
-        <br /></li>
+        affiliation*</span><br></strong> The authors
+        affiliation.<br>
+        <br></li>
 
-        <li><strong>abstract<br /></strong> An abstract of the
-        work.<br />
-        <br /></li>
+        <li><strong>abstract<br></strong> An abstract of the
+        work.<br>
+        <br></li>
 
-        <li><strong>doi<br /></strong> The Digital Object
+        <li><strong>doi<br></strong> The Digital Object
         Identifier, a permanent identifier given to
-        documents.<br />
-        <br /></li>
+        documents.<br>
+        <br></li>
 
-        <li><strong>eid<br /></strong> The Electronic identifier is
+        <li><strong>eid<br></strong> The Electronic identifier is
         for electronic journals that also appear in print. This
         number replaces the page number, and is used to find the
         article within the printed volume. Sometimes also called
-        <em>citation number</em>.<br />
-        <br /></li>
+        <em>citation number</em>.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        contents*</span><br /></strong> A Table of Contents<br />
-        <br /></li>
+        contents*</span><br></strong> A Table of Contents<br />
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        copyright*</span><br /></strong> Copyright
-        information.<br />
-        <br /></li>
+        copyright*</span><br></strong> Copyright
+        information.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        ISBN*</span><br /></strong> The International Standard Book
-        Number.<br />
-        <br /></li>
+        ISBN*</span><br></strong> The International Standard Book
+        Number.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        ISSN*</span><br /></strong> The International Standard
-        Serial Number. Used to identify a journal.<br />
-        <br /></li>
+        ISSN*</span><br></strong> The International Standard
+        Serial Number. Used to identify a journal.<br>
+        <br></li>
 
-        <li><strong>keywords<br /></strong> Key words used for
-        searching or possibly for annotation.<br />
-        <br /></li>
+        <li><strong>keywords<br></strong> Key words used for
+        searching or possibly for annotation.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        language*</span><br /></strong> The language the document
-        is in.<br />
-        <br /></li>
+        language*</span><br></strong> The language the document
+        is in.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        location*</span><br /></strong> A location associated with
+        location*</span><br></strong> A location associated with
         the entry, such as the city in which a conference took
-        place.<br />
-        <br /></li>
+        place.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        LCCN*</span><br /></strong> The Library of Congress Call
-        Number. I've also seen this as <tt>lib-congress</tt>.<br />
-        <br /></li>
+        LCCN*</span><br></strong> The Library of Congress Call
+        Number. I've also seen this as <tt>lib-congress</tt>.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        mrnumber*</span><br /></strong> The <i>Mathematical
-        Reviews</i> number.<br />
-        <br /></li>
+        mrnumber*</span><br></strong> The <i>Mathematical
+        Reviews</i> number.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        price*</span><br /></strong> The price of the
-        document.<br />
-        <br /></li>
+        price*</span><br></strong> The price of the
+        document.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        size*</span><br /></strong> The physical dimensions of a
-        work.<br />
-        <br /></li>
+        size*</span><br></strong> The physical dimensions of a
+        work.<br>
+        <br></li>
 
-        <li><strong>URL<br /></strong> The WWW Universal Resource
+        <li><strong>URL<br></strong> The WWW Universal Resource
         Locator that points to the item being referenced. This
         often is used for technical reports to point to the ftp
         site where the postscript source of the report is
@@ -266,10 +266,10 @@
     <h3>JuraBib</h3>
 
     <ul>
-        <li><strong>urldate<br /></strong> The date of the last
+        <li><strong>urldate<br></strong> The date of the last
         page visit.</li>
-    </ul><br />
-     *) not direct supported by JabRef<br />
-     <br />
+    </ul><br>
+     *) not direct supported by JabRef<br>
+     <br>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/help/CiteSeerHelp.html b/src/help/CiteSeerHelp.html
index cd4e720..ff0823f 100644
--- a/src/help/CiteSeerHelp.html
+++ b/src/help/CiteSeerHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Importing From CiteSeer</h1>
 
@@ -21,8 +21,8 @@
     content page on CiteSeer. The citeseerurl field must be in one
     of the following formats:</p>
 
-    <p>http://citeseer.ist.psu.edu/DDDDDD[.html], or<br />
-    oai:CiteSeerPSU:DDDDDD, or<br />
+    <p>http://citeseer.ist.psu.edu/DDDDDD[.html], or<br>
+    oai:CiteSeerPSU:DDDDDD, or<br>
     DDDDDD</p>
 
     <p>where DDDDD is a sequence of digits. To find the sequence of
diff --git a/src/help/CommandLine.html b/src/help/CommandLine.html
index 84ac25d..d7091d8 100644
--- a/src/help/CommandLine.html
+++ b/src/help/CommandLine.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Command line options</h1>
 
diff --git a/src/help/ContentSelectorHelp.html b/src/help/ContentSelectorHelp.html
index 2830169..d75661e 100755
--- a/src/help/ContentSelectorHelp.html
+++ b/src/help/ContentSelectorHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Field content selector</h1>
 
diff --git a/src/help/Contents.html b/src/help/Contents.html
index 078c86a..16142bd 100755
--- a/src/help/Contents.html
+++ b/src/help/Contents.html
@@ -3,53 +3,53 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Help contents</h1>
 
-    <p><a href="HelpHelp.html">About the Help window</a><br />
-     <a href="JabRefHelp.html">General information</a><br /></p>
+    <p><a href="HelpHelp.html">About the Help window</a><br>
+     <a href="JabRefHelp.html">General information</a><br></p>
 
 
-    <p><a href="BibtexHelp.html"><em>Bibtex</em> help</a><br />
-     <a href="CommandLine.html">Command line options</a><br />
-     <a href="CustomExports.html">Custom export filters</a><br />
-     <a href="CustomImports.html">Custom import filters</a><br />
+    <p><a href="BibtexHelp.html"><em>Bibtex</em> help</a><br>
+     <a href="CommandLine.html">Command line options</a><br>
+     <a href="CustomExports.html">Custom export filters</a><br>
+     <a href="CustomImports.html">Custom import filters</a><br>
      <a href="LabelPatterns.html">Customizing the BibTex key
-    generator</a><br />
+    generator</a><br>
      <a href="CustomEntriesHelp.html">Customizing entry
-    types</a><br />
+    types</a><br>
      <a href="GeneralFields.html">Customizing general
-    fields</a><br />
+    fields</a><br>
      <a href="EndNoteFilters.html">The EndNote import/export filter
-    set</a><br />
-     <a href="EntryEditorHelp.html">Entry editor</a><br />
-     <a href="FileLinks.html">External file links</a><br />
-     <a href="TimeStampHelp.html">Entry time stamps</a><br />
+    set</a><br>
+     <a href="EntryEditorHelp.html">Entry editor</a><br>
+     <a href="FileLinks.html">External file links</a><br>
+     <a href="TimeStampHelp.html">Entry time stamps</a><br>
      <a href="CiteSeerHelp.html">Fetching entries from
-    <em>CiteSeer</em></a><br />
+    <em>CiteSeer</em></a><br>
      <a href="MedlineHelp.html">Fetching entries from
-    <em>Medline</em></a><br />
+    <em>Medline</em></a><br>
      <a href="IEEEXploreHelp.html">Fetching entries from
-    <em>IEEExplore</em></a><br />
+    <em>IEEExplore</em></a><br>
      <a href="ContentSelectorHelp.html">Field content
-    selector</a><br />
+    selector</a><br>
      <a href="GroupsHelp.html">Help on using
-    <em>Groups</em></a><br />
+    <em>Groups</em></a><br>
      <a href="ImportInspectionDialog.html">Import inspection
-    window</a><br />
+    window</a><br>
      <a href="JournalAbbreviations.html">Journal
-    abbreviations</a><br />
-     <a href="BaseFrameHelp.html">The JabRef main window</a><br />
-     <a href="OwnerHelp.html">The 'owner' field</a><br />
-     <a href="MarkingHelp.html">Marking entries</a><br />
+    abbreviations</a><br>
+     <a href="BaseFrameHelp.html">The JabRef main window</a><br>
+     <a href="OwnerHelp.html">The 'owner' field</a><br>
+     <a href="MarkingHelp.html">Marking entries</a><br>
      <a href="OpenOfficeHelp.html">Using JabRef bibliographies in
-    OpenOffice.org</a><br />
+    OpenOffice.org</a><br>
      <a href="ExternalFiles.html">PDF/PS/URL/DOI links in
-    JabRef</a><br />
-     <a href="SearchHelp.html">Searching in JabRef</a><br />
-     <a href="StringEditorHelp.html">String editor</a><br />
-     <a href="PreviewHelp.html">Entry preview setup</a><br />
+    JabRef</a><br>
+     <a href="SearchHelp.html">Searching in JabRef</a><br>
+     <a href="StringEditorHelp.html">String editor</a><br>
+     <a href="PreviewHelp.html">Entry preview setup</a><br>
      <a href="XMPHelp.html">XMP metadata support in JabRef</a></p>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/help/CustomEntriesHelp.html b/src/help/CustomEntriesHelp.html
index fccfb6b..7623c76 100644
--- a/src/help/CustomEntriesHelp.html
+++ b/src/help/CustomEntriesHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Customizing entry types</h1>
 
diff --git a/src/help/CustomExports.html b/src/help/CustomExports.html
index 258f220..4e239c8 100644
--- a/src/help/CustomExports.html
+++ b/src/help/CustomExports.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Custom export filters</h1>
 
@@ -57,14 +57,14 @@
     <p>In our example export filter, these could look like the
     following:</p>
 
-    <p><i>html.begin.layout</i>:<br />
-    <code><HTML><br />
-     <BODY> text="#275856"><br />
+    <p><i>html.begin.layout</i>:<br>
+    <code><HTML><br>
+     <BODY> text="#275856"><br>
     <basefont size="4" color="#2F4958"
     face="arial"></code></p>
 
-    <p><i>html.end.layout</i>:<br />
-    <code></BODY><br />
+    <p><i>html.end.layout</i>:<br>
+    <code></BODY><br>
      </HTML></code></p>
 
     <p>The file <i>html.layout</i> provides the <i>default</i>
@@ -304,7 +304,7 @@
     <p>You can define your own formatter in the preference tab
     "Name Formatter" using the following format and then use it
     with the name given to it as any other formatter</p>
-    <code><case1>@<range11>@<format>@<range12>@<format>@<range13>...@@<br />
+    <code><case1>@<range11>@<format>@<range12>@<format>@<range13>...@@<br>
 
      <case2>@<range21>@... and so on.</code>
 
@@ -401,8 +401,8 @@
     by instead using the <code>\begin</code> and <code>\end</code>
     commands:</p>
 
-    <p><code>\begin{editor}<br />
-    \format[HTMLChars,AuthorFirstFirst]{\editor} (Ed.)<br />
+    <p><code>\begin{editor}<br>
+    \format[HTMLChars,AuthorFirstFirst]{\editor} (Ed.)<br>
      \end{editor}</code></p>
 
     <p>The <code>\begin</code> and <code>\end</code> commands make
@@ -428,7 +428,7 @@
     keyword:</p>
 
     <p><code>\begingroup{keywords}New Category:
-    \format[HTMLChars]{\keywords}<br />
+    \format[HTMLChars]{\keywords}<br>
      \endgroup{keywords}</code></p>
 
     <h2>Sharing your work</h2>
diff --git a/src/help/CustomImports.html b/src/help/CustomImports.html
index d1615f5..bbc815d 100644
--- a/src/help/CustomImports.html
+++ b/src/help/CustomImports.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Custom import filters</h1>
 
@@ -67,8 +67,8 @@
 1936;John Maynard Keynes;The General Theory of Employment, Interest and Money
 2003;Boldrin & Levine;Case Against Intellectual Monopoly
 2004;ROBERT HUNT AND JAMES BESSEN;The Software Patent Experiment
-</pre><br />
-    <br />
+</pre><br>
+    <br>
 
     <p>In your favorite IDE or text editor create a class derived
     from <code>ImportFormat</code> that implements methods
@@ -111,8 +111,8 @@ public class SimpleCsvImporter extends ImportFormat {
         return bibitems;
   }
 }
-</pre><br />
-    <br />
+</pre><br>
+    <br>
 
     <p>Note that the example is in the default package. Suppose you
     have saved it under
@@ -123,8 +123,8 @@ public class SimpleCsvImporter extends ImportFormat {
     <pre>
 javac -classpath JabRef-2.0.jar SimpleCsvImporter.java
 </pre>Now there should be a file
-<code>/mypath/SimpleCsvImporter.class</code>.<br />
-    <br />
+<code>/mypath/SimpleCsvImporter.class</code>.<br>
+    <br>
 
 
     <p>In JabRef, open <b>Options -> Manage custom imports</b>,
diff --git a/src/help/EndNoteFilters.html b/src/help/EndNoteFilters.html
index 9314958..eb46097 100644
--- a/src/help/EndNoteFilters.html
+++ b/src/help/EndNoteFilters.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>EndNote Export Filter</h1>
 
diff --git a/src/help/EntryEditorHelp.html b/src/help/EntryEditorHelp.html
index 19c3d63..b997bdc 100755
--- a/src/help/EntryEditorHelp.html
+++ b/src/help/EntryEditorHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>The entry editor</h1>
 
diff --git a/src/help/ExternalFiles.html b/src/help/ExternalFiles.html
index 70e71b5..b60a793 100644
--- a/src/help/ExternalFiles.html
+++ b/src/help/ExternalFiles.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>PDF/PS/URL/DOI links in JabRef</h1>
 
diff --git a/src/help/FileLinks.html b/src/help/FileLinks.html
index 5ff166d..de2f892 100644
--- a/src/help/FileLinks.html
+++ b/src/help/FileLinks.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>File links in JabRef</h1>
 
diff --git a/src/help/GeneralFields.html b/src/help/GeneralFields.html
index 28d48fa..d931b53 100644
--- a/src/help/GeneralFields.html
+++ b/src/help/GeneralFields.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Customizing general fields</h1>
 
@@ -15,8 +15,8 @@
     the name of the tab, followed by a colon (:), and the fields it
     should contain, separated by semicolons (;).</p>
 
-    <p>E.g.<br />
-    <code>General:url;keywords;doi;pdf<br />
+    <p>E.g.<br>
+    <code>General:url;keywords;doi;pdf<br>
      Abstract:abstract;annote</code></p>
 
     <p>which would give one tab named "General" containing the
diff --git a/src/help/GroupsHelp.html b/src/help/GroupsHelp.html
index c13f017..dfeec0f 100644
--- a/src/help/GroupsHelp.html
+++ b/src/help/GroupsHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Groups</h1>
 
diff --git a/src/help/HelpHelp.html b/src/help/HelpHelp.html
index 4de8bfe..847e6e3 100755
--- a/src/help/HelpHelp.html
+++ b/src/help/HelpHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>The help window</h1>
 
diff --git a/src/help/IEEEXploreHelp.html b/src/help/IEEEXploreHelp.html
index fc014b8..9a57e35 100644
--- a/src/help/IEEEXploreHelp.html
+++ b/src/help/IEEEXploreHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Search IEEEXplore</h1>
 
diff --git a/src/help/ImportInspectionDialog.html b/src/help/ImportInspectionDialog.html
index 13695de..3c94e9b 100644
--- a/src/help/ImportInspectionDialog.html
+++ b/src/help/ImportInspectionDialog.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Import inspection window</h1>
 
diff --git a/src/help/JabRefHelp.html b/src/help/JabRefHelp.html
index 17f8656..63bf0f9 100755
--- a/src/help/JabRefHelp.html
+++ b/src/help/JabRefHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>JabRef</h1>
 
diff --git a/src/help/JournalAbbreviations.html b/src/help/JournalAbbreviations.html
index 7ba29e7..341ff76 100644
--- a/src/help/JournalAbbreviations.html
+++ b/src/help/JournalAbbreviations.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Journal abbreviations</h1>
 
diff --git a/src/help/LabelPatterns.html b/src/help/LabelPatterns.html
index c0b5bd1..6fbc77a 100644
--- a/src/help/LabelPatterns.html
+++ b/src/help/LabelPatterns.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Customizing the BibTeX key generator</h1>
 
@@ -29,46 +29,46 @@
 
     <ul>
         <li><b>[<code>auth</code>]</b>: The last name of the first
-        author<br /></li>
+        author<br></li>
 
         <li><b>[<code>authors</code>]</b>: The last name of all
-        authors<br /></li>
+        authors<br></li>
 
         <li><b>[<code>authorLast</code>]</b>: The last name of the last
-        author<br /></li>
+        author<br></li>
 
         <li><b>[<code>authorsN</code>]</b>: The last name of up to
         N authors. If there are more authors, "EtAl" is
-        appended.<br /></li>
+        appended.<br></li>
 
         <li><b>[<code>authIniN</code>]</b>: The beginning of each
         author's last name, using no more than N
-        characters.<br /></li>
+        characters.<br></li>
 
         <li><b>[<code>authorIni</code>]</b>: The first 5 characters
         of the first author's last name, and the last name initials
-        of the remaining authors.<br /></li>
+        of the remaining authors.<br></li>
 
         <li><b>[<code>authN</code>]</b>: The first N characters of
-        the first author's last name<br /></li>
+        the first author's last name<br></li>
 
         <li><b>[<code>authN_M</code>]</b>: The first N characters
-        of the Mth author's last name<br /></li>
+        of the Mth author's last name<br></li>
 
         <li><b>[<code>auth.auth.ea</code>]</b>: The last name of
         the first two authors, and ".ea" if there are more than
-        two.<br /></li>
+        two.<br></li>
 
         <li><b>[<code>auth.etal</code>]</b>: The last name of the
         first author, and the last name of the second author if
         there are two authors or ".etal" if there are more than
-        two.<br /></li>
+        two.<br></li>
 
         <li><b>[<code>authshort</code>]</b>: The last name if one
         author is given; the first character of up to three
         authors' last names if more than one author is given. A
         plus character is added, if there are more than three
-        authors.<br /></li>
+        authors.<br></li>
     </ul><b>Note:</b> If there is no author (as in the case of an
     edited book), then all of the above
     <b><code>[auth...]</code></b> markers will use the editor(s)
@@ -83,56 +83,56 @@
 
     <ul>
         <li><b>[<code>edtr</code>]</b>: The last name of the first
-        editor<br /></li>
+        editor<br></li>
 
         <li><b>[<code>edtrIniN</code>]</b>: The beginning of each
         editor's last name, using no more than N
-        characters<br /></li>
+        characters<br></li>
 
         <li><b>[<code>editors</code>]</b>: The last name of all
-        editors<br /></li>
+        editors<br></li>
 
         <li><b>[<code>editorLast</code>]</b>: The last name of the last
-        editor<br /></li>
+        editor<br></li>
 
         <li><b>[<code>editorIni</code>]</b>: The first 5 characters
         of the first editor's last name, and the last name initials
-        of the remaining editors.<br /></li>
+        of the remaining editors.<br></li>
 
         <li><b>[<code>edtrN</code>]</b>: The first N characters of
-        the first editor's last name<br /></li>
+        the first editor's last name<br></li>
 
         <li><b>[<code>edtrN_M</code>]</b>: The first N characters
-        of the Mth editor's last name<br /></li>
+        of the Mth editor's last name<br></li>
 
         <li><b>[<code>edtr.edtr.ea</code>]</b>: The last name of
         the first two editors, and ".ea" if there are more than
-        two.<br /></li>
+        two.<br></li>
 
         <li><b>[<code>edtrshort</code>]</b>: The last name if one
         editor is given; the first character of up to three
         editors' last names if more than one editor is given. A
         plus character is added, if there are more than three
-        editors.<br /></li>
+        editors.<br></li>
 
         <li><b>[<code>firstpage</code>]</b>: The number of the
-        first page of the publication<br /></li>
+        first page of the publication<br></li>
 
         <li><b>[<code>keywordN</code>]</b>: Keyword number N from
         the "keywords" field, assuming keywords are separated by
-        commas or semicolons.<br /></li>
+        commas or semicolons.<br></li>
 
         <li><b>[<code>lastpage</code>]</b>: The number of the last
-        page of the publication<br /></li>
+        page of the publication<br></li>
 
         <li><b>[<code>shorttitle</code>]</b>: The first 3 words of
-        the title<br /></li>
+        the title<br></li>
 
         <li><b>[<code>shortyear</code>]</b>: The last 2 digits of
-        the publication year<br /></li>
+        the publication year<br></li>
 
         <li><b>[<code>veryshorttitle</code>]</b>: The first word of
-        the title, discounting 'the', 'a', 'an'.<br /></li>
+        the title, discounting 'the', 'a', 'an'.<br></li>
     </ul>
 
     <p>A field name (or one of the above pseudo-field names) may
@@ -145,12 +145,12 @@
         and subsequent characters following white space will be
         included. For example, <b>[journal:abbr]</b> would from the
         journal name "Journal of Fish Biology" produce
-        "JoFB".<br /></li>
+        "JoFB".<br></li>
 
         <li><b>:lower</b>: Forces the text inserted by the field
         marker to be in lowercase. For example, <b>[auth:lower]</b>
         expands the last name of the first author in
-        lowercase.<br /></li>
+        lowercase.<br></li>
     </ul>
 
     <p>If you haven't defined a key pattern for a certain entry
@@ -166,8 +166,8 @@
     labels might look like:</p>
 
     <blockquote>
-        <code>Yared1998</code><br />
-         <code>Yared1998a</code><br />
+        <code>Yared1998</code><br>
+         <code>Yared1998a</code><br>
         <code>Yared1998b</code>
     </blockquote>
 
diff --git a/src/help/MarkingHelp.html b/src/help/MarkingHelp.html
index 1b97321..ac5329c 100644
--- a/src/help/MarkingHelp.html
+++ b/src/help/MarkingHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Mark entries</h1>
 
diff --git a/src/help/MedlineHelp.html b/src/help/MedlineHelp.html
index 626cce2..0932df9 100644
--- a/src/help/MedlineHelp.html
+++ b/src/help/MedlineHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Fetching Medline entries</h1>
 
diff --git a/src/help/OpenOfficeHelp.html b/src/help/OpenOfficeHelp.html
index 4814d16..8f5ce96 100644
--- a/src/help/OpenOfficeHelp.html
+++ b/src/help/OpenOfficeHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Using JabRef bibliographies in OpenOffice.org</h1>
 
diff --git a/src/help/OwnerHelp.html b/src/help/OwnerHelp.html
index 8ce1853..5819e0e 100644
--- a/src/help/OwnerHelp.html
+++ b/src/help/OwnerHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>The 'owner' field</h1>
 
diff --git a/src/help/PreviewHelp.html b/src/help/PreviewHelp.html
index 2b30ccf..ef05a96 100644
--- a/src/help/PreviewHelp.html
+++ b/src/help/PreviewHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Entry preview setup</h1>
 
diff --git a/src/help/RemoteHelp.html b/src/help/RemoteHelp.html
index d40e3db..d563ff9 100644
--- a/src/help/RemoteHelp.html
+++ b/src/help/RemoteHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Remote operation</h1>
 
diff --git a/src/help/SearchHelp.html b/src/help/SearchHelp.html
index 18a7cca..cd12436 100644
--- a/src/help/SearchHelp.html
+++ b/src/help/SearchHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Searching</h1>
 
diff --git a/src/help/ShortAuxImport.html b/src/help/ShortAuxImport.html
index 6bc6c0c..23024e3 100644
--- a/src/help/ShortAuxImport.html
+++ b/src/help/ShortAuxImport.html
@@ -3,7 +3,7 @@
 <body>
     <basefont size="-1"
           color="#2F4958"
-          face="arial" /> This feature generates a new database,
+          face="arial"> This feature generates a new database,
           which contains only the used references of an existing
           TeX project.
 </body>
diff --git a/src/help/ShortIntegrityCheck.html b/src/help/ShortIntegrityCheck.html
index 8cac5e9..d6eb6dd 100644
--- a/src/help/ShortIntegrityCheck.html
+++ b/src/help/ShortIntegrityCheck.html
@@ -3,8 +3,8 @@
 <body>
     <basefont size="-1"
           color="#2F4958"
-          face="arial" /> Integrity check is a process that checks
+          face="arial"> Integrity check is a process that checks
           for indications of wrongly filled out bibtex fields.
-          "Scan" is the button that starts the check. <br />
+          "Scan" is the button that starts the check. <br>
 </body>
 </html>
diff --git a/src/help/ShortPlainImport.html b/src/help/ShortPlainImport.html
index 97de394..09b8b24 100644
--- a/src/help/ShortPlainImport.html
+++ b/src/help/ShortPlainImport.html
@@ -3,9 +3,9 @@
 <body>
     <basefont size="-1"
           color="#2F4958"
-          face="arial" />This is a simple copy and paste dialog.
+          face="arial">This is a simple copy and paste dialog.
           First load or paste some text into the text input
           area.  After that, you can mark text and assign it
-          to a bibtex field. <br />
+          to a bibtex field. <br>
 </body>
 </html>
diff --git a/src/help/StringEditorHelp.html b/src/help/StringEditorHelp.html
index 381d1bf..1a55efd 100755
--- a/src/help/StringEditorHelp.html
+++ b/src/help/StringEditorHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>The string editor</h1>
 
diff --git a/src/help/TimeStampHelp.html b/src/help/TimeStampHelp.html
index 2bd6bef..f21dc4f 100644
--- a/src/help/TimeStampHelp.html
+++ b/src/help/TimeStampHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Entry time stamps</h1>
 
diff --git a/src/help/XMPHelp.html b/src/help/XMPHelp.html
index 3531e3f..ae279ff 100644
--- a/src/help/XMPHelp.html
+++ b/src/help/XMPHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>XMP metadata support in JabRef</h1>
 
@@ -86,8 +86,8 @@
 
                     <li>All other fields are saved using their
                     field-name as is.</li>
-                </ul><br />
-                <br />
+                </ul><br>
+                <br>
 
 
                 <p>The following is an example of the mapping</p>
@@ -129,8 +129,8 @@
                 <ul>
                     <li>In RDF attribute-value pairs can also be
                     expressed as nodes and vice versa.</li>
-                </ul><br />
-                <br />
+                </ul><br>
+                <br>
 
 
                 <h2>Related Links:</h2>
@@ -160,8 +160,8 @@
                     <li>
                     <a href="http://partners.adobe.com/public/developer/en/xmp/sdk/xmpspecification.pdf">
                     Adobe XMP Specification</a></li>
-                </ul><br />
-                <br />
+                </ul><br>
+                <br>
 
             </div>
         </li>
diff --git a/src/help/de/About.html b/src/help/de/About.html
index b663948..46ef898 100644
--- a/src/help/de/About.html
+++ b/src/help/de/About.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <center>
         <h1>JabRef Version @version@</h1>
diff --git a/src/help/de/BaseFrameHelp.html b/src/help/de/BaseFrameHelp.html
index b929276..89fcbdb 100644
--- a/src/help/de/BaseFrameHelp.html
+++ b/src/help/de/BaseFrameHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Das Hauptfenster von JabRef</h1>
 
diff --git a/src/help/de/BibtexHelp.html b/src/help/de/BibtexHelp.html
index 31da4bc..543366e 100644
--- a/src/help/de/BibtexHelp.html
+++ b/src/help/de/BibtexHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Über <em>BibTeX</em></h1>
 
@@ -34,24 +34,24 @@
 
     <ul>
         <li>
-        <strong style="font-style: italic;">Bibtexkey<br /></strong>Eine
+        <strong style="font-style: italic;">Bibtexkey<br></strong>Eine
         eindeutige Bezeichnung, um sich in LaTeX-Dokumenten auf den
         Eintrag beziehen zu können. Beachten Sie, dass der
         Bibtexkey genau mit dem Verweis im LaTeX-Dokument
         übereinstimmen muss (auch die
-        Groß-/Kleinschreibung).<br />
+        Groß-/Kleinschreibung).<br>
         </li>
 
-        <li><strong>address<br /></strong> Der Ort des
+        <li><strong>address<br></strong> Der Ort des
         <em>Verlags</em> oder einer anderen Institution.</li>
 
-        <li><strong>annote<br /></strong> Eine Anmerkung. Dieses
+        <li><strong>annote<br></strong> Eine Anmerkung. Dieses
         Feld wird von den Standard-Bibliographiestilen nicht
         verwendet, kann aber bei einigen Stilen benutzt werden, um
         eine kommentierte Literaturliste zu erstellen.</li>
 
         <li>
-            <strong>author<br /></strong> Dieses Feld sollte alle
+            <strong>author<br></strong> Dieses Feld sollte alle
             Autoren Ihres Eintrags enthalten. Die Namen werden
             durch das Wort <tt>and</tt> getrennt, auch wenn es mehr
             als zwei Autoren gibt. Jeder Name kann in zwei
@@ -65,18 +65,18 @@
                 Eddie</li>
             </ul>Die zweite Form sollte für Autoren mit zwei
             oder mehr Nachnamen benutzt werden, um zwischen dem
-            mittleren und dem Nachnamen zu unterscheiden.<br />
+            mittleren und dem Nachnamen zu unterscheiden.<br>
         </li>
 
-        <li><strong>booktitle<br /></strong> Der Titel eines
+        <li><strong>booktitle<br></strong> Der Titel eines
         Buches, aus dem ein Teil zitiert wird. Falls Sie ein Buch
         zitieren wollen, nehmen Sie für den Titel stattdessen
         das <tt>title</tt>-Feld.</li>
 
-        <li><strong>chapter<br /></strong> Eine Kapitelnummer (oder
+        <li><strong>chapter<br></strong> Eine Kapitelnummer (oder
         Abschnittsnummer oder was-auch-immer-Nummer).</li>
 
-        <li><strong>crossref<br /></strong> Der <tt>key</tt> eines
+        <li><strong>crossref<br></strong> Der <tt>key</tt> eines
         Eintrags, auf den ein Querverweis gesetzt wird. Damit
         lassen sich beispielsweise die Daten eines Sammelbandes in
         einem Eintrag für einen Aufsatztitel wiederverwenden,
@@ -84,28 +84,28 @@
         Funktionalität von <tt>crossref</tt> ist jedoch nicht
         in jedem Fall praktikabel.</li>
 
-        <li><strong>edition<br /></strong> Die Auflage eines Buch,
+        <li><strong>edition<br></strong> Die Auflage eines Buch,
         z.B. ,,Zweite``. Die Ordnungszahl sollte mit einem
         Großbuchstaben beginnen; sie wird von den
         Standardstilen gegebenenfalls in Kleinbuchstaben
         umgewandelt. Manche Stile verlangen hier eine Ziffer.</li>
 
-        <li><strong>editor<br /></strong> Dieses Feld ist analog zu
+        <li><strong>editor<br></strong> Dieses Feld ist analog zu
         dem <em>author</em>-Feld. Falls zusätzlich ein
         <tt>author</tt>-Feld angegeben wird, bezeichnet das
         <tt>editor</tt>-Feld den Herausgeber des Buches oder des
         Sammelbandes, in dem die referenzierte Literatur erschienen
         ist.</li>
 
-        <li><strong>howpublished<br /></strong> Die Art, wie ein
+        <li><strong>howpublished<br></strong> Die Art, wie ein
         Werk veröffentlicht wurde (meist außerhalb eines
         Verlags). Das erste Wort sollte mit einem
         Großbuchstaben beginnen.</li>
 
-        <li><strong>institution<br /></strong> Die fördernde
+        <li><strong>institution<br></strong> Die fördernde
         Institutions eines technischen Reports.</li>
 
-        <li><strong>journal<br /></strong> Ein Zeitschriftenname.
+        <li><strong>journal<br></strong> Ein Zeitschriftenname.
         Mit Hilfe von "Strings" können Zeitschriftennamen
         abgekürzt werden. Zum Erstellen eines solchen Strings
         können Sie den
@@ -114,7 +114,7 @@
         <a href="JournalAbbreviations.html">Abkürzung von
         Zeitschriftentiteln</a> verwenden.</li>
 
-        <li><strong>key<br /></strong> Dieses Feld wird zur
+        <li><strong>key<br></strong> Dieses Feld wird zur
         Sortierung, zur Erstellung von Labels (falls kein
         <tt>author</tt> vorhanden ist) und für Querverweise
         (<tt>crossref</tt>) verwendet. Verwechseln Sie dieses Feld
@@ -122,26 +122,26 @@
         <code>\cite</code>-Kommandos gebraucht wird und am Anfang
         jedes Eintrags erscheint (im BibTeX-Quelltext).</li>
 
-        <li><strong>month<br /></strong> Der Monat, in dem ein Werk
+        <li><strong>month<br></strong> Der Monat, in dem ein Werk
         veröffentlicht oder geschrieben wurde. Benutzen Sie am
         besten die englischen Abkürzungen (jan, feb, mar, apr,
         may, jun, jul, aug, sep, oct, nov, dec).</li>
 
-        <li><strong>note<br /></strong> Zusätzliche
+        <li><strong>note<br></strong> Zusätzliche
         Infromationen. Das erste Wort sollte mit einem
         Großbuchstaben beginnen.</li>
 
-        <li><strong>number</strong><br />
+        <li><strong>number</strong><br>
         Die Nummer einer Zeitschrift, eines technischen Reports
         oder eines Bandes innerhalb einer Reihe (<tt>series</tt>).
         Zeitschriften haben oft eine Band- und Heftzählung,
         der Band entspricht dem <tt>volume</tt>-, das Heft dem
         <tt>number</tt>-Eintrag.</li>
 
-        <li><strong>organization<br /></strong> Die Organisation,
+        <li><strong>organization<br></strong> Die Organisation,
         die einen Konferenzband fördert.</li>
 
-        <li><strong>pages<br /></strong> Die Seitenzahl(en) oder
+        <li><strong>pages<br></strong> Die Seitenzahl(en) oder
         der Seitenzahlbereich, z.B. <tt>42-111</tt> oder
         <tt>7,41,73-97</tt> or <tt>43+</tt> (das `<tt>+</tt>'
         deutet auf folgende Seiten, die nicht einen einfachen
@@ -150,20 +150,20 @@
         (<tt>--</tt>) verwandelt, der in TeX den bis-Strich anzeigt
         (also 7–33).</li>
 
-        <li><strong>publisher<br /></strong> Der Name des
+        <li><strong>publisher<br></strong> Der Name des
         Verlags.</li>
 
-        <li><strong>school<br /></strong> Der Name einer
+        <li><strong>school<br></strong> Der Name einer
         Universität, an der eine Abschlussarbeit - z.B. eine
         Dissertation (<tt>phdthesis</tt>) oder Magisterarbeit
         (<tt>mastersthesis</tt>) - geschrieben wurde.</li>
 
-        <li><strong>series<br /></strong> Der Name einer Reihe, in
+        <li><strong>series<br></strong> Der Name einer Reihe, in
         der ein Buch erschienen ist. Falls die Bücher einer
         Reihe nummeriert sind, wird die entsprechende Nummer im
         Feld <tt>number</tt> angegeben.</li>
 
-        <li><strong>title<br /></strong> Der Titel des Werkes. Die
+        <li><strong>title<br></strong> Der Titel des Werkes. Die
         Groß- und Kleinschreibung kann von den
         Bibliographiestilen und der benutzten Sprache abhängig
         sein (wobei sie mit deutschen Bibliographiestilen
@@ -172,16 +172,16 @@
         sollen, müssen in geschweifte Klammern eingefasst
         werden (z.B. <tt>A {German} title</tt>).</li>
 
-        <li><strong>type<br /></strong> Der Typ eines technischen
+        <li><strong>type<br></strong> Der Typ eines technischen
         Reports, z.B. ``Research Note''. Bei <em>jurabib</em> wird
         dieses Feld auch für den Typ einer Abschlussarbeit
         verwendet.</li>
 
-        <li><strong>volume<br /></strong> Der Band (Jahrgang) einer
+        <li><strong>volume<br></strong> Der Band (Jahrgang) einer
         Zeitschrift oder der Band eines Buches in einem
         mehrbändigen Werk.</li>
 
-        <li><strong>year<br /></strong> Das Jahr der
+        <li><strong>year<br></strong> Das Jahr der
         Veröffentlichung (oder bei einem
         unveröffentlichten Werk das Jahr, in dem es
         geschrieben wurde). Normalerweise sollte im
@@ -207,101 +207,101 @@
     <ul>
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        affiliation*</span><br /></strong> Die Zugehörigkeit
-        eines Autors.<br />
+        affiliation*</span><br></strong> Die Zugehörigkeit
+        eines Autors.<br>
         </li>
 
-        <li><strong>abstract<br /></strong> Die Zusammenfassung
-        eines Werks.<br />
+        <li><strong>abstract<br></strong> Die Zusammenfassung
+        eines Werks.<br>
         </li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        contents*</span><br /></strong> Ein
-        Inhaltsverzeichnis.<br />
+        contents*</span><br></strong> Ein
+        Inhaltsverzeichnis.<br>
         </li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        copyright*</span><br /></strong>
-        Copyright-Informationen.<br />
+        copyright*</span><br></strong>
+        Copyright-Informationen.<br>
         </li>
 
-        <li><strong>doi<br /></strong> Der <em>Digital Object
+        <li><strong>doi<br></strong> Der <em>Digital Object
         Identifier</em> ist eine permanente Kennung von
-        Dokumenten.<br />
+        Dokumenten.<br>
         </li>
 
-        <li><strong>eid<br /></strong> Der EID (<em>Electronic
+        <li><strong>eid<br></strong> Der EID (<em>Electronic
         identifier</em>) wird für elektronische Zeitschriften
         benutzt, die auch im Druck erscheinen. Mit dieser Nummer,
         die die Seitenzahlen ersetzt, lässt sich der Artikel
         in der gedruckten Ausgabe finden. Der EID wird manchmal
-        auch <em>citation number</em> genannt.<br />
+        auch <em>citation number</em> genannt.<br>
         </li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        ISBN*</span><br /></strong> Die Internationale
-        Standardbuchnummer.<br />
+        ISBN*</span><br></strong> Die Internationale
+        Standardbuchnummer.<br>
         </li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        ISSN*</span><br /></strong> Die Internationale
-        Standardseriennummer (für Zeitschriften).<br />
+        ISSN*</span><br></strong> Die Internationale
+        Standardseriennummer (für Zeitschriften).<br>
         </li>
 
-        <li><strong>keywords<br /></strong> Stichworte, können
-        in JabRef gut zum Gruppieren verwendet werden.<br />
+        <li><strong>keywords<br></strong> Stichworte, können
+        in JabRef gut zum Gruppieren verwendet werden.<br>
         </li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        language*</span><br /></strong> Die Sprache des
-        Werks.<br />
+        language*</span><br></strong> Die Sprache des
+        Werks.<br>
         </li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        location*</span><br /></strong> Der Ort, der mit einem Werk
+        location*</span><br></strong> Der Ort, der mit einem Werk
         in Verbindung steht, z.B. die Stadt, in der eine Konferenz
-        stattgefunden hat.<br />
+        stattgefunden hat.<br>
         </li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        LCCN*</span><br /></strong> Die <em>Library of Congress
+        LCCN*</span><br></strong> Die <em>Library of Congress
         Call Number</em>. Manchmal heißt das Feld auch
-        <tt>lib-congress</tt>.<br />
+        <tt>lib-congress</tt>.<br>
         </li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        mrnumber*</span><br /></strong> Die <i>Mathematical
-        Reviews</i>-Nummer.<br />
+        mrnumber*</span><br></strong> Die <i>Mathematical
+        Reviews</i>-Nummer.<br>
         </li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        price*</span><br /></strong> Der Preis.<br />
+        price*</span><br></strong> Der Preis.<br />
         </li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        size*</span><br /></strong> Die physische Größe
-        eines Dokuments.<br />
+        size*</span><br></strong> Die physische Größe
+        eines Dokuments.<br>
         </li>
 
-        <li><strong>url<br /></strong> Der <em>Uniform Resource
+        <li><strong>url<br></strong> Der <em>Uniform Resource
         Locator</em> (URL, "einheitlicher Quellenanzeiger"), der
-        auf eine Webseite im Internet verweist.<br />
+        auf eine Webseite im Internet verweist.<br>
         </li>
 
-        <li><strong>urldate<br /></strong> Das Datum, an dem eine
+        <li><strong>urldate<br></strong> Das Datum, an dem eine
         Webseite zuletzt besucht wurde.</li>
-    </ul><br />
-     <br />
-     <br />
+    </ul><br>
+     <br>
+     <br>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/help/de/CiteSeerHelp.html b/src/help/de/CiteSeerHelp.html
index 4ace49b..6408a11 100644
--- a/src/help/de/CiteSeerHelp.html
+++ b/src/help/de/CiteSeerHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>CiteSeer-Import</h1>
 
@@ -23,8 +23,8 @@
     <em>citeseerurl</em> muss in einem der folgenden Formate
     eingegeben werden:</p>
 
-    <p>http://citeseer.ist.psu.edu/DDDDDD[.html], oder<br />
-     oai:CiteSeerPSU:DDDDDD, oder<br />
+    <p>http://citeseer.ist.psu.edu/DDDDDD[.html], oder<br>
+     oai:CiteSeerPSU:DDDDDD, oder<br>
      DDDDDD</p>
 
     <p>wobei DDDDDD eine Ziffernfolge darstellt. Um diese
@@ -59,7 +59,7 @@
     <p>Wenn Sie einen
     HTTP-Proxy-Server benutzen müssen, übergeben Sie den
     Servernamen und die Portnummer an Java. Diese
-    Umgebungseinstellungen sind dokumentiert unter<br />
+    Umgebungseinstellungen sind dokumentiert unter<br>
 
     <a href="http://java.sun.com/j2se/1.4.2/docs/guide/net/properties.html">http://java.sun.com/j2se/1.4.2/docs/guide/net/properties.html</a></p>
 
diff --git a/src/help/de/CommandLine.html b/src/help/de/CommandLine.html
index 83e5f53..2bdb110 100644
--- a/src/help/de/CommandLine.html
+++ b/src/help/de/CommandLine.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Kommandozeilen-Optionen</h1>
 
diff --git a/src/help/de/ContentSelectorHelp.html b/src/help/de/ContentSelectorHelp.html
index 3c7d449..6e4f411 100644
--- a/src/help/de/ContentSelectorHelp.html
+++ b/src/help/de/ContentSelectorHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Wortauswahl verwalten</h1>
 
diff --git a/src/help/de/Contents.html b/src/help/de/Contents.html
index fa04fd8..5d3e4d8 100644
--- a/src/help/de/Contents.html
+++ b/src/help/de/Contents.html
@@ -4,57 +4,57 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Hilfe - Inhalt</h1>
 
     <p><a href="HelpHelp.html">Über die
-    Hilfe</a><br />
+    Hilfe</a><br>
      <a href="JabRefHelp.html">Allgemeines</a></p>
 
      <p>
      <a href="GeneralFields.html">Allgemeine Felder
-    festlegen</a><br />
+    festlegen</a><br>
      <a href="LabelPatterns.html">Anpassen der automatischen
-    Generierung von BibTeX-keys</a><br />
-     <a href="OwnerHelp.html">Das 'Besitzer' (owner) Feld</a><br />
-     <a href="BibtexHelp.html"><em>BibTeX</em> Hilfe</a><br />
-     <a href="MarkingHelp.html">Einträge markieren</a><br />
+    Generierung von BibTeX-keys</a><br>
+     <a href="OwnerHelp.html">Das 'Besitzer' (owner) Feld</a><br>
+     <a href="BibtexHelp.html"><em>BibTeX</em> Hilfe</a><br>
+     <a href="MarkingHelp.html">Einträge markieren</a><br>
      <a href="CiteSeerHelp.html">Einträge von
-    <em>CiteSeer</em> abrufen</a><br />
+    <em>CiteSeer</em> abrufen</a><br>
      <a href="IEEEXploreHelp.html">Einträge von
-    <em>IEEExplore</em> abrufen</a><br />
+    <em>IEEExplore</em> abrufen</a><br>
      <a href="MedlineHelp.html">Einträge von <em>Medline</em>
-    abrufen</a><br />
-     <a href="EntryEditorHelp.html">Der Eintrags-Editor</a><br />
+    abrufen</a><br>
+     <a href="EntryEditorHelp.html">Der Eintrags-Editor</a><br>
      <a href="CustomEntriesHelp.html">Eintragstypen
-    anpassen</a><br />
-     <a href="PreviewHelp.html">Eintragsvorschau anpassen</a><br />
-     <a href="CustomExports.html">Exportfilter anpassen</a><br />
-     <a href="RemoteHelp.html">Externer Zugriff</a><br />
+    anpassen</a><br>
+     <a href="PreviewHelp.html">Eintragsvorschau anpassen</a><br>
+     <a href="CustomExports.html">Exportfilter anpassen</a><br>
+     <a href="RemoteHelp.html">Externer Zugriff</a><br>
      <a href="EndNoteFilters.html">Die Exportfilter und
-    Importfilter für EndNote</a><br />
+    Importfilter für EndNote</a><br>
      <a href="BaseFrameHelp.html">Das Hauptfenster von
-    JabRef</a><br />
+    JabRef</a><br>
      <a href="GroupsHelp.html">Hilfe zu den
-    <em>Gruppen</em></a><br />
-     <a href="CustomImports.html">Importfilter anpassen</a><br />
-     <a href="ImportInspectionDialog.html">Import-Kontrollfenster</a><br />
+    <em>Gruppen</em></a><br>
+     <a href="CustomImports.html">Importfilter anpassen</a><br>
+     <a href="ImportInspectionDialog.html">Import-Kontrollfenster</a><br>
 
      <a href="OpenOfficeHelp.html">JabRef-Bibliographien in
-    OpenOffice.org benutzen</a><br />
-     <a href="CommandLine.html">Kommandozeilen-Optionen</a><br />
-     <a href="FileLinks.html">Links zu externen Dateien</a><br />
+    OpenOffice.org benutzen</a><br>
+     <a href="CommandLine.html">Kommandozeilen-Optionen</a><br>
+     <a href="FileLinks.html">Links zu externen Dateien</a><br>
      <a href="ExternalFiles.html">Links zu PDF- und PS-Dateien,
-    URLs und DOIs</a><br />
-     <a href="StringEditorHelp.html">Der String-Editor</a><br />
+    URLs und DOIs</a><br>
+     <a href="StringEditorHelp.html">Der String-Editor</a><br>
      <a href="SearchHelp.html">Die Suchfunktionen von
-    JabRef</a><br />
+    JabRef</a><br>
      <a href="ContentSelectorHelp.html">Wortauswahl
-    verwalten</a><br />
-     <a href="XMPHelp.html">XMP-Metadaten und JabRef</a><br />
+    verwalten</a><br>
+     <a href="XMPHelp.html">XMP-Metadaten und JabRef</a><br>
      <a href="JournalAbbreviations.html">Zeitschriftentitel
-    abkürzen</a><br />
-     <a href="TimeStampHelp.html">Zeitstempel</a><br /></p>
+    abkürzen</a><br>
+     <a href="TimeStampHelp.html">Zeitstempel</a><br></p>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/help/de/CustomEntriesHelp.html b/src/help/de/CustomEntriesHelp.html
index 1fb6bc1..c5c7a82 100644
--- a/src/help/de/CustomEntriesHelp.html
+++ b/src/help/de/CustomEntriesHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Eintragstypen anpassen</h1>
 
diff --git a/src/help/de/CustomExports.html b/src/help/de/CustomExports.html
index 1f1e3a2..799ba70 100644
--- a/src/help/de/CustomExports.html
+++ b/src/help/de/CustomExports.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Exportfilter anpassen</h1>
 
@@ -65,14 +65,14 @@
     <p>In unserem Beispiel-Exportfilter könnten diese Dateien
     folgendermaßen aussehen:</p>
 
-    <p><i>html.begin.layout</i>:<br />
-    <code><HTML><br />
-     <BODY> text="#275856"><br />
+    <p><i>html.begin.layout</i>:<br>
+    <code><HTML><br>
+     <BODY> text="#275856"><br>
     <basefont size="4" color="#2F4958"
     face="arial"></code></p>
 
-    <p><i>html.end.layout</i>:<br />
-    <code></BODY><br />
+    <p><i>html.end.layout</i>:<br>
+    <code></BODY><br>
      </HTML></code></p>
 
     <p>Die Datei <i>html.layout</i> stellt die
@@ -294,7 +294,7 @@
     <p>Sie können unter <strong>Optionen -> Einstellungen
     -> Namens-Formatierer</strong> Ihren eigenen Formatierer
     schreiben. Benutzen Sie das folgende Format:
-    <code><Fall1>@<Bereich11>@<Format>@<Bereich12>@<Format>@<Bereich13>...@@<br />
+    <code><Fall1>@<Bereich11>@<Format>@<Bereich12>@<Format>@<Bereich13>...@@<br>
 
      <Fall2>@<Bereich21>@... und so weiter.</code></p>
 
@@ -397,8 +397,8 @@
     Kommandos <code>\begin</code> und <code>\end</code>
     verhindern:</p>
 
-    <p><code>\begin{editor}<br />
-    \format[HTMLChars,AuthorFirstFirst]{\editor} (Hrsg.)<br />
+    <p><code>\begin{editor}<br>
+    \format[HTMLChars,AuthorFirstFirst]{\editor} (Hrsg.)<br>
      \end{editor}</code></p>
 
     <p>Die Kommandos <code>\begin</code> und <code>\end</code>
@@ -429,7 +429,7 @@
     Kommandos, um nach keyword zu gruppieren:</p>
 
     <p><code>\begingroup{keywords}New Category:
-    \format[HTMLChars]{\keywords}<br />
+    \format[HTMLChars]{\keywords}<br>
      \endgroup{keywords}</code></p>
 
     <h2>Teilen Sie Ihre Arbeit mit anderen</h2>
diff --git a/src/help/de/CustomImports.html b/src/help/de/CustomImports.html
index 2bf6485..fd853e5 100644
--- a/src/help/de/CustomImports.html
+++ b/src/help/de/CustomImports.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Importfilter anpassen</h1>
 
diff --git a/src/help/de/EndNoteFilters.html b/src/help/de/EndNoteFilters.html
index d114cc9..2585b08 100644
--- a/src/help/de/EndNoteFilters.html
+++ b/src/help/de/EndNoteFilters.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>EndNote Exportfilter</h1>
 
diff --git a/src/help/de/EntryEditorHelp.html b/src/help/de/EntryEditorHelp.html
index 878690c..de454d7 100644
--- a/src/help/de/EntryEditorHelp.html
+++ b/src/help/de/EntryEditorHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Der Eintrags-Editor</h1>
 
diff --git a/src/help/de/ExternalFiles.html b/src/help/de/ExternalFiles.html
index 6cdcae9..f6a64c5 100644
--- a/src/help/de/ExternalFiles.html
+++ b/src/help/de/ExternalFiles.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Links zu PDF- und PS-Dateien, URLs und DOIs in
     JabRef</h1>
diff --git a/src/help/de/FileLinks.html b/src/help/de/FileLinks.html
index 449cac0..d628215 100644
--- a/src/help/de/FileLinks.html
+++ b/src/help/de/FileLinks.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Datei-Links in JabRef</h1>
 
diff --git a/src/help/de/GeneralFields.html b/src/help/de/GeneralFields.html
index 00d1bf8..0ae2177 100644
--- a/src/help/de/GeneralFields.html
+++ b/src/help/de/GeneralFields.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Allgemeine Felder festlegen</h1>
 
@@ -21,7 +21,7 @@
 
     <p>Das Beispiel</p>
 
-    <p><code>Allgemeine Felder:url;keywords;doi;pdf<br />
+    <p><code>Allgemeine Felder:url;keywords;doi;pdf<br>
      Zusammenfassung:abstract;annote</code></p>
 
     <p>ergibt somit einen Tab mit dem Namen "Allgemeine Felder",
diff --git a/src/help/de/GroupsHelp.html b/src/help/de/GroupsHelp.html
index 5de74e5..ecbf516 100644
--- a/src/help/de/GroupsHelp.html
+++ b/src/help/de/GroupsHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Gruppen</h1>
 
diff --git a/src/help/de/HelpHelp.html b/src/help/de/HelpHelp.html
index e47343c..45028dd 100644
--- a/src/help/de/HelpHelp.html
+++ b/src/help/de/HelpHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Das Hilfefenster</h1>
 
diff --git a/src/help/de/IEEEXploreHelp.html b/src/help/de/IEEEXploreHelp.html
index 515b906..f6c812f 100644
--- a/src/help/de/IEEEXploreHelp.html
+++ b/src/help/de/IEEEXploreHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>IEEEXplore durchsuchen</h1>
 
diff --git a/src/help/de/ImportInspectionDialog.html b/src/help/de/ImportInspectionDialog.html
index d71d4b5..e38e8fc 100644
--- a/src/help/de/ImportInspectionDialog.html
+++ b/src/help/de/ImportInspectionDialog.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Import-Kontrollfenster</h1>
 
diff --git a/src/help/de/JabRefHelp.html b/src/help/de/JabRefHelp.html
index b93d48f..2ccf1a2 100644
--- a/src/help/de/JabRefHelp.html
+++ b/src/help/de/JabRefHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>JabRef</h1>
 
diff --git a/src/help/de/JournalAbbreviations.html b/src/help/de/JournalAbbreviations.html
index 34ec6d8..f1fb514 100644
--- a/src/help/de/JournalAbbreviations.html
+++ b/src/help/de/JournalAbbreviations.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Zeitschriftentitel abkürzen</h1>
 
diff --git a/src/help/de/LabelPatterns.html b/src/help/de/LabelPatterns.html
index 63a6956..d917cfd 100644
--- a/src/help/de/LabelPatterns.html
+++ b/src/help/de/LabelPatterns.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Anpassen der automatischen Erstellung von
     BibTeX-Keys</h1>
@@ -34,35 +34,35 @@
 
     <ul>
         <li><b>[<code>auth</code>]</b>: Der Nachname des ersten
-        Autors.<br /></li>
+        Autors.<br></li>
 
         <li><b>[<code>authors</code>]</b>: Die Nachnamen aller
-        Autoren.<br /></li>
+        Autoren.<br></li>
 
         <li><b>[<code>authorLast</code>]</b>: Der Nachname des
-        letzten Autors<br /></li>
+        letzten Autors<br></li>
 
         <li><b>[<code>authorsN</code>]</b>: Die Nachnamen von bis
         zu N Autoren. Falls es mehr Autoren gibt, wird EtAl
-        angehängt.<br /></li>
+        angehängt.<br></li>
 
         <li><b>[<code>authIniN</code>]</b>: Der Anfang des
         Nachnamens von jedem Autoren, wobei nicht mehr als N
-        Buchstaben verwendet werden.<br /></li>
+        Buchstaben verwendet werden.<br></li>
 
         <li><b>[<code>authorIni</code>]</b>: Die ersten 5
         Buchstaben des Nachnamens des ersten Autors und die
-        Initialen der Nachnamen der restlichen Autoren.<br /></li>
+        Initialen der Nachnamen der restlichen Autoren.<br></li>
 
         <li><b>[<code>authN</code>]</b>: Die ersten N Buchstaben
-        des Nachnamens des ersten Autors.<br /></li>
+        des Nachnamens des ersten Autors.<br></li>
 
         <li><b>[<code>authN_M</code>]</b>: Die ersten N Buchstaben
-        des Nachnamens des M. Autors.<br /></li>
+        des Nachnamens des M. Autors.<br></li>
 
         <li><b>[<code>auth.auth.ea</code>]</b>: Die Nachnamen der
         beiden ersten Autoren und ".ea", falls es mehr als zwei
-        Autoren sind.<br /></li>
+        Autoren sind.<br></li>
 
         <li><b>[<code>auth.etal</code>]</b>: Der Nachname des
         ersten Autors und der Nachname des zweiten Autors bei zwei
@@ -72,7 +72,7 @@
         Autor; der erste Buchstabe der Nachnamen von bis zu drei
         Autoren, falls mehr als ein Autor vorhanden ist. Ein Plus
         (+) wird angehängt, falls es mehr als drei Autoren
-        gibt.<br /></li>
+        gibt.<br></li>
     </ul><b>Anmerkung:</b>Falls es keinen Autor gibt (z.B. bei
     einem Buch mit Herausgeber), benutzen die genannten
     [auth...]-Feldmarken den oder die Herausgeber, die im
@@ -86,58 +86,58 @@
 
     <ul>
         <li><b>[<code>edtr</code>]</b>: Der Nachname des ersten
-        Herausgebers.<br /></li>
+        Herausgebers.<br></li>
 
         <li><b>[<code>editors</code>]</b>: Die Nachnamen aller
-        Herausgeber.<br /></li>
+        Herausgeber.<br></li>
 
         <li><b>[<code>editorLast</code>]</b>: Der Nachname des letzten
-        Herausgebers.<br /></li>
+        Herausgebers.<br></li>
 
         <li><b>[<code>edtrIniN</code>]</b>: Der Anfang des
         Nachnamens von jedem Herausgeber, wobei nicht mehr als N
-        Buchstaben verwendet werden.<br /></li>
+        Buchstaben verwendet werden.<br></li>
 
         <li><b>[<code>editorIni</code>]</b>: Die ersten 5
         Buchstaben des Nachnamens des Herausgebers und die Initialen der
-        Nachnamen der restlichen Herausgeber.<br /></li>
+        Nachnamen der restlichen Herausgeber.<br></li>
 
         <li><b>[<code>edtrN</code>]</b>: Die ersten N Buchstaben
-        des Nachnamens des ersten Herausgebers.<br /></li>
+        des Nachnamens des ersten Herausgebers.<br></li>
 
         <li><b>[<code>edtrN_M</code>]</b>: Die ersten N Buchstaben
-        des Nachnamens des M. Herausgebers.<br /></li>
+        des Nachnamens des M. Herausgebers.<br></li>
 
         <li><b>[<code>edtr.edtr.ea</code>]</b>: Der Nachname der
         ersten beiden Herausgeber und ".ea", falls es mehr als zwei
-        Herausgeber sind.<br /></li>
+        Herausgeber sind.<br></li>
 
         <li><b>[<code>edtrshort</code>]</b>: Der Nachname bei einem
         Herausgeber; der erste Buchstabe der Nachnamen von bis zu drei
         Herausgebern, falls mehr als ein Herausgeber vorhanden ist. Ein Plus
         (+) wird angehängt, falls es mehr als drei Herausgeber
-        gibt.<br /></li>
+        gibt.<br></li>
 
         <li><b>[<code>firstpage</code>]</b>: Die erste Seitenzahl
-        einer Veröffentlichung (pages).<br /></li>
+        einer Veröffentlichung (pages).<br></li>
 
         <li><b>[<code>keywordN</code>]</b>: Stichwort Nummer N aus
         dem Feld "keywords", gesetzt den Fall, dass die Stichworte
         durch Komma oder Semikolon voneinander getrennt
-        sind.<br /></li>
+        sind.<br></li>
 
         <li><b>[<code>lastpage</code>]</b>: Die letzte Seitenzahl
-        einer Veröffentlichung (pages).<br /></li>
+        einer Veröffentlichung (pages).<br></li>
 
         <li><b>[<code>shorttitle</code>]</b>: Die ersten 3 Worte
-        eines Titels (title).<br /></li>
+        eines Titels (title).<br></li>
 
         <li><b>[<code>shortyear</code>]</b>: Die letzten 2 Ziffern
-        des Jahrgangs (year).<br /></li>
+        des Jahrgangs (year).<br></li>
 
         <li><b>[<code>veryshorttitle</code>]</b>: Die ersten beiden
         Worte des Titels (title), wobei 'the', 'a' und 'an'
-        ausgelassen werden.<br /></li>
+        ausgelassen werden.<br></li>
     </ul>
 
     <p>Hinter einem Feldnamen (oder einem der oben
@@ -151,7 +151,7 @@
         erste Buchstabe und weitere Buchstaben, die auf ein
         Leerzeichen folgen, werden berücksichtigt. Zum
         Beispiel würde <b>[journal:abbr]</b> die Zeitschrift
-        "Jorunal of Fish Biology" zu "JoFB" wandeln.<br /></li>
+        "Jorunal of Fish Biology" zu "JoFB" wandeln.<br></li>
 
         <li><b>:lower</b>: Wandelt den von der Feldmarke
         eingefügten Text in Kleinbuchstaben. So wird
@@ -174,8 +174,8 @@
     aussehen:</p>
 
     <blockquote>
-        <code>Yared1998</code><br />
-         <code>Yared1998a</code><br />
+        <code>Yared1998</code><br>
+         <code>Yared1998a</code><br>
         <code>Yared1998b</code>
     </blockquote>
 
diff --git a/src/help/de/MarkingHelp.html b/src/help/de/MarkingHelp.html
index f09b75f..f0d8a2d 100644
--- a/src/help/de/MarkingHelp.html
+++ b/src/help/de/MarkingHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Einträge markieren</h1>
 
diff --git a/src/help/de/MedlineHelp.html b/src/help/de/MedlineHelp.html
index aeec5a7..7edde8f 100644
--- a/src/help/de/MedlineHelp.html
+++ b/src/help/de/MedlineHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Einträge von Medline abrufen</h1>
 
@@ -45,7 +45,7 @@
     <p>Wenn Sie einen
     HTTP-Proxy-Server benutzen müssen, übergeben Sie den
     Servernamen und die Portnummer an Java. Diese
-    Umgebungseinstellungen sind dokumentiert unter<br />
+    Umgebungseinstellungen sind dokumentiert unter<br>
 
     <a href="http://java.sun.com/j2se/1.4.2/docs/guide/net/properties.html">http://java.sun.com/j2se/1.4.2/docs/guide/net/properties.html</a></p>
 
diff --git a/src/help/de/OpenOfficeHelp.html b/src/help/de/OpenOfficeHelp.html
index 5315ec9..11e9b8a 100644
--- a/src/help/de/OpenOfficeHelp.html
+++ b/src/help/de/OpenOfficeHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>JabRef-Bibliographien in OpenOffice.org benutzen</h1>
 
diff --git a/src/help/de/OwnerHelp.html b/src/help/de/OwnerHelp.html
index 86c088a..314e4ef 100644
--- a/src/help/de/OwnerHelp.html
+++ b/src/help/de/OwnerHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Das 'Besitzer' (owner) Feld</h1>
 
diff --git a/src/help/de/PreviewHelp.html b/src/help/de/PreviewHelp.html
index 99013e6..2f18c5a 100644
--- a/src/help/de/PreviewHelp.html
+++ b/src/help/de/PreviewHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Eintragsvorschau einstellen</h1>
 
diff --git a/src/help/de/RemoteHelp.html b/src/help/de/RemoteHelp.html
index 470fb60..2225b74 100644
--- a/src/help/de/RemoteHelp.html
+++ b/src/help/de/RemoteHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Externer Zugriff</h1>
 
diff --git a/src/help/de/SearchHelp.html b/src/help/de/SearchHelp.html
index 2f925f8..29e92d1 100644
--- a/src/help/de/SearchHelp.html
+++ b/src/help/de/SearchHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Suchfunktionen</h1>
 
diff --git a/src/help/de/ShortAuxImport.html b/src/help/de/ShortAuxImport.html
index 3298197..b953317 100644
--- a/src/help/de/ShortAuxImport.html
+++ b/src/help/de/ShortAuxImport.html
@@ -4,7 +4,7 @@
 <body>
     <basefont size="-1"
           color="#2F4958"
-          face="arial" /> Dieses Modul erstellt eine neue
+          face="arial"> Dieses Modul erstellt eine neue
           Datenbank, welche nur die im TeX Projekt vorkommenden
           Verweise/Einträge enthält.
 </body>
diff --git a/src/help/de/ShortIntegrityCheck.html b/src/help/de/ShortIntegrityCheck.html
index 9a77178..d5bcafe 100644
--- a/src/help/de/ShortIntegrityCheck.html
+++ b/src/help/de/ShortIntegrityCheck.html
@@ -4,7 +4,7 @@
 <body>
     <basefont size="-1"
           color="#2F4958"
-          face="arial" /> Die Integritätsprüfung
+          face="arial"> Die Integritätsprüfung
           überprüft alle Einträge auf deren
           Gültigkeit und versucht Fehler aufzudecken. Mit dem
           "Überprüfen" Button kann der Vorgang gestartet
diff --git a/src/help/de/ShortPlainImport.html b/src/help/de/ShortPlainImport.html
index 0219660..d83561e 100644
--- a/src/help/de/ShortPlainImport.html
+++ b/src/help/de/ShortPlainImport.html
@@ -4,7 +4,7 @@
 <body>
     <basefont size="-1"
           color="#2F4958"
-          face="arial" /> Dieser Dialog ermöglicht das
+          face="arial"> Dieser Dialog ermöglicht das
           schnelle Einfügen von Einträgen aus normalen
           Text. Die gewünschten Textstellen werden markiert
           und z.B. durch Doppelklick einem selektierten BibTeX
diff --git a/src/help/de/StringEditorHelp.html b/src/help/de/StringEditorHelp.html
index a5fdf83..3145a76 100644
--- a/src/help/de/StringEditorHelp.html
+++ b/src/help/de/StringEditorHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Der String-Editor</h1>
 
diff --git a/src/help/de/TimeStampHelp.html b/src/help/de/TimeStampHelp.html
index 77dfa0a..37f521a 100644
--- a/src/help/de/TimeStampHelp.html
+++ b/src/help/de/TimeStampHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Zeitstempel</h1>
 
diff --git a/src/help/de/XMPHelp.html b/src/help/de/XMPHelp.html
index fef434b..068c48a 100644
--- a/src/help/de/XMPHelp.html
+++ b/src/help/de/XMPHelp.html
@@ -4,7 +4,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Unterstützung von XMP-Metadaten in JabRef</h1>
 
@@ -96,8 +96,8 @@
 
         <li>Alle anderen Felder werden unter ihrem Feld-Namen
         gespeichert.</li>
-    </ul><br />
-    <br />
+    </ul><br>
+    <br>
 
 
     <p>Es folgt ein Beispiel:</p>
@@ -139,8 +139,8 @@
     <ul>
         <li>In RDF können Attribut-Wert-Paare auch als Knoten
         wiedergegeben werden und vice versa.</li>
-    </ul><br />
-    <br />
+    </ul><br>
+    <br>
 
 
     <h2>Weiterführende Links</h2>
@@ -169,7 +169,7 @@
         <li>
         <a href="http://partners.adobe.com/public/developer/en/xmp/sdk/xmpspecification.pdf">
         Adobe XMP Spezifikation</a></li>
-    </ul><br />
-    <br />
+    </ul><br>
+    <br>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/help/fr/About.html b/src/help/fr/About.html
index af4d0a0..ba268aa 100644
--- a/src/help/fr/About.html
+++ b/src/help/fr/About.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <center>
         <h1>JabRef version @version@</h1>
diff --git a/src/help/fr/BaseFrameHelp.html b/src/help/fr/BaseFrameHelp.html
index 96383c4..f6daebc 100644
--- a/src/help/fr/BaseFrameHelp.html
+++ b/src/help/fr/BaseFrameHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>La fenêtre principale de
     JabRef</h1>
@@ -138,8 +138,8 @@
     éditeur de texte, à une exception
     près : pour référencer une
     chaîne, entourer le nom de la chaîne avec le
-    caractère #, tel que dans :<br />
-      '#jan# 1997',<br />
+    caractère #, tel que dans :<br>
+      '#jan# 1997',<br>
     ce qui sera interprété comme la chaîne
     nommée 'jan' suivie de '1997'.</p>
 
diff --git a/src/help/fr/BibtexHelp.html b/src/help/fr/BibtexHelp.html
index 3c33183..01d5a60 100644
--- a/src/help/fr/BibtexHelp.html
+++ b/src/help/fr/BibtexHelp.html
@@ -3,7 +3,7 @@
 <body style="color: rgb(39, 88, 86);">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>A propos de <em>BibTeX</em></h1>
 
@@ -38,9 +38,9 @@
         LaTeX. Notez que lorsque vous référencez une
         entrée dans LaTeX, la clef doit respecter la casse
         (majuscules/minuscules) de la chaîne de
-        référence.<br /></li>
+        référence.<br></li>
 
-        <li><strong>address<br /></strong> Habituellement l'adresse
+        <li><strong>address<br></strong> Habituellement l'adresse
         de l'<tt>éditeur commercial</tt> ("publisher" en
         anglais) ou d'un autre type d'institution. Pour les
         principales maisons d'édition, van Leunen
@@ -49,69 +49,69 @@
         coté, vous pouvez aider le lecteur en donnant
         l'adresse complète.</li>
 
-        <li><strong>annote<br /></strong> Une annotation. Ce champ
+        <li><strong>annote<br></strong> Une annotation. Ce champ
         n'est pas utilisé par les styles bibliographiques
         standards, mais peut être utilisé par d'autres
         styles qui produisent une bibliographie
         annotée.</li>
 
-        <li><strong>author<br /></strong> Ce champ doit contenir la
+        <li><strong>author<br></strong> Ce champ doit contenir la
         liste complète des auteurs de votre entrée.
         Les noms sont séparés par le mot
         <em>and</em>, même si il y a plus de deux auteurs.
         Chaque nom peut être écrit dans deux formes
-        équivalentes :<br />
-         Donald E. Knuth <em>ou</em> Knuth, Donald E.<br />
-         Eddie van Halen <em>ou</em> van Halen, Eddie<br />
+        équivalentes :<br>
+         Donald E. Knuth <em>ou</em> Knuth, Donald E.<br>
+         Eddie van Halen <em>ou</em> van Halen, Eddie<br>
          La seconde forme devrait être utilisée pour
         les auteurs ayants plus de deux noms afin de
         différencier les seconds prénoms et les noms
-        de famille [NDT: pas sur de la traduction...].<br />
-        <br /></li>
+        de famille [NDT: pas sur de la traduction...].<br>
+        <br></li>
 
-        <li><strong>booktitle<br /></strong> Titre d'un livre, dont
+        <li><strong>booktitle<br></strong> Titre d'un livre, dont
         une partie est citée. Pour les entrées du
         type "book", utilisez le champ <tt>title</tt>.</li>
 
-        <li><strong>chapter<br /></strong> Un numéro de
+        <li><strong>chapter<br></strong> Un numéro de
         chapitre (ou de partie, ou d'autre chose).</li>
 
-        <li><strong>crossref<br /></strong> La clef de
+        <li><strong>crossref<br></strong> La clef de
         l'entrée vers laquelle on effectue le renvoi.</li>
 
-        <li><strong>edition<br /></strong> Le numéro
+        <li><strong>edition<br></strong> Le numéro
         d'édition d'un livre -- par exemple
         "Troisième". Cela doit être un nombre, et la
         première lettre doit être capitalisée,
         comme montré ici ; les styles standards la
         convertisse en minuscule si nécessaire.</li>
 
-        <li><strong>editor<br /></strong> Ce champ est analogue au
+        <li><strong>editor<br></strong> Ce champ est analogue au
         champ <em>author</em>. Il permet d'indiquer le nom des
         éditeurs scientifiques, coordonateurs, etc.</li>
 
-        <li><strong>howpublished<br /></strong> Comment quelque
+        <li><strong>howpublished<br></strong> Comment quelque
         chose de non-standard a été publiée.
         Le premier mot prend une majuscule.</li>
 
-        <li><strong>institution<br /></strong> L'institution ayant
+        <li><strong>institution<br></strong> L'institution ayant
         promue un rapport technique.</li>
 
-        <li><strong>journal<br /></strong> Un nom de journal. Le
+        <li><strong>journal<br></strong> Un nom de journal. Le
         nom d'un journal peut être abrégé en
         utilisant une "chaîne". Pour définir une
         chaîne, utilisez
         <a href="StringEditorHelp.html">l'éditeur de
         chaînes</a>.</li>
 
-        <li><strong>key<br /></strong> utilisé pour
+        <li><strong>key<br></strong> utilisé pour
         alphabétiser, renvoyer et créer une
         étiquette quand l'information sur "author" est
         manquante. Ce champ ne doit pas être confondu avec la
         clef qui est fournie dans la commande <code>\cite</code> et
         au début de l'entrée.</li>
 
-        <li><strong>month<br /></strong> Le mois au cours duquel le
+        <li><strong>month<br></strong> Le mois au cours duquel le
         travail a été publié ou, pour un
         travail non publié, au cours duquel il a
         été écrit. Vous devriez utiliser
@@ -119,11 +119,11 @@
         feb, mar, apr, may, jun, jul, aug, sep, oct, nov,
         dec).</li>
 
-        <li><strong>note<br /></strong> Toute information
+        <li><strong>note<br></strong> Toute information
         additionnelle qui peut aider le lecteur. Le premier mot
         doit prendre une majuscule.</li>
 
-        <li><strong>number</strong><br />
+        <li><strong>number</strong><br>
         Le numéro d'un journal, d'un magazine, d'un rapport
         technique ou d'un travail dans une série. Les
         journaux et les magazines sont habituellement
@@ -134,11 +134,11 @@
         numéros lorsqu'ils appartiennent à une
         série nommée.</li>
 
-        <li><strong>organization<br /></strong> L'organisation
+        <li><strong>organization<br></strong> L'organisation
         ayant promue une conférence ou qui publie un
         manuel.</li>
 
-        <li><strong>pages<br /></strong> Un ou plusieurs
+        <li><strong>pages<br></strong> Un ou plusieurs
         numéros de page, ou une gamme de numéros, tel
         que <tt>42-111</tt> ou <tt>7,41,73-97</tt> ou <tt>43+</tt>
         (le `<tt>+</tt>' dans le dernier exemple indique des pages
@@ -150,33 +150,33 @@
         pour définir une gamme de nombres (comme dans
         <tt>7-33</tt>).</li>
 
-        <li><strong>publisher<br /></strong> Le nom de
+        <li><strong>publisher<br></strong> Le nom de
         l'éditeur commercial.</li>
 
-        <li><strong>school<br /></strong> Le nom de l'école
+        <li><strong>school<br></strong> Le nom de l'école
         où a été écrite une
         thèse.</li>
 
-        <li><strong>series<br /></strong> Le nom d'une série
+        <li><strong>series<br></strong> Le nom d'une série
         ou d'un ensemble de livres. Quand on cite un livre entier,
         le champ <tt>title</tt> donne son titre et le champ
         optionnel <tt>series</tt> donne le nom de la série
         ou de l'ensemble de volumes dans lequel le livre est
         publié.</li>
 
-        <li><strong>title<br /></strong> Le titre du travail. La
+        <li><strong>title<br></strong> Le titre du travail. La
         capitalisation dépend du style bibliographique et de
         la langue utilisés. Pour les mots qui doivent
         être capitalisés (tel un nom propre), mettre
         le mot (ou sa première lettre) entre accolades.</li>
 
-        <li><strong>type<br /></strong> Le type de rapport
+        <li><strong>type<br></strong> Le type de rapport
         technique -- par exemple, "Note de recherche".</li>
 
-        <li><strong>volume<br /></strong> Le volume d'un journal ou
+        <li><strong>volume<br></strong> Le volume d'un journal ou
         d'un livre en plusieurs tomes.</li>
 
-        <li><strong>year<br /></strong> L'année de
+        <li><strong>year<br></strong> L'année de
         publication ou, pour un travail non publié,
         l'année où il a été
         écrit. Généralement, elle doit prendre
@@ -186,7 +186,7 @@
         sont des chiffres (hors caractères de ponctuation),
         tel que `(autour de 1984)'. Ce champ est requis par la
         plupart des types d'entrées.</li>
-    </ul><br />
+    </ul><br>
 
 
     <h2>Autres champs</h2>
@@ -199,97 +199,97 @@
     <ul>
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        affiliation*</span><br /></strong> L'affiliation des
-        auteurs.<br />
-        <br /></li>
+        affiliation*</span><br></strong> L'affiliation des
+        auteurs.<br>
+        <br></li>
 
-        <li><strong>abstract<br /></strong> Le résumé
-        d'un travail.<br />
-        <br /></li>
+        <li><strong>abstract<br></strong> Le résumé
+        d'un travail.<br>
+        <br></li>
 
-        <li><strong>doi<br /></strong> Le Digital Object Identifier
+        <li><strong>doi<br></strong> Le Digital Object Identifier
         ("identifiant d'objet numérique") est l'identifiant
         permanent donné à un document
-        numérique.<br />
-        <br /></li>
+        numérique.<br>
+        <br></li>
 
-        <li><strong>eid<br /></strong> L'Electronic IDentifier
+        <li><strong>eid<br></strong> L'Electronic IDentifier
         ("identifiant électronique") est utilisé par
         les journaux électroniques qui ont aussi une version
         papier. Ce numéro remplace le nombre de pages et est
         utilisé pour trouver un article dans un volume
         imprimé. Il est parfois aussi appelé
-        <em>citation number</em>.<br />
-        <br /></li>
+        <em>citation number</em>.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        contents*</span><br /></strong> La table des
-        matières<br />
-        <br /></li>
+        contents*</span><br></strong> La table des
+        matières<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        copyright*</span><br /></strong> Informations sur les
-        droits d'auteur (copyright).<br />
-        <br /></li>
+        copyright*</span><br></strong> Informations sur les
+        droits d'auteur (copyright).<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        ISBN*</span><br /></strong> L'"International Standard Book
-        Number".<br />
-        <br /></li>
+        ISBN*</span><br></strong> L'"International Standard Book
+        Number".<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        ISSN*</span><br /></strong> L'"International Standard
+        ISSN*</span><br></strong> L'"International Standard
         Serial Number". Utilisé pour identifier un
-        journal.<br />
-        <br /></li>
+        journal.<br>
+        <br></li>
 
-        <li><strong>keywords<br /></strong> Mots-clefs
+        <li><strong>keywords<br></strong> Mots-clefs
         utilisés pour la recherche, ou pour
-        annotation.<br />
-        <br /></li>
+        annotation.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        language*</span><br /></strong> La langue du
-        document.<br />
-        <br /></li>
+        language*</span><br></strong> La langue du
+        document.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        location*</span><br /></strong> Une localisation
+        location*</span><br></strong> Une localisation
         associée avec l'entrée, telle que la ville
-        où la conférence a eu lieu.<br />
-        <br /></li>
+        où la conférence a eu lieu.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        LCCN*</span><br /></strong> Le "Library of Congress Call
+        LCCN*</span><br></strong> Le "Library of Congress Call
         Number". Champ parfois nommé
-        <tt>lib-congress</tt>.<br />
-        <br /></li>
+        <tt>lib-congress</tt>.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        mrnumber*</span><br /></strong> Le numéro de
-        <i>Mathematical Reviews</i>.<br />
-        <br /></li>
+        mrnumber*</span><br></strong> Le numéro de
+        <i>Mathematical Reviews</i>.<br>
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        price*</span><br /></strong> Le prix du document.<br />
-        <br /></li>
+        price*</span><br></strong> Le prix du document.<br />
+        <br></li>
 
         <li>
         <strong><span style="font-weight: normal; font-style: italic;">
-        size*</span><br /></strong> La taille physique d'un
-        travail.<br />
-        <br /></li>
+        size*</span><br></strong> La taille physique d'un
+        travail.<br>
+        <br></li>
 
-        <li><strong>URL<br /></strong> Le "WWW Universal Resource
+        <li><strong>URL<br></strong> Le "WWW Universal Resource
         Locator" (adresse URL) qui pointe vers
         l'élément référencé.
         C'est souvent utilisé pour les rapports techniques
@@ -300,10 +300,10 @@
     <h3>JuraBib</h3>
 
     <ul>
-        <li><strong>urldate<br /></strong> La date de la
+        <li><strong>urldate<br></strong> La date de la
         dernière visite de la page.</li>
-    </ul><br />
-     *) non supporté directement par JabRef<br />
-     <br />
+    </ul><br>
+     *) non supporté directement par JabRef<br>
+     <br>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/help/fr/CiteSeerHelp.html b/src/help/fr/CiteSeerHelp.html
index 279e769..5767740 100644
--- a/src/help/fr/CiteSeerHelp.html
+++ b/src/help/fr/CiteSeerHelp.html
@@ -4,7 +4,7 @@
 <body style="color: rgb(39, 88, 86); direction: ltr;">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Récupération depuis CiteSeer</h1>
 
@@ -25,8 +25,8 @@
     contenu sur CiteSeer. Le champ citeseerurl doit être
     rempli avec l'un des formats suivants :</p>
 
-    <p>http://citeseer.ist.psu.edu/DDDDDD[.html], ou<br />
-    oai:CiteSeerPSU:DDDDDD, ou<br />
+    <p>http://citeseer.ist.psu.edu/DDDDDD[.html], ou<br>
+    oai:CiteSeerPSU:DDDDDD, ou<br>
     DDDDDD</p>
 
     <p>où DDDDD est une séquence de chiffres. Pour
diff --git a/src/help/fr/CommandLine.html b/src/help/fr/CommandLine.html
index 2e51e2b..4b5d5e6 100644
--- a/src/help/fr/CommandLine.html
+++ b/src/help/fr/CommandLine.html
@@ -4,7 +4,7 @@
 <body style="color: rgb(39, 88, 86); direction: ltr;">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Les options de la ligne de commande</h1>
 
diff --git a/src/help/fr/ContentSelectorHelp.html b/src/help/fr/ContentSelectorHelp.html
index 8679d50..86a395c 100644
--- a/src/help/fr/ContentSelectorHelp.html
+++ b/src/help/fr/ContentSelectorHelp.html
@@ -4,7 +4,7 @@
 <body style="color: rgb(39, 88, 86); direction: ltr;">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Sélecteur de contenu de champ</h1>
 
diff --git a/src/help/fr/Contents.html b/src/help/fr/Contents.html
index 73e1933..defe785 100644
--- a/src/help/fr/Contents.html
+++ b/src/help/fr/Contents.html
@@ -3,65 +3,65 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Contenu de l'aide</h1>
 
     <p><a href="HelpHelp.html">A propos de
-    la fenêtre d'aide</a><br />
+    la fenêtre d'aide</a><br>
      <a href="JabRefHelp.html">Informations
     générales</a></p>
 
 
-    <p><a href="BibtexHelp.html">Aide sur <em>BibTeX</em></a><br />
+    <p><a href="BibtexHelp.html">Aide sur <em>BibTeX</em></a><br>
      <a href="CommandLine.html">Options de la ligne de
-    commande</a><br />
+    commande</a><br>
      <a href="CustomExports.html">Filtres d'exportation
-    personnalisés</a><br />
+    personnalisés</a><br>
      <a href="CustomImports.html">Filtres d'importation
-    personnalisés</a><br />
+    personnalisés</a><br>
      <a href="LabelPatterns.html">Personnalisation du
-    générateur de clefs BibTeX</a><br />
+    générateur de clefs BibTeX</a><br>
      <a href="CustomEntriesHelp.html">Personnalisation des types
-    d'entrées</a><br />
+    d'entrées</a><br>
      <a href="GeneralFields.html">Personnalisation des champs
-    généraux</a><br />
+    généraux</a><br>
      <a href="EndNoteFilters.html">Filtres
-    d'importation/exportation d'EndNote</a><br />
+    d'importation/exportation d'EndNote</a><br>
      <a href="EntryEditorHelp.html">Éditeur
-    d'entrées</a><br />
-     <a href="FileLinks.html">Liens de fichiers externes</a><br />
+    d'entrées</a><br>
+     <a href="FileLinks.html">Liens de fichiers externes</a><br>
      <a href="TimeStampHelp.html">Horodatage des
-    entrées</a><br />
+    entrées</a><br>
      <a href="CiteSeerHelp.html">Récupération des
-    entrées depuis <em>CiteSeer</em></a><br />
+    entrées depuis <em>CiteSeer</em></a><br>
      <a href="MedlineHelp.html">Récupération des
-    entrées depuis <em>Medline</em></a><br />
+    entrées depuis <em>Medline</em></a><br>
      <a href="IEEEXploreHelp.html">Récupération des
-    entrées depuis <em>IEEExplore</em></a><br />
+    entrées depuis <em>IEEExplore</em></a><br>
      <a href="ContentSelectorHelp.html">Sélecteur de contenu
-    de champ</a><br />
+    de champ</a><br>
      <a href="GroupsHelp.html">Utilisation des
-    <em>Groupes</em></a><br />
+    <em>Groupes</em></a><br>
      <a href="ImportInspectionDialog.html">Fenêtre de
-    vérification des importations</a><br />
+    vérification des importations</a><br>
      <a href="JournalAbbreviations.html">Abréviations de
-    journaux</a><br />
+    journaux</a><br>
      <a href="BaseFrameHelp.html">La fenêtre principale de
-    JabRef</a><br />
+    JabRef</a><br>
      <a href="OwnerHelp.html">Le champ 'owner'
-    (propriétaire)</a><br />
+    (propriétaire)</a><br>
      <a href="MarkingHelp.html">Étiqueter des
-    entrées</a><br />
+    entrées</a><br>
      <a href="OpenOfficeHelp.html">Utiliser les bibliographies
-    JabRef dans OpenOffice.org</a><br />
+    JabRef dans OpenOffice.org</a><br>
      <a href="ExternalFiles.html">Liens PDF/PS/URL/DOI dans
-    JabRef</a><br />
-     <a href="SearchHelp.html">Recherche dans JabRef</a><br />
+    JabRef</a><br>
+     <a href="SearchHelp.html">Recherche dans JabRef</a><br>
      <a href="StringEditorHelp.html">Éditeur de
-    chaînes</a><br />
+    chaînes</a><br>
      <a href="PreviewHelp.html">Configuration de l'aperçu
-    des entrées</a><br />
+    des entrées</a><br>
      <a href="XMPHelp.html">Support des
     metadonnées XMP dans JabRef</a></p>
 </body>
diff --git a/src/help/fr/CustomEntriesHelp.html b/src/help/fr/CustomEntriesHelp.html
index 37af71c..f6521f0 100644
--- a/src/help/fr/CustomEntriesHelp.html
+++ b/src/help/fr/CustomEntriesHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Personnaliser les types d'entrées</h1>
 
diff --git a/src/help/fr/CustomExports.html b/src/help/fr/CustomExports.html
index 66ffa8b..3cdcc70 100644
--- a/src/help/fr/CustomExports.html
+++ b/src/help/fr/CustomExports.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Filtres d'exportation personnalisés</h1>
 
@@ -67,14 +67,14 @@
     <p>Dans notre exemple de fichier d'exportation, cela pourrait
     ressembler à</p>
 
-    <p><i>html.begin.layout</i> :<br />
-    <code><HTML><br />
-     <BODY> text="#275856"><br />
+    <p><i>html.begin.layout</i> :<br>
+    <code><HTML><br>
+     <BODY> text="#275856"><br>
     <basefont size="4" color="#2F4958"
     face="arial"></code></p>
 
-    <p><i>html.end.layout</i> :<br />
-    <code></BODY><br />
+    <p><i>html.end.layout</i> :<br>
+    <code></BODY><br>
      </HTML></code></p>
 
     <p>Le fichier <i>html.layout</i> fournit le gabarit par
@@ -363,7 +363,7 @@
     utilisant le format suivant et en l'utilisant ensuite avec le
     nom que vous avez défini comme de n'importe quel autre
     formateur</p>
-    <code><cas1>@<gamme11>@<format>@<gamme12>@<format>@<gamme13>...@@<br />
+    <code><cas1>@<gamme11>@<format>@<gamme12>@<format>@<gamme13>...@@<br>
 
      <cas2>@<gamme21>@... et ainsi de suite.</code>
 
@@ -470,8 +470,8 @@
     effectué en utilisant les commandes <code>\begin</code>
     et <code>\end</code> :</p>
 
-    <p><code>\begin{editor}<br />
-    \format[HTMLChars,AuthorFirstFirst]{\editor} (Ed.)<br />
+    <p><code>\begin{editor}<br>
+    \format[HTMLChars,AuthorFirstFirst]{\editor} (Ed.)<br>
      \end{editor}</code></p>
 
     <p>Les commandes <code>\begin</code> et <code>\end</code>
@@ -502,7 +502,7 @@
     les grouper par mot-clefs :</p>
 
     <p><code>\begingroup{keywords}New Category:
-    \format[HTMLChars]{\keywords}<br />
+    \format[HTMLChars]{\keywords}<br>
      \endgroup{keywords}</code></p>
 
     <h2>Partage de votre travail</h2>
diff --git a/src/help/fr/CustomImports.html b/src/help/fr/CustomImports.html
index 9760bbf..d7d6d60 100644
--- a/src/help/fr/CustomImports.html
+++ b/src/help/fr/CustomImports.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Filtres d'importation personnalisés</h1>
 
diff --git a/src/help/fr/EndNoteFilters.html b/src/help/fr/EndNoteFilters.html
index b9f170c..d05801a 100644
--- a/src/help/fr/EndNoteFilters.html
+++ b/src/help/fr/EndNoteFilters.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Filtre d'exportation EndNote</h1>
 
diff --git a/src/help/fr/EntryEditorHelp.html b/src/help/fr/EntryEditorHelp.html
index bc9b713..daecb6d 100644
--- a/src/help/fr/EntryEditorHelp.html
+++ b/src/help/fr/EntryEditorHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>L'éditeur d'entrées</h1>
 
diff --git a/src/help/fr/ExternalFiles.html b/src/help/fr/ExternalFiles.html
index 3153cbf..d2b5d11 100644
--- a/src/help/fr/ExternalFiles.html
+++ b/src/help/fr/ExternalFiles.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Les liens PDF/PS/URL/DOI dans JabRef</h1>
 
diff --git a/src/help/fr/FileLinks.html b/src/help/fr/FileLinks.html
index cbca1a7..df8db1e 100644
--- a/src/help/fr/FileLinks.html
+++ b/src/help/fr/FileLinks.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Liens de fichier dans JabRef</h1>
 
diff --git a/src/help/fr/GeneralFields.html b/src/help/fr/GeneralFields.html
index 5e46967..a069f41 100644
--- a/src/help/fr/GeneralFields.html
+++ b/src/help/fr/GeneralFields.html
@@ -4,7 +4,7 @@
 <body style="color: rgb(39, 88, 86); direction: ltr;">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Personnalisation des champs généraux</h1>
 
@@ -19,7 +19,7 @@
     puis par les champs séparés par un point-virgule
     (;), devant être contenus.</p>
 
-    <p>Exemple :</p><code>General:url;keyword;doi;pdf<br />
+    <p>Exemple :</p><code>General:url;keyword;doi;pdf<br>
     Abstract:abstract;annote</code>
 
     <p>produit un onglet appelé "General" contenant les
diff --git a/src/help/fr/GroupsHelp.html b/src/help/fr/GroupsHelp.html
index 0341fd8..fdab916 100644
--- a/src/help/fr/GroupsHelp.html
+++ b/src/help/fr/GroupsHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Les groupes</h1>
 
diff --git a/src/help/fr/HelpHelp.html b/src/help/fr/HelpHelp.html
index 91a5a5b..8f93317 100644
--- a/src/help/fr/HelpHelp.html
+++ b/src/help/fr/HelpHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>La fenêtre d'aide</h1>
 
diff --git a/src/help/fr/IEEEXploreHelp.html b/src/help/fr/IEEEXploreHelp.html
index 6fd84a4..f68f30f 100644
--- a/src/help/fr/IEEEXploreHelp.html
+++ b/src/help/fr/IEEEXploreHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Recherche IEEEXplore</h1>
 
diff --git a/src/help/fr/ImportInspectionDialog.html b/src/help/fr/ImportInspectionDialog.html
index cf0773e..0f72723 100644
--- a/src/help/fr/ImportInspectionDialog.html
+++ b/src/help/fr/ImportInspectionDialog.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Fenêtre de vérification des importations</h1>
 
diff --git a/src/help/fr/JabRefHelp.html b/src/help/fr/JabRefHelp.html
index c72d312..d7e213f 100644
--- a/src/help/fr/JabRefHelp.html
+++ b/src/help/fr/JabRefHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>JabRef</h1>
 
diff --git a/src/help/fr/JournalAbbreviations.html b/src/help/fr/JournalAbbreviations.html
index 20cf0cb..7dd6a79 100644
--- a/src/help/fr/JournalAbbreviations.html
+++ b/src/help/fr/JournalAbbreviations.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Abréviations des journaux</h1>
 
diff --git a/src/help/fr/LabelPatterns.html b/src/help/fr/LabelPatterns.html
index 83130d1..f5bffbe 100644
--- a/src/help/fr/LabelPatterns.html
+++ b/src/help/fr/LabelPatterns.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Personnalisation du générateur de clefs
     BibTeX</h1>
@@ -36,46 +36,46 @@
 
     <ul>
         <li><b>[<code>auth</code>]</b> : Le nom du premier
-        auteur<br /></li>
+        auteur<br></li>
 
         <li><b>[<code>authors</code>]</b> : Le nom de tous les
-        auteurs<br /></li>
+        auteurs<br></li>
 
         <li><b>[<code>authorLast</code>]</b>: Le nom propre du dernier
-        auteur<br /></li>
+        auteur<br></li>
 
         <li><b>[<code>authorsN</code>]</b>: Les noms des N premiers
         auteurs. S'il y a plus d'auteurs, "EtAl" est
-        ajouté.<br /></li>
+        ajouté.<br></li>
 
         <li><b>[<code>authIniN</code>]</b> : Les N
         premières lettres (ou moins) du nom de chacun des
-        auteurs.<br /></li>
+        auteurs.<br></li>
 
         <li><b>[<code>authorIni</code>]</b> : Les 5
         premières lettres du nom du premier auteur et les
-        initiales du nom des auteurs restants<br /></li>
+        initiales du nom des auteurs restants<br></li>
 
         <li><b>[<code>authN</code>]</b> : Les N
-        premières lettres du premier auteur.<br /></li>
+        premières lettres du premier auteur.<br></li>
 
         <li><b>[<code>authN_M</code>]</b> : Les N
         premières lettres du nom des M premiers
-        auteurs.<br /></li>
+        auteurs.<br></li>
 
         <li><b>[<code>auth.auth.ea</code>]</b> : Le nom des
         deux premiers auteurs suivi de ".ea" lorsqu'ils sont plus
-        de deux.<br /></li>
+        de deux.<br></li>
 
         <li><b>[<code>auth.etal</code>]</b>: Le nom du premier
         auteur et le nom du second auteur, ou ".etal" s'il y en a
-        plus de deux.<br /></li>
+        plus de deux.<br></li>
 
         <li><b>[<code>authshort</code>]</b> : Le nom s'il n'y
         a qu'un seul auteur. Jusqu'à trois auteurs, le
         premier caractère du nom de chacun d'eux. Au
         delà de trois auteurs, le caractère plus (+)
-        est ajouté.<br /></li>
+        est ajouté.<br></li>
     </ul><b>Note :</b> S'il n'y a pas d'auteur (dans le cas
     d'un livre édité), alors tous les marqueurs
     <b><code>[auth...]</code></b> ci-dessus utiliseront
@@ -91,60 +91,60 @@
 
     <ul>
         <li><b>[<code>edtr</code>]</b> : Le nom du premier
-        éditeur<br /></li>
+        éditeur<br></li>
 
         <li><b>[<code>edtrIniN</code>]</b> : Les N
         premières lettres du nom de chaque
-        éditeur<br /></li>
+        éditeur<br></li>
 
         <li><b>[<code>editors</code>]</b> : Le nom des chacun
-        des éditeurs<br /></li>
+        des éditeurs<br></li>
 
         <li><b>[<code>editorLast</code>]</b>: Le nom propre du dernier
-        éditeur<br /></li>
+        éditeur<br></li>
         
         <li><b>[<code>editorIni</code>]</b> : Les cinq
         premières lettres du nom du premier éditeur
         suivi des initiales du nom des éditeurs
-        restants.<br /></li>
+        restants.<br></li>
 
         <li><b>[<code>edtrN</code>]</b> : Les N
         premières lettres du nom du premier
-        éditeur<br /></li>
+        éditeur<br></li>
 
         <li><b>[<code>edtrN_M</code>]</b> : Les N
         premières lettres du nom des M premiers
-        éditeurs.<br /></li>
+        éditeurs.<br></li>
 
         <li><b>[<code>edtr.edtr.ea</code>]</b> : Le nom des
         deux premiers éditeurs suivi de ".ea" lorsqu'ils
-        sont plus de deux.<br /></li>
+        sont plus de deux.<br></li>
 
         <li><b>[<code>edtrshort</code>]</b> : Le nom s'il n'y
         a qu'un seul éditeur. Jusqu'à trois
         éditeurs, le premier caractère du nom de
         chacun d'eux. Au delà de trois éditeurs, le
-        caractère plus (+) est ajouté.<br /></li>
+        caractère plus (+) est ajouté.<br></li>
 
         <li><b>[<code>firstpage</code>]</b> : Le numéro
-        de la première page de la publication<br /></li>
+        de la première page de la publication<br></li>
 
         <li><b>[<code>keywordN</code>]</b>: Nombre de mots-clefs
         dans le champ "keywords" en supposant que les mots-clefs
         sont séparés par des virgules ou des
-        points-virgules.<br /></li>
+        points-virgules.<br></li>
 
         <li><b>[<code>lastpage</code>]</b> : Le numéro
-        de la dernière page de la publication<br /></li>
+        de la dernière page de la publication<br></li>
 
         <li><b>[<code>shorttitle</code>]</b> : Les 3 premiers
-        mots du titre<br /></li>
+        mots du titre<br></li>
 
         <li><b>[<code>shortyear</code>]</b> : Les 2 derniers
-        chiffres de l'année de publication<br /></li>
+        chiffres de l'année de publication<br></li>
 
         <li><b>[<code>veryshorttitle</code>]</b> : Le premier
-        mot du titre qui ne soit pas 'the', 'a', 'an'.<br /></li>
+        mot du titre qui ne soit pas 'the', 'a', 'an'.<br></li>
     </ul>
 
     <p>Un nom de champs (ou celui de l'un des pseudo-champs vu au
@@ -159,7 +159,7 @@
         le premier caractère et les caractères
         suivant un espace seront inclus. Par exemple,
         <b>[journal:abbr]</b> abrègera "Journal of Fish
-        Biology" en "JoFB".<br /></li>
+        Biology" en "JoFB".<br></li>
 
         <li><b>:lower</b>, force le texte inséré par
         le marqueur de champ à être en minuscules. Par
@@ -184,8 +184,8 @@
     les étiquettes ressemblent à :</p>
 
     <blockquote>
-        <code>Yared1998</code><br />
-        <code>Yared1998a</code><br />
+        <code>Yared1998</code><br>
+        <code>Yared1998a</code><br>
         <code>Yared1998b</code>
     </blockquote>
 
diff --git a/src/help/fr/MarkingHelp.html b/src/help/fr/MarkingHelp.html
index 8e39530..3077c28 100644
--- a/src/help/fr/MarkingHelp.html
+++ b/src/help/fr/MarkingHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Etiqueter les entrées</h1>
 
diff --git a/src/help/fr/MedlineHelp.html b/src/help/fr/MedlineHelp.html
index c84874e..cee8d70 100644
--- a/src/help/fr/MedlineHelp.html
+++ b/src/help/fr/MedlineHelp.html
@@ -4,7 +4,7 @@
 <body style="color: rgb(39, 88, 86); direction: ltr;">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Récupération d'entrées depuis
     Medline</h1>
@@ -57,7 +57,7 @@
     http://java.sun.com/j2se/1.4.2/docs/guide/net/properties.html</p>
 
     <p><code>java -Dhttp.proxyHost="hostname"
-    -Dhttp.proxyPort="portnumber"</code></p><br />
-    <br />
+    -Dhttp.proxyPort="portnumber"</code></p><br>
+    <br>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/help/fr/OpenOfficeHelp.html b/src/help/fr/OpenOfficeHelp.html
index 2d122c0..a0d7b51 100644
--- a/src/help/fr/OpenOfficeHelp.html
+++ b/src/help/fr/OpenOfficeHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Utiliser les bibliographies JabRef dans
     OpenOffice.org</h1>
diff --git a/src/help/fr/OwnerHelp.html b/src/help/fr/OwnerHelp.html
index feca15f..393525d 100644
--- a/src/help/fr/OwnerHelp.html
+++ b/src/help/fr/OwnerHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Le champ 'owner' (propriétaire)</h1>
 
diff --git a/src/help/fr/PreviewHelp.html b/src/help/fr/PreviewHelp.html
index 942b7b8..da22a62 100644
--- a/src/help/fr/PreviewHelp.html
+++ b/src/help/fr/PreviewHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Configuration de l'aperçu des
     entrées</h1>
diff --git a/src/help/fr/RemoteHelp.html b/src/help/fr/RemoteHelp.html
index 83b7c34..87b13a7 100644
--- a/src/help/fr/RemoteHelp.html
+++ b/src/help/fr/RemoteHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Accès à distance</h1>
 
diff --git a/src/help/fr/SearchHelp.html b/src/help/fr/SearchHelp.html
index f440568..3b54ca1 100644
--- a/src/help/fr/SearchHelp.html
+++ b/src/help/fr/SearchHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Recherche</h1>
 
diff --git a/src/help/fr/ShortAuxImport.html b/src/help/fr/ShortAuxImport.html
index 59b3882..43dbe18 100644
--- a/src/help/fr/ShortAuxImport.html
+++ b/src/help/fr/ShortAuxImport.html
@@ -3,7 +3,7 @@
 <body>
     <basefont size="-1"
           color="#2F4958"
-          face="arial" /> Cette fonction génère une
+          face="arial"> Cette fonction génère une
           nouvelle base de données qui contient uniquement
           les références utilisées dans un
           projet TeX existant.
diff --git a/src/help/fr/ShortIntegrityCheck.html b/src/help/fr/ShortIntegrityCheck.html
index 9a873c0..4e87b06 100644
--- a/src/help/fr/ShortIntegrityCheck.html
+++ b/src/help/fr/ShortIntegrityCheck.html
@@ -3,7 +3,7 @@
 <body>
     <basefont size="-1"
           color="#2F4958"
-          face="arial" /> La vérification
+          face="arial"> La vérification
           d'intégrité est un processus qui recherche
           des indices de champs BibTeX mal
           remplis."Démarrer" est le bouton pour lancer la
diff --git a/src/help/fr/ShortPlainImport.html b/src/help/fr/ShortPlainImport.html
index 5211c17..80a175a 100644
--- a/src/help/fr/ShortPlainImport.html
+++ b/src/help/fr/ShortPlainImport.html
@@ -3,7 +3,7 @@
 <body>
     <basefont size="-1"
           color="#2F4958"
-          face="arial" /> Ceci est simplement une fenêtre de
+          face="arial"> Ceci est simplement une fenêtre de
           copier-coller. Commencez par charger ou coller du texte
           dans la zone de saisie de texte. Ensuite, vous pouvez
           sélectionner des portions de texte et les
diff --git a/src/help/fr/StringEditorHelp.html b/src/help/fr/StringEditorHelp.html
index da31fb3..2329f27 100644
--- a/src/help/fr/StringEditorHelp.html
+++ b/src/help/fr/StringEditorHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>L'éditeur de chaîne</h1>
 
diff --git a/src/help/fr/TimeStampHelp.html b/src/help/fr/TimeStampHelp.html
index 49d57bc..9f5e790 100644
--- a/src/help/fr/TimeStampHelp.html
+++ b/src/help/fr/TimeStampHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Horodatage des entrées</h1>
 
diff --git a/src/help/fr/XMPHelp.html b/src/help/fr/XMPHelp.html
index 5bb19b8..feb4b02 100644
--- a/src/help/fr/XMPHelp.html
+++ b/src/help/fr/XMPHelp.html
@@ -3,7 +3,7 @@
 <body text="#275856">
     <basefont size="4"
           color="#2F4958"
-          face="arial" />
+          face="arial">
 
     <h1>Support des metadonnées XMP dans
     JabRef</h1>
@@ -105,8 +105,8 @@
 
         <li>Tous les autres champs sont sauvés en utilisant
         directement le nom de leur champ.</li>
-    </ul><br />
-    <br />
+    </ul><br>
+    <br>
 
 
     <p>Ci-dessous, un exemple de mise en correspondance</p>
@@ -149,8 +149,8 @@
         <li>Selon RDF, les couples attribut-valeur peuvent aussi
         être exprimés comme des noeuds, et
         vice-versa.</li>
-    </ul><br />
-    <br />
+    </ul><br>
+    <br>
 
 
     <h2>Liens :</h2>
@@ -180,7 +180,7 @@
         <li>
         <a href="http://partners.adobe.com/public/developer/en/xmp/sdk/xmpspecification.pdf">
         Adobe XMP Specification</a></li>
-    </ul><br />
-    <br />
+    </ul><br>
+    <br>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/java/net/sf/jabref/JabRef.java b/src/java/net/sf/jabref/JabRef.java
index e1c90c2..cc57d18 100644
--- a/src/java/net/sf/jabref/JabRef.java
+++ b/src/java/net/sf/jabref/JabRef.java
@@ -80,7 +80,8 @@ public class JabRef {
     public JabRef(String[] args) {
 
         ths = this;
-
+	// Activate antialiasing on Java 5:
+	System.getProperties().put( "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/JabRefFrame.java b/src/java/net/sf/jabref/JabRefFrame.java
index 992bfb9..7a5d654 100644
--- a/src/java/net/sf/jabref/JabRefFrame.java
+++ b/src/java/net/sf/jabref/JabRefFrame.java
@@ -1864,21 +1864,27 @@ class FetchCiteSeerAction
    * @param openInNew Should the entries be imported into a new database?
    * @param callBack The callback for the ImportInspectionDialog to use.
    */
-  public void addImportedEntries(final BasePanel panel, final List entries, String filename, boolean openInNew,
-                                 ImportInspectionDialog.CallBack callBack) {
+  public void addImportedEntries(final BasePanel panel, final List entries, String filename, final boolean openInNew,
+                                 final ImportInspectionDialog.CallBack callBack) {
       // Use the import inspection dialog if it is enabled in preferences, and (there are more than
       // one entry or the inspection dialog is also enabled for single entries):
       if (Globals.prefs.getBoolean("useImportInspectionDialog") &&
               (Globals.prefs.getBoolean("useImportInspectionDialogForSingle") || (entries.size() > 1))) {
-                ImportInspectionDialog diag = new ImportInspectionDialog(ths, panel,
-                        BibtexFields.DEFAULT_INSPECTION_FIELDS,
-                        Globals.lang("Import"), openInNew);
-                diag.addEntries(entries);
-                diag.addCallBack(callBack);
-                diag.entryListComplete();
-                Util.placeDialog(diag, ths);
-                diag.setVisible(true);
-        diag.toFront();
+
+	  SwingUtilities.invokeLater(new Runnable() {
+              public void run() {
+                  ImportInspectionDialog diag = new ImportInspectionDialog(ths, panel,
+                          BibtexFields.DEFAULT_INSPECTION_FIELDS,
+                          Globals.lang("Import"), openInNew);
+                  diag.addEntries(entries);
+                  diag.addCallBack(callBack);
+                  diag.entryListComplete();
+                  Util.placeDialog(diag, ths);
+                  diag.setVisible(true);
+                  diag.toFront();
+              }
+          });
+                
         } else {
             ths.addBibEntries(entries, filename, openInNew);
           if ((panel != null) && (entries.size() == 1)) {
diff --git a/src/java/net/sf/jabref/JabRefPreferences.java b/src/java/net/sf/jabref/JabRefPreferences.java
index c173af1..d48efc9 100644
--- a/src/java/net/sf/jabref/JabRefPreferences.java
+++ b/src/java/net/sf/jabref/JabRefPreferences.java
@@ -877,9 +877,9 @@ public class JabRefPreferences {
         ExternalFileType tp = new ExternalFileType("URL", "html", "firefox", "www");
         list.add(tp);
 
-        // Under Windows we initialize all file types with an empty viewer app, to
+        // Under Windows/Mac we initialize all file types with an empty viewer app, to
         // rely on the default app instead:
-        if (Globals.ON_WIN) {
+        if (Globals.ON_WIN || Globals.ON_MAC) {
             for (Iterator<ExternalFileType> iterator = list.iterator(); iterator.hasNext();) {
                 ExternalFileType type = iterator.next();
                 type.setOpenWith("");
diff --git a/src/java/net/sf/jabref/Util.java b/src/java/net/sf/jabref/Util.java
index efead94..e28067f 100644
--- a/src/java/net/sf/jabref/Util.java
+++ b/src/java/net/sf/jabref/Util.java
@@ -700,9 +700,12 @@ public class Util {
 			try {
                 String filePath = httpLink ? link : file.getPath();
                 if (Globals.ON_MAC) {
-					String[] cmd = { "/usr/bin/open", "-a", fileType.getOpenWith(), filePath };
-					Runtime.getRuntime().exec(cmd);
-				} else if (Globals.ON_WIN) {
+		    // Use "-a <application>" if the app is specified, and just "open <filename>" otherwise:
+                    String[] cmd = ((fileType.getOpenWith() != null) && (fileType.getOpenWith().length() > 0)) ?
+                            new String[] { "/usr/bin/open", "-a", fileType.getOpenWith(), filePath } :
+                            new String[] { "/usr/bin/open", filePath };
+		    Runtime.getRuntime().exec(cmd);		
+		} else if (Globals.ON_WIN) {
                     if ((fileType.getOpenWith() != null) && (fileType.getOpenWith().length() > 0)) {
                         // Application is specified. Use it:
                         openFileWithApplicationOnWindows(filePath, fileType.getOpenWith());
@@ -2696,4 +2699,4 @@ public static void openExternalFileUnknown(JabRefFrame frame, BibtexEntry entry,
 		return one == null ? two == null : one.equals(two);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/resource/build.properties b/src/resource/build.properties
index c5262ed..eb67569 100644
--- a/src/resource/build.properties
+++ b/src/resource/build.properties
@@ -1,3 +1,3 @@
-builddate=November 8 2007
-build=319
-version=2.3
\ No newline at end of file
+builddate=November 29 2007
+build=335
+version=2.3.1
\ No newline at end of file
diff --git a/src/txt/README b/src/txt/README
index f395f52..776577e 100644
--- a/src/txt/README
+++ b/src/txt/README
@@ -1,6 +1,6 @@
 
-JabRef 2.3
-----------
+JabRef 2.3.1
+------------
 
 
 Introduction:
@@ -80,6 +80,11 @@ appear in your chosen languages.
 
 Change log:
 
+2.3.1
+    - Removed default applications for file types under Mac OS X, and made use of the
+      standard "/usr/bin/open <filename>" way to open files except when an application name
+      is explicitly set.
+    - [ 1620792 ] Fixed: JabRef randomly hangs during Medline fetch
 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
diff --git a/src/windows/nsis/installer_languages/english.nsh b/src/windows/nsis/installer_languages/english.nsh
index cc7d8b0..6b5960b 100644
--- a/src/windows/nsis/installer_languages/english.nsh
+++ b/src/windows/nsis/installer_languages/english.nsh
@@ -12,17 +12,13 @@ LangString WelcomePageText "${JabRef_LANG}" "This wizard will guide you through
 					     \r\n\
 					     $_CLICK"
 
-LangString FileTypeTitle "${JabRef_LANG}" "BibTeX-file"
-
 LangString SecAssociateBibTitle "${JabRef_LANG}" "Associate BibTeX-files"
 LangString SecDesktopTitle "${JabRef_LANG}" "Desktop icon"
 
 LangString SecAssociateBibDescription "${JabRef_LANG}" "Files with the extension .bib will automatically be opened with JabRef."
 LangString SecDesktopDescription "${JabRef_LANG}" "Puts JabRef icon on the desktop."
 
-LangString OpenIn "${JabRef_LANG}" "Open in JabRef"
-
-LangString NotAdmin "${JabRef_LANG}" "You must have administrator privileges to install JabRef!"
+LangString StillInstalled "${JabRef_LANG}" "JabRef ${Version} is already installed!"
 
 LangString FinishPageMessage "${JabRef_LANG}" "Congratulations! JabRef has been installed successfully."
 LangString FinishPageRun "${JabRef_LANG}" "Launch JabRef"
diff --git a/src/windows/nsis/installer_languages/french.nsh b/src/windows/nsis/installer_languages/french.nsh
index 4a8df21..5ae5d51 100644
--- a/src/windows/nsis/installer_languages/french.nsh
+++ b/src/windows/nsis/installer_languages/french.nsh
@@ -9,10 +9,8 @@
 LicenseLangString JabRefLicenseData ${JabRef_LANG} "${PRODUCT_LICENSE_FILE}"
 
 LangString WelcomePageText "${JabRef_LANG}" "Cet assistant va vous guider au cours de l'installation de JabRef.\r\n\
-                         \r\n\
-                         $_CLICK"
-
-LangString FileTypeTitle "${JabRef_LANG}" "Fichier BibTeX"
+                                            \r\n\
+					    $_CLICK"
 
 LangString SecAssociateBibTitle "${JabRef_LANG}" "Association aux fichiers BibTeX"
 LangString SecDesktopTitle "${JabRef_LANG}" "Ic�ne du bureau"
@@ -20,9 +18,7 @@ LangString SecDesktopTitle "${JabRef_LANG}" "Ic
 LangString SecAssociateBibDescription "${JabRef_LANG}" "Les fichiers ayant l'extension .bib seront automatiquement ouverts avec JabRef."
 LangString SecDesktopDescription "${JabRef_LANG}" "Ajoute l'ic�ne de JabRef sur le bureau."
 
-LangString OpenIn "${JabRef_LANG}" "Ouvert dans JabRef"
-
-LangString NotAdmin "${JabRef_LANG}" "Vous devez avoir les droits d'administration pour installer JabRef !"
+LangString StillInstalled "${JabRef_LANG}" "JabRef ${Version} est dej� install�!"
 
 LangString FinishPageMessage "${JabRef_LANG}" "F�licitations ! JabRef a �t� correctement install�."
 LangString FinishPageRun "${JabRef_LANG}" "Lancer JabRef"
diff --git a/src/windows/nsis/installer_languages/german.nsh b/src/windows/nsis/installer_languages/german.nsh
index 7acd00b..c7ad736 100644
--- a/src/windows/nsis/installer_languages/german.nsh
+++ b/src/windows/nsis/installer_languages/german.nsh
@@ -12,17 +12,13 @@ LangString WelcomePageText "${JabRef_LANG}" "Dieser Assistent wird Sie durch die
 					     \r\n\
 					     $_CLICK"
 
-LangString FileTypeTitle "${JabRef_LANG}" "BibTeX-Datei"
-
 LangString SecAssociateBibTitle "${JabRef_LANG}" "Dateizuordnung f�r BibTeX-Dateien"
 LangString SecDesktopTitle "${JabRef_LANG}" "Desktopsymbol"
 
 LangString SecAssociateBibDescription "${JabRef_LANG}" "Dateien mit der Endung .bib werden automatisch mit JabRef ge�ffnet."
 LangString SecDesktopDescription "${JabRef_LANG}" "Erstellt Verkn�pfung zu JabRef auf dem Desktop."
 
-LangString OpenIn "${JabRef_LANG}" "In JabRef �ffnen"
-
-LangString NotAdmin "${JabRef_LANG}" "Sie ben�tigen Administratorrechte um JabRef zu installieren!"
+LangString StillInstalled "${JabRef_LANG}" "JabRef ${Version} ist bereits installiert!"
 
 LangString FinishPageMessage "${JabRef_LANG}" "Gl�ckwunsch! JabRef wurde erfolgreich installiert."
 LangString FinishPageRun "${JabRef_LANG}" "JabRef starten"
diff --git a/src/windows/nsis/installer_languages/italian.nsh b/src/windows/nsis/installer_languages/italian.nsh
index d7761d0..a83b1b3 100644
--- a/src/windows/nsis/installer_languages/italian.nsh
+++ b/src/windows/nsis/installer_languages/italian.nsh
@@ -9,10 +9,8 @@
 LicenseLangString JabRefLicenseData ${JabRef_LANG} "${PRODUCT_LICENSE_FILE}"
 
 LangString WelcomePageText "${JabRef_LANG}" "Questa procedura ti guider� durante il processo di installazione di JabRef.\r\n\
-                         \r\n\
-                         $_CLICK"
-
-LangString FileTypeTitle "${JabRef_LANG}" "File BibTeX"
+                                            \r\n\
+					    $_CLICK"
 
 LangString SecAssociateBibTitle "${JabRef_LANG}" "Associazione dei file BibTeX"
 LangString SecDesktopTitle "${JabRef_LANG}" "Icona del Desktop"
@@ -20,9 +18,7 @@ LangString SecDesktopTitle "${JabRef_LANG}" "Icona del Desktop"
 LangString SecAssociateBibDescription "${JabRef_LANG}" "I file con estensione .bib saranno aperti automaticamente con JabRef."
 LangString SecDesktopDescription "${JabRef_LANG}" "Aggiungi l'icona di JabRef sul Desktop"
 
-LangString OpenIn "${JabRef_LANG}" "Apri con JabRef"
-
-LangString NotAdmin "${JabRef_LANG}" "Sono necessari privilegi di amministratore per installare JabRef!"
+LangString StillInstalled "${JabRef_LANG}" "JabRef ${Version} is already installed!"
 
 LangString FinishPageMessage "${JabRef_LANG}" "Congratulazioni! L'installazione di JabRef � terminata con successo."
 LangString FinishPageRun "${JabRef_LANG}" "Avvia JabRef"
diff --git a/src/windows/nsis/launcher.nsi b/src/windows/nsis/launcher.nsi
index f7a4c3d..19ac3f6 100644
--- a/src/windows/nsis/launcher.nsi
+++ b/src/windows/nsis/launcher.nsi
@@ -22,6 +22,7 @@ OutFile "dist\${APPNAME}.exe"
 
 SilentInstall silent
 XPStyle on
+RequestExecutionLevel user
 
 Section ""
 
diff --git a/src/windows/nsis/setup.nsi b/src/windows/nsis/setup.nsi
index 3d38bb0..d348d55 100644
--- a/src/windows/nsis/setup.nsi
+++ b/src/windows/nsis/setup.nsi
@@ -1,9 +1,9 @@
-# owner	JabRef Team
+# owner		JabRef Team
 # license	GPL version 2
-# author	Uwe St�hr
-# file version	1.0	date	18-01-2007
+# author	Uwe Stöhr
+# file version	2.0	date	20-11-2007
 
-; To compile this script NSIS 2.23 and newer are required
+; To compile this script NSIS 2.30 or newer are required
 ; http://nsis.sourceforge.net/
 
 
@@ -14,24 +14,37 @@ CRCCheck force
 ; Make the installer as small as possible.
 SetCompressor lzma
 
+; set execution level for Windows Vista
+RequestExecutionLevel user
 
 # general definitions
 ; you only need to change this section for new releases
-VIProductVersion "2.2.0.0" ; file version for the installer in the scheme "x.x.x.x"
+; you only need to change this section for new releases
+VIProductVersion "2.3.0.0" ; file version for the installer in the scheme "x.x.x.x"
 !ifndef VERSION
-	!define VERSION "2.2"
+	!define VERSION "2.3"
 !endif
 Name "JabRef ${VERSION}"
 !define REGKEY "SOFTWARE\JabRef"
 !define COMPANY "JabRef Team"
 !define URL "http://jabref.sourceforge.net"
-!define PRODUCT_EXE "JabRef.exe"
+!define PRODUCT_NAME "JabRef"
+!define PRODUCT_EXE "$INSTDIR\JabRef.exe"
+!define PRODUCT_EXE2 "JabRef.exe"
+!define PRODUCT_REGNAME "BibTeX.Document"
+!define PRODUCT_EXT ".bib"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
 !define PRODUCT_LICENSE_FILE "dist\gpl.txt"
 
 
+; registry preparations
+!define SHCNE_ASSOCCHANGED 0x08000000
+!define SHCNF_IDLIST 0
+
+
 # Variables
 Var StartmenuFolder
+Var CreateFileAssociations
 Var CreateDesktopIcon
 Var Answer
 Var UserName
@@ -39,7 +52,6 @@ Var UserName
 
 # Included files
 !include "MUI.nsh"
-!include "fileassoc.nsh"
 !include "LogicLib.nsh"
 
 
@@ -104,7 +116,7 @@ Var UserName
 !insertmacro MUI_PAGE_INSTFILES
 
 ; Finish page
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${PRODUCT_EXE}"
+!define MUI_FINISHPAGE_RUN "${PRODUCT_EXE}"
 !define MUI_FINISHPAGE_TEXT "$(FinishPageMessage)"
 !define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageRun)"
 !insertmacro MUI_PAGE_FINISH
@@ -117,20 +129,16 @@ Var UserName
 # Installer languages
 !insertmacro MUI_LANGUAGE "English" # first language is the default language
 !insertmacro MUI_LANGUAGE "German"
-!insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "Italian"
 
 !include "installer_languages\english.nsh"
 !include "installer_languages\german.nsh"
-!include "installer_languages\french.nsh"
-!include "installer_languages\italian.nsh"
+
 
 # Installer attributes
 OutFile JabRefSetup.exe
 InstallDir "$PROGRAMFILES\JabRef"
 BrandingText "$(^Name) installer" ; appear at the bottom of the installer windows
 XPStyle on ; use XP style for installer windows
-InstallDirRegKey HKLM "${REGKEY}" Path
 LicenseData "$(JabRefLicenseData)"
 
 ; creates file informations for the JabRefSetup.exe
@@ -149,7 +157,7 @@ Section "!JabRef" SecCore
 SectionEnd
 
 Section "$(SecAssociateBibTitle)" SecAssociateBib
- !insertmacro APP_ASSOCIATE "bib" "JabRef.BibTeX" "$(FileTypeTitle)" "$INSTDIR\${PRODUCT_EXE},0" "$(OpenIn)" "$INSTDIR\${PRODUCT_EXE} $\"%1$\""
+ StrCpy $CreateFileAssociations "true"
 SectionEnd
 
 Section "$(SecDesktopTitle)" SecDesktop
@@ -164,37 +172,53 @@ SectionEnd
 
 Section "-Installation actions" SecInstallation
 
-  ; create shortcuts for all users
-  SetShellVarContext all
   ; copy files
   SetOutPath "$INSTDIR"
   SetOverwrite on
   File /r dist\*.*
-  WriteRegStr HKLM "${REGKEY}\Components" Main 1
+  WriteRegStr SHCTX "${REGKEY}\Components" Main 1
+  
   ; register JabRef
-  WriteRegStr HKLM "${REGKEY}" Path $INSTDIR
+  WriteRegStr SHCTX "${REGKEY}" Path $INSTDIR
   WriteUninstaller $INSTDIR\uninstall.exe
+  
   ; create shortcuts to startmenu
   SetOutPath "$INSTDIR"
   CreateDirectory "$SMPROGRAMS\$StartmenuFolder"
-  CreateShortCut "$SMPROGRAMS\$StartmenuFolder\$(^Name).lnk" "$INSTDIR\${PRODUCT_EXE}" "" "$INSTDIR\JabRef.exe"
+  CreateShortCut "$SMPROGRAMS\$StartmenuFolder\$(^Name).lnk" "${PRODUCT_EXE}" "" "$INSTDIR\JabRef.exe"
   CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Uninstall $(^Name).lnk" "$INSTDIR\uninstall.exe"
+  
   ; create desktop icon
   ${if} $CreateDesktopIcon == "true"
    SetOutPath "$INSTDIR"
-   CreateShortCut "$DESKTOP\$(^Name).lnk" "$INSTDIR\${PRODUCT_EXE}" "" "$INSTDIR\${PRODUCT_EXE}" ;$(^Name).lnk
+   CreateShortCut "$DESKTOP\$(^Name).lnk" "${PRODUCT_EXE}" "" "${PRODUCT_EXE}" ;$(^Name).lnk
   ${endif}
-  ; register information that appear in Windows' software listing
-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${VERSION}"
-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "Publisher" "${COMPANY}"
-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${URL}"
-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_EXE}"
-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "StartMenu" "$SMPROGRAMS\$StartmenuFolder"
-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninstall.exe"
-  WriteRegDWORD HKLM "${PRODUCT_UNINST_KEY}" "NoModify" 0x00000001
-  WriteRegDWORD HKLM "${PRODUCT_UNINST_KEY}" "NoRepair" 0x00000001
-       
+  WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu" "$SMPROGRAMS\$StartmenuFolder"
+  ${if} $Answer == "yes" ; if user is admin
+  
+   ; register information that appear in Windows' software listing
+   WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+   WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${VERSION}"
+   WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "Publisher" "${COMPANY}"
+   WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${URL}"
+   WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayIcon" "${PRODUCT_EXE}"
+   WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninstall.exe"   
+   WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoModify" 0x00000001
+   WriteRegDWORD SHCTX "${PRODUCT_UNINST_KEY}" "NoRepair" 0x00000001
+  ${endif}
+  
+  # register the extension .bib
+  ${if} $CreateFileAssociations == "true"
+   # write informations about file type
+   WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}" "" "${PRODUCT_NAME} Document"
+   WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\DefaultIcon" "" "${PRODUCT_EXE},0"
+   WriteRegStr SHCTX "Software\Classes\${PRODUCT_REGNAME}\Shell\open\command" "" '"${PRODUCT_EXE}" "%1"'
+   # write informations about file extensions
+   WriteRegStr SHCTX "Software\Classes\${PRODUCT_EXT}" "" "${PRODUCT_REGNAME}"
+   # refresh shell
+   System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)'
+  ${endif}
+
 SectionEnd
 
 
@@ -205,28 +229,43 @@ Section "un.JabRef" un.SecUnProgramFiles
   ; delete installation folder
   RMDir /r $INSTDIR	
   ; delete start menu entry
-  ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "StartMenu"
+  ReadRegStr $0 SHCTX "${PRODUCT_UNINST_KEY}" "StartMenu"
   RMDir /r "$0"
+  
   ; delete desktop icon
   Delete "$DESKTOP\$(^Name).lnk"
-  ; delete registry entries
+  
+  # remove file extension .lyx
+  ReadRegStr $R0 SHCTX "Software\Classes\${PRODUCT_EXT}" ""
+  ${if} $R0 == "${PRODUCT_REGNAME}"
+   DeleteRegKey SHCTX "Software\Classes\${PRODUCT_EXT}"
+   DeleteRegKey SHCTX "Software\Classes\${PRODUCT_REGNAME}"
+  ${endif}
+  
+  ; delete remaining registry entries
   DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey HKLM "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey HKCR "Applications\${PRODUCT_EXE}"
-  DeleteRegValue HKCR ".bib" "JabRef.BibTeX_backup"
-  DeleteRegValue HKLM "Software\Classes\.bib" "JabRef.BibTeX_backup"
-  DeleteRegKey HKLM "${REGKEY}"
-  ; remove file association with .bib-files
-  !insertmacro APP_UNASSOCIATE "bib" "JabRef.BibTeX"
+  DeleteRegKey SHCTX "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKCR "Applications\${PRODUCT_EXE2}"
+  DeleteRegKey HKCU "${REGKEY}"
+  DeleteRegKey SHCTX "${REGKEY}"
+  
   ; close uninstaller automatically
   SetAutoClose true
-    
+
 SectionEnd
 
 
 # Installer functions
 Function .onInit
 
+
+ # check if the same Jabref version is already installed
+  ReadRegStr $0 SHCTX "${PRODUCT_UNINST_KEY}" "Publisher"
+  ${if} $0 != ""
+   MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)"
+   Abort
+  ${endif}
+  
  InitPluginsDir
   ; If the user does *not* have administrator privileges, abort
   StrCpy $Answer ""
@@ -235,8 +274,8 @@ Function .onInit
   ${if} $Answer == "yes"
    SetShellVarContext all ; set that e.g. shortcuts will be created for all users
   ${else}
-   MessageBox MB_OK|MB_ICONSTOP "$(NotAdmin)"
-   Abort
+   SetShellVarContext current
+   StrCpy $INSTDIR "$APPDATA\$(^Name)"
   ${endif}
 
 FunctionEnd
@@ -244,27 +283,32 @@ FunctionEnd
 
 # Uninstaller functions
 Function un.onInit
-	
+
   ; If the user does *not* have administrator privileges, abort
   StrCpy $Answer ""
   !insertmacro IsUserAdmin $Answer $UserName
   ${if} $Answer == "yes"
    SetShellVarContext all
   ${else}
-   MessageBox MB_OK|MB_ICONSTOP "$(UnNotAdminLabel)"
-   Abort
+   # check if the Jabref has been installed with admin permisions
+   ReadRegStr $0 HKLM "${PRODUCT_UNINST_KEY}" "Publisher"
+   ${if} $0 != ""
+    MessageBox MB_OK|MB_ICONSTOP "$(UnNotAdminLabel)"
+    Abort
+   ${endif}
+   SetShellVarContext current
   ${endif}
   
   ; ask if it should really be removed
   MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "$(UnReallyRemoveLabel)" IDYES +2
   Abort
-  
+
 FunctionEnd
 
 Function un.onUninstSuccess
-	
+
   HideWindow
   MessageBox MB_ICONINFORMATION|MB_OK "$(UnRemoveSuccessLabel)"
-  
+
 FunctionEnd
 

-- 
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